aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2025-04-15 20:49:27 +0200
committerbptato <nincsnevem662@gmail.com>2025-04-15 20:49:27 +0200
commitbb27ae370a8bb312eee0c9009eecb2e1f8f4727a (patch)
treee44ac63dedd7e96d3bccae7737173ce9c0bc90ca
parent95640d50d9e585e98048c394d6aa1b91a0be1d77 (diff)
downloadchawan-bb27ae370a8bb312eee0c9009eecb2e1f8f4727a.tar.gz
loaderiface: return PosixStream for startRequest
-rw-r--r--src/local/pager.nim2
-rw-r--r--src/server/loader.nim2
-rw-r--r--src/server/loaderiface.nim13
-rw-r--r--src/server/response.nim4
4 files changed, 10 insertions, 11 deletions
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 4312393b..51bd445e 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -2926,7 +2926,7 @@ proc askMailcap(pager: Pager; container: Container; ostream: PosixStream;
)
proc connected(pager: Pager; container: Container; response: Response) =
- var istream = PosixStream(response.body)
+ var istream = response.body
container.applyResponse(response, pager.config.external.mimeTypes)
if response.status == 401: # unauthorized
pager.setLineEdit(lmUsername, container.url.username)
diff --git a/src/server/loader.nim b/src/server/loader.nim
index 372d7ec4..7510b8c1 100644
--- a/src/server/loader.nim
+++ b/src/server/loader.nim
@@ -1405,6 +1405,7 @@ proc load(ctx: var LoaderContext; stream: SocketStream; request: Request;
var sv {.noinit.}: array[2, cint]
var fail = false
stream.withPacketWriter w:
+ #TODO use pipe?
if socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sv) == 0:
w.swrite(true)
w.sendFd(sv[1])
@@ -1618,6 +1619,7 @@ proc tee(ctx: var LoaderContext; stream: SocketStream; client: ClientHandle;
let outputIn = ctx.findOutput(sourceId, client)
let target = ctx.clientMap.getOrDefault(targetPid)
var sv {.noinit.}: array[2, cint]
+ #TODO use pipe?
if target != nil and outputIn != nil and
socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_IP, sv) == 0:
let ostream = newSocketStream(sv[0])
diff --git a/src/server/loaderiface.nim b/src/server/loaderiface.nim
index bce85690..c3f7d9e6 100644
--- a/src/server/loaderiface.nim
+++ b/src/server/loaderiface.nim
@@ -40,7 +40,7 @@ type
cdsBeforeResult, cdsBeforeStatus
MapData* = ref object of RootObj
- stream*: SocketStream
+ stream*: PosixStream
LoaderData = ref object of MapData
@@ -122,11 +122,8 @@ template withPacketReader(loader: FileLoader; r, body: untyped) =
loader.controlStream.withPacketReader r:
body
-# Start a request. This should not block (not for a significant amount of time
-# anyway).
-#TODO can we return PosixStream here?
-#TODO2 actually, why don't just use a pipe in the first place?
-#TODO3 this chokes if loader runs out of fds...
+# Start a request. This should not block (not for a significant amount
+# of time anyway).
proc startRequest(loader: FileLoader; request: Request): SocketStream =
loader.withPacketWriter w:
w.swrite(lcLoad)
@@ -144,7 +141,7 @@ proc startRequest(loader: FileLoader; request: Request): SocketStream =
return nil
proc startRequest*(loader: FileLoader; request: Request;
- config: LoaderClientConfig): SocketStream =
+ config: LoaderClientConfig): PosixStream =
loader.withPacketWriter w:
w.swrite(lcLoadConfig)
w.swrite(request)
@@ -152,7 +149,7 @@ proc startRequest*(loader: FileLoader; request: Request;
var fd: cint
loader.withPacketReader r:
fd = r.recvFd()
- return newSocketStream(fd)
+ return newPosixStream(fd)
iterator data*(loader: FileLoader): MapData {.inline.} =
for it in loader.map:
diff --git a/src/server/response.nim b/src/server/response.nim
index 401ce030..1cb70919 100644
--- a/src/server/response.nim
+++ b/src/server/response.nim
@@ -33,7 +33,7 @@ type
Response* = ref object
responseType* {.jsget: "type".}: ResponseType
res*: int
- body*: SocketStream
+ body*: PosixStream
bodyUsed* {.jsget.}: bool
status* {.jsget.}: uint16
headers* {.jsget.}: Headers
@@ -51,7 +51,7 @@ type
jsDestructor(Response)
-proc newResponse*(res: int; request: Request; stream: SocketStream;
+proc newResponse*(res: int; request: Request; stream: PosixStream;
outputId: int): Response =
return Response(
res: res,