Updates for more modern (v1.6.0) nim.

This commit is contained in:
Mahlon E. Smith 2021-10-27 14:36:25 -07:00
parent 0b542f5445
commit fdb32f2dfd
4 changed files with 13 additions and 20 deletions

View file

@ -5,7 +5,7 @@ CACHE = .cache
default: development default: development
development: ${FILES} development: ${FILES}
nim --debugInfo --assertions:on --linedir:on -d:ssl --define:debug --nimcache:${CACHE} c ${FILES} nim --debugInfo --assertions:on --profiler:on --stackTrace:on --linedir:on -d:ssl --define:debug --nimcache:${CACHE} c ${FILES}
@mv src/stomp . @mv src/stomp .
autobuild: autobuild:
@ -16,7 +16,7 @@ debugger: ${FILES}
nim --debugger:on --nimcache:${CACHE} c ${FILES} nim --debugger:on --nimcache:${CACHE} c ${FILES}
release: ${FILES} release: ${FILES}
nim -d:release --opt:speed --nimcache:${CACHE} c ${FILES} nim -d:release --opt:speed --panics:on --nimcache:${CACHE} c ${FILES}
@mv src/stomp . @mv src/stomp .
docs: docs:

View file

@ -153,8 +153,7 @@ This is a complete client that does the following:
# (This should be compiled with -d:ssl) # (This should be compiled with -d:ssl)
import import
json, std/[net,json],
net,
stomp stomp
let let

View file

@ -50,12 +50,12 @@
## ##
import import
strutils, std/nativesockets,
nativesockets, std/net,
net, std/os,
os, std/strutils,
times, std/times,
uri std/uri
const const
VERSION = "0.1.3" ## The current program version. VERSION = "0.1.3" ## The current program version.
@ -130,7 +130,7 @@ proc parse_headers( response: StompResponse, c: StompClient ): int =
c.socket.readline( line, c.timeout ) c.socket.readline( line, c.timeout )
while not line.is_eol: while not line.is_eol:
if defined( debug ): printf " <-- %s\n", line if defined( debug ): printf " <-- %s\n", cstring(line)
var header = line.split( ":" ) var header = line.split( ":" )
if header.len < 2: break if header.len < 2: break
response.headers.add( (header[0], header[1]) ) response.headers.add( (header[0], header[1]) )
@ -206,7 +206,7 @@ proc newStompResponse( c: StompClient ): StompResponse =
# #
result.frame = line result.frame = line
if defined( debug ): if defined( debug ):
printf " <-- %s\n", line printf " <-- %s\n", cstring(line)
# Parse headers and body. # Parse headers and body.
# #
@ -319,7 +319,7 @@ proc newStompClient*( s: Socket, uri: string ): StompClient =
result.options.heartbeat = opt[1].parse_int result.options.heartbeat = opt[1].parse_int
else: else:
discard discard
except IndexError, ValueError: except IndexDefect, ValueError:
discard discard
# Set default STOMP port if otherwise unset. # Set default STOMP port if otherwise unset.
@ -763,12 +763,6 @@ need to URI escape: /%2Ftest
proc receive_message( c: StompClient, r: StompResponse ) = proc receive_message( c: StompClient, r: StompResponse ) =
messages.add( r ) messages.add( r )
case r.frame:
of "RECEIPT":
discard
of "MESSAGE":
discard r.payload
discard r[ "ack" ]
proc seen_heartbeat( c: StompClient, r: StompResponse ) = proc seen_heartbeat( c: StompClient, r: StompResponse ) =
heartbeats = heartbeats + 1 heartbeats = heartbeats + 1

View file

@ -11,5 +11,5 @@ srcDir = "src"
# Dependencies # Dependencies
requires "nim >= 0.19.0" requires "nim >= 1.4.0"