Merge pull request #9 from tasnimzotder/temp

Temp

Author: tasnimzotder

.DS_Store

@@ -0,0 +1,99 @@
+name: Client Release
+
+on:
+  push:
+    branches: [ 'main' ]
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-14, ubuntu-latest]  
+        arch: [amd64, arm64] 
+        exclude:
+          - os: macos-14
+            arch: amd64
+          - os: ubuntu-latest
+            arch: arm64
+
+    defaults:
+      run:
+        working-directory: ./client 
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.22
+
+      - name: Install dependencies
+        run: go mod download -x
+
+      - name: test
+        run: go test -v ./...
+
+      - name: Set GOOS for macOS
+        if: matrix.os == 'macos-14'
+        run: echo "GOOS=darwin" >> $GITHUB_ENV
+      
+      - name: Set GOOS for Ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: echo "GOOS=linux" >> $GITHUB_ENV
+
+      - name: Build client
+        env:
+          CGO_ENABLED: 1
+          GOOS: ${{ env.GOOS }}
+          GOARCH: ${{ matrix.arch }}
+        run: go build -o client
+
+      - name: Upload client artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: tchat-${{ env.GOOS }}-${{ matrix.arch }} 
+          path: ./client 
+
+  # release:
+  #   # if: startsWith(github.ref, 'refs/tags/v')
+  #   needs: build
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v2
+
+  #     - name: Download client artifact
+  #       uses: actions/download-artifact@v3
+  #       with:
+  #         path: .
+        
+  #     - name: Create Release
+  #       id: create_release
+  #       uses: actions/create-release@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #       with:
+  #         tag_name: ${{ github.ref }}
+  #         release_name: Release ${{ github.ref }}
+  #         body: |
+  #           Changes in this Release
+  #           - First Change
+  #           - Second Change
+  #         draft: true
+  #         prerelease: false
+    
+  #     - name: Upload release assets
+  #       uses: actions/upload-release-asset@v1
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #       with:
+  #         upload_url: ${{ steps.create_release.outputs.upload_url }}
+  #         asset_path: ./tchat-*-*
+  #         asset_name: tchat-*-*
+  #         asset_content_type: application/octet-stream

.github/workflows/release.yml

@@ -0,0 +1,2 @@
+
+dist/

.idea/vcs.xml

@@ -2,13 +2,10 @@ build_dev:
 	go build -o bin/tchat main.go
 
 build:
-	GOOS=linux GOARCH=amd64 go build -o bin/tchat.linux.amd64 main.go
-	GOOS=linux GOARCH=arm64 go build -o bin/tchat.linux.arm64 main.go
-	GOOS=darwin GOARCH=arm64 go build -o bin/tchat.darwin.arm64 main.go
-	GOOS=windows GOARCH=amd64 go build -o bin/tchat.windows.amd64.exe main.go
+	CGO_ENABLED=1 go build -o bin/tchat main.go
 
 bin:
 	sudo cp bin/tchat /usr/local/bin/tchat
 
 test:
-	go test -v -count=1 ./... -cover
+	go test -v -count=1 ./... -cover

client/.gitignore

@@ -16,17 +16,17 @@ import (
 	"github.com/tasnimzotder/tchat/_client/pkg/models"
 )
 
