update

number571 · Oct 7, 2024 · 82e8940 · 82e8940
1 parent 4d3b5fd
commit 82e8940
Show file tree

Hide file tree

Showing 56 changed files with 10,967 additions and 8,568 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Update `cmd/hidden_lake/helpers/traffic`: rename "storage_enabled" -> "database_enabled"
 - Update `cmd/hidden_lake/helpers/traffic`: "messages_capacity" can be = 0
 - Update `pkg/storage/cache`: cache/lru/lru.go -> cache/lru.go
+- Update `internal/api`: Request success if "200 >= code < 300" (old version only code=200)
 
 <!-- ... -->
 

diff --git a/cmd/hidden_lake/_configs/hlt.yml b/cmd/hidden_lake/_configs/hlt.yml
@@ -1,7 +1,6 @@
 settings:
   message_size_bytes: 8192
   key_size_bits: 4096
-  messages_capacity: 2048
 logging:
 - info
 - warn

diff --git a/cmd/hidden_lake/_test/result/coverage.out b/cmd/hidden_lake/_test/result/coverage.out
diff --git a/cmd/hidden_lake/_test/result/coverage.svg b/cmd/hidden_lake/_test/result/coverage.svg
diff --git a/cmd/hidden_lake/helpers/loader/internal/config/init.go b/cmd/hidden_lake/helpers/loader/internal/config/init.go
@@ -4,7 +4,6 @@ import (
 	"os"
 
 	hll_settings "github.com/number571/go-peer/cmd/hidden_lake/helpers/loader/pkg/settings"
-	hlt_settings "github.com/number571/go-peer/cmd/hidden_lake/helpers/traffic/pkg/settings"
 	hls_settings "github.com/number571/go-peer/cmd/hidden_lake/service/pkg/settings"
 	logger "github.com/number571/go-peer/internal/logger/std"
 )
@@ -16,7 +15,7 @@ func InitConfig(cfgPath string, initCfg *SConfig) (IConfig, error) {
 	if initCfg == nil {
 		initCfg = &SConfig{
 			FSettings: &SConfigSettings{
-				FMessagesCapacity: hlt_settings.CDefaultMessagesCapacity,
+				FMessagesCapacity: hll_settings.CDefaultMessagesCapacity,
 				FWorkSizeBits:     hls_settings.CDefaultWorkSizeBits,
 				FNetworkKey:       hls_settings.CDefaultNetworkKey,
 			},

diff --git a/cmd/hidden_lake/helpers/loader/pkg/settings/settings.go b/cmd/hidden_lake/helpers/loader/pkg/settings/settings.go
@@ -9,6 +9,10 @@ const (
 	CPathYML = "hll.yml"
 )
 
+const (
+	CDefaultMessagesCapacity = (2 << 10) // count
+)
+
 const (
 	CDefaultHTTPAddress = "127.0.0.1:9561"
 )

diff --git a/cmd/hidden_lake/helpers/traffic/README.md b/cmd/hidden_lake/helpers/traffic/README.md
@@ -56,7 +56,6 @@ Default config `hlt.yml`
 settings:
   message_size_bytes: 8192
   key_size_bits: 4096
-  messages_capacity: 2048
 logging:
   - info
   - warn

diff --git a/cmd/hidden_lake/helpers/traffic/internal/cache/cache_test.go b/cmd/hidden_lake/helpers/traffic/internal/cache/cache_test.go
@@ -0,0 +1,5 @@
+package cache
+
+import "testing"
+
+func TestNothing(_ *testing.T) {}
diff --git a/cmd/hidden_lake/helpers/traffic/internal/handler/message.go b/cmd/hidden_lake/helpers/traffic/internal/handler/message.go
@@ -40,9 +40,9 @@ func HandleMessageAPI(
 			query := pR.URL.Query()
 
 			hash := encoding.HexDecode(query.Get("hash"))
-			if hash == nil {
+			if len(hash) == 0 {
 				pHTTPLogger.PushWarn(logBuilder.WithMessage(http_logger.CLogDecodeBody))
-				_ = api.Response(pW, http.StatusNotFound, "failed: decode message")
+				_ = api.Response(pW, http.StatusTeapot, "failed: decode hash")
 				return
 			}
 
@@ -81,6 +81,12 @@ func HandleMessageAPI(
 				return
 			}
 
+			if !pNode.GetCacheSetter().Set(netMsg.GetHash(), []byte{}) {
+				pHTTPLogger.PushInfo(logBuilder.WithMessage("hash_already_exist"))
+				_ = api.Response(pW, http.StatusAccepted, "accepted: hash already exist")
+				return // hash of message already in queue
+			}
+
 			if err := tcpHandler(pCtx, pNode, nil, netMsg); err != nil {
 				// internal logger
 				_ = api.Response(pW, http.StatusBadRequest, "failed: handle message")

diff --git a/cmd/hidden_lake/helpers/traffic/internal/storage/storage.go b/cmd/hidden_lake/helpers/traffic/internal/storage/storage.go
@@ -61,9 +61,6 @@ func (p *sMessageStorage) Push(pMsg net_message.IMessage) error {
 		return utils.MergeErrors(ErrLoadMessage, err)
 	}
 	hash := pMsg.GetHash()
-	if ok := p.fLRUCache.Set(hash, pMsg.ToBytes()); !ok {
-		return ErrMessageIsExist
-	}
 	_, err := p.fDatabase.Get(hash)
 	if err == nil {
 		return ErrHashAlreadyExist
@@ -74,6 +71,9 @@ func (p *sMessageStorage) Push(pMsg net_message.IMessage) error {
 	if err := p.fDatabase.Set(hash, []byte{}); err != nil {
 		return utils.MergeErrors(ErrSetHashIntoDB, err)
 	}
+	if ok := p.fLRUCache.Set(hash, pMsg.ToBytes()); !ok {
+		return ErrMessageIsExist
+	}
 	return nil
 }
 

diff --git a/cmd/hidden_lake/helpers/traffic/pkg/settings/settings.go b/cmd/hidden_lake/helpers/traffic/pkg/settings/settings.go
@@ -10,11 +10,6 @@ const (
 	CPathDB  = "hlt.db"
 )
 
-const (
-	CDefaultHashesWindow     = (2 << 10)
-	CDefaultMessagesCapacity = (2 << 10)
-)
-
 const (
 	CHandleIndexPath          = "/api/index"
 	CHandleStoragePointerPath = "/api/storage/pointer"
@@ -24,7 +19,8 @@ const (
 )
 
 const (
-	CDefaultDatabaseEnabled = false
+	CDefaultMessagesCapacity = 0
+	CDefaultDatabaseEnabled  = false
 )
 
 const (

diff --git a/examples/anonymity/echo_service/routing/middle_hlt_1/hlt.yml b/examples/anonymity/echo_service/routing/middle_hlt_1/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/echo_service/routing/middle_hlt_2/hlt.yml b/examples/anonymity/echo_service/routing/middle_hlt_2/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/echo_service/routing/middle_hlt_3/hlt.yml b/examples/anonymity/echo_service/routing/middle_hlt_3/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/echo_service/secret_channel/chatingar/recv_hlc/hls.yml b/examples/anonymity/echo_service/secret_channel/chatingar/recv_hlc/hls.yml
@@ -1,8 +1,8 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
-  fetch_timeout_ms: 60000
+  work_size_bits: 22
+  fetch_timeout_ms: 300_000
   queue_period_ms: 30_000
 logging:
   - info

diff --git a/examples/anonymity/echo_service/secret_channel/chatingar/recv_hlc/hlt.yml b/examples/anonymity/echo_service/secret_channel/chatingar/recv_hlc/hlt.yml
@@ -2,9 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  fetch_timeout_ms: 60000
-  queue_period_ms: 30_000
-  messages_capacity: 2048
 address:
   tcp: :8581
   http: :8582

diff --git a/examples/anonymity/echo_service/secret_channel/chatingar/send_hlc/hls.yml b/examples/anonymity/echo_service/secret_channel/chatingar/send_hlc/hls.yml
@@ -1,8 +1,8 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
-  fetch_timeout_ms: 60000
+  work_size_bits: 22
+  fetch_timeout_ms: 300_000
   queue_period_ms: 30_000
 logging:
   - info

diff --git a/examples/anonymity/echo_service/secret_channel/chatingar/send_hlc/hlt.yml b/examples/anonymity/echo_service/secret_channel/chatingar/send_hlc/hlt.yml
@@ -2,9 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  fetch_timeout_ms: 60000
-  queue_period_ms: 30_000
-  messages_capacity: 2048
 address:
   tcp: :7581
   http: :7582

diff --git a/examples/anonymity/echo_service/secret_channel/common/recv_hlc/hlt.yml b/examples/anonymity/echo_service/secret_channel/common/recv_hlc/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
 address:
   tcp: :8581
   http: :8582

diff --git a/examples/anonymity/echo_service/secret_channel/common/send_hlc/hlt.yml b/examples/anonymity/echo_service/secret_channel/common/send_hlc/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
 address:
   tcp: :7581
   http: :7582

diff --git a/examples/anonymity/filesharer/routing/middle_hlt_1/hlt.yml b/examples/anonymity/filesharer/routing/middle_hlt_1/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/filesharer/routing/middle_hlt_2/hlt.yml b/examples/anonymity/filesharer/routing/middle_hlt_2/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/filesharer/routing/middle_hlt_3/hlt.yml b/examples/anonymity/filesharer/routing/middle_hlt_3/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/filesharer/secret_channel/chatingar/node1_hlf/hls_copy.yml b/examples/anonymity/filesharer/secret_channel/chatingar/node1_hlf/hls_copy.yml
@@ -1,7 +1,7 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
+  work_size_bits: 22
   fetch_timeout_ms: 300_000
   queue_period_ms: 30_000
 logging:

diff --git a/examples/anonymity/filesharer/secret_channel/chatingar/node1_hlf/hlt.yml b/examples/anonymity/filesharer/secret_channel/chatingar/node1_hlf/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
 address:
   tcp: :8581
   http: :8582

diff --git a/examples/anonymity/filesharer/secret_channel/chatingar/node2_hlf/hls_copy.yml b/examples/anonymity/filesharer/secret_channel/chatingar/node2_hlf/hls_copy.yml
@@ -1,7 +1,7 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
+  work_size_bits: 22
   fetch_timeout_ms: 300_000
   queue_period_ms: 30_000
 logging:

diff --git a/examples/anonymity/filesharer/secret_channel/chatingar/node2_hlf/hlt.yml b/examples/anonymity/filesharer/secret_channel/chatingar/node2_hlf/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
 address:
   tcp: :7581
   http: :7582

diff --git a/examples/anonymity/filesharer/secret_channel/common/node1_hlf/hls_copy.yml b/examples/anonymity/filesharer/secret_channel/common/node1_hlf/hls_copy.yml
@@ -1,11 +1,9 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
+  work_size_bits: 22
   fetch_timeout_ms: 60000
-  queue_period_ms: 20_000
-  rand_queue_period_ms: 10_000
-  rand_message_size_bytes: 1024
+  queue_period_ms: 5000
 logging:
 - info
 - warn

diff --git a/examples/anonymity/filesharer/secret_channel/common/node1_hlf/hlt.yml b/examples/anonymity/filesharer/secret_channel/common/node1_hlf/hlt.yml
@@ -2,8 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
-  rand_message_size_bytes: 1024
 address:
   tcp: :8581
   http: :8582

diff --git a/examples/anonymity/filesharer/secret_channel/common/node2_hlf/hls_copy.yml b/examples/anonymity/filesharer/secret_channel/common/node2_hlf/hls_copy.yml
@@ -1,11 +1,9 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
+  work_size_bits: 22
   fetch_timeout_ms: 60000
-  queue_period_ms: 20_000
-  rand_queue_period_ms: 10_000
-  rand_message_size_bytes: 1024
+  queue_period_ms: 5000
 logging:
 - info
 - warn

diff --git a/examples/anonymity/filesharer/secret_channel/common/node2_hlf/hlt.yml b/examples/anonymity/filesharer/secret_channel/common/node2_hlf/hlt.yml
@@ -2,8 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
-  rand_message_size_bytes: 1024
 address:
   tcp: :7581
   http: :7582

diff --git a/examples/anonymity/messenger/group/middle_hlt/hlt.yml b/examples/anonymity/messenger/group/middle_hlt/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
 logging:
   - info
   - warn

diff --git a/examples/anonymity/messenger/routing/middle_hlt_1/hlt.yml b/examples/anonymity/messenger/routing/middle_hlt_1/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/messenger/routing/middle_hlt_2/hlt.yml b/examples/anonymity/messenger/routing/middle_hlt_2/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/messenger/routing/middle_hlt_3/hlt.yml b/examples/anonymity/messenger/routing/middle_hlt_3/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 8192
   key_size_bits: 4096
   work_size_bits: 22
-  messages_capacity: 2048
   rand_message_size_bytes: 4096
   network_key: oMj49BD8he1n8bfq
 logging:

diff --git a/examples/anonymity/messenger/secret_channel/chatingar/node1_hlm/hls_copy.yml b/examples/anonymity/messenger/secret_channel/chatingar/node1_hlm/hls_copy.yml
@@ -1,8 +1,8 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
-  fetch_timeout_ms: 60000
+  work_size_bits: 22
+  fetch_timeout_ms: 300_000
   queue_period_ms: 30_000
 logging:
 - info

diff --git a/examples/anonymity/messenger/secret_channel/chatingar/node1_hlm/hlt.yml b/examples/anonymity/messenger/secret_channel/chatingar/node1_hlm/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
 address:
   tcp: :8581
   http: :8582

diff --git a/examples/anonymity/messenger/secret_channel/chatingar/node2_hlm/hls_copy.yml b/examples/anonymity/messenger/secret_channel/chatingar/node2_hlm/hls_copy.yml
@@ -1,8 +1,8 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
-  fetch_timeout_ms: 60000
+  work_size_bits: 22
+  fetch_timeout_ms: 300_000
   queue_period_ms: 30_000
 logging:
 - info

diff --git a/examples/anonymity/messenger/secret_channel/chatingar/node2_hlm/hlt.yml b/examples/anonymity/messenger/secret_channel/chatingar/node2_hlm/hlt.yml
@@ -2,7 +2,6 @@ settings:
   message_size_bytes: 4096
   key_size_bits: 2048
   work_size_bits: 22
-  messages_capacity: 2048
 address:
   tcp: :7581
   http: :7582

diff --git a/examples/anonymity/messenger/secret_channel/common/node1_hlm/hls_copy.yml b/examples/anonymity/messenger/secret_channel/common/node1_hlm/hls_copy.yml
@@ -1,11 +1,9 @@
 settings:
   message_size_bytes: 4096
-  work_size_bits: 22
   key_size_bits: 2048
+  work_size_bits: 22
   fetch_timeout_ms: 60000
-  queue_period_ms: 20_000
-  rand_queue_period_ms: 10_000
-  rand_message_size_bytes: 1024
+  queue_period_ms: 5000
 logging:
 - info
 - warn
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,10 @@ const ( @@
     	CPathYML = "hll.yml"
     )
+    const (
+    	CDefaultMessagesCapacity = (2 << 10) // count
+    )
     const (
     	CDefaultHTTPAddress = "127.0.0.1:9561"
     )
@@ Expand Down @@