src/syndicate/drivers/http_driver.nim

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Unlicense
 
 import std/[httpcore, options, parseutils, sets, streams, strutils, tables, times, uri]
-import preserves, ../../syndicate, ../bags, ./timers
+import preserves, ../../syndicate, ../bags
 import ../protocols/http
 import taps
 
@@ -25,7 +25,7 @@ proc extractQuery(s: var string): Table[Symbol, seq[QueryValue]] =
   let start = succ skipUntil(s, '?')
   if start < s.len:
     var query = s[start..s.high]
-    s.setLen(pred start)
+    s.setLen(start)
     for key, val in uri.decodeQuery(query):
       var list = result.getOrDefault(Symbol key)
       list.add QueryValue(orKind: QueryValueKind.string, string: val)
@@ -114,10 +114,9 @@ proc lenLine(chunk: Chunk): string =
 type
   Driver = ref object
     facet: Facet
-    ds, timers: Cap
+    ds: Cap
     bindings: Bag[Value]
       # cannot make a bag of HttpBinding, no `==` operator
-    sequenceNumber: BiggestInt
   Session = ref object
     facet: Facet
     driver: Driver
@@ -128,7 +127,6 @@ type
     req: HttpRequest
     stream: StringStream
     mode: HttpResponseKind
-    active: bool
 
 proc send[T: byte|char](ses: Session; data: openarray[T]) =
   ses.conn.send(addr data[0], data.len, endOfMessage = false)
@@ -188,7 +186,6 @@ method message(e: Exchange; turn: var Turn; a: AssertionRef) =
 
     of HttpResponseKind.status:
       if e.mode == res.orKind:
-        e.active = true
         e.ses.conn.startBatch()
         e.stream.write(
             SupportedVersion, " ", res.status.code, " ", res.status.message, CRLF,
@@ -201,27 +198,24 @@ method message(e: Exchange; turn: var Turn; a: AssertionRef) =
         e.stream.write(res.header.name, ": ", res.header.value, CRLF)
 
     of HttpResponseKind.chunk:
-      if res.chunk.chunk.len > 0:
-        if e.mode == HttpResponseKind.header:
-          e.stream.write("transfer-encoding: chunked" & CRLF & CRLF)
-          e.ses.send(move e.stream.data)
-          e.mode = res.orKind
-        if e.mode == res.orKind:
-          e.ses.send(res.chunk.chunk.lenLine)
-          e.ses.send(res.chunk.chunk)
-          e.ses.send(CRLF)
+      if e.mode == HttpResponseKind.header:
+        e.stream.write("transfer-encoding: chunked" & CRLF & CRLF)
+        e.ses.send(move e.stream.data)
+        e.mode = res.orKind
+      if e.mode == res.orKind:
+        e.ses.send(res.chunk.chunk.lenLine)
+        e.ses.send(res.chunk.chunk)
+        e.ses.send(CRLF)
 
     of HttpResponseKind.done:
       if e.mode in {HttpResponseKind.header, HttpResponseKind.chunk}:
         if e.mode == HttpResponseKind.header:
           e.stream.write("content-length: ", $res.done.chunk.len & CRLF & CRLF)
           e.ses.send(move e.stream.data)
-          if res.done.chunk.len > 0:
-            e.ses.send(res.done.chunk)
+          e.ses.send(res.done.chunk)
         elif e.mode == HttpResponseKind.chunk:
           e.ses.send(res.done.chunk.lenLine)
-          if res.done.chunk.len > 0:
-            e.ses.send(res.done.chunk)
+          e.ses.send(res.done.chunk)
           e.ses.send(CRLF & "0" & CRLF & CRLF)
         e.mode = res.orKind
         e.ses.conn.endBatch()
@@ -241,21 +235,10 @@ proc service(turn: var Turn; exch: Exchange) =
     if handler.isNone:
       stop(turn)
     else:
-      let
-        cap =  newCap(turn, exch)
-        ctx = publish(turn, handler.get, HttpContext(
+      publish(turn, handler.get, HttpContext(
           req: exch.req,
-          res: embed cap,
+          res: embed newCap(turn, exch),
         ))
-      const timeout = initDuration(seconds = 4)
-      after(turn, exch.ses.driver.timers, timeout) do (turn: var Turn):
-        if not exch.active:
-          var res = HttpResponse(orKind: HttpResponseKind.status)
-          res.status.code = 504
-          res.status.message = "Binding timeout"
-          message(turn, cap, res)
-          res = HttpResponse(orKind: HttpResponseKind.done)
-          message(turn, cap, res)
 
 proc service(ses: Session) =
   ## Service a connection to an HTTP client.
@@ -267,8 +250,6 @@ proc service(ses: Session) =
     ses.facet.run do (turn: var Turn):
       var (n, req) = parseRequest(ses.conn, cast[string](data))
       if n > 0:
-        inc(ses.driver.sequenceNumber)
-        req.sequenceNumber = ses.driver.sequenceNumber
         req.port = BiggestInt ses.port
         inFacet(turn) do (turn: var Turn):
           preventInertCheck(turn)
@@ -315,8 +296,7 @@ proc httpListen(turn: var Turn; driver: Driver; port: Port): Listener =
   listener
 
 proc httpDriver(turn: var Turn; ds: Cap) =
-  let driver = Driver(facet: turn.facet, ds: ds, timers: turn.newDataspace)
-  spawnTimerDriver(turn, driver.timers)
+  let driver = Driver(facet: turn.facet, ds: ds)
 
   during(turn, ds, HttpBinding?:{
         1: grab(),