-func connectionCmd(apiClient *client.Client) *cobra.Command {
+func connectionCmd(storageClient *storage.Storage) *cobra.Command {
 	return &cobra.Command{
 		Use:   "conn",
 		Short: "conn",
 		Run: func(cmd *cobra.Command, args []string) {
-			connectionCmdHandler(apiClient, cmd, args)
+			connectionCmdHandler(storageClient, cmd, args)
 		},
 	}
 }
 
-func connectionCmdHandler(apiClient *client.Client, cmd *cobra.Command, args []string) {
+func connectionCmdHandler(storageClient *storage.Storage, cmd *cobra.Command, args []string) {
 	connectionTypes := []string{"begin", "create", "list", "remove"}
 
 	commandPrompt := promptui.Select{
@@ -41,29 +41,29 @@ func connectionCmdHandler(apiClient *client.Client, cmd *cobra.Command, args []s
 
 	switch connectionType {
 	case "begin":
-		beginConnectionHandler(apiClient)
+		beginConnectionHandler(storageClient)
 	case "create":
-		createConnectionHandler(apiClient)
+		createConnectionHandler(storageClient)
 	case "list":
-		listConnectionHandler()
+		listConnectionHandler(storageClient)
 	case "remove":
 		// todo: implement
 	}
 }
 
-func beginConnectionHandler(apiClient *client.Client) {
+func beginConnectionHandler(storageClient *storage.Storage) {
 	display.PrintMessage("info", "Beginning connection")
 	display.PrintMessage("info", "This setting will store your public RSA key on the server for other users to download \nand use to send you encrypted messages.\n")
 
-	sqlite, err := storage.NewSQLiteStorage()
-	if err != nil {
-		display.PrintMessage("error", "Failed to create storage")
-		return
-	}
-
-	defer sqlite.Close()
+	//sqlite, err := storage.NewSQLiteStorage()
+	//if err != nil {
+	//	display.PrintMessage("error", "Failed to create storage")
+	//	return
+	//}
+	//
+	//defer sqlite.Close()
 
-	publicKey, err := sqlite.GetPublicRSAKey()
+	publicKey, err := storageClient.GetPublicRSAKey()
 	if err != nil {
 		display.PrintMessage("error", "Failed to get public RSA key")
 		return
@@ -72,7 +72,7 @@ func beginConnectionHandler(apiClient *client.Client) {
 	publicKeyBase64 := cryptography.EncodeBase64(publicKey)
 
 	// user
-	user, err := sqlite.GetLastUser()
+	user, err := storageClient.GetLastUser()
 	if err != nil {
 		display.PrintMessage("error", "Failed to get user")
 		return
@@ -92,7 +92,7 @@ func beginConnectionHandler(apiClient *client.Client) {
 	}
 
 	// start connection
-	err = apiClient.CreateConnection(connectionRequest)
+	err = storageClient.API.CreateConnection(connectionRequest)
 	if err != nil {
 		display.PrintMessage("error", "Failed to create connection")
 		return
@@ -118,7 +118,7 @@ func beginConnectionHandler(apiClient *client.Client) {
 	table.Render()
 }
 
-func createConnectionHandler(apiClient *client.Client) {
+func createConnectionHandler(storageClient *storage.Storage) {
 	userIdPrompt := promptui.Prompt{
 		Label: "Enter the user ID",
 		Validate: func(input string) error {
@@ -157,7 +157,7 @@ func createConnectionHandler(apiClient *client.Client) {
 	}
 
 	// get connection
-	connection, err := apiClient.GetConnection(request)
+	connection, err := storageClient.API.GetConnection(request)
 	if err != nil {
 		display.PrintMessage("error", "Failed to get connection")
 		return
@@ -191,15 +191,15 @@ func createConnectionHandler(apiClient *client.Client) {
 	}
 
 	// add contact
-	sqlite, err := storage.NewSQLiteStorage()
-	if err != nil {
-		display.PrintMessage("error", "Failed to create storage")
-		return
-	}
-
-	defer sqlite.Close()
-
-	err = sqlite.SaveContact(contact)
+	//sqlite, err := storage.NewSQLiteStorage()
+	//if err != nil {
+	//	display.PrintMessage("error", "Failed to create storage")
+	//	return
+	//}
+	//
+	//defer sqlite.Close()
+
+	err = storageClient.SaveContact(contact)
 	if err != nil {
 		display.PrintMessage("error", "Failed to save contact")
 		return
@@ -208,16 +208,16 @@ func createConnectionHandler(apiClient *client.Client) {
 	display.PrintMessage("info", "Contact added successfully")
 }
 
-func listConnectionHandler() {
-	sqlite, err := storage.NewSQLiteStorage()
-	if err != nil {
-		display.PrintMessage("error", "Failed to create storage")
-		return
-	}
-
-	defer sqlite.Close()
+func listConnectionHandler(storageClient *storage.Storage) {
+	//sqlite, err := storage.NewSQLiteStorage()
+	//if err != nil {
+	//	display.PrintMessage("error", "Failed to create storage")
+	//	return
+	//}
+	//
+	//defer sqlite.Close()
 
-	contacts, err := sqlite.GetContacts()
+	contacts, err := storageClient.GetContacts()
 	if err != nil {
 		display.PrintMessage("error", "Failed to get contacts")
 		return

client/Makefile

@@ -7,29 +7,28 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/tasnimzotder/tchat/_client/internal/display"
 	"github.com/tasnimzotder/tchat/_client/internal/storage"
-	"github.com/tasnimzotder/tchat/_client/pkg/client"
 )
 
-func messageCmd(apiClient *client.Client) *cobra.Command {
+func messageCmd(storageClient *storage.Storage) *cobra.Command {
 	_messageCmd := &cobra.Command{
 		Use:   "msg",
 		Short: "Message commands",
 		Run: func(cmd *cobra.Command, args []string) {
-			messageCmdHandler(apiClient, cmd, args)
+			messageCmdHandler(storageClient, cmd, args)
 		},
 	}
 
 	_messageCmd.Flags().BoolP("clear", "c", false, "Clear messages")
 	_messageCmd.Flags().BoolP("display", "d", false, "Display nth Message (default: last)")
 	_messageCmd.Flags().BoolP("save", "s", false, "Save nth Message (default: last)")
 
-	_messageCmd.AddCommand(sendMessageCmd(apiClient))
+	_messageCmd.AddCommand(sendMessageCmd(storageClient))
 	// messageCmd.AddCommand(getMessagesCmd(apiClient))
 
 	return _messageCmd
 }
 
-func messageCmdHandler(apiClient *client.Client, cmd *cobra.Command, args []string) error {
+func messageCmdHandler(storageClient *storage.Storage, cmd *cobra.Command, args []string) error {
 	clearFlag, err := cmd.Flags().GetBool("clear")
 	if err != nil {
 		return err
@@ -50,25 +49,25 @@ func messageCmdHandler(apiClient *client.Client, cmd *cobra.Command, args []stri
 		fmt.Println("Saving last message")
 	}
 
-	sqlite, err := storage.NewSQLiteStorage()
-	if err != nil {
-		return err
-	}
-
-	defer sqlite.Close()
+	//sqlite, err := storage.NewSQLiteStorage()
+	//if err != nil {
+	//	return err
+	//}
+	//
+	//defer sqlite.Close()
 
-	userID, err := sqlite.GetUserID()
+	userID, err := storageClient.GetUserID()
 	if err != nil {
 		return err
 	}
 
-	messages, err := apiClient.GetMessages(userID)
+	messages, err := storageClient.API.GetMessages(userID)
 	if err != nil {
 		return err
 	}
 
 	if clearFlag {
-		err = sqlite.DeleteMessages()
+		err = storageClient.DeleteMessages()
 
 		if err != nil {
 			return err
@@ -78,13 +77,13 @@ func messageCmdHandler(apiClient *client.Client, cmd *cobra.Command, args []stri
 	}
 
 	// save messages
-	err = sqlite.SaveMessages(messages)
+	err = storageClient.SaveMessages(messages)
 	if err != nil {
 		return err
 	}
 
 	// get messages
-	messages, err = sqlite.GetMessages()
+	messages, err = storageClient.GetMessages()
 	if err != nil {
 		return err
 	}
@@ -93,7 +92,6 @@ func messageCmdHandler(apiClient *client.Client, cmd *cobra.Command, args []stri
 	for i, j := 0, len(messages)-1; i < j; i, j = i+1, j-1 {
 		messages[i], messages[j] = messages[j], messages[i]
 	}
-	
 
 	if displayFlag {
 		// todo: implement
@@ -121,9 +119,9 @@ func messageCmdHandler(apiClient *client.Client, cmd *cobra.Command, args []stri
 		}
 
 		message := messages[len(messages)-idx]
-		display.DisplaySingleMessage(message)
+		display.DisplaySingleMessage(storageClient, message)
 	} else {
-		display.DisplayMessages(messages)
+		display.DisplayMessages(storageClient, messages)
 	}
 
 	return nil