about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/config/config.nim10
-rw-r--r--src/html/htmlparser.nim1
-rw-r--r--src/io/loader.nim1
-rw-r--r--src/io/request.nim12
-rw-r--r--src/io/response.nim1
-rw-r--r--src/js/exception.nim48
-rw-r--r--src/js/javascript.nim182
-rw-r--r--src/types/cookie.nim1
-rw-r--r--src/types/url.nim1
-rw-r--r--src/utils/opt.nim3
10 files changed, 129 insertions, 131 deletions
diff --git a/src/config/config.nim b/src/config/config.nim
index 7fc0b2b1..1bfacd28 100644
--- a/src/config/config.nim
+++ b/src/config/config.nim
@@ -45,7 +45,7 @@ type
   SiteConfig* = object
     url*: Opt[Regex]
     host*: Opt[Regex]
-    rewrite_url*: (proc(s: URL): Opt[URL])
+    rewrite_url*: (proc(s: URL): Result[URL, JSError])
     cookie*: Opt[bool]
     third_party_cookie*: seq[Regex]
     share_cookie_jar*: Opt[string]
@@ -57,7 +57,7 @@ type
 
   OmniRule* = object
     match*: Regex
-    substitute_url*: (proc(s: string): Opt[string])
+    substitute_url*: (proc(s: string): Result[string, JSError])
 
   StartConfig = object
     visual_home*: string
@@ -176,8 +176,7 @@ proc getSiteConfig*(config: Config, jsctx: JSContext): seq[SiteConfig] =
     if sc.rewrite_url.isSome:
       let fun = jsctx.eval(sc.rewrite_url.get, "<siteconf>",
         JS_EVAL_TYPE_GLOBAL)
-      let f = getJSFunction[URL, URL](jsctx, fun)
-      conf.rewrite_url = f.get
+      conf.rewrite_url = getJSFunction[URL, URL](jsctx, fun)
     result.add(conf)
 
 proc getOmniRules*(config: Config, jsctx: JSContext): seq[OmniRule] =
@@ -187,8 +186,7 @@ proc getOmniRules*(config: Config, jsctx: JSContext): seq[OmniRule] =
       match: re.get
     )
     let fun = jsctx.eval(rule.substitute_url, "<siteconf>", JS_EVAL_TYPE_GLOBAL)
-    let f = getJSFunction[string, string](jsctx, fun)
-    conf.substitute_url = f.get
+    conf.substitute_url = getJSFunction[string, string](jsctx, fun)
     result.add(conf)
 
 func getRealKey(key: string): string =
diff --git a/src/html/htmlparser.nim b/src/html/htmlparser.nim
index 9f9d4b85..bb7498c4 100644
--- a/src/html/htmlparser.nim
+++ b/src/html/htmlparser.nim
@@ -14,7 +14,6 @@ import encoding/decoderstream
 import html/dom
 import html/tags
 import html/htmltokenizer
-import js/exception
 import js/javascript
 import types/url
 import utils/twtstr
diff --git a/src/io/loader.nim b/src/io/loader.nim
index e88a4a69..6583ce2c 100644
--- a/src/io/loader.nim
+++ b/src/io/loader.nim
@@ -32,7 +32,6 @@ import io/urlfilter
 import ips/serialize
 import ips/serversocket
 import ips/socketstream
-import js/exception
 import js/javascript
 import types/cookie
 import types/mime
diff --git a/src/io/request.nim b/src/io/request.nim
index a5a0158f..af7daf47 100644
--- a/src/io/request.nim
+++ b/src/io/request.nim
@@ -5,7 +5,6 @@ import tables
 
 import bindings/quickjs
 import io/headers
-import js/exception
 import js/javascript
 import types/formdata
 import types/url
