aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2024-11-21 19:13:03 +0100
committerbptato <nincsnevem662@gmail.com>2024-11-21 19:13:03 +0100
commite37011aef12e2878af4d9df4ed9ff8327283c01f (patch)
tree587432067a2ebaadac8bffb567edb6b11a94e59c /src
parent2847f768f20b443d5eaefa0ac1a3f6fd13f5eabe (diff)
downloadchawan-e37011aef12e2878af4d9df4ed9ff8327283c01f.tar.gz
buffer: proper toggleImages implementation
It necessarily removes the config.images check from codec access, which I'm not quite happy about, so I've added a check to the DOM instead. (TODO: maybe pager should just dynamically grant codec access as a capability instead? but maybe that's even more error prone...)
Diffstat (limited to 'src')
-rw-r--r--src/html/dom.nim27
-rw-r--r--src/html/env.nim2
-rw-r--r--src/loader/loaderiface.nim6
-rw-r--r--src/loader/response.nim6
-rw-r--r--src/local/container.nim3
-rw-r--r--src/local/pager.nim5
-rw-r--r--src/server/buffer.nim22
7 files changed, 50 insertions, 21 deletions
diff --git a/src/html/dom.nim b/src/html/dom.nim
index 149e2912..45c37ca7 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -1228,7 +1228,7 @@ iterator elements(node: Node; tag: TagType): Element {.inline.} =
if desc.tagType == tag:
yield desc
-iterator elements(node: Node; tag: set[TagType]): Element {.inline.} =
+iterator elements*(node: Node; tag: set[TagType]): Element {.inline.} =
for desc in node.elements:
if desc.tagType in tag:
yield desc
@@ -3260,6 +3260,11 @@ proc style*(element: Element): CSSStyleDeclaration {.jsfget.} =
element.cachedStyle = CSSStyleDeclaration(element: element)
return element.cachedStyle
+proc corsFetch(window: Window; input: Request): FetchPromise =
+ if not window.images and input.url.scheme.startsWith("img-codec+"):
+ return newResolvedPromise(JSResult[Response].err(newFetchTypeError()))
+ return window.loader.fetch(input)
+
# see https://html.spec.whatwg.org/multipage/links.html#link-type-stylesheet
#TODO make this somewhat compliant with ^this
proc loadResource(window: Window; link: HTMLLinkElement) =
@@ -3280,7 +3285,7 @@ proc loadResource(window: Window; link: HTMLLinkElement) =
let cvals = parseComponentValues(media)
let media = parseMediaQueryList(cvals)
applies = media.appliesImpl(window)
- let p = window.loader.fetch(
+ let p = window.corsFetch(
newRequest(url)
).then(proc(res: JSResult[Response]): Promise[JSResult[string]] =
if res.isSome:
@@ -3302,8 +3307,13 @@ proc getImageId(window: Window): int =
result = window.imageId
inc window.imageId
-proc loadResource(window: Window; image: HTMLImageElement) =
- if not window.images or image.fetchStarted:
+proc loadResource*(window: Window; image: HTMLImageElement) =
+ if not window.images:
+ image.invalid = image.invalid or image.bitmap != nil
+ image.bitmap = nil
+ image.fetchStarted = false
+ return
+ if image.fetchStarted:
return
image.fetchStarted = true
let src = image.attr(satSrc)
@@ -3327,7 +3337,7 @@ proc loadResource(window: Window; image: HTMLImageElement) =
let cachedURL = CachedURLImage(expiry: -1, loading: true)
window.imageURLCache[surl] = cachedURL
let headers = newHeaders({"Accept": "*/*"})
- let p = window.loader.fetch(newRequest(url, headers = headers)).then(
+ let p = window.corsFetch(newRequest(url, headers = headers)).then(
proc(res: JSResult[Response]): EmptyPromise =
if res.isNone:
return newResolvedPromise()
@@ -3346,7 +3356,7 @@ proc loadResource(window: Window; image: HTMLImageElement) =
headers = newHeaders({"Cha-Image-Info-Only": "1"}),
body = RequestBody(t: rbtOutput, outputId: response.outputId),
)
- let r = window.loader.fetch(request)
+ let r = window.corsFetch(request)
response.resume()
response.close()
var expiry = -1i64
@@ -4758,8 +4768,7 @@ proc toBlob(ctx: JSContext; this: HTMLCanvasElement; callback: JSValue;
# callback will go out of scope when we return, so capture a new reference.
let callback = JS_DupValue(ctx, callback)
let window = this.document.window
- let loader = window.loader
- loader.fetch(newRequest(
+ window.corsFetch(newRequest(
newURL("img-codec+x-cha-canvas:decode").get,
httpMethod = hmPost,
body = RequestBody(t: rbtCache, cacheId: this.bitmap.cacheId)
@@ -4767,7 +4776,7 @@ proc toBlob(ctx: JSContext; this: HTMLCanvasElement; callback: JSValue;
if res.isNone:
return newResolvedPromise(res)
let res = res.get
- let p = loader.fetch(newRequest(
+ let p = window.corsFetch(newRequest(
url,
httpMethod = hmPost,
headers = headers,
diff --git a/src/html/env.nim b/src/html/env.nim
index 1e622697..1b86b0f9 100644
--- a/src/html/env.nim
+++ b/src/html/env.nim
@@ -170,7 +170,7 @@ proc fetch(window: Window; input: JSValue;
let input = ?newRequest(window.jsctx, input, init)
#TODO cors requests?
if not window.settings.origin.isSameOrigin(input.request.url.origin):
- let err = newTypeError("NetworkError when attempting to fetch resource")
+ let err = newFetchTypeError()
return ok(newResolvedPromise(JSResult[Response].err(err)))
return ok(window.loader.fetch(input.request))
diff --git a/src/loader/loaderiface.nim b/src/loader/loaderiface.nim
index 5895ab04..33b26444 100644
--- a/src/loader/loaderiface.nim
+++ b/src/loader/loaderiface.nim
@@ -282,8 +282,7 @@ proc onConnected(loader: FileLoader; connectData: ConnectData) =
stream.sclose()
# delete before resolving the promise
loader.unset(connectData)
- let err = newTypeError("NetworkError when attempting to fetch resource")
- promise.resolve(JSResult[Response].err(err))
+ promise.resolve(JSResult[Response].err(newFetchTypeError()))
of cdsBeforeStatus:
r.sread(connectData.status) # packet 2
inc connectData.state
@@ -314,8 +313,7 @@ proc onConnected(loader: FileLoader; connectData: ConnectData) =
if redirectNum < 5: #TODO use config.network.max_redirect?
loader.fetch0(redirect, promise, redirectNum)
else:
- let err = newTypeError("NetworkError when attempting to fetch resource")
- promise.resolve(JSResult[Response].err(err))
+ promise.resolve(JSResult[Response].err(newFetchTypeError()))
else:
promise.resolve(JSResult[Response].ok(response))
diff --git a/src/loader/response.nim b/src/loader/response.nim
index c83962d7..bdf81a10 100644
--- a/src/loader/response.nim
+++ b/src/loader/response.nim
@@ -71,6 +71,9 @@ func makeNetworkError*(): Response {.jsstfunc: "Response.error".} =
bodyUsed: true
)
+proc newFetchTypeError*(): JSError =
+ return newTypeError("NetworkError when attempting to fetch resource")
+
func sok(response: Response): bool {.jsfget: "ok".} =
return response.status in 200u16 .. 299u16
@@ -148,8 +151,7 @@ proc onFinishText(response: Response; success: bool) =
let charset = response.getCharset(CHARSET_UTF_8)
bodyRead.resolve(JSResult[string].ok(opaque.buf.decodeAll(charset)))
else:
- let err = newTypeError("NetworkError when attempting to fetch resource")
- bodyRead.resolve(JSResult[string].err(err))
+ bodyRead.resolve(JSResult[string].err(newFetchTypeError()))
proc text*(response: Response): Promise[JSResult[string]] {.jsfunc.} =
if response.body == nil:
diff --git a/src/local/container.nim b/src/local/container.nim
index d27cffac..0c592ee4 100644
--- a/src/local/container.nim
+++ b/src/local/container.nim
@@ -1391,7 +1391,8 @@ proc markURL(container: Container) {.jsfunc.} =
proc toggleImages(container: Container) {.jsfunc.} =
if container.iface == nil:
return
- container.iface.toggleImages().then(proc() =
+ container.iface.toggleImages().then(proc(images: bool) =
+ container.config.images = images
container.needslines = true
)
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 3973ade1..58395b89 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -1369,9 +1369,8 @@ proc applySiteconf(pager: Pager; url: URL; charsetOverride: Charset;
res.autofocus = sc.autofocus.get
if sc.meta_refresh.isSome:
res.metaRefresh = sc.meta_refresh.get
- if res.images:
- loaderConfig.filter.allowschemes
- .add(pager.config.external.urimethodmap.imageProtos)
+ loaderConfig.filter.allowschemes
+ .add(pager.config.external.urimethodmap.imageProtos)
return res
# Load request in a new buffer.
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index 9ded8fbd..cdffcc7f 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -1113,6 +1113,7 @@ proc onload(buffer: Buffer) =
reprocess = false
else: # EOF
buffer.finishLoad().then(proc() =
+ buffer.window.loadingResourcePromises = @[]
discard buffer.maybeReshape()
buffer.state = bsLoaded
buffer.document.readyState = rsComplete
@@ -1697,8 +1698,27 @@ proc markURL*(buffer: Buffer; schemes: seq[string]) {.proxy.} =
stack.add(element)
buffer.reshape()
-proc toggleImages*(buffer: Buffer) {.proxy.} =
+proc toggleImages0(buffer: Buffer): bool =
buffer.config.images = not buffer.config.images
+ buffer.window.images = buffer.config.images
+ for element in buffer.document.elements({TAG_IMG, TAG_IMAGE}):
+ buffer.window.loadResource(HTMLImageElement(element))
+ buffer.savetask = true
+ buffer.loadResources().then(proc() =
+ if buffer.tasks[bcToggleImages] == 0:
+ # we resolved in then
+ buffer.savetask = false
+ else:
+ buffer.resolveTask(bcToggleImages, buffer.config.images)
+ buffer.window.loadingResourcePromises = @[]
+ buffer.prevStyled = nil
+ buffer.rootBox = nil
+ buffer.reshape()
+ )
+ return buffer.config.images
+
+proc toggleImages*(buffer: Buffer): bool {.proxy, task.} =
+ buffer.toggleImages0()
macro bufferDispatcher(funs: static ProxyMap; buffer: Buffer;
cmd: BufferCommand; packetid: int; r: var BufferedReader) =