update

number571 · Jan 28, 2025 · fb808e6 · fb808e6
1 parent ee87cd1
commit fb808e6
Show file tree

Hide file tree

Showing 16 changed files with 368 additions and 370 deletions.
diff --git a/docs/hidden_lake_anonymous_network.docx b/docs/hidden_lake_anonymous_network.docx
diff --git a/examples/notifier/simple/node1_hln/hln.yml b/examples/notifier/simple/node1_hln/hln.yml
@@ -1,6 +1,6 @@
 settings:
   messages_capacity: 2048
-  work_size_bits: 30
+  work_size_bits: 25
   pow_parallel: 64
   network_key: channel_password
 logging:

diff --git a/examples/notifier/simple/node2_hln/hln.yml b/examples/notifier/simple/node2_hln/hln.yml
@@ -1,6 +1,6 @@
 settings:
   messages_capacity: 2048
-  work_size_bits: 30
+  work_size_bits: 25
   pow_parallel: 64
   network_key: channel_password
 logging:

diff --git a/examples/notifier/simple/node3_hln/hln.yml b/examples/notifier/simple/node3_hln/hln.yml
@@ -1,6 +1,6 @@
 settings:
   messages_capacity: 2048
-  work_size_bits: 30
+  work_size_bits: 25
   pow_parallel: 64
   network_key: channel_password
 logging:

diff --git a/internal/applications/notifier/internal/handler/friends_chat.go b/internal/applications/notifier/internal/handler/friends_chat.go
@@ -14,7 +14,7 @@ import (
 	hlm_settings "github.com/number571/hidden-lake/internal/applications/notifier/pkg/settings"
 	hls_client "github.com/number571/hidden-lake/internal/service/pkg/client"
 	"github.com/number571/hidden-lake/internal/utils/alias"
-	"github.com/number571/hidden-lake/internal/utils/layer1x"
+	"github.com/number571/hidden-lake/internal/utils/layer3"
 	http_logger "github.com/number571/hidden-lake/internal/utils/logger/http"
 	"github.com/number571/hidden-lake/internal/utils/msgdata"
 	"github.com/number571/hidden-lake/internal/webui"
@@ -154,21 +154,12 @@ func pushMessage(
 	}
 
 	cfgSett := pCfg.GetSettings()
-	msg := layer1x.NewMessage(
+	msg := layer3.NewMessage(
 		layer1.NewConstructSettings(&layer1.SConstructSettings{
-			FSettings: layer1.NewSettings(&layer1.SSettings{
-				FWorkSizeBits: cfgSett.GetWorkSizeBits(),
-			}),
+			FSettings: cfgSett,
 			FParallel: cfgSett.GetPowParallel(),
 		}),
-		layer1x.NewMessage(
-			layer1.NewConstructSettings(&layer1.SConstructSettings{
-				FSettings: layer1.NewSettings(&layer1.SSettings{
-					FNetworkKey: cfgSett.GetNetworkKey(),
-				}),
-			}),
-			pMsgBytes,
-		).ToBytes(),
+		pMsgBytes,
 	)
 
 	hlnClient := hln_client.NewClient(

diff --git a/internal/applications/notifier/internal/handler/incoming_finalyze.go b/internal/applications/notifier/internal/handler/incoming_finalyze.go
@@ -10,7 +10,7 @@ import (
 	"github.com/number571/hidden-lake/internal/applications/notifier/internal/database"
 	"github.com/number571/hidden-lake/internal/utils/alias"
 	"github.com/number571/hidden-lake/internal/utils/api"
-	"github.com/number571/hidden-lake/internal/utils/layer1x"
+	"github.com/number571/hidden-lake/internal/utils/layer3"
 	http_logger "github.com/number571/hidden-lake/internal/utils/logger/http"
 	"github.com/number571/hidden-lake/internal/utils/msgdata"
 
@@ -59,7 +59,7 @@ func HandleIncomingFinalyzeHTTP(
 			return
 		}
 
-		rawBodyBytes, err := layer1x.ExtractMessage(rawMsg)
+		rawBodyBytes, err := layer3.ExtractMessage(rawMsg)
 		if err != nil {
 			pLogger.PushWarn(logBuilder.WithMessage("extract_raw_message"))
 			_ = api.Response(pW, http.StatusNotAcceptable, "failed: extract raw message")
@@ -89,7 +89,13 @@ func HandleIncomingFinalyzeHTTP(
 			rawBodyBytes,
 		)
 		if !hashExist && err == nil {
-			bodyBytes, err := layer1x.ExtractMessage(decMsg)
+			if _, err := pDB.SetHash(rel, true, decMsg.GetHash()); err != nil {
+				pLogger.PushWarn(logBuilder.WithMessage("set_hash"))
+				_ = api.Response(pW, http.StatusNotAcceptable, "failed: set hash")
+				return
+			}
+
+			bodyBytes, err := layer3.ExtractMessage(decMsg)
 			if err != nil {
 				pLogger.PushWarn(logBuilder.WithMessage("extract_dec_message"))
 				_ = api.Response(pW, http.StatusBadRequest, "failed: extract dec message")

diff --git a/internal/applications/notifier/internal/handler/incoming_redirect.go b/internal/applications/notifier/internal/handler/incoming_redirect.go
@@ -15,7 +15,7 @@ import (
 	hls_settings "github.com/number571/hidden-lake/internal/service/pkg/settings"
 	"github.com/number571/hidden-lake/internal/utils/alias"
 	"github.com/number571/hidden-lake/internal/utils/api"
-	"github.com/number571/hidden-lake/internal/utils/layer1x"
+	"github.com/number571/hidden-lake/internal/utils/layer3"
 	http_logger "github.com/number571/hidden-lake/internal/utils/logger/http"
 )
 
@@ -55,7 +55,7 @@ func HandleIncomingRedirectHTTP(
 			return
 		}
 
-		if _, err := layer1x.ExtractMessage(rawMsg); err != nil {
+		if _, err := layer3.ExtractMessage(rawMsg); err != nil {
 			pLogger.PushWarn(logBuilder.WithMessage("decode_message_body"))
 			_ = api.Response(pW, http.StatusNotAcceptable, "failed: decode message body")
 			return

diff --git a/internal/applications/notifier/internal/utils/msg_size.go b/internal/applications/notifier/internal/utils/msg_size.go
@@ -5,18 +5,18 @@ import (
 	"errors"
 
 	"github.com/number571/go-peer/pkg/message/layer1"
-	"github.com/number571/go-peer/pkg/payload"
 	hln_client "github.com/number571/hidden-lake/internal/applications/notifier/pkg/client"
 	"github.com/number571/hidden-lake/internal/service/pkg/client"
+	"github.com/number571/hidden-lake/internal/utils/layer3"
 )
 
 var (
 	gReqSize = uint64(len(
-		hln_client.NewBuilder().Redirect(layer1.NewMessage(
+		hln_client.NewBuilder().Redirect(layer3.NewMessage(
 			layer1.NewConstructSettings(&layer1.SConstructSettings{
 				FSettings: layer1.NewSettings(&layer1.SSettings{}),
 			}),
-			payload.NewPayload32(0, []byte{}),
+			[]byte{},
 		)).ToBytes(),
 	))
 )

diff --git a/internal/applications/notifier/pkg/client/builder.go b/internal/applications/notifier/pkg/client/builder.go
@@ -9,6 +9,7 @@ import (
 )
 
 func init() {
+	// used for set gReqSize constant: 'internal/applications/notifier/internal/utils/msg_size.go'
 	if len(hln_settings.CFinalyzePath) != len(hln_settings.CRedirectPath) {
 		panic("notifier builder length")
 	}

diff --git a/internal/applications/notifier/pkg/client/types.go b/internal/applications/notifier/pkg/client/types.go
@@ -7,10 +7,6 @@ import (
 	hls_request "github.com/number571/hidden-lake/pkg/request"
 )
 
-const (
-	CSaltSize = 32
-)
-
 type IClient interface {
 	Finalyze(context.Context, []string, layer1.IMessage) error
 	Redirect(context.Context, []string, string, layer1.IMessage) error

diff --git a/internal/applications/notifier/pkg/settings/settings.go b/internal/applications/notifier/pkg/settings/settings.go
@@ -17,11 +17,6 @@ const (
 	CPathDB     = "hln.db"
 )
 
-const (
-	CHeaderPow  = "Hl-Notifier-Pow"
-	CHeaderSalt = "Hl-Notifier-Salt"
-)
-
 const (
 	CFinalyzePath = "/finalyze"
 	CRedirectPath = "/redirect"

diff --git a/internal/utils/layer1x/errors.go → internal/utils/layer3/errors.go b/internal/utils/layer1x/errors.go → internal/utils/layer3/errors.go
@@ -1,7 +1,7 @@
-package layer1x
+package layer3
 
 const (
-	errPrefix = "internal/utils/layer1x = "
+	errPrefix = "internal/utils/layer3 = "
 )
 
 type SAppError struct {

diff --git a/internal/utils/layer1x/layer1x.go → internal/utils/layer3/layer3.go b/internal/utils/layer1x/layer1x.go → internal/utils/layer3/layer3.go
@@ -1,4 +1,4 @@
-package layer1x
+package layer3
 
 import (
 	"bytes"
@@ -10,18 +10,27 @@ import (
 )
 
 const (
-	cHeadVal  = 0x01
 	cSaltSize = 32
 )
 
 func NewMessage(pSett layer1.IConstructSettings, pBody []byte) layer1.IMessage {
-	salt := random.NewRandom().GetBytes(cSaltSize)
+	cfgSett := pSett.GetSettings()
+	encMsg := layer1.NewMessage(
+		layer1.NewConstructSettings(&layer1.SConstructSettings{
+			FSettings: layer1.NewSettings(&layer1.SSettings{
+				FNetworkKey: cfgSett.GetNetworkKey(),
+			}),
+		}),
+		newPayload(pBody),
+	)
 	return layer1.NewMessage(
-		pSett,
-		payload.NewPayload32(
-			crc32.Checksum(salt, crc32.IEEETable),
-			bytes.Join([][]byte{salt, pBody}, []byte{}),
-		),
+		layer1.NewConstructSettings(&layer1.SConstructSettings{
+			FSettings: layer1.NewSettings(&layer1.SSettings{
+				FWorkSizeBits: cfgSett.GetWorkSizeBits(),
+			}),
+			FParallel: pSett.GetParallel(),
+		}),
+		newPayload(encMsg.ToBytes()),
 	)
 }
 
@@ -36,3 +45,11 @@ func ExtractMessage(pMsg layer1.IMessage) ([]byte, error) {
 	}
 	return body[cSaltSize:], nil
 }
+
+func newPayload(pBody []byte) payload.IPayload32 {
+	salt := random.NewRandom().GetBytes(cSaltSize)
+	return payload.NewPayload32(
+		crc32.Checksum(salt, crc32.IEEETable),
+		bytes.Join([][]byte{salt, pBody}, []byte{}),
+	)
+}
diff --git a/internal/utils/layer1x/layer1x_test.go → internal/utils/layer3/layer3_test.go b/internal/utils/layer1x/layer1x_test.go → internal/utils/layer3/layer3_test.go
@@ -1,4 +1,4 @@
-package layer1x
+package layer3
 
 import "testing"
 

diff --git a/test/result/badge_codelines.svg b/test/result/badge_codelines.svg