@@ -200,7 +199,7 @@ func newRequest*(ctx: JSContext, resource: string,
   var credentials = CredentialsMode.SAME_ORIGIN
   var mode = fallbackMode.get(RequestMode.NO_CORS)
   let hl = newHeaders()
-  var proxyUrl: Opt[URL]
+  var proxyUrl: URL
   var multipart: Opt[FormData]
   #TODO fallback mode, origin, window, request mode, ...
   if init.isSome:
@@ -210,9 +209,9 @@ func newRequest*(ctx: JSContext, resource: string,
     let bodyProp = JS_GetPropertyStr(ctx, init, "body")
     if not JS_IsNull(bodyProp) and not JS_IsUndefined(bodyProp):
       # ????
-      multipart = fromJS[FormData](ctx, bodyProp)
+      multipart = opt(fromJS[FormData](ctx, bodyProp))
       if multipart.isNone:
-        body = fromJS[string](ctx, bodyProp)
+        body = opt(fromJS[string](ctx, bodyProp))
     #TODO inputbody
     if (multipart.isSome or body.isSome) and
         httpMethod in {HTTP_GET, HTTP_HEAD}:
@@ -224,9 +223,10 @@ func newRequest*(ctx: JSContext, resource: string,
     mode = fromJS[RequestMode](ctx, JS_GetPropertyStr(ctx, init, "mode"))
       .get(mode)
     #TODO find a standard compatible way to implement this
-    proxyUrl = fromJS[URL](ctx, JS_GetPropertyStr(ctx, init, "proxyUrl"))
+    let proxyUrlProp = JS_GetPropertyStr(ctx, init, "proxyUrl")
+    proxyUrl = fromJS[URL](ctx, proxyUrlProp).get(nil)
   return ok(newRequest(url, httpMethod, hl, body, multipart, mode, credentials,
-    proxy = proxyUrl.get(nil)))
+    proxy = proxyUrl))
 
 func credentialsMode*(attribute: CORSAttribute): CredentialsMode =
   case attribute
diff --git a/src/io/response.nim b/src/io/response.nim
index 321f43d0..6a5a5bbf 100644
--- a/src/io/response.nim
+++ b/src/io/response.nim
@@ -4,7 +4,6 @@ import bindings/quickjs
 import io/headers
 import io/promise
 import io/request
-import js/exception
 import js/javascript
 import types/url
 
diff --git a/src/js/exception.nim b/src/js/exception.nim
index 44b178ba..79239bd4 100644
--- a/src/js/exception.nim
+++ b/src/js/exception.nim
@@ -51,53 +51,5 @@ func message0(this: DOMException): string {.jsfget: "message".} =
 func code(this: DOMException): uint16 {.jsfget.} =
   return NamesTable.getOrDefault(this.name, 0u16)
 
-proc newEvalError*(message: string): JSError =
-  return JSError(
-    e: JS_EVAL_ERROR0,
-    message: message
-  )
-
-proc newRangeError*(message: string): JSError =
-  return JSError(
-    e: JS_RANGE_ERROR0,
-    message: message
-  )
-
-proc newReferenceError*(message: string): JSError =
-  return JSError(
-    e: JS_REFERENCE_ERROR0,
-    message: message
-  )
-
-proc newSyntaxError*(message: string): JSError =
-  return JSError(
-    e: JS_SYNTAX_ERROR0,
-    message: message
-  )
-
-proc newTypeError*(message: string): JSError =
-  return JSError(
-    e: JS_TYPE_ERROR0,
-    message: message
-  )
-
-proc newURIError*(message: string): JSError =
-  return JSError(
-    e: JS_URI_ERROR0,
-    message: message
-  )
-
-proc newInternalError*(message: string): JSError =
-  return JSError(
-    e: JS_INTERNAL_ERROR0,
-    message: message
-  )
-
-proc newAggregateError*(message: string): JSError =
-  return JSError(
-    e: JS_AGGREGATE_ERROR0,
-    message: message
-  )
-
 proc addDOMExceptionModule*(ctx: JSContext) =
   ctx.registerType(DOMException, JS_CLASS_ERROR, errid = opt(JS_DOM_EXCEPTION))
diff --git a/src/js/javascript.nim b/src/js/javascript.nim
index 61d7cefe..222e3ca5 100644
--- a/src/js/javascript.nim
+++ b/src/js/javascript.nim
@@ -409,7 +409,68 @@ func getMinArgs(params: seq[FuncParam]): int =
         return i
   return params.len
 
-func fromJSInt[T: SomeInteger](ctx: JSContext, val: JSValue): Opt[T] =
+proc newEvalError*(message: string): JSError =
+  return JSError(
+    e: JS_EVAL_ERROR0,
+    message: message
+  )
+
+proc newRangeError*(message: string): JSError =
+  return JSError(
+    e: JS_RANGE_ERROR0,
+    message: message
+  )
+
+proc newReferenceError*(message: string): JSError =
+  return JSError(
+    e: JS_REFERENCE_ERROR0,
+    message: message
+  )
+
+proc newSyntaxError*(message: string): JSError =
+  return JSError(
+    e: JS_SYNTAX_ERROR0,
+    message: message
+  )
+
+proc newTypeError*(message: string): JSError =
+  return JSError(
+    e: JS_TYPE_ERROR0,
+    message: message
+  )
+
+proc newURIError*(message: string): JSError =
+  return JSError(
+    e: JS_URI_ERROR0,
+    message: message
+  )
+
+proc newInternalError*(message: string): JSError =
+  return JSError(
+    e: JS_INTERNAL_ERROR0,
+    message: message
+  )
+
+proc newAggregateError*(message: string): JSError =
+  return JSError(
+    e: JS_AGGREGATE_ERROR0,
+    message: message
+  )
+
+func fromJSString(ctx: JSContext, val: JSValue): Result[string, JSError] =
+  var plen: csize_t
+  let outp = JS_ToCStringLen(ctx, addr plen, val) # cstring
+  if outp == nil:
+    return err()
+  var ret = newString(plen)
+  if plen != 0:
+    prepareMutation(ret)
+    copyMem(addr ret[0], outp, plen)
+  JS_FreeCString(ctx, outp)
+  return ok(ret)
+
+func fromJSInt[T: SomeInteger](ctx: JSContext, val: JSValue):
+    Result[T, JSError] =
   if not JS_IsNumber(val):
     return err()
   when T is int:
@@ -445,7 +506,8 @@ func fromJSInt[T: SomeInteger](ctx: JSContext, val: JSValue): Opt[T] =
       return err()
     return ok(cast[uint64](ret))
 
-proc fromJSFloat[T: SomeFloat](ctx: JSContext, val: JSValue): Opt[T] =
+proc fromJSFloat[T: SomeFloat](ctx: JSContext, val: JSValue):
+    Result[T, JSError] =
   if not JS_IsNumber(val):
     return err()
   var f64: float64
@@ -453,7 +515,7 @@ proc fromJSFloat[T: SomeFloat](ctx: JSContext, val: JSValue): Opt[T] =
     return err()
   return ok(cast[T](f64))
 
-proc fromJS*[T](ctx: JSContext, val: JSValue): Opt[T]
+proc fromJS*[T](ctx: JSContext, val: JSValue): Result[T, JSError]
 
 macro len(t: type tuple): int =
   let i = t.getType()[1].len - 1 # - tuple
@@ -463,7 +525,7 @@ macro fromJSTupleBody(a: tuple) =
   let len = a.getType().len - 1
   let done = ident("done")
   result = newStmtList(quote do:
-    var `done`: Opt[bool])
+    var `done`: bool)
   for i in 0..<len:
     result.add(quote do:
       let next = JS_Call(ctx, next_method, it, 0, nil)
@@ -474,10 +536,8 @@ macro fromJSTupleBody(a: tuple) =
       if JS_IsException(doneVal):
         return err()
       defer: JS_FreeValue(ctx, doneVal)
-      `done` = fromJS[bool](ctx, doneVal)
-      if `done`.isnone: # exception
-        return err()
-      if `done`.get:
+      `done` = ?fromJS[bool](ctx, doneVal)
+      if `done`:
         JS_ThrowTypeError(ctx, "Too few arguments in sequence (got %d, expected %d)", `i`, `len`)
         return err()
       let valueVal = JS_GetProperty(ctx, next, ctx.getOpaque().str_refs[VALUE])
@@ -496,12 +556,10 @@ macro fromJSTupleBody(a: tuple) =
           return err()
         defer: JS_FreeValue(ctx, next)
         let doneVal = JS_GetProperty(ctx, next, ctx.getOpaque().str_refs[DONE])
-        `done` = fromJS[bool](ctx, doneVal)
-        if `done`.isnone: # exception
-          return err()
+        `done` = ?fromJS[bool](ctx, doneVal)
         var i = `i`
         # we're emulating a sequence, so we must query all remaining parameters too:
-        while not `done`.get:
+        while not `done`:
           inc i
           let next = JS_Call(ctx, next_method, it, 0, nil)
           if JS_IsException(next):
@@ -511,16 +569,15 @@ macro fromJSTupleBody(a: tuple) =
           if JS_IsException(doneVal):
             return err()
           defer: JS_FreeValue(ctx, doneVal)
-          `done` = fromJS[bool](ctx, doneVal)
-          if `done`.isnone: # exception
-            return err()
-          if `done`.get:
-            JS_ThrowTypeError(ctx, "Too many arguments in sequence (got %d, expected %d)", i, `len`)
-            return err()
+          `done` = ?fromJS[bool](ctx, doneVal)
+          if `done`:
+            let msg = "Too many arguments in sequence (got " & $i &
+              ", expected " & $`len` & ")"
+            return err(newTypeError(msg))
           JS_FreeValue(ctx, JS_GetProperty(ctx, next, ctx.getOpaque().str_refs[VALUE]))
       )
 
-proc fromJSTuple[T: tuple](ctx: JSContext, val: JSValue): Opt[T] =
+proc fromJSTuple[T: tuple](ctx: JSContext, val: JSValue): Result[T, JSError] =
   let itprop = JS_GetProperty(ctx, val, ctx.getOpaque().sym_refs[ITERATOR])
   if JS_IsException(itprop):
     return err()
@@ -537,7 +594,7 @@ proc fromJSTuple[T: tuple](ctx: JSContext, val: JSValue): Opt[T] =
   fromJSTupleBody(x)
   return ok(x)
 
-proc fromJSSeq[T](ctx: JSContext, val: JSValue): Opt[seq[T]] =
+proc fromJSSeq[T](ctx: JSContext, val: JSValue): Result[seq[T], JSError] =
   let itprop = JS_GetProperty(ctx, val, ctx.getOpaque().sym_refs[ITERATOR])
   if JS_IsException(itprop):
     return err()
@@ -560,10 +617,8 @@ proc fromJSSeq[T](ctx: JSContext, val: JSValue): Opt[seq[T]] =
     if JS_IsException(doneVal):
       return err()
     defer: JS_FreeValue(ctx, doneVal)
-    let done = fromJS[bool](ctx, doneVal)
-    if done.isnone: # exception
-      return err()
-    if done.get:
+    let done = ?fromJS[bool](ctx, doneVal)
+    if done:
       break
     let valueVal = JS_GetProperty(ctx, next, ctx.getOpaque().str_refs[VALUE])
     if JS_IsException(valueVal):
@@ -598,22 +653,19 @@ proc fromJSSet[T](ctx: JSContext, val: JSValue): Opt[set[T]] =
     if JS_IsException(doneVal):
       return err()
     defer: JS_FreeValue(ctx, doneVal)
-    let done = fromJS[bool](ctx, doneVal)
-    if done.isnone: # exception
-      return err()
-    if done.get:
+    let done = ?fromJS[bool](ctx, doneVal)
+    if done:
       break
     let valueVal = JS_GetProperty(ctx, next, ctx.getOpaque().value)
     if JS_IsException(valueVal):
       return err()
     defer: JS_FreeValue(ctx, valueVal)
-    let genericRes = fromJS[typeof(s.items)](ctx, valueVal)
-    if genericRes.isnone: # exception
-      return err()
-    s.incl(genericRes.get)
+    let genericRes = ?fromJS[typeof(s.items)](ctx, valueVal)
+    s.incl(genericRes)
   return ok(s)
 
-proc fromJSTable[A, B](ctx: JSContext, val: JSValue): Opt[Table[A, B]] =
+proc fromJSTable[A, B](ctx: JSContext, val: JSValue):
+    Result[Table[A, B], JSError] =
   var ptab: ptr JSPropertyEnum
   var plen: uint32
   let flags = cint(JS_GPN_STRING_MASK)
@@ -631,15 +683,11 @@ proc fromJSTable[A, B](ctx: JSContext, val: JSValue): Opt[Table[A, B]] =
     let atom = prop.atom
     let k = JS_AtomToValue(ctx, atom)
     defer: JS_FreeValue(ctx, k)
-    let kn = fromJS[A](ctx, k)
-    if kn.isErr: # exception
-      return err()
+    let kn = ?fromJS[A](ctx, k)
     let v = JS_GetProperty(ctx, val, atom)
     defer: JS_FreeValue(ctx, v)
-    let vn = fromJS[B](ctx, v)
-    if vn.isErr: # exception
-      return err()
-    res[kn.get] = vn.get
+    let vn = ?fromJS[B](ctx, v)
+    res[kn] = vn
   return ok(res)
 
 proc toJS*(ctx: JSContext, s: cstring): JSValue
@@ -666,13 +714,13 @@ proc toJSRefObj(ctx: JSContext, obj: ref object): JSValue
 proc toJS*(ctx: JSContext, obj: ref object): JSValue
 proc toJS*(ctx: JSContext, err: JSError): JSValue
 
-# ew....
-proc fromJSFunction1[T, U](ctx: JSContext, val: JSValue): Opt[proc(x: U): Opt[T]] =
-  return ok(proc(x: U): Opt[T] =
+#TODO varargs
+proc fromJSFunction1[T, U](ctx: JSContext, val: JSValue):
+    proc(x: U): Result[T, JSError] =
+  return proc(x: U): Result[T, JSError] =
     var arg1 = toJS(ctx, x)
     let ret = JS_Call(ctx, val, JS_UNDEFINED, 1, addr arg1)
     return fromJS[T](ctx, ret)
-  )
 
 macro unpackReturnType(f: typed) =
   var x = f.getTypeImpl()
@@ -713,7 +761,7 @@ template optionType[T](o: type Option[T]): auto =
   T
 
 # wrap
-proc fromJSOption[T](ctx: JSContext, val: JSValue): Opt[Option[T]] =
+proc fromJSOption[T](ctx: JSContext, val: JSValue): Result[Option[T], JSError] =
   if JS_IsUndefined(val):
     #TODO what about null?
     return err()
@@ -721,14 +769,14 @@ proc fromJSOption[T](ctx: JSContext, val: JSValue): Opt[Option[T]] =
   return ok(some(res))
 
 # unwrap
-proc fromJSOpt[T](ctx: JSContext, val: JSValue): Opt[T] =
+proc fromJSOpt[T](ctx: JSContext, val: JSValue): Result[T, JSError] =
   if JS_IsUndefined(val):
     #TODO what about null?
     return err()
   let res = ?fromJS[T](ctx, val)
   return ok(res)
 
-proc fromJSBool(ctx: JSContext, val: JSValue): Opt[bool] =
+proc fromJSBool(ctx: JSContext, val: JSValue): Result[bool, JSError] =
   let ret = JS_ToBool(ctx, val)
   if ret == -1: # exception
     return err()
@@ -736,46 +784,45 @@ proc fromJSBool(ctx: JSContext, val: JSValue): Opt[bool] =
     return ok(false)
   return ok(true)
 
-proc fromJSEnum[T: enum](ctx: JSContext, val: JSValue): Opt[T] =
+proc fromJSEnum[T: enum](ctx: JSContext, val: JSValue): Result[T, JSError] =
   if JS_IsException(val):
     return err()
   let s = ?toString(ctx, val)
   try:
     return ok(parseEnum[T](s))
   except ValueError:
-    JS_ThrowTypeError(ctx, "`%s' is not a valid value for enumeration %s",
-      cstring(s), $T)
-    return err()
+    return err(newTypeError("`" & s &
+      "' is not a valid value for enumeration " & $T))
 
-proc fromJSObject[T: ref object](ctx: JSContext, val: JSValue): Opt[T] =
+proc fromJSObject[T: ref object](ctx: JSContext, val: JSValue): Result[T, JSError] =
   if JS_IsException(val):
-    return err()
+    return err(nil)
   if JS_IsNull(val):
     return ok(T(nil))
   const t = $T
   let ctxOpaque = ctx.getOpaque()
   if ctxOpaque.gclaz == t:
-    return getGlobalOpaque(ctx, T, val)
+    return ok(?getGlobalOpaque(ctx, T, val))
   if not JS_IsObject(val):
-    JS_ThrowTypeError(ctx, "Value is not an object")
-    return err()
+    return err(newTypeError("Value is not an object"))
   if not isInstanceOf(ctx, val, t):
     const errmsg = t & " expected"
     JS_ThrowTypeError(ctx, errmsg)
-    return err()
+    return err(newTypeError(errmsg))
   let classid = JS_GetClassID(val)
   let op = cast[T](JS_GetOpaque(val, classid))
   return ok(cast[T](op))
 
-proc fromJS*[T](ctx: JSContext, val: JSValue): Opt[T] =
+proc fromJS*[T](ctx: JSContext, val: JSValue): Result[T, JSError] =
   when T is string:
-    return toString(ctx, val)
+    return fromJSString(ctx, val)
   elif T is char:
     return fromJSChar(ctx, val)
   elif T is Rune:
     return fromJSRune(ctx, val)
   elif T is (proc):
-    return fromJSFunction1[typeof(unpackReturnType(T)), typeof(unpackArg0(T))](ctx, val)
+    return ok(fromJSFunction1[typeof(unpackReturnType(T)),
+      typeof(unpackArg0(T))](ctx, val))
   elif T is Option:
     return fromJSOption[optionType(T)](ctx, val)
   elif T is Opt: # unwrap
@@ -789,7 +836,8 @@ proc fromJS*[T](ctx: JSContext, val: JSValue): Opt[T] =
   elif T is bool:
     return fromJSBool(ctx, val)
   elif typeof(result).valType is Table:
-    return fromJSTable[typeof(result.get.keys), typeof(result.get.values)](ctx, val)
+    return fromJSTable[typeof(result.get.keys),
+      typeof(result.get.values)](ctx, val)
   elif T is SomeInteger:
     return fromJSInt[T](ctx, val)
   elif T is SomeFloat:
@@ -815,11 +863,11 @@ func fromJS[T: string|uint32](ctx: JSContext, atom: JSAtom): Opt[T] =
       return ok(T(cast[uint32](atom) and (not JS_ATOM_TAG_INT)))
   else:
     let val = JS_AtomToValue(ctx, atom)
-    return fromJS[T](ctx, val)
+    return toString(ctx, val)
 
 proc getJSFunction*[T, U](ctx: JSContext, val: JSValue):
-    Opt[(proc(x: T): Opt[U])] =
-  return fromJS[(proc(x: T): Opt[U])](ctx, val)
+    (proc(x: T): Result[U, JSError]) =
+  return fromJSFunction1[T, U](ctx, val)
 
 proc toJS*(ctx: JSContext, s: cstring): JSValue =
   return JS_NewString(ctx, s)
@@ -1147,8 +1195,10 @@ template fromJS_or_return*(t, ctx, val: untyped): untyped =
     if JS_IsException(val):
       return JS_EXCEPTION
     let x = fromJS[t](ctx, val)
-    if x.isnone:
-      return JS_EXCEPTION
+    if x.isErr:
+      if x.error == nil:
+        return JS_EXCEPTION
+      return toJS(ctx, x.error)
     x.get
   )
 
diff --git a/src/types/cookie.nim b/src/types/cookie.nim
index 7418963d..7fbfd6c0 100644
--- a/src/types/cookie.nim
+++ b/src/types/cookie.nim
@@ -2,7 +2,6 @@ import strutils
 import times
 
 import io/urlfilter
-import js/exception
 import js/javascript
 import js/regex
 import types/url
diff --git a/src/types/url.nim b/src/types/url.nim
index 3eb6889c..b8b4913a 100644
--- a/src/types/url.nim
+++ b/src/types/url.nim
@@ -5,7 +5,6 @@ import options
 import unicode
 import math
 
-import js/exception
 import js/javascript
 import types/blob
 import utils/twtstr
diff --git a/src/utils/opt.nim b/src/utils/opt.nim
index 7dd045af..cdf69633 100644
--- a/src/utils/opt.nim
+++ b/src/utils/opt.nim
@@ -48,6 +48,9 @@ template ok*[E](res: var Result[void, E]) =
 template err*[T, E](t: type Result[T, E], e: E): Result[T, E] =
   Result[T, E](has: false, ex: e)
 
+template err*[T](t: type Result[T, ref object]): auto =
+  t(has: false, ex: nil)
+
 template err*[T](t: type Result[T, void]): Result[T, void] =
   Result[T, void](has: false)
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-01-11 00:47:59 +0000