aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2025-03-01 21:39:54 +0100
committerbptato <nincsnevem662@gmail.com>2025-03-01 21:39:54 +0100
commit5a080116b92d80c498ea2f4220f3b3dc1fb54abc (patch)
treefc95b147812f73774ac84e6e2665248b6a543afe /src
parent40b4b4febd728b48a18ed3ed6e7e7339834d7c5f (diff)
downloadchawan-5a080116b92d80c498ea2f4220f3b3dc1fb54abc.tar.gz
Refactor bufreader, bufwriter
This adds a runtime check to packet readers to ensure that all fds have been read, and switches to seqs for packet writers.
Diffstat (limited to 'src')
-rw-r--r--src/html/dom.nim2
-rw-r--r--src/io/bufreader.nim172
-rw-r--r--src/io/bufwriter.nim164
-rw-r--r--src/io/dynstream.nim12
-rw-r--r--src/io/packetreader.nim176
-rw-r--r--src/io/packetwriter.nim148
-rw-r--r--src/local/container.nim10
-rw-r--r--src/local/pager.nim10
-rw-r--r--src/server/buffer.nim47
-rw-r--r--src/server/forkserver.nim14
-rw-r--r--src/server/loader.nim72
-rw-r--r--src/server/loaderiface.nim18
-rw-r--r--src/server/request.nim28
-rw-r--r--src/types/blob.nim39
-rw-r--r--src/types/formdata.nim28
-rw-r--r--src/types/url.nim14
16 files changed, 465 insertions, 489 deletions
diff --git a/src/html/dom.nim b/src/html/dom.nim
index ab45dc76..e36ff3cd 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -24,9 +24,9 @@ import html/enums
import html/event
import html/performance
import html/script
-import io/bufwriter
import io/console
import io/dynstream
+import io/packetwriter
import io/promise
import io/timeout
import monoucha/fromjs
diff --git a/src/io/bufreader.nim b/src/io/bufreader.nim
deleted file mode 100644
index 271a3671..00000000
--- a/src/io/bufreader.nim
+++ /dev/null
@@ -1,172 +0,0 @@
-import std/options
-import std/tables
-
-import io/dynstream
-import types/color
-import types/opt
-
-type BufferedReader* = object
- buffer: seq[uint8]
- bufIdx: int
- recvAux*: seq[cint] #TODO assert on unused ones
-
-proc sread*(reader: var BufferedReader; n: out SomeNumber)
-proc sread*[T](reader: var BufferedReader; s: out set[T])
-proc sread*[T: enum](reader: var BufferedReader; x: out T)
-proc sread*(reader: var BufferedReader; s: out string)
-proc sread*(reader: var BufferedReader; b: out bool)
-proc sread*(reader: var BufferedReader; tup: var tuple)
-proc sread*[I, T](reader: var BufferedReader; a: out array[I, T])
-proc sread*[T](reader: var BufferedReader; s: out seq[T])
-proc sread*[U, V](reader: var BufferedReader; t: out Table[U, V])
-proc sread*(reader: var BufferedReader; obj: var object)
-proc sread*(reader: var BufferedReader; obj: var ref object)
-proc sread*[T](reader: var BufferedReader; o: out Option[T])
-proc sread*[T, E](reader: var BufferedReader; o: out Result[T, E])
-proc sread*(reader: var BufferedReader; c: var ARGBColor)
-proc sread*(reader: var BufferedReader; c: var CellColor)
-
-proc initReader*(stream: DynStream; len, auxLen: int): BufferedReader =
- assert len != 0 or auxLen != 0
- var reader = BufferedReader(
- buffer: newSeqUninitialized[uint8](len),
- recvAux: newSeqUninitialized[cint](auxLen),
- bufIdx: 0
- )
- if not stream.readDataLoop(reader.buffer):
- raise newException(EOFError, "end of file")
- if auxLen > 0:
- # bufwriter added ancillary data.
- var dummy {.noinit.}: array[1, uint8]
- var numFds = 0
- let n = SocketStream(stream).recvMsg(dummy, reader.recvAux, numFds)
- if n < dummy.len or numFds < auxLen:
- raise newException(EOFError, "end of file")
- return reader
-
-proc initPacketReader*(stream: DynStream): BufferedReader =
- var len {.noinit.}: array[2, int]
- if not stream.readDataLoop(addr len[0], sizeof(len)):
- raise newException(EOFError, "end of file")
- return stream.initReader(len[0], len[1])
-
-template withPacketReader*(stream: DynStream; r, body: untyped) =
- block:
- var r = stream.initPacketReader()
- body
-
-proc empty*(reader: var BufferedReader): bool =
- return reader.bufIdx == reader.buffer.len
-
-proc readData*(reader: var BufferedReader; buffer: pointer; len: int) =
- assert reader.bufIdx + len <= reader.buffer.len
- copyMem(buffer, addr reader.buffer[reader.bufIdx], len)
- reader.bufIdx += len
-
-proc sread*(reader: var BufferedReader; n: out SomeNumber) =
- n = 0
- reader.readData(addr n, sizeof(n))
-
-proc sread*[T: enum](reader: var BufferedReader; x: out T) =
- var i {.noinit.}: int
- reader.sread(i)
- x = cast[T](i)
-
-proc sread*[T](reader: var BufferedReader; s: out set[T]) =
- var len {.noinit.}: int
- reader.sread(len)
- s = {}
- for i in 0 ..< len:
- var x: T
- reader.sread(x)
- s.incl(x)
-
-proc sread*(reader: var BufferedReader; s: out string) =
- var len {.noinit.}: int
- reader.sread(len)
- s = newString(len)
- if len > 0:
- reader.readData(addr s[0], len)
-
-proc sread*(reader: var BufferedReader; b: out bool) =
- var n: uint8
- reader.sread(n)
- if n == 1u8:
- b = true
- else:
- assert n == 0u8
- b = false
-
-proc sread*(reader: var BufferedReader; tup: var tuple) =
- for f in tup.fields:
- reader.sread(f)
-
-proc sread*[I; T](reader: var BufferedReader; a: out array[I, T]) =
- for x in a.mitems:
- reader.sread(x)
-
-proc sread*[T](reader: var BufferedReader; s: out seq[T]) =
- var len {.noinit.}: int
- reader.sread(len)
- s = newSeq[T](len)
- for x in s.mitems:
- reader.sread(x)
-
-proc sread*[U; V](reader: var BufferedReader; t: out Table[U, V]) =
- var len {.noinit.}: int
- reader.sread(len)
- t = initTable[U, V](len)
- for i in 0..<len:
- var k: U
- reader.sread(k)
- var v: V
- reader.sread(v)
- t[k] = v
-
-proc sread*(reader: var BufferedReader; obj: var object) =
- obj = default(typeof(obj))
- for f in obj.fields:
- reader.sread(f)
-
-proc sread*(reader: var BufferedReader; obj: var ref object) =
- var n: bool
- reader.sread(n)
- if n:
- obj = new(typeof(obj))
- reader.sread(obj[])
- else:
- obj = nil
-
-proc sread*[T](reader: var BufferedReader; o: out Option[T]) =
- var x: bool
- reader.sread(x)
- if x:
- var m: T
- reader.sread(m)
- o = some(m)
- else:
- o = none(T)
-
-proc sread*[T, E](reader: var BufferedReader; o: out Result[T, E]) =
- var x: bool
- reader.sread(x)
- if x:
- when T isnot void:
- var m: T
- reader.sread(m)
- o.ok(m)
- else:
- o.ok()
- else:
- when E isnot void:
- var e: E
- reader.sread(e)
- o.err(e)
- else:
- o.err()
-
-proc sread*(reader: var BufferedReader; c: var ARGBColor) =
- reader.sread(uint32(c))
-
-proc sread*(reader: var BufferedReader; c: var CellColor) =
- reader.sread(uint32(c))
diff --git a/src/io/bufwriter.nim b/src/io/bufwriter.nim
deleted file mode 100644
index 3a347a52..00000000
--- a/src/io/bufwriter.nim
+++ /dev/null
@@ -1,164 +0,0 @@
-# Write data to streams in packets.
-# Each packet is prefixed with two pointer-sized integers;
-# the first one indicates the buffer's length, while the second one the
-# length of its ancillary data (i.e. the number of file descriptors
-# passed).
-
-import std/algorithm
-import std/options
-import std/tables
-
-import io/dynstream
-import types/color
-import types/opt
-
-type BufferedWriter* = object
- stream: DynStream
- buffer: ptr UncheckedArray[uint8]
- bufSize: int
- bufLen: int
- sendAux*: seq[cint]
-
-proc `=destroy`(writer: var BufferedWriter) =
- if writer.buffer != nil:
- dealloc(writer.buffer)
- writer.buffer = nil
-
-proc swrite*(writer: var BufferedWriter; n: SomeNumber)
-proc swrite*[T](writer: var BufferedWriter; s: set[T])
-proc swrite*[T: enum](writer: var BufferedWriter; x: T)
-proc swrite*(writer: var BufferedWriter; s: string)
-proc swrite*(writer: var BufferedWriter; b: bool)
-proc swrite*(writer: var BufferedWriter; tup: tuple)
-proc swrite*[I, T](writer: var BufferedWriter; a: array[I, T])
-proc swrite*[T](writer: var BufferedWriter; s: openArray[T])
-proc swrite*[U, V](writer: var BufferedWriter; t: Table[U, V])
-proc swrite*(writer: var BufferedWriter; obj: object)
-proc swrite*(writer: var BufferedWriter; obj: ref object)
-proc swrite*[T](writer: var BufferedWriter; o: Option[T])
-proc swrite*[T, E](writer: var BufferedWriter; o: Result[T, E])
-proc swrite*(writer: var BufferedWriter; c: ARGBColor)
-proc swrite*(writer: var BufferedWriter; c: CellColor)
-
-const InitLen = sizeof(int) * 2
-const SizeInit = max(64, InitLen)
-proc initWriter*(stream: DynStream): BufferedWriter =
- return BufferedWriter(
- stream: stream,
- buffer: cast[ptr UncheckedArray[uint8]](alloc(SizeInit)),
- bufSize: SizeInit,
- bufLen: InitLen
- )
-
-proc flush*(writer: var BufferedWriter) =
- # subtract the length field's size
- let len = [writer.bufLen - InitLen, writer.sendAux.len]
- copyMem(writer.buffer, unsafeAddr len[0], sizeof(len))
- if not writer.stream.writeDataLoop(writer.buffer, writer.bufLen):
- raise newException(EOFError, "end of file")
- if writer.sendAux.len > 0:
- writer.sendAux.reverse()
- let n = SocketStream(writer.stream).sendMsg([0u8], writer.sendAux)
- if n < 1:
- raise newException(EOFError, "end of file")
- writer.bufLen = 0
-
-proc deinit*(writer: var BufferedWriter) =
- dealloc(writer.buffer)
- writer.buffer = nil
- writer.bufSize = 0
- writer.bufLen = 0
- writer.sendAux.setLen(0)
-
-template withPacketWriter*(stream: DynStream; w, body: untyped) =
- var w = stream.initWriter()
- try:
- body
- finally:
- w.flush()
- w.deinit()
-
-proc writeData*(writer: var BufferedWriter; buffer: pointer; len: int) =
- let targetLen = writer.bufLen + len
- let missing = targetLen - writer.bufSize
- if missing > 0:
- let target = writer.bufSize + missing
- writer.bufSize *= 2
- if writer.bufSize < target:
- writer.bufSize = target
- let p = realloc(writer.buffer, writer.bufSize)
- writer.buffer = cast[ptr UncheckedArray[uint8]](p)
- copyMem(addr writer.buffer[writer.bufLen], buffer, len)
- writer.bufLen = targetLen
-
-proc swrite*(writer: var BufferedWriter; n: SomeNumber) =
- writer.writeData(unsafeAddr n, sizeof(n))
-
-proc swrite*[T: enum](writer: var BufferedWriter; x: T) =
- static:
- doAssert sizeof(int) >= sizeof(T)
- writer.swrite(int(x))
-
-proc swrite*[T](writer: var BufferedWriter; s: set[T]) =
- writer.swrite(s.card)
- for e in s:
- writer.swrite(e)
-
-proc swrite*(writer: var BufferedWriter; s: string) =
- writer.swrite(s.len)
- if s.len > 0:
- writer.writeData(unsafeAddr s[0], s.len)
-
-proc swrite*(writer: var BufferedWriter; b: bool) =
- if b:
- writer.swrite(1u8)
- else:
- writer.swrite(0u8)
-
-proc swrite*(writer: var BufferedWriter; tup: tuple) =
- for f in tup.fields:
- writer.swrite(f)
-
-proc swrite*[I, T](writer: var BufferedWriter; a: array[I, T]) =
- for x in a:
- writer.swrite(x)
-
-proc swrite*[T](writer: var BufferedWriter; s: openArray[T]) =
- writer.swrite(s.len)
- for x in s:
- writer.swrite(x)
-
-proc swrite*[U, V](writer: var BufferedWriter; t: Table[U, V]) =
- writer.swrite(t.len)
- for k, v in t:
- writer.swrite(k)
- writer.swrite(v)
-
-proc swrite*(writer: var BufferedWriter; obj: object) =
- for f in obj.fields:
- writer.swrite(f)
-
-proc swrite*(writer: var BufferedWriter; obj: ref object) =
- writer.swrite(obj != nil)
- if obj != nil:
- writer.swrite(obj[])
-
-proc swrite*[T](writer: var BufferedWriter; o: Option[T]) =
- writer.swrite(o.isSome)
- if o.isSome:
- writer.swrite(o.get)
-
-proc swrite*[T, E](writer: var BufferedWriter; o: Result[T, E]) =
- writer.swrite(o.isSome)
- if o.isSome:
- when not (T is void):
- writer.swrite(o.get)
- else:
- when not (E is void):
- writer.swrite(o.error)
-
-proc swrite*(writer: var BufferedWriter; c: ARGBColor) =
- writer.swrite(uint32(c))
-
-proc swrite*(writer: var BufferedWriter; c: CellColor) =
- writer.swrite(uint32(c))
diff --git a/src/io/dynstream.nim b/src/io/dynstream.nim
index f6bc4418..aa6bf874 100644
--- a/src/io/dynstream.nim
+++ b/src/io/dynstream.nim
@@ -336,11 +336,11 @@ proc setCloseOnExec*(ps: PosixStream) =
type SocketStream* = ref object of PosixStream
proc sendMsg*(s: SocketStream; buffer: openArray[uint8];
- sendAux: openArray[cint]): int =
+ fds: openArray[cint]): int =
assert buffer.len > 0
var iov = IOVec(iov_base: unsafeAddr buffer[0], iov_len: csize_t(buffer.len))
- let sendAuxSize = sizeof(cint) * sendAux.len
- let controlLen = CMSG_SPACE(csize_t(sendAuxSize))
+ let fdSize = sizeof(cint) * fds.len
+ let controlLen = CMSG_SPACE(csize_t(fdSize))
var cmsgBuf = newSeqUninitialized[uint8](controlLen)
var hdr = Tmsghdr(
msg_iov: addr iov,
@@ -349,11 +349,11 @@ proc sendMsg*(s: SocketStream; buffer: openArray[uint8];
msg_controllen: SockLen(controlLen)
)
let cmsg = CMSG_FIRSTHDR(addr hdr)
- cmsg.cmsg_len = SockLen(CMSG_LEN(csize_t(sendAuxSize)))
+ cmsg.cmsg_len = SockLen(CMSG_LEN(csize_t(fdSize)))
cmsg.cmsg_level = SOL_SOCKET
cmsg.cmsg_type = SCM_RIGHTS
- if sendAux.len > 0:
- copyMem(CMSG_DATA(cmsg), unsafeAddr sendAux[0], sendAuxSize)
+ if fds.len > 0:
+ copyMem(CMSG_DATA(cmsg), unsafeAddr fds[0], fdSize)
return sendmsg(SocketHandle(s.fd), addr hdr, 0)
proc recvMsg*(s: SocketStream; buffer: var openArray[uint8];
diff --git a/src/io/packetreader.nim b/src/io/packetreader.nim
new file mode 100644
index 00000000..fb9eef10
--- /dev/null
+++ b/src/io/packetreader.nim
@@ -0,0 +1,176 @@
+import std/options
+import std/tables
+
+import io/dynstream
+import types/color
+import types/opt
+
+type PacketReader* = object
+ buffer: seq[uint8]
+ bufIdx: int
+ fds: seq[cint] #TODO assert on unused ones
+
+proc sread*(r: var PacketReader; n: out SomeNumber)
+proc sread*[T](r: var PacketReader; s: out set[T])
+proc sread*[T: enum](r: var PacketReader; x: out T)
+proc sread*(r: var PacketReader; s: out string)
+proc sread*(r: var PacketReader; b: out bool)
+proc sread*(r: var PacketReader; tup: var tuple)
+proc sread*[I, T](r: var PacketReader; a: out array[I, T])
+proc sread*[T](r: var PacketReader; s: out seq[T])
+proc sread*[U, V](r: var PacketReader; t: out Table[U, V])
+proc sread*(r: var PacketReader; obj: var object)
+proc sread*(r: var PacketReader; obj: var ref object)
+proc sread*[T](r: var PacketReader; o: out Option[T])
+proc sread*[T, E](r: var PacketReader; o: out Result[T, E])
+proc sread*(r: var PacketReader; c: var ARGBColor)
+proc sread*(r: var PacketReader; c: var CellColor)
+
+proc initReader*(stream: DynStream; len, nfds: int): PacketReader =
+ assert len != 0 or nfds != 0
+ var r = PacketReader(
+ buffer: newSeqUninitialized[uint8](len),
+ fds: newSeqUninitialized[cint](nfds),
+ bufIdx: 0
+ )
+ if not stream.readDataLoop(r.buffer):
+ raise newException(EOFError, "end of file")
+ if nfds > 0:
+ # bufwriter added ancillary data.
+ var dummy {.noinit.}: array[1, uint8]
+ var numFds = 0
+ let n = SocketStream(stream).recvMsg(dummy, r.fds, numFds)
+ if n < dummy.len or numFds < nfds:
+ raise newException(EOFError, "end of file")
+ return r
+
+proc initPacketReader*(stream: DynStream): PacketReader =
+ var len {.noinit.}: array[2, int]
+ if not stream.readDataLoop(addr len[0], sizeof(len)):
+ raise newException(EOFError, "end of file")
+ return stream.initReader(len[0], len[1])
+
+template withPacketReader*(stream: DynStream; r, body: untyped) =
+ block:
+ var r = stream.initPacketReader()
+ body
+ assert r.fds.len == 0
+
+proc empty*(r: var PacketReader): bool =
+ return r.bufIdx == r.buffer.len
+
+proc readData*(r: var PacketReader; buffer: pointer; len: int) =
+ assert r.bufIdx + len <= r.buffer.len
+ copyMem(buffer, addr r.buffer[r.bufIdx], len)
+ r.bufIdx += len
+
+proc recvFd*(r: var PacketReader): cint =
+ return r.fds.pop()
+
+proc sread*(r: var PacketReader; n: out SomeNumber) =
+ n = 0
+ r.readData(addr n, sizeof(n))
+
+proc sread*[T: enum](r: var PacketReader; x: out T) =
+ var i {.noinit.}: int
+ r.sread(i)
+ x = cast[T](i)
+
+proc sread*[T](r: var PacketReader; s: out set[T]) =
+ var len {.noinit.}: int
+ r.sread(len)
+ s = {}
+ for i in 0 ..< len:
+ var x: T
+ r.sread(x)
+ s.incl(x)
+
+proc sread*(r: var PacketReader; s: out string) =
+ var len {.noinit.}: int
+ r.sread(len)
+ s = newString(len)
+ if len > 0:
+ r.readData(addr s[0], len)
+
+proc sread*(r: var PacketReader; b: out bool) =
+ var n: uint8
+ r.sread(n)
+ if n == 1u8:
+ b = true
+ else:
+ assert n == 0u8
+ b = false
+
+proc sread*(r: var PacketReader; tup: var tuple) =
+ for f in tup.fields:
+ r.sread(f)
+
+proc sread*[I; T](r: var PacketReader; a: out array[I, T]) =
+ for x in a.mitems:
+ r.sread(x)
+
+proc sread*[T](r: var PacketReader; s: out seq[T]) =
+ var len {.noinit.}: int
+ r.sread(len)
+ s = newSeq[T](len)
+ for x in s.mitems:
+ r.sread(x)
+
+proc sread*[U; V](r: var PacketReader; t: out Table[U, V]) =
+ var len {.noinit.}: int
+ r.sread(len)
+ t = initTable[U, V](len)
+ for i in 0..<len:
+ var k: U
+ r.sread(k)
+ var v: V
+ r.sread(v)
+ t[k] = v
+
+proc sread*(r: var PacketReader; obj: var object) =
+ obj = default(typeof(obj))
+ for f in obj.fields:
+ r.sread(f)
+
+proc sread*(r: var PacketReader; obj: var ref object) =
+ var n: bool
+ r.sread(n)
+ if n:
+ obj = new(typeof(obj))
+ r.sread(obj[])
+ else:
+ obj = nil
+
+proc sread*[T](r: var PacketReader; o: out Option[T]) =
+ var x: bool
+ r.sread(x)
+ if x:
+ var m: T
+ r.sread(m)
+ o = some(m)
+ else:
+ o = none(T)
+
+proc sread*[T, E](r: var PacketReader; o: out Result[T, E]) =
+ var x: bool
+ r.sread(x)
+ if x:
+ when T isnot void:
+ var m: T
+ r.sread(m)
+ o.ok(m)
+ else:
+ o.ok()
+ else:
+ when E isnot void:
+ var e: E
+ r.sread(e)
+ o.err(e)
+ else:
+ o.err()
+
+proc sread*(r: var PacketReader; c: var ARGBColor) =
+ r.sread(uint32(c))
+
+proc sread*(r: var PacketReader; c: var CellColor) =
+ r.sread(uint32(c))
diff --git a/src/io/packetwriter.nim b/src/io/packetwriter.nim
new file mode 100644
index 00000000..b6786ce0
--- /dev/null
+++ b/src/io/packetwriter.nim
@@ -0,0 +1,148 @@
+# Write data to streams in packets.
+# Each packet is prefixed with two pointer-sized integers;
+# the first one indicates the buffer's length, while the second one the
+# length of its ancillary data (i.e. the number of file descriptors
+# passed).
+
+import std/algorithm
+import std/options
+import std/tables
+
+import io/dynstream
+import types/color
+import types/opt
+
+type PacketWriter* = object
+ stream: DynStream
+ buffer: seq[uint8]
+ bufLen: int
+ # file descriptors to send in the packet
+ fds: seq[cint]
+
+proc swrite*(w: var PacketWriter; n: SomeNumber)
+proc swrite*[T](w: var PacketWriter; s: set[T])
+proc swrite*[T: enum](w: var PacketWriter; x: T)
+proc swrite*(w: var PacketWriter; s: string)
+proc swrite*(w: var PacketWriter; b: bool)
+proc swrite*(w: var PacketWriter; tup: tuple)
+proc swrite*[I, T](w: var PacketWriter; a: array[I, T])
+proc swrite*[T](w: var PacketWriter; s: openArray[T])
+proc swrite*[U, V](w: var PacketWriter; t: Table[U, V])
+proc swrite*(w: var PacketWriter; obj: object)
+proc swrite*(w: var PacketWriter; obj: ref object)
+proc swrite*[T](w: var PacketWriter; o: Option[T])
+proc swrite*[T, E](w: var PacketWriter; o: Result[T, E])
+proc swrite*(w: var PacketWriter; c: ARGBColor)
+proc swrite*(w: var PacketWriter; c: CellColor)
+
+proc sendFd*(w: var PacketWriter; fd: cint) =
+ w.fds.add(fd)
+
+const InitLen = sizeof(int) * 2
+const SizeInit = max(64, InitLen)
+proc initWriter(stream: DynStream): PacketWriter =
+ return PacketWriter(
+ stream: stream,
+ buffer: newSeqUninitialized[uint8](SizeInit),
+ bufLen: InitLen
+ )
+
+proc flush*(w: var PacketWriter) =
+ # subtract the length field's size
+ let len = [w.bufLen - InitLen, w.fds.len]
+ copyMem(addr w.buffer[0], unsafeAddr len[0], sizeof(len))
+ if not w.stream.writeDataLoop(w.buffer.toOpenArray(0, w.bufLen - 1)):
+ raise newException(EOFError, "end of file")
+ if w.fds.len > 0:
+ w.fds.reverse()
+ let n = SocketStream(w.stream).sendMsg([0u8], w.fds)
+ if n < 1:
+ raise newException(EOFError, "end of file")
+ w.bufLen = 0
+ w.fds.setLen(0)
+
+template withPacketWriter*(stream: DynStream; w, body: untyped) =
+ var w = stream.initWriter()
+ body
+ w.flush()
+
+proc writeData*(w: var PacketWriter; buffer: pointer; len: int) =
+ let targetLen = w.bufLen + len
+ let missing = targetLen - w.buffer.len
+ if missing > 0:
+ let target = max(w.buffer.len + missing, w.buffer.len * 2)
+ w.buffer.setLen(target)
+ copyMem(addr w.buffer[w.bufLen], buffer, len)
+ w.bufLen = targetLen
+
+proc swrite*(w: var PacketWriter; n: SomeNumber) =
+ w.writeData(unsafeAddr n, sizeof(n))
+
+proc swrite*[T: enum](w: var PacketWriter; x: T) =
+ static:
+ doAssert sizeof(int) >= sizeof(T)
+ w.swrite(int(x))
+
+proc swrite*[T](w: var PacketWriter; s: set[T]) =
+ w.swrite(s.card)
+ for e in s:
+ w.swrite(e)
+
+proc swrite*(w: var PacketWriter; s: string) =
+ w.swrite(s.len)
+ if s.len > 0:
+ w.writeData(unsafeAddr s[0], s.len)
+
+proc swrite*(w: var PacketWriter; b: bool) =
+ if b:
+ w.swrite(1u8)
+ else:
+ w.swrite(0u8)
+
+proc swrite*(w: var PacketWriter; tup: tuple) =
+ for f in tup.fields:
+ w.swrite(f)
+
+proc swrite*[I, T](w: var PacketWriter; a: array[I, T]) =
+ for x in a:
+ w.swrite(x)
+
+proc swrite*[T](w: var PacketWriter; s: openArray[T]) =
+ w.swrite(s.len)
+ for x in s:
+ w.swrite(x)
+
+proc swrite*[U, V](w: var PacketWriter; t: Table[U, V]) =
+ w.swrite(t.len)
+ for k, v in t:
+ w.swrite(k)
+ w.swrite(v)
+
+proc swrite*(w: var PacketWriter; obj: object) =
+ for f in obj.fields:
+ w.swrite(f)
+
+proc swrite*(w: var PacketWriter; obj: ref object) =
+ w.swrite(obj != nil)
+ if obj != nil:
+ w.swrite(obj[])
+
+proc swrite*[T](w: var PacketWriter; o: Option[T]) =
+ w.swrite(o.isSome)
+ if o.isSome:
+ w.swrite(o.get)
+
+proc swrite*[T, E](w: var PacketWriter; o: Result[T, E]) =
+ w.swrite(o.isSome)
+ if o.isSome:
+ when not (T is void):
+ w.swrite(o.get)
+ else:
+ when not (E is void):
+ w.swrite(o.error)
+
+proc swrite*(w: var PacketWriter; c: ARGBColor) =
+ w.swrite(uint32(c))
+
+proc swrite*(w: var PacketWriter; c: CellColor) =
+ w.swrite(uint32(c))
diff --git a/src/local/container.nim b/src/local/container.nim
index 980e95bc..3c1423f1 100644
--- a/src/local/container.nim
+++ b/src/local/container.nim
@@ -8,7 +8,7 @@ import config/config
import config/cookie
import config/mimetypes
import css/render
-import io/bufwriter
+import io/packetwriter
import io/dynstream
import io/promise
import local/select
@@ -247,9 +247,9 @@ proc clone*(container: Container; newurl: URL; loader: FileLoader):
discard close(sv[1])
return nil
container.iface.stream.source.withPacketWriter w:
- w.sendAux.add(sv[1])
- w.sendAux.add(pipefd[0])
- w.sendAux.add(pipefd[1])
+ w.sendFd(sv[1])
+ w.sendFd(pipefd[0])
+ w.sendFd(pipefd[1])
discard close(sv[1])
discard close(pipefd[0])
discard close(pipefd[1])
@@ -1598,7 +1598,7 @@ proc readSuccess*(container: Container; s: string; fd: cint = -1) =
if fd != -1:
doAssert container.iface.stream.flush()
container.iface.stream.source.withPacketWriter w:
- w.sendAux.add(fd)
+ w.sendFd(fd)
p.then(proc(res: Request) =
if res != nil:
container.triggerEvent(ContainerEvent(t: cetOpen, request: res))
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 756f822e..0e6a0fb7 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -17,10 +17,10 @@ import config/mailcap
import config/mimetypes
import css/render
import html/script
-import io/bufreader
-import io/bufwriter
import io/console
import io/dynstream
+import io/packetreader
+import io/packetwriter
import io/poll
import io/promise
import io/timeout
@@ -2737,14 +2737,14 @@ proc connected3(pager: Pager; container: Container; stream: SocketStream;
loader.resume([istreamOutputId, ostreamOutputId])
stream.withPacketWriter w:
w.swrite(outCacheId)
- w.sendAux.add(cstream.fd)
+ w.sendFd(cstream.fd)
# pass down ostream
- w.sendAux.add(ostream.fd)
+ w.sendFd(ostream.fd)
ostream.sclose()
container.setStream(bufStream)
else: # cloned buffer
stream.withPacketWriter w:
- w.sendAux.add(cstream.fd)
+ w.sendFd(cstream.fd)
# buffer is cloned, just share the parent's cached source
discard loader.shareCachedItem(container.cacheId, container.process)
# also add a reference here; it will be removed when the container is
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index 6c7c81a6..b8fdadc5 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -26,10 +26,10 @@ import html/env
import html/event
import html/formdata as formdata_impl
import html/script
-import io/bufreader
-import io/bufwriter
import io/console
import io/dynstream
+import io/packetreader
+import io/packetwriter
import io/poll
import io/promise
import io/timeout
@@ -222,12 +222,10 @@ proc buildInterfaceProc(fun: NimNode; funid: string):
let name = fun[0] # sym
let params = fun[3] # formalparams
let retval = params[0] # sym
- var body = newStmtList()
assert params.len >= 2 # return type, this value
let nup = ident(funid) # add this to enums
let this2 = newIdentDefs(ident("iface"), ident("BufferInterface"))
let thisval = this2[0]
- var params2: seq[NimNode] = @[]
var retval2: NimNode
var addfun: NimNode
if retval.kind == nnkEmpty:
@@ -238,36 +236,29 @@ proc buildInterfaceProc(fun: NimNode; funid: string):
addfun = quote do:
addPromise[`retval`](`thisval`, `thisval`.packetid)
retval2 = newNimNode(nnkBracketExpr).add(ident("Promise"), retval)
- params2.add(retval2)
- params2.add(this2)
+ var params2 = @[retval2, this2]
# flatten args
for i in 2 ..< params.len:
let param = params[i]
for i in 0 ..< param.len - 2:
let id2 = newIdentDefs(ident(param[i].strVal), param[^2])
params2.add(id2)
- body.add(quote do:
- var writer {.inject.} = `thisval`.stream.initWriter()
- writer.swrite(BufferCommand.`nup`)
- writer.swrite(`thisval`.packetid)
- )
+ let writeStmts = newStmtList()
for i in 2 ..< params2.len:
let s = params2[i][0] # sym e.g. url
- body.add(quote do:
- writer.swrite(`s`)
- )
- body.add(quote do:
- writer.flush()
- writer.deinit()
+ writeStmts.add(quote do: writer.swrite(`s`))
+ let body = quote do:
+ `thisval`.stream.withPacketWriter writer:
+ writer.swrite(BufferCommand.`nup`)
+ writer.swrite(`thisval`.packetid)
+ `writeStmts`
let promise = `addfun`
inc `thisval`.packetid
return promise
- )
- var pragmas: NimNode
- if retval.kind == nnkEmpty:
- pragmas = newNimNode(nnkPragma).add(ident("discardable"))
+ let pragmas = if retval.kind == nnkEmpty:
+ newNimNode(nnkPragma).add(ident("discardable"))
else:
- pragmas = newEmptyNode()
+ newEmptyNode()
return (newProc(name, params2, body, pragmas = pragmas), nup)
type
@@ -943,9 +934,9 @@ proc clone*(buffer: Buffer; newurl: URL): int {.proxy.} =
var pstream: SocketStream
var pins, pouts: PosixStream
buffer.pstream.withPacketReader r:
- pstream = newSocketStream(r.recvAux.pop())
- pins = newPosixStream(r.recvAux.pop())
- pouts = newPosixStream(r.recvAux.pop())
+ pstream = newSocketStream(r.recvFd())
+ pins = newPosixStream(r.recvFd())
+ pouts = newPosixStream(r.recvFd())
let pid = fork()
if pid == -1:
buffer.window.console.error("Failed to clone buffer.")
@@ -997,7 +988,7 @@ proc clone*(buffer: Buffer; newurl: URL): int {.proxy.} =
# get key for new buffer
buffer.loader.controlStream.sclose()
buffer.pstream.withPacketReader r:
- buffer.loader.controlStream = newSocketStream(r.recvAux.pop())
+ buffer.loader.controlStream = newSocketStream(r.recvFd())
buffer.pollData.register(buffer.pstream.fd, POLLIN)
# must reconnect after the new client is set up, or the client pids get
# mixed up.
@@ -1347,7 +1338,7 @@ proc readSuccess*(buffer: Buffer; s: string; hasFd: bool): Request {.proxy.} =
var fd: cint = -1
if hasFd:
buffer.pstream.withPacketReader r:
- fd = r.recvAux.pop()
+ fd = r.recvFd()
if buffer.document.focus != nil:
let focus = buffer.document.focus
buffer.restoreFocus()
@@ -1799,7 +1790,7 @@ proc toggleImages*(buffer: Buffer): bool {.proxy, task.} =
buffer.toggleImages0()
macro bufferDispatcher(funs: static ProxyMap; buffer: Buffer;
- cmd: BufferCommand; packetid: int; r: var BufferedReader) =
+ cmd: BufferCommand; packetid: int; r: var PacketReader) =
let switch = newNimNode(nnkCaseStmt)
switch.add(ident("cmd"))
for k, v in funs:
diff --git a/src/server/forkserver.nim b/src/server/forkserver.nim
index 4d69ab4b..0190f831 100644
--- a/src/server/forkserver.nim
+++ b/src/server/forkserver.nim
@@ -6,9 +6,9 @@ import std/tables
import chagashi/charset
import config/config
import config/urimethodmap
-import io/bufreader
-import io/bufwriter
import io/dynstream
+import io/packetreader
+import io/packetwriter
import server/buffer
import server/loader
import server/loaderiface
@@ -68,7 +68,7 @@ proc forkBuffer*(forkserver: ForkServer; config: BufferConfig; url: URL;
w.swrite(attrs)
w.swrite(ishtml)
w.swrite(charsetStack)
- w.sendAux.add(sv[1])
+ w.sendFd(sv[1])
discard close(sv[1])
var bufferPid: int
forkserver.stream.withPacketReader r:
@@ -107,7 +107,7 @@ proc forkLoader(ctx: var ForkServerContext; config: LoaderConfig): int =
ctx.loaderStream = nil
return pid
-proc forkBuffer(ctx: var ForkServerContext; r: var BufferedReader): int =
+proc forkBuffer(ctx: var ForkServerContext; r: var PacketReader): int =
var config: BufferConfig
var url: URL
var attrs: WindowAttributes
@@ -118,7 +118,7 @@ proc forkBuffer(ctx: var ForkServerContext; r: var BufferedReader): int =
r.sread(attrs)
r.sread(ishtml)
r.sread(charsetStack)
- let fd = r.recvAux.pop()
+ let fd = r.recvFd()
stderr.flushFile()
let pid = fork()
if pid == -1:
@@ -139,8 +139,8 @@ proc forkBuffer(ctx: var ForkServerContext; r: var BufferedReader): int =
var istream: SocketStream
pstream.withPacketReader r:
r.sread(cacheId)
- loaderStream = newSocketStream(r.recvAux.pop())
- istream = newSocketStream(r.recvAux.pop())
+ loaderStream = newSocketStream(r.recvFd())
+ istream = newSocketStream(r.recvFd())
let loader = newFileLoader(loaderPid, pid, loaderStream)
gpstream = pstream
onSignal SIGTERM:
diff --git a/src/server/loader.nim b/src/server/loader.nim
index e49ea4af..12527313 100644
--- a/src/server/loader.nim
+++ b/src/server/loader.nim
@@ -34,9 +34,9 @@ import std/times
import config/cookie
import config/urimethodmap
-import io/bufreader
-import io/bufwriter
import io/dynstream
+import io/packetreader
+import io/packetwriter
import io/poll
import monoucha/javascript
import server/connecterror
@@ -1310,18 +1310,18 @@ proc setupRequestDefaults(request: Request; config: LoaderClientConfig) =
proc load(ctx: var LoaderContext; stream: SocketStream; request: Request;
client: ClientHandle; config: LoaderClientConfig) =
- var sy {.noinit.}: array[2, cint]
+ var sv {.noinit.}: array[2, cint]
var fail = false
stream.withPacketWriter w:
- if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sy) == 0:
+ if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sv) == 0:
w.swrite(true)
- w.sendAux.add(sy[1])
+ w.sendFd(sv[1])
else:
fail = true
w.swrite(false)
if not fail:
- discard close(sy[1])
- let stream = newSocketStream(sy[0])
+ discard close(sv[1])
+ let stream = newSocketStream(sv[0])
let handle = newInputHandle(stream, ctx.getOutputId(), client.pid)
when defined(debug):
handle.url = request.url
@@ -1333,13 +1333,13 @@ proc load(ctx: var LoaderContext; stream: SocketStream; request: Request;
ctx.loadResource(client, config, request, handle)
proc load(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
- r: var BufferedReader) =
+ r: var PacketReader) =
var request: Request
r.sread(request)
ctx.load(stream, request, client, client.config)
proc loadConfig(ctx: var LoaderContext; stream: SocketStream;
- client: ClientHandle; r: var BufferedReader) =
+ client: ClientHandle; r: var PacketReader) =
var request: Request
var config: LoaderClientConfig
r.sread(request)
@@ -1347,7 +1347,7 @@ proc loadConfig(ctx: var LoaderContext; stream: SocketStream;
ctx.load(stream, request, client, config)
proc getCacheFile(ctx: var LoaderContext; stream: SocketStream;
- r: var BufferedReader) =
+ r: var PacketReader) =
var cacheId: int
var sourcePid: int
r.sread(cacheId)
@@ -1361,7 +1361,7 @@ proc getCacheFile(ctx: var LoaderContext; stream: SocketStream;
w.swrite("")
proc addClient(ctx: var LoaderContext; stream: SocketStream;
- r: var BufferedReader) =
+ r: var PacketReader) =
var pid: int
var config: LoaderClientConfig
var clonedFrom: int
@@ -1369,10 +1369,10 @@ proc addClient(ctx: var LoaderContext; stream: SocketStream;
r.sread(config)
r.sread(clonedFrom)
assert pid notin ctx.clientMap
- var sy {.noinit.}: array[2, cint]
+ var sv {.noinit.}: array[2, cint]
stream.withPacketWriter w:
- if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sy) == 0:
- let stream = newSocketStream(sy[0])
+ if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sv) == 0:
+ let stream = newSocketStream(sv[0])
let client = ClientHandle(stream: stream, pid: pid, config: config)
ctx.register(client)
ctx.put(client)
@@ -1387,13 +1387,13 @@ proc addClient(ctx: var LoaderContext; stream: SocketStream;
if it.origin.isSameOrigin(origin):
client.authMap.add(it)
w.swrite(true)
- w.sendAux.add(sy[1])
+ w.sendFd(sv[1])
else:
w.swrite(false)
- discard close(sy[1])
+ discard close(sv[1])
proc removeClient(ctx: var LoaderContext; stream: SocketStream;
- r: var BufferedReader) =
+ r: var PacketReader) =
var pid: int
r.sread(pid)
if pid in ctx.clientMap:
@@ -1401,7 +1401,7 @@ proc removeClient(ctx: var LoaderContext; stream: SocketStream;
ctx.unregClient.add(client)
proc addCacheFile(ctx: var LoaderContext; stream: SocketStream;
- client: ClientHandle; r: var BufferedReader) =
+ client: ClientHandle; r: var PacketReader) =
var outputId: int
var targetPid: int
r.sread(outputId)
@@ -1416,7 +1416,7 @@ proc addCacheFile(ctx: var LoaderContext; stream: SocketStream;
w.swrite(id)
proc redirectToFile(ctx: var LoaderContext; stream: SocketStream;
- r: var BufferedReader) =
+ r: var PacketReader) =
var outputId: int
var targetPath: string
var displayUrl: string
@@ -1450,7 +1450,7 @@ proc redirectToFile(ctx: var LoaderContext; stream: SocketStream;
w.swrite(success)
proc shareCachedItem(ctx: var LoaderContext; stream: SocketStream;
- r: var BufferedReader) =
+ r: var PacketReader) =
# share a cached file with another buffer. this is for newBufferFrom
# (i.e. view source)
var sourcePid: int # pid of source client
@@ -1470,7 +1470,7 @@ proc shareCachedItem(ctx: var LoaderContext; stream: SocketStream;
w.swrite(n != -1)
proc openCachedItem(ctx: LoaderContext; stream: SocketStream;
- client: ClientHandle; r: var BufferedReader) =
+ client: ClientHandle; r: var PacketReader) =
# open a cached item
var id: int
r.sread(id)
@@ -1478,20 +1478,20 @@ proc openCachedItem(ctx: LoaderContext; stream: SocketStream;
stream.withPacketWriter w:
w.swrite(ps != nil)
if ps != nil:
- w.sendAux.add(ps.fd)
+ w.sendFd(ps.fd)
if ps != nil:
ps.sclose()
proc passFd(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
- r: var BufferedReader) =
+ r: var PacketReader) =
var id: string
r.sread(id)
- let fd = r.recvAux.pop()
+ let fd = r.recvFd()
#TODO cloexec?
client.passedFdMap.add((id, newPosixStream(fd)))
proc addPipe(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
- r: var BufferedReader) =
+ r: var PacketReader) =
var id: string
r.sread(id)
var pipefd {.noinit.}: array[2, cint]
@@ -1501,14 +1501,14 @@ proc addPipe(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
else:
stream.withPacketWriter w:
w.swrite(true)
- w.sendAux.add(pipefd[1])
+ w.sendFd(pipefd[1])
discard close(pipefd[1])
let ps = newPosixStream(pipefd[0])
ps.setCloseOnExec()
client.passedFdMap.add((id, ps))
proc removeCachedItem(ctx: var LoaderContext; stream: SocketStream;
- client: ClientHandle; r: var BufferedReader) =
+ client: ClientHandle; r: var PacketReader) =
var id: int
r.sread(id)
let n = client.cacheMap.find(id)
@@ -1520,7 +1520,7 @@ proc removeCachedItem(ctx: var LoaderContext; stream: SocketStream;
discard unlink(cstring(item.path))
proc tee(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
- r: var BufferedReader) =
+ r: var PacketReader) =
var sourceId: int
var targetPid: int
r.sread(sourceId)
@@ -1528,15 +1528,15 @@ proc tee(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
let outputIn = ctx.findOutput(sourceId, client)
if outputIn != nil:
let id = ctx.getOutputId()
- var sy {.noinit.}: array[2, cint]
+ var sv {.noinit.}: array[2, cint]
stream.withPacketWriter w:
- if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sy) == 0:
+ if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sv) == 0:
w.swrite(id)
- w.sendAux.add(sy[1])
+ w.sendFd(sv[1])
else:
w.swrite(-1)
- discard close(sy[1])
- let ostream = newSocketStream(sy[0])
+ discard close(sv[1])
+ let ostream = newSocketStream(sv[0])
ostream.setBlocking(false)
let output = outputIn.tee(ostream, id, targetPid)
ctx.put(output)
@@ -1545,7 +1545,7 @@ proc tee(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
w.swrite(-1)
proc addAuth(ctx: var LoaderContext; stream: SocketStream;
- r: var BufferedReader) =
+ r: var PacketReader) =
var url: URL
r.sread(url)
let origin = url.authOrigin
@@ -1563,7 +1563,7 @@ proc addAuth(ctx: var LoaderContext; stream: SocketStream;
ctx.pagerClient.authMap.add(item)
proc suspend(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
- r: var BufferedReader) =
+ r: var PacketReader) =
var ids: seq[int]
r.sread(ids)
for id in ids:
@@ -1575,7 +1575,7 @@ proc suspend(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
ctx.unregister(output)
proc resume(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
- r: var BufferedReader) =
+ r: var PacketReader) =
var ids: seq[int]
r.sread(ids)
for id in ids:
diff --git a/src/server/loaderiface.nim b/src/server/loaderiface.nim
index 74c0307e..c6ac515d 100644
--- a/src/server/loaderiface.nim
+++ b/src/server/loaderiface.nim
@@ -6,9 +6,9 @@
import std/tables
import config/cookie
-import io/bufreader
-import io/bufwriter
import io/dynstream
+import io/packetreader
+import io/packetwriter
import io/promise
import monoucha/javascript
import monoucha/jserror
@@ -139,7 +139,7 @@ proc startRequest(loader: FileLoader; request: Request): SocketStream =
loader.withPacketReader r:
r.sread(success)
if success:
- fd = r.recvAux.pop()
+ fd = r.recvFd()
if success:
let res = newSocketStream(fd)
res.setCloseOnExec()
@@ -154,7 +154,7 @@ proc startRequest*(loader: FileLoader; request: Request;
w.swrite(config)
var fd: cint
loader.withPacketReader r:
- fd = r.recvAux.pop()
+ fd = r.recvFd()
return newSocketStream(fd)
iterator data*(loader: FileLoader): MapData {.inline.} =
@@ -261,7 +261,7 @@ proc tee*(loader: FileLoader; sourceId, targetPid: int): (SocketStream, int) =
var fd: cint
loader.withPacketReader r:
r.sread(outputId)
- fd = r.recvAux.pop()
+ fd = r.recvFd()
return (newSocketStream(fd), outputId)
proc addCacheFile*(loader: FileLoader; outputId, targetPid: int): int =
@@ -430,7 +430,7 @@ proc openCachedItem*(loader: FileLoader; cacheId: int): PosixStream =
var success: bool
r.sread(success)
if success:
- fd = r.recvAux.pop()
+ fd = r.recvFd()
if fd != -1:
return newPosixStream(fd)
return nil
@@ -439,7 +439,7 @@ proc passFd*(loader: FileLoader; id: string; fd: cint) =
loader.withPacketWriterFire w:
w.swrite(lcPassFd)
w.swrite(id)
- w.sendAux.add(fd)
+ w.sendFd(fd)
proc removeCachedItem*(loader: FileLoader; cacheId: int) =
loader.withPacketWriterFire w:
@@ -463,7 +463,7 @@ proc addClient*(loader: FileLoader; pid: int; config: LoaderClientConfig;
loader.withPacketReader r:
r.sread(success)
if success and not isPager:
- fd = r.recvAux.pop()
+ fd = r.recvFd()
if success and not isPager:
return newSocketStream(fd)
return nil
@@ -484,7 +484,7 @@ proc addPipe*(loader: FileLoader; id: string): PosixStream =
var success: bool
r.sread(success)
if success:
- fd = r.recvAux.pop()
+ fd = r.recvFd()
if fd != -1:
return newPosixStream(fd)
return nil
diff --git a/src/server/request.nim b/src/server/request.nim
index 3745a413..03bfd238 100644
--- a/src/server/request.nim
+++ b/src/server/request.nim
@@ -2,8 +2,8 @@ import std/options
import std/tables
import html/script
-import io/bufreader
-import io/bufwriter
+import io/packetreader
+import io/packetwriter
import monoucha/fromjs
import monoucha/javascript
import monoucha/jserror
@@ -94,25 +94,25 @@ type
jsDestructor(JSRequest)
-proc swrite*(writer: var BufferedWriter; o: RequestBody) =
- writer.swrite(o.t)
+proc swrite*(w: var PacketWriter; o: RequestBody) =
+ w.swrite(o.t)
case o.t
of rbtNone: discard
- of rbtString: writer.swrite(o.s)
- of rbtMultipart: writer.swrite(o.multipart)
- of rbtOutput: writer.swrite(o.outputId)
- of rbtCache: writer.swrite(o.cacheId)
+ of rbtString: w.swrite(o.s)
+ of rbtMultipart: w.swrite(o.multipart)
+ of rbtOutput: w.swrite(o.outputId)
+ of rbtCache: w.swrite(o.cacheId)
-proc sread*(reader: var BufferedReader; o: var RequestBody) =
+proc sread*(r: var PacketReader; o: var RequestBody) =
var t: RequestBodyType
- reader.sread(t)
+ r.sread(t)
o = RequestBody(t: t)
case t
of rbtNone: discard
- of rbtString: reader.sread(o.s)
- of rbtMultipart: reader.sread(o.multipart)
- of rbtOutput: reader.sread(o.outputId)
- of rbtCache: reader.sread(o.cacheId)
+ of rbtString: r.sread(o.s)
+ of rbtMultipart: r.sread(o.multipart)
+ of rbtOutput: r.sread(o.outputId)
+ of rbtCache: r.sread(o.cacheId)
proc contentLength*(body: RequestBody): int =
case body.t
diff --git a/src/types/blob.nim b/src/types/blob.nim
index f34082d1..7a4a59f2 100644
--- a/src/types/blob.nim
+++ b/src/types/blob.nim
@@ -3,8 +3,8 @@ import std/posix
import std/strutils
import config/mimetypes
-import io/bufreader
-import io/bufwriter
+import io/packetreader
+import io/packetwriter
import monoucha/fromjs
import monoucha/javascript
import monoucha/jstypes
@@ -30,36 +30,33 @@ jsDestructor(WebFile)
# Forward declarations
proc deallocBlob*(opaque, p: pointer) {.raises: [].}
-#TODO it would be nice if we had a separate fd type that does sendAux;
-# this solution fails when blob isn't swritten by some module that does
-# not import it (just as a transitive dependency).
-proc swrite*(writer: var BufferedWriter; blob: Blob) =
+proc swrite*(w: var PacketWriter; blob: Blob) =
if blob.fd.isSome:
- writer.sendAux.add(blob.fd.get)
- writer.swrite(blob of WebFile)
+ w.sendFd(blob.fd.get)
+ w.swrite(blob of WebFile)
if blob of WebFile:
- writer.swrite(WebFile(blob).name)
- writer.swrite(blob.fd.isSome)
- writer.swrite(blob.ctype)
- writer.swrite(blob.size)
+ w.swrite(WebFile(blob).name)
+ w.swrite(blob.fd.isSome)
+ w.swrite(blob.ctype)
+ w.swrite(blob.size)
if blob.size > 0:
- writer.writeData(blob.buffer, blob.size)
+ w.writeData(blob.buffer, blob.size)
-proc sread*(reader: var BufferedReader; blob: var Blob) =
+proc sread*(r: var PacketReader; blob: var Blob) =
var isWebFile: bool
- reader.sread(isWebFile)
+ r.sread(isWebFile)
blob = if isWebFile: WebFile() else: Blob()
if isWebFile:
- reader.sread(WebFile(blob).name)
+ r.sread(WebFile(blob).name)
var hasFd: bool
- reader.sread(hasFd)
+ r.sread(hasFd)
if hasFd:
- blob.fd = some(reader.recvAux.pop())
- reader.sread(blob.ctype)
- reader.sread(blob.size)
+ blob.fd = some(r.recvFd())
+ r.sread(blob.ctype)
+ r.sread(blob.size)
if blob.size > 0:
let buffer = alloc(blob.size)
- reader.readData(blob.buffer, blob.size)
+ r.readData(blob.buffer, blob.size)
blob.buffer = buffer
blob.deallocFun = deallocBlob
diff --git a/src/types/formdata.nim b/src/types/formdata.nim
index da6def70..3a07b9aa 100644
--- a/src/types/formdata.nim
+++ b/src/types/formdata.nim
@@ -1,8 +1,8 @@
import std/strutils
-import io/bufreader
-import io/bufwriter
import io/dynstream
+import io/packetreader
+import io/packetwriter
import monoucha/javascript
import types/blob
import utils/twtstr
@@ -23,28 +23,28 @@ type
jsDestructor(FormData)
-proc swrite*(writer: var BufferedWriter; part: FormDataEntry) =
- writer.swrite(part.isstr)
- writer.swrite(part.name)
- writer.swrite(part.filename)
+proc swrite*(w: var PacketWriter; part: FormDataEntry) =
+ w.swrite(part.isstr)
+ w.swrite(part.name)
+ w.swrite(part.filename)
if part.isstr:
- writer.swrite(part.svalue)
+ w.swrite(part.svalue)
else:
- writer.swrite(part.value)
+ w.swrite(part.value)
-proc sread*(reader: var BufferedReader; part: var FormDataEntry) =
+proc sread*(r: var PacketReader; part: var FormDataEntry) =
var isstr: bool
- reader.sread(isstr)
+ r.sread(isstr)
if isstr:
part = FormDataEntry(isstr: true)
else:
part = FormDataEntry(isstr: false)
- reader.sread(part.name)
- reader.sread(part.filename)
+ r.sread(part.name)
+ r.sread(part.filename)
if part.isstr:
- reader.sread(part.svalue)
+ r.sread(part.svalue)
else:
- reader.sread(part.value)
+ r.sread(part.value)
iterator items*(this: FormData): lent FormDataEntry {.inline.} =
for entry in this.entries:
diff --git a/src/types/url.nim b/src/types/url.nim
index 64078dbd..b2d77232 100644
--- a/src/types/url.nim
+++ b/src/types/url.nim
@@ -4,8 +4,8 @@ import std/options
import std/strutils
import std/tables
-import io/bufreader
-import io/bufwriter
+import io/packetreader
+import io/packetwriter
import lib/punycode
import monoucha/fromjs
import monoucha/javascript
@@ -72,15 +72,15 @@ func serialize*(url: URL; excludeHash = false; excludePassword = false):
func serializeip(ipv4: uint32): string
func serializeip(ipv6: array[8, uint16]): string
-proc swrite*(writer: var BufferedWriter; url: URL) =
+proc swrite*(w: var PacketWriter; url: URL) =
if url != nil:
- writer.swrite(url.serialize())
+ w.swrite(url.serialize())
else:
- writer.swrite("")
+ w.swrite("")
-proc sread*(reader: var BufferedReader; url: var URL) =
+proc sread*(r: var PacketReader; url: var URL) =
var s: string
- reader.sread(s)
+ r.sread(s)
if s == "":
url = nil
else: