mirror of
https://github.com/waku-org/nwaku.git
synced 2025-01-09 14:26:27 +00:00
ed09074cc3
* message.nim: set max message size to 150KiB according to spec Using KiB instead of KB because that seems more aligned with the actual default defined in nim-libp2p (1024 * 1024) Spec details: https://rfc.vac.dev/spec/64/#message-size * test_protocol.nim: align test to current WakuMessage limit * test_waku_client.nim: adapt test to MaxWakuMessageSize change * make maxMessageSize configurable for wakunode2 * wakunode2 app now accepts max-num-bytes-msg-size with KiB, KB, or B units * testlib/wakunode.nim: set maxMessageSize: "1024 KiB" * test_waku_client.nim: remove duplicate check in "Valid Payload Sizes" * set DefaultMaxWakuMessageSizeStr as the only source of truth * external_config.nim: rename max-num-bytes-msg-size -> max-msg-size
54 lines
1.5 KiB
Nim
54 lines
1.5 KiB
Nim
|
|
import
|
|
std/strutils,
|
|
stew/results,
|
|
regex
|
|
|
|
proc parseMsgSize*(input: string): Result[uint64, string] =
|
|
## Parses size strings such as "1.2 KiB" or "3Kb" and returns the equivalent number of bytes
|
|
## if the parse task goes well. If not, it returns an error describing the problem.
|
|
|
|
const RegexDef = """\s*(\d+([\,\.]\d*)?)\s*([Kk]{0,1}[i]?[Bb]{1})"""
|
|
const RegexParseSize = re2(RegexDef)
|
|
|
|
var m: RegexMatch2
|
|
if input.match(RegexParseSize, m) == false:
|
|
return err("error in parseSize. regex is not matching: " & RegexDef)
|
|
|
|
var value: float
|
|
|
|
try:
|
|
value = parseFloat(input[m.captures[0]].replace(",", "."))
|
|
except ValueError:
|
|
return err("invalid size in parseSize: " & getCurrentExceptionMsg() &
|
|
" error parsing: " & input[m.captures[0]] & " KKK : " & $m)
|
|
|
|
let units = input[m.captures[2]].toLowerAscii() # units is "kib", or "kb", or "b".
|
|
|
|
var multiplier: float
|
|
case units:
|
|
of "kb":
|
|
multiplier = 1000
|
|
of "kib":
|
|
multiplier = 1024
|
|
of "ib":
|
|
return err("wrong units. ib or iB aren't allowed.")
|
|
else: ## bytes
|
|
multiplier = 1
|
|
|
|
value = value * multiplier
|
|
|
|
return ok(uint64(value))
|
|
|
|
proc parseCorrectMsgSize*(input: string): uint64 =
|
|
## This proc always returns an int and wraps the following proc:
|
|
##
|
|
## proc parseMsgSize*(input: string): Result[int, string] = ...
|
|
##
|
|
## in case of error, it just returns 0, and this is expected to
|
|
## be called only from a controlled and well-known inputs
|
|
|
|
let ret = parseMsgSize(input).valueOr:
|
|
return 0
|
|
return ret
|