diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-02-26 20:03:29 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-02-26 20:21:56 +0100 |
| commit | 3662225a7e42b60f661871e4562239d5cdeabe98 (patch) | |
| tree | 3a809a33992a838dbc2391236b243c7d5df9f862 /src | |
| parent | 55ffd92756faa3b60e3472404025a18509e0fce2 (diff) | |
| download | chawan-3662225a7e42b60f661871e4562239d5cdeabe98.tar.gz | |
dynstream, console: remove DynFileStream
Conflating buffered streams with non-buffered streams is generally a
bad idea.
Diffstat (limited to 'src')
| -rw-r--r-- | src/html/dom.nim | 2 | ||||
| -rw-r--r-- | src/html/env.nim | 3 | ||||
| -rw-r--r-- | src/io/console.nim | 25 | ||||
| -rw-r--r-- | src/io/dynstream.nim | 36 | ||||
| -rw-r--r-- | src/io/timeout.nim | 9 | ||||
| -rw-r--r-- | src/local/pager.nim | 36 | ||||
| -rw-r--r-- | src/server/buffer.nim | 4 |
7 files changed, 45 insertions, 70 deletions
diff --git a/src/html/dom.nim b/src/html/dom.nim index 5f236af6..ab45dc76 100644 --- a/src/html/dom.nim +++ b/src/html/dom.nim @@ -4350,7 +4350,7 @@ proc runJSJobs*(window: Window) = if r.isSome: break let ctx = r.error - ctx.writeException(window.console.err) + window.console.writeException(ctx) proc performMicrotaskCheckpoint*(window: Window) = if window.inMicrotaskCheckpoint: diff --git a/src/html/env.nim b/src/html/env.nim index 019412c7..efd11825 100644 --- a/src/html/env.nim +++ b/src/html/env.nim @@ -434,10 +434,9 @@ proc newWindow*(scripting: ScriptingMode; images, styling, autofocus: bool; attrsp: ptr WindowAttributes; loader: FileLoader; url: URL; urandom: PosixStream; imageTypes: Table[string, string]; userAgent, referrer: string): Window = - let err = newDynFileStream(stderr) let window = Window( attrsp: attrsp, - internalConsole: newConsole(err), + internalConsole: newConsole(stderr), navigator: Navigator(), loader: loader, images: images, diff --git a/src/io/console.nim b/src/io/console.nim index 87260353..25a989a9 100644 --- a/src/io/console.nim +++ b/src/io/console.nim @@ -1,18 +1,17 @@ -import io/dynstream import monoucha/fromjs import monoucha/javascript import types/opt import utils/twtstr type Console* = ref object - err*: DynStream + err: File clearFun: proc() showFun: proc() hideFun: proc() jsDestructor(Console) -proc newConsole*(err: DynStream; clearFun: proc() = nil; showFun: proc() = nil; +proc newConsole*(err: File; clearFun: proc() = nil; showFun: proc() = nil; hideFun: proc() = nil): Console = return Console( err: err, @@ -21,6 +20,17 @@ proc newConsole*(err: DynStream; clearFun: proc() = nil; showFun: proc() = nil; hideFun: hideFun ) +proc setStream*(console: Console; file: File) = + console.err.close() + console.err = file + +proc write*(console: Console; c: char) = + discard console.err.writeBuffer(unsafeAddr c, 1) + +proc write*(console: Console; s: openArray[char]) = + if s.len > 0: + discard console.err.writeBuffer(unsafeAddr s[0], s.len) + proc log*(console: Console; ss: varargs[string]) = var buf = "" for i, s in ss.mypairs: @@ -80,6 +90,9 @@ proc addConsoleModule*(ctx: JSContext) = # "For historical reasons, console is lowercased." ctx.registerType(Console, nointerface = true, name = "console") -proc writeException*(ctx: JSContext; s: DynStream) = - s.write(ctx.getExceptionMsg()) - discard s.flush() +proc flush*(console: Console) = + console.err.flushFile() + +proc writeException*(console: Console; ctx: JSContext) = + console.err.write(ctx.getExceptionMsg()) + console.flush() diff --git a/src/io/dynstream.nim b/src/io/dynstream.nim index 5fce2bfe..f6bc4418 100644 --- a/src/io/dynstream.nim +++ b/src/io/dynstream.nim @@ -447,39 +447,3 @@ method flush*(s: BufStream): bool = proc newBufStream*(s: SocketStream; registerFun: proc(fd: int)): BufStream = return BufStream(source: s, registerFun: registerFun) - -type - DynFileStream* = ref object of DynStream - file*: File - -method readData*(s: DynFileStream; buffer: pointer; len: int): int = - let n = s.file.readBuffer(buffer, len) - if n == 0: - s.setEnd() - return n - -method writeData*(s: DynFileStream; buffer: pointer; len: int): int = - return s.file.writeBuffer(buffer, len) - -method seek*(s: DynFileStream; off: int64): int64 = - s.file.setFilePos(off) - return off - -method sclose*(s: DynFileStream) = - assert not s.closed - s.file.close() - s.closed = true - -proc c_fflush(f: File): cint {.importc: "fflush", header: "<stdio.h>".} - -method flush*(s: DynFileStream): bool = - return c_fflush(s.file) == 0 - -proc newDynFileStream*(file: File): DynFileStream = - return DynFileStream(file: file) - -proc newDynFileStream*(path: string): DynFileStream = - var file: File = nil - if file.open(path): - return newDynFileStream(path) - return nil diff --git a/src/io/timeout.nim b/src/io/timeout.nim index 0015d892..c131b9c6 100644 --- a/src/io/timeout.nim +++ b/src/io/timeout.nim @@ -2,7 +2,6 @@ import std/algorithm import std/times import io/console -import io/dynstream import monoucha/fromjs import monoucha/javascript import monoucha/jsutils @@ -80,12 +79,12 @@ proc setTimeout*(state: var TimeoutState; t: TimeoutType; handler: JSValue; state.sorted = false return id -proc runEntry(state: var TimeoutState; entry: TimeoutEntry; err: DynStream) = +proc runEntry(state: var TimeoutState; entry: TimeoutEntry; console: Console) = if JS_IsFunction(state.jsctx, entry.val): let ret = JS_Call(state.jsctx, entry.val, JS_UNDEFINED, cint(entry.args.len), entry.args.toJSValueArray()) if JS_IsException(ret): - state.jsctx.writeException(err) + console.writeException(state.jsctx) JS_FreeValue(state.jsctx, ret) else: var s: string @@ -103,7 +102,7 @@ proc sortAndGetTimeout*(state: var TimeoutState): cint = let now = getUnixMillis() return cint(max(state.timeouts[^1].expires - now, -1)) -proc run*(state: var TimeoutState; err: DynStream): bool = +proc run*(state: var TimeoutState; console: Console): bool = let now = getUnixMillis() var found = false var H = state.timeouts.high @@ -113,7 +112,7 @@ proc run*(state: var TimeoutState; err: DynStream): bool = let entry = state.timeouts[i] if entry.dead: continue - state.runEntry(entry, err) + state.runEntry(entry, console) found = true case entry.t of ttTimeout: diff --git a/src/local/pager.nim b/src/local/pager.nim index ca067c3d..756f822e 100644 --- a/src/local/pager.nim +++ b/src/local/pager.nim @@ -510,7 +510,7 @@ proc runJSJobs(pager: Pager) = if r.isSome: break let ctx = r.error - ctx.writeException(pager.console.err) + pager.console.writeException(ctx) if pager.exitCode != -1: pager.quit(0) @@ -560,7 +560,7 @@ proc evalAction(pager: Pager; action: string; arg0: int32): EmptyPromise = assert not pager.inEval pager.quit(pager.exitCode) if JS_IsException(ret): - pager.jsctx.writeException(pager.console.err) + pager.console.writeException(pager.jsctx) elif JS_IsObject(ret): var maybep: EmptyPromise if ctx.fromJS(ret, maybep).isSome: @@ -572,7 +572,7 @@ proc command0(pager: Pager; src: string; filename = "<command>"; silence = false; module = false) = let ret = pager.evalJS(src, filename, module = module) if JS_IsException(ret): - pager.jsctx.writeException(pager.console.err) + pager.console.writeException(pager.jsctx) else: if not silence: var res: string @@ -2067,8 +2067,9 @@ proc clearConsole(pager: Pager) = pager.replace(pager.consoleWrapper.container, replacement) pager.consoleWrapper.container = replacement let console = pager.console - console.err.sclose() - console.err = pouts + var file: File = nil + if file.open(pouts.fd, fmWrite): + console.setStream(file) proc addConsole(pager: Pager; interactive: bool): ConsoleWrapper = if interactive and pager.config.start.consoleBuffer: @@ -2086,17 +2087,16 @@ proc addConsole(pager: Pager; interactive: bool): ConsoleWrapper = let container = pager.readPipe0("text/plain", CHARSET_UNKNOWN, pins, url, ConsoleTitle, {}) pouts.write("Type (M-c) console.hide() to return to buffer mode.\n") - let console = newConsole(pouts, clearFun, showFun, hideFun) - return ConsoleWrapper(console: console, container: container) - let err = newPosixStream(STDERR_FILENO) - return ConsoleWrapper(console: newConsole(err)) + var file: File = nil + if file.open(pouts.fd, fmWrite): + let console = newConsole(file, clearFun, showFun, hideFun) + return ConsoleWrapper(console: console, container: container) + return ConsoleWrapper(console: newConsole(stderr)) proc flushConsole*(pager: Pager) = if pager.console == nil: # hack for when client crashes before console has been initialized - pager.consoleWrapper = ConsoleWrapper( - console: newConsole(newDynFileStream(stderr)) - ) + pager.consoleWrapper = ConsoleWrapper(console: newConsole(stderr)) pager.handleRead(pager.forkserver.estream.fd) proc command(pager: Pager) {.jsfunc.} = @@ -3163,14 +3163,14 @@ proc handleStderr(pager: Pager) = found = true break if hadlf: - pager.console.err.write(prefix) + pager.console.write(prefix) if j - i > 0: - pager.console.err.write(buffer.toOpenArray(i, j - 1)) + pager.console.write(buffer.toOpenArray(i, j - 1)) i = j hadlf = found if not hadlf: - pager.console.err.write('\n') - discard pager.console.err.flush() + pager.console.write('\n') + pager.console.flush() proc handleRead(pager: Pager; fd: int) = if pager.term.istream != nil and fd == pager.term.istream.fd: @@ -3271,7 +3271,7 @@ proc inputLoop(pager: Pager) = pager.handleWrite(efd) if (event.revents and POLLERR) != 0 or (event.revents and POLLHUP) != 0: pager.handleError(efd) - if pager.timeouts.run(pager.console.err): + if pager.timeouts.run(pager.console): let container = pager.consoleWrapper.container if container != nil: container.tailOnLoad = true @@ -3318,7 +3318,7 @@ proc headlessLoop(pager: Pager) = pager.handleError(efd) pager.loader.unblockRegister() pager.loader.unregistered.setLen(0) - discard pager.timeouts.run(pager.console.err) + discard pager.timeouts.run(pager.console) pager.runJSJobs() pager.acceptBuffers() diff --git a/src/server/buffer.nim b/src/server/buffer.nim index 61642297..6c7c81a6 100644 --- a/src/server/buffer.nim +++ b/src/server/buffer.nim @@ -1414,7 +1414,7 @@ proc evalJSURL(buffer: Buffer; url: URL): Opt[string] = let ctx = buffer.window.jsctx let ret = ctx.eval(source, '<' & $buffer.baseURL & '>', JS_EVAL_TYPE_GLOBAL) if JS_IsException(ret): - ctx.writeException(buffer.window.console.err) + buffer.window.console.writeException(ctx) return err() # error if JS_IsUndefined(ret): return err() # no need to navigate @@ -1926,7 +1926,7 @@ proc runBuffer(buffer: Buffer) = buffer.loader.unregistered.setLen(0) buffer.loader.unblockRegister() if buffer.config.scripting != smFalse: - if buffer.window.timeouts.run(buffer.window.console.err): + if buffer.window.timeouts.run(buffer.window.console): buffer.window.runJSJobs() buffer.maybeReshape() |