fix/scenario

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/google/uuid v1.3.1
 	github.com/quic-go/quic-go v0.39.0
-	github.com/quic-s/quics v0.0.0-20231022050507-37265559d546
+	github.com/quic-s/quics v0.0.0-20231022064309-d84b4c889eae
 	github.com/quic-s/quics-protocol v0.0.0-20231007080707-81b358ef2f0b
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.17.0

go.sum

@@ -260,6 +260,8 @@ github.com/quic-s/quics v0.0.0-20231017163803-d03854e9069a h1:160qewSyfKRtAcGwG8
 github.com/quic-s/quics v0.0.0-20231017163803-d03854e9069a/go.mod h1:eQDkECDehkewssISgB16qONKKtJDxr62IV2R5ubXfyI=
 github.com/quic-s/quics v0.0.0-20231022050507-37265559d546 h1:QZuDkVhU73HrV7qF3+uV/1Zznn8/4SWszEyEFIq4YZI=
 github.com/quic-s/quics v0.0.0-20231022050507-37265559d546/go.mod h1:eQDkECDehkewssISgB16qONKKtJDxr62IV2R5ubXfyI=
+github.com/quic-s/quics v0.0.0-20231022064309-d84b4c889eae h1:eLPCRocBa0u23Yp+GNac6exyhvTKsJ0l+VCZo/LZlUI=
+github.com/quic-s/quics v0.0.0-20231022064309-d84b4c889eae/go.mod h1:eQDkECDehkewssISgB16qONKKtJDxr62IV2R5ubXfyI=
 github.com/quic-s/quics-protocol v0.0.0-20231007080707-81b358ef2f0b h1:nYwaFH5UBkQFAjJnidVwmxZcD5d+fUQE2lWCLkh7zqc=
 github.com/quic-s/quics-protocol v0.0.0-20231007080707-81b358ef2f0b/go.mod h1:nmSpvk/GC9lbgIPSvzKNbUwnkkacCe/caK0QQsuzQ5Q=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

pkg/net/qclient/rsAdapter.go

@@ -1 +1,37 @@
 package qclient
+
+import (
+	qp "github.com/quic-s/quics-protocol"
+	qstypes "github.com/quic-s/quics/pkg/types"
+)
+
+func SendPing(stream *qp.Stream, UUID string) (*qstypes.Ping, error) {
+
+	req := qstypes.Ping{
+		UUID: UUID,
+	}
+
+	breq, err := req.Encode()
+	if err != nil {
+		return nil, err
+	}
+
+	err = stream.SendBMessage(breq)
+	if err != nil {
+		return nil, err
+	}
+
+	bres, err := stream.RecvBMessage()
+	if err != nil {
+		return nil, err
+	}
+
+	result := qstypes.Ping{}
+	err = result.Decode(bres)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+
+}

pkg/sync/conflict.go

@@ -20,7 +20,7 @@ const (
 func ConflictDownload(path string) error {
 	_, Afterpath := badger.SplitBeforeAfterRoot(path)
 
-	err := Conn.OpenTransaction("CONFLICTDOWNLOAD", func(stream *stream.Stream, transactionName string, transactionID []byte) error {
+	err := Conn.OpenTransaction(qstypes.CONFLICTDOWNLOAD, func(stream *stream.Stream, transactionName string, transactionID []byte) error {
 		UUID := badger.GetUUID()
 		res, err := qclient.SendConflictDownload(stream, UUID, Afterpath)
 		if err != nil {
@@ -97,7 +97,7 @@ func ChooseOne(path string, Side string) error {
 	UUID := badger.GetUUID()
 	_, AfterPath := badger.SplitBeforeAfterRoot(path)
 
-	err := Conn.OpenTransaction("CHOOSEONE", func(stream *stream.Stream, transactionName string, transactionID []byte) error {
+	err := Conn.OpenTransaction(qstypes.CHOOSEONE, func(stream *stream.Stream, transactionName string, transactionID []byte) error {
 
 		// Send ChooseOne
 		res, err := qclient.SendChooseOne(stream, UUID, AfterPath, Side)

pkg/sync/forcesync.go

@@ -9,11 +9,12 @@ import (
 	"github.com/quic-s/quics-client/pkg/types"
 	qp "github.com/quic-s/quics-protocol"
 	"github.com/quic-s/quics-protocol/pkg/stream"
+	qstypes "github.com/quic-s/quics/pkg/types"
 )
 
 func ForceSyncMain() {
 
-	err := QPClient.RecvTransactionHandleFunc("FORCESYNC", func(conn *qp.Connection, stream *stream.Stream, transactionName string, transactionID []byte) error {
+	err := QPClient.RecvTransactionHandleFunc(qstypes.FORCESYNC, func(conn *qp.Connection, stream *stream.Stream, transactionName string, transactionID []byte) error {
 		log.Println("quics-client: [FORCESYNC] transaction start")
 		UUID := badger.GetUUID()
 

pkg/sync/fsnoti.go

@@ -24,7 +24,7 @@ func DirWatchStart() {
 				// lock mutex by hash value of file path
 				// using hash value is to reduce the number of mutex
 
-				if event.Op&fsnotify.Remove == fsnotify.Remove {
+				if event.Op&fsnotify.Remove == fsnotify.Remove || event.Op&fsnotify.Rename == fsnotify.Rename {
 					log.Println("quics-client : REMOVE event ")
 					go PleaseSync(path)
 					continue

pkg/sync/history.go

@@ -14,7 +14,7 @@ func RollBack(path string, version uint64) error {
 
 	_, AfterPath := badger.SplitBeforeAfterRoot(path)
 
-	err := QPClient.RecvTransactionHandleFunc("ROLLBACK", func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
+	err := QPClient.RecvTransactionHandleFunc(qstypes.ROLLBACK, func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
 		rollbackres, err := qclient.SendRollBack(stream, badger.GetUUID(), AfterPath, version)
 		if err != nil {
 			return err
@@ -34,7 +34,7 @@ func RollBack(path string, version uint64) error {
 // @URL /api/v1/history/show
 func HistoryShow(path string, cntfromhead uint64) ([]qstypes.FileHistory, error) {
 	historyShowRes := []qstypes.FileHistory{}
-	err := QPClient.RecvTransactionHandleFunc("HISTORYSHOW", func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
+	err := QPClient.RecvTransactionHandleFunc(qstypes.HISTORYSHOW, func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
 		historyshowres, err := qclient.SendShowHistory(stream, badger.GetUUID(), path, cntfromhead)
 		if err != nil {
 			return err
@@ -54,7 +54,7 @@ func HistoryShow(path string, cntfromhead uint64) ([]qstypes.FileHistory, error)
 // @URL /api/v1/history/download
 func HistoryDownload(path string, version uint64) error {
 
-	err := QPClient.RecvTransactionHandleFunc("HISTORYDOWNLOAD", func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
+	err := QPClient.RecvTransactionHandleFunc(qstypes.HISTORYDOWNLOAD, func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
 		historydownloadres, err := qclient.SendDownloadHistory(stream, badger.GetUUID(), path, version)
 		if err != nil {
 			return err

pkg/sync/mustsync.go

@@ -12,12 +12,13 @@ import (
 
 	"github.com/quic-s/quics-client/pkg/types"
 	qp "github.com/quic-s/quics-protocol"
+	qstypes "github.com/quic-s/quics/pkg/types"
 )
 
 // TODO
 func NeedContentMain() {
 
-	err := QPClient.RecvTransactionHandleFunc("NEEDCONTENT", func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
+	err := QPClient.RecvTransactionHandleFunc(qstypes.NEEDCONTENT, func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
 		req, err := qclient.NeedContentRecvHandler(stream)
 		if err != nil {
 			return err
@@ -49,7 +50,7 @@ func NeedContentMain() {
 
 func MustSyncMain() {
 
-	err := QPClient.RecvTransactionHandleFunc("MUSTSYNC", func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
+	err := QPClient.RecvTransactionHandleFunc(qstypes.MUSTSYNC, func(conn *qp.Connection, stream *qp.Stream, transactionName string, transactionID []byte) error {
 		UUID := badger.GetUUID()
 		mustSyncReq, err := qclient.MustSyncRecvHandler(stream)
 		if err != nil {

pkg/sync/pleasesync.go

@@ -4,6 +4,7 @@ import (
 	"crypto/sha1"
 	"log"
 	"os"
+	"reflect"
 	"time"
 
 	"github.com/quic-s/quics-client/pkg/db/badger"
@@ -175,6 +176,9 @@ func PSwhenRemove(path string) {
 
 	// Update Sync Timestamp and hash as same as update Timestamp and hash
 	prevSyncMetadata := badger.GetSyncMetadata(path)
+	if reflect.ValueOf(prevSyncMetadata).IsZero() {
+		return
+	}
 
 	syncMetadata := types.SyncMetadata{
 		BeforePath:          BeforePath,

pkg/sync/registration.go

@@ -15,9 +15,9 @@ import (
 
 	"github.com/quic-s/quics-client/pkg/db/badger"
 	"github.com/quic-s/quics-client/pkg/net/qclient"
-	"github.com/quic-s/quics-client/pkg/utils"
 	"github.com/quic-s/quics-client/pkg/viper"
 	qp "github.com/quic-s/quics-protocol"
+	"github.com/quic-s/quics-protocol/pkg/stream"
 	qstypes "github.com/quic-s/quics/pkg/types"
 )
 
@@ -55,11 +55,28 @@ func ClientRegistration(ClientPassword string, SIP string, SPort string) error {
 	return nil
 }
 
+func CheckInternetConnection() bool {
+	err := Conn.OpenTransaction("PING", func(stream *stream.Stream, transactionName string, transactionID []byte) error {
+		res, err := qclient.SendPing(stream, badger.GetUUID())
+		if err != nil {
+			return err
+		}
+		if reflect.ValueOf(res).IsZero() {
+			return fmt.Errorf("ping do not success")
+		}
+		return nil
+	})
+	if err != nil {
+		return false
+	}
+	return true
+}
+
 func Reconnect() {
 	prevStatus := true
 	for {
 
-		isOnline := utils.CheckInternetConnection()
+		isOnline := CheckInternetConnection()
 		if !prevStatus && isOnline {
 			ip := viper.GetViperEnvVariables("QUICS_SERVER_IP")
 			if ip == "" {

pkg/sync/setup.go

@@ -29,10 +29,12 @@ func init() {
 	MustSyncMain()
 	ForceSyncMain()
 	FullScanMain()
+	NeedContentMain()
 
 }
 func InitQPClient() {
-	newClient, err := qp.New(qp.LOG_LEVEL_INFO)
+	//newClient, err := qp.New(qp.LOG_LEVEL_INFO)
+	newClient, err := qp.New(qp.LOG_LEVEL_ERROR)
 	if err != nil {
 		panic(err)
 	}