@@ -76,13 +76,13 @@ if: matrix.os == 'windows-latest'
 
       # Build for Linux
       - name: Build (Linux)
-        run: nimble build -v -y --passL:-static -d:release --gcc.exe:musl-gcc --gcc.linkerexe:musl-gcc --gc:orc --opt:size litestore
+        run: nimble build -v -y --passL:-static -d:release --gcc.exe:musl-gcc --gcc.linkerexe:musl-gcc --mm:refc --opt:size litestore
         if: matrix.os == 'ubuntu-latest'
 
       # Build for macOS/Windows
       - name: Build (macOS, Windows)
         shell: bash
-        run: nimble build -v -y -d:release --gc:orc --opt:size litestore
+        run: nimble build -v -y -d:release --mm:refc --opt:size litestore
         if: matrix.os == 'macos-latest' || matrix.os == 'windows-latest'
 
       # Import admin directory and create default db

@@ -40,4 +40,4 @@ curl https://nim-lang.org/choosenim/init.sh -sSf > init.sh
                   sh init.sh -y
 
             - name: Build
-              run: nimble build -y -d:release --gcc.exe:musl-gcc --gcc.linkerexe:musl-gcc
+              run: nimble build -y -d:release --gcc.exe:musl-gcc --gcc.linkerexe:musl-gcc --mm:refc

@@ -16,8 +16,13 @@ LiteStore_UserGuide.htm
 jester_integration
 js
 *_backup
-./config.json
+config.json
+*jwks.json
 *.db-shm
 *.db-wal
 *.nim.bak
 litestore_linkerArgs.txt
+token*.txt
+x5c*.cert
+jwt
+middleware

@@ -1,6 +1,6 @@ 
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 Fabio Cevasco
+Copyright (c) 2015-2024 Fabio Cevasco
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

@@ -32,7 +32,7 @@ for page in ${pages[@]}
 do
   (cat "${page}"; printf "\n\n") >> LiteStore_UserGuide.md
 done
-hastyscribe --field/version:1.11.0 LiteStore_UserGuide.md
+hastyscribe --field/version:1.13.0 LiteStore_UserGuide.md
 rm LiteStore_UserGuide.md
 mv LiteStore_UserGuide.htm ../..
 cd ../..

@@ -0,0 +1,1 @@ 
+A minimalist nosql document store.

@@ -25,7 +25,7 @@ installExt    = @["nim", "c", "h", "json", "ico"]
 
 # Dependencies
 
-requires "nim >= 1.4.4", "https://github.com/h3rald/nim-jwt", "nimgen", "duktape"
+requires "nim >= 2.0.0", "db_connector", "nimgen", "duktape"
 
 # Build
 

@@ -40,8 +40,13 @@ However, users with the **admin:wiki** scope will be able to access documents located under the /docs/wiki/ folder.
 
 Finally, specify the public signature to be used to validate JWT tokens using the **signature** property. Typically, its value should be set to the first value of the [x.509 certificate chain](https://auth0.com/docs/tokens/reference/jwt/jwks-properties) specified in the [JSON Web Key Set](https://auth0.com/docs/jwks) of your API.
 
+> %tip%
+> signature vs. jwks_uri
+> 
+> As of version 1.13.0, it is recommended to use the **jwks_uri** property in a LiteStore configuration file instead of the **signature** property.
+
 To use this configuration at runtime, specify it through the **-\-auth** option, like this:
 
 `litestore -\-auth:auth.json`
 
-Once enabled, LiteStore will return HTTP 401 error codes if an invalid token or no token is included in the HTTP Authorization header of the request accessing the resource or HTTP 403 error codes in case an authenticated user does not have a valid scope to access a specified resource.+Once enabled, LiteStore will return HTTP 401 error codes if an invalid token or no token is included in the HTTP Authorization header of the request accessing the resource or HTTP 403 error codes in case an authenticated user does not have a valid scope to access a specified resource.

@@ -101,4 +101,13 @@ * **allowed** — If set to **false**, LiteStore will return a [405 - Method not allowed](class:kwd) error code when accessing  the resource with the specified method.
 
 ### signature
 
-This section must be  set to a valid certificate used validate JWT tokens. Note that the certificate must follow a specific format and start with the appropriate begin/end  blocks.+This section must be  set to a valid certificate used validate JWT tokens. Note that the certificate must follow a specific format and start with the appropriate begin/end  blocks.
+
+### jwks_uri
+
+As of version 1.13.0, this property can be set to a URI pointing to a valid [JSON Web Key Sets](https://auth0.com/docs/secure/tokens/json-web-tokens/json-web-key-sets) file. If this property is specified, it will be used instead of **signature** to perform signature verification of JWKS tokens.
+
+> %note%
+> How JWKS data is managed
+> 
+> If this property is set, LiteStore will attempt to download the specified JWKS file on startup. This file will be catched to a *store-name*_jwks.json file (e.g. `data_jwks.json`) and its contents stored in memory.

@@ -10,8 +10,6 @@ ### $req
 
 The current HTTP request sent to access the current resource.
 
-#### Properties
-
 <dl>
 <dt>method: string</dt>
 <dd>The HTTP method used by the request, all uppercase (GET, POST, DELETE, PUT, PATCH, OPTIOONS, or HEAD).</dd>
@@ -67,7 +65,7 @@ All methods return a response object containing two String properties, **code** and **content**.
 
 <dl>
 <dt>function get(resource: string, id: string, parameters: string): object</dt>
-<dd>Retrieves the specified resource(s.). 
+<dd>Retrieves the specified resource(s).
 <p>
 Examples:
 <ul>
@@ -125,4 +123,70 @@ <li><code>$store.head('docs')</code></li>
 </ul>
 </p>
 </dd>
-</dl>+</dl>
+
+### $http
+
+Simple synchronous API to perform HTTP requests. 
+
+All methods return a response object containing the following properties:
+* **code** (string)
+* **content** (string)
+* **headers** (object)
+
+<dl>
+<dt>function get(url: string, headers: object): object</dt>
+<dd>Executes a GET request.
+<p>
+Example:
+<ul>
+<li><code>$http.get('https://reqres.in/api/users', {})</code></li>
+</ul>
+</p>
+</dd>
+<dt>function post(url: string, headers: object body: string): object</dt>
+<dd>Executes a POST request.
+<p>
+Example:
+<ul>
+<li><code>$http.post(https://reqres.in/api/users', {'Content-Type': 'application/json'}, '{"name": "Test", "job": "Tester"}')</code></li>
+</ul>
+</p>
+</dd>
+<dt>function put(url: string, headers: object body: string): object</dt>
+<dd>Executes a PUT request.
+<p>
+Example:
+<ul>
+<li><code>$http.put(https://reqres.in/api/users/2', {'Content-Type': 'application/json'}, '{"name": "Test", "job": "Tester"}')</code></li>
+</ul>
+</p>
+</dd>
+<dt>function patch(url: string, headers: object body: string): object</dt>
+<dd>Executes a PATCH request.
+<p>
+Example:
+<ul>
+<li><code>$http.patch(https://reqres.in/api/users/2', {'Content-Type': 'application/json'}, '{"name": "Test", "job": "Tester"}')</code></li>
+</ul>
+</p>
+</dd>
+<dt>function delete(url: string, headers: object): object</dt>
+<dd>Executes a DELETE request.
+<p>
+Example:
+<ul>
+<li><code>$http.delete('https://reqres.in/api/users/2', {})</code></li>
+</ul>
+</p>
+</dd>
+<dt>function head(url: string, headers: object): object</dt>
+<dd>Executes a HEAD request.
+<p>
+Example:
+<ul>
+<li><code>$http.head('https://reqres.in/api/users', {})</code></li>
+</ul>
+</p>
+</dd>
+</dl>

@@ -1,19 +0,0 @@ 
-define:release
-threads:on
-
-@if nimHasWarningObservableStores:
-  warning[ObservableStores]: off
-@end
-
-# https://blog.filippo.io/easy-windows-and-linux-cross-compilers-for-macos/
-
-amd64.windows.gcc.path = "/usr/local/bin"
-amd64.windows.gcc.exe = "x86_64-w64-mingw32-gcc"
-amd64.windows.gcc.linkerexe = "x86_64-w64-mingw32-gcc"
-
-amd64.linux.gcc.path = "/usr/local/bin"
-amd64.linux.gcc.exe = "x86_64-linux-musl-gcc"
-amd64.linux.gcc.linkerexe = "x86_64-linux-musl-gcc"
-
---gc = "orc"
---opt = "size"

@@ -0,0 +1,23 @@ 
+
+switch("mm", "refc")
+switch("opt", "size")
+switch("define", "ssl")
+switch("define", "release")
+switch("threadAnalysis", "off")
+
+when defined(windows):
+    switch("dynlibOverride", "sqlite3_64")
+else:
+    switch("dynlibOverride", "sqlite3")
+
+when defined(ssl):
+    switch("define", "useOpenSsl3")
+    when defined(windows):
+        # TODO",  change once issue nim#15220 is resolved
+        switch("define", "noOpenSSLHacks")
+        switch("define", "sslVersion:(")
+        switch("dynlibOverride", "ssl-")
+        switch("dynlibOverride", "crypto-")
+    else:
+        switch("dynlibOverride", "ssl")
+        switch("dynlibOverride", "crypto")

@@ -35,7 +35,7 @@ if pair.len < 2 or pair[1] == "":
     raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
   try:
     pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
+  except CatchableError:
     raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
   case pair[0]:
     of "search":
@@ -45,12 +45,12 @@ options.tags = pair[1]
     of "limit":
       try:
         options.limit = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
     of "offset":
       try:
         options.offset = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
     of "sort":
       let orderby = pair[1].orderByClauses()
@@ -139,7 +139,7 @@ result.headers = newHttpHeaders(TAB_HEADERS)
         result.headers["Content-Length"] = "0"
         result.content = ""
         result.code = Http204
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to delete document '$1'" % id)
 
 proc getRawDocuments(LS: LiteStore, options: QueryOptions = newQueryOptions()): LSResponse =
@@ -208,7 +208,7 @@ result.content = doc
       result.code = Http201
     else:
       result = resError(Http500, "Unable to create document.")
-  except:
+  except CatchableError:
     result = resError(Http500, "Unable to create document.")
 
 proc putDocument(LS: LiteStore, id: string, body: string, ct: string): LSResponse =
@@ -232,7 +232,7 @@ result.content = doc
         result.code = Http200
       else:
         result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to update document '$1'." % id)
 
 proc patchDocument(LS: LiteStore, id: string, body: string): LSResponse =
@@ -258,7 +258,7 @@ try:
         apply = applyPatchOperation(tags, item["op"].str, item["path"].str, item["value"].str)
         if not apply:
           break
-      except:
+      except CatchableError:
         return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
     else:
         return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
@@ -270,7 +270,7 @@ discard LS.store.destroyTag(t1.str, id, true)
       for t2 in tags:
         if t2 != "":
           LS.store.createTag(t2, id, true)
-    except:
+    except CatchableError:
       return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
   return LS.getRawDocument(id)
 
@@ -331,7 +331,7 @@ result.content = ""
     else:
       result = LS.getRawDocuments(options)
       result.content = ""
-  except:
+  except CatchableError:
     return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
 
 proc get(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
@@ -350,7 +350,7 @@ else:
             return LS.getDocument(id, options)
         else:
           return LS.getRawDocuments(options)
-      except:
+      except CatchableError:
         return resError(Http500, "Internal Server Error - $1" % getCurrentExceptionMsg())
     of "info":
       if id != "":
@@ -409,7 +409,7 @@ else:
             result.headers = ctHeader("text/plain")
           result.content = contents
           result.code = Http200
-        except:
+        except CatchableError:
           return resError(Http500, "Unable to read file '$1'." % path)
       else:
         return resError(Http404, "File '$1' not found." % path)
@@ -444,4 +444,4 @@ if LS.readonly:
         return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
       return validate(req, LS, resource, id, patch)
     else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)

@@ -34,7 +34,7 @@ if pair.len < 2 or pair[1] == "":
     raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
   try:
     pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
+  except CatchableError:
     raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
   case pair[0]:
     of "search":
@@ -44,12 +44,12 @@ options.tags = pair[1]
     of "limit":
       try:
         options.limit = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
     of "offset":
       try:
         options.offset = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
     of "sort":
       let orderby = pair[1].orderByClauses()
@@ -77,7 +77,7 @@ case ct:
         of "application/json":
           try:
             discard body.parseJson()
-          except:
+          except CatchableError:
             return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
         else:
           discard
@@ -156,7 +156,7 @@ result.headers = newHttpHeaders(TAB_HEADERS)
         result.headers["Content-Length"] = "0"
         result.content = ""
         result.code = Http204
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to delete document '$1'" % id)
 
 proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions()): LSResponse =
@@ -229,7 +229,7 @@ result.content = doc
       result.code = Http201
     else:
       result = resError(Http500, "Unable to create document.")
-  except:
+  except CatchableError:
     result = resError(Http500, "Unable to create document.")
 
 proc putDocument*(LS: LiteStore, id: string, body: string, ct: string): LSResponse =
@@ -255,7 +255,7 @@ result.content = doc
         result.code = Http200
       else:
         result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to update document '$1'." % id)
 
 proc patchDocument*(LS: LiteStore, id: string, body: string): LSResponse =
@@ -281,7 +281,7 @@ try:
         apply = applyPatchOperation(tags, item["op"].str, item["path"].str, item["value"].str)
         if not apply:
           break
-      except:
+      except CatchableError:
         return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
     else:
         return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
@@ -293,7 +293,7 @@ discard LS.store.destroyTag(t1.str, id, true)
       for t2 in tags:
         if t2 != "":
           LS.store.createTag(t2, id, true)
-    except:
+    except CatchableError:
       return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
   return LS.getRawDocument(id)
 
@@ -370,7 +370,7 @@ result.content = ""
     else:
       result = LS.getRawDocuments(options)
       result.content = ""
-  except:
+  except CatchableError:
     return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
 
 proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
@@ -391,7 +391,7 @@ else:
             return LS.getDocument(id, options)
         else:
           return LS.getRawDocuments(options)
-      except:
+      except CatchableError:
         return resError(Http500, "Internal Server Error - $1" % getCurrentExceptionMsg())
     of "info":
       if id != "":
@@ -447,7 +447,7 @@ else:
             result.headers = ctHeader("text/plain")
           result.content = contents
           result.code = Http200
-        except:
+        except CatchableError:
           return resError(Http500, "Unable to read file '$1'." % path)
       else:
         return resError(Http404, "File '$1' not found." % path)
@@ -482,4 +482,4 @@ if LS.readonly:
         return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
       return validate(req, LS, resource, id, patch)
     else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)

@@ -141,7 +141,7 @@ if pair.len < 2 or pair[1] == "":
     raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
   try:
     pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
+  except CatchableError:
     raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
   case pair[0]:
     of "filter":
@@ -159,12 +159,12 @@ options.tags = pair[1]
     of "limit":
       try:
         options.limit = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
     of "offset":
       try:
         options.offset = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
     of "sort":
       let orderby = pair[1].orderByClauses()
@@ -192,7 +192,7 @@ case ct:
         of "application/json":
           try:
             discard body.parseJson()
-          except:
+          except CatchableError:
             return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
         else:
           discard
@@ -263,7 +263,7 @@ raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
         else:
           d = d[index]
           dorig = dorig[index]
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
     else:
       if c >= keys.len:
@@ -350,7 +350,7 @@ result.headers = newHttpHeaders(TAB_HEADERS)
         result.headers["Content-Length"] = "0"
         result.content = ""
         result.code = Http204
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to delete document '$1'" % id)
 
 proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions()): LSResponse =
@@ -420,7 +420,7 @@ result.content = doc
       result.code = Http201
     else:
       result = resError(Http500, "Unable to create document.")
-  except:
+  except CatchableError:
     result = resError(Http500, "Unable to create document.")
 
 proc putDocument*(LS: LiteStore, id: string, body: string, ct: string): LSResponse =
@@ -446,7 +446,7 @@ result.content = doc
         result.code = Http200
       else:
         result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to update document '$1'." % id)
 
 proc patchDocument*(LS: LiteStore, id: string, body: string): LSResponse =
@@ -471,7 +471,7 @@ if tags.contains("$subtype:json"):
     try:
       origData = jdoc["data"].getStr.parseJson
       data = origData.copy
-    except:
+    except CatchableError:
       discard
   var c = 1
   for item in jbody.items:
@@ -482,7 +482,7 @@ try:
         apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
         if not apply:
           break
-      except:
+      except CatchableError:
         return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
     else:
         return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
@@ -493,7 +493,7 @@ try:
         var doc = LS.store.updateDocument(id, data.pretty, "application/json")
         if doc == "":
           return resError(Http500, "Unable to patch document '$1'." % id)
-      except:
+      except CatchableError:
         return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
     if origTags != tags:
       try:
@@ -502,7 +502,7 @@ discard LS.store.destroyTag(t1.str, id, true)
         for t2 in tags:
           if t2 != "":
             LS.store.createTag(t2, id, true)
-      except:
+      except CatchableError:
         return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
   return LS.getRawDocument(id)
 
@@ -579,7 +579,7 @@ result.content = ""
     else:
       result = LS.getRawDocuments(options)
       result.content = ""
-  except:
+  except CatchableError:
     return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
 
 proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
@@ -600,7 +600,7 @@ else:
             return LS.getDocument(id, options)
         else:
           return LS.getRawDocuments(options)
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
     of "info":
       if id != "":
@@ -656,7 +656,7 @@ else:
             result.headers = ctHeader("text/plain")
           result.content = contents
           result.code = Http200
-        except:
+        except CatchableError:
           return resError(Http500, "Unable to read file '$1'." % path)
       else:
         return resError(Http404, "File '$1' not found." % path)
@@ -691,4 +691,4 @@ if LS.readonly:
         return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
       return validate(req, LS, resource, id, patch)
     else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)

@@ -141,7 +141,7 @@ if pair.len < 2 or pair[1] == "":
     raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
   try:
     pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
+  except CatchableError:
     raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
   case pair[0]:
     of "filter":
@@ -161,32 +161,32 @@ options.tags = pair[1]
     of "created-after":
       try:
         options.createdAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid created-after value: $1" % getCurrentExceptionMsg())
     of "created-before":
       try:
         options.createdBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid created-before value: $1" % getCurrentExceptionMsg())
     of "modified-after":
       try:
         options.modifiedAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid modified.after value: $1" % getCurrentExceptionMsg())
     of "modified-before":
       try:
         options.modifiedBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid modified-before value: $1" % getCurrentExceptionMsg())
     of "limit":
       try:
         options.limit = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
     of "offset":
       try:
         options.offset = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
     of "sort":
       let orderby = pair[1].orderByClauses()
@@ -216,7 +216,7 @@ case ct:
         of "application/json":
           try:
             discard body.parseJson()
-          except:
+          except CatchableError:
             return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
         else:
           discard
@@ -286,7 +286,7 @@ raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
         else:
           d = d[index]
           dorig = dorig[index]
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
     else:
       if c >= keys.len:
@@ -386,7 +386,7 @@ setOrigin(LS, req, result.headers)
         result.headers["Content-Length"] = "0"
         result.content = ""
         result.code = Http204
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to delete document '$1'" % id)
 
 proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
@@ -484,7 +484,7 @@ result.content = doc
       result.code = Http201
     else:
       result = resError(Http500, "Unable to create document.")
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to create document.")
 
@@ -513,7 +513,7 @@ result.content = doc
         result.code = Http200
       else:
         result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to update document '$1'." % id)
 
 proc patchDocument*(LS: LiteStore, id: string, body: string, req: LSRequest): LSResponse =
@@ -538,7 +538,7 @@ if tags.contains("$subtype:json"):
     try:
       origData = jdoc["data"].getStr.parseJson
       data = origData.copy
-    except:
+    except CatchableError:
       discard
   var c = 1
   for item in jbody.items:
@@ -549,7 +549,7 @@ try:
         apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
         if not apply:
           break
-      except:
+      except CatchableError:
         return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
     else:
         return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
@@ -560,7 +560,7 @@ try:
         var doc = LS.store.updateDocument(id, data.pretty, "application/json")
         if doc == "":
           return resError(Http500, "Unable to patch document '$1'." % id)
-      except:
+      except CatchableError:
         return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
     if origTags != tags:
       try:
@@ -569,7 +569,7 @@ discard LS.store.destroyTag(t1.str, id, true)
         for t2 in tags:
           if t2 != "":
             LS.store.createTag(t2, id, true)
-      except:
+      except CatchableError:
         return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
   return LS.getRawDocument(id, newQueryOptions(), req)
 
@@ -661,7 +661,7 @@ result.content = ""
     else:
       result = LS.getRawDocuments(options, req)
       result.content = ""
-  except:
+  except CatchableError:
     return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
 
 proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
@@ -681,7 +681,7 @@ else:
             return LS.getDocument(id, options, req)
         else:
           return LS.getRawDocuments(options, req)
-      except:
+      except CatchableError:
         let e = getCurrentException()
         let trace = e.getStackTrace()
         echo trace
@@ -694,7 +694,7 @@ if id != "":
           return LS.getTag(id, options, req)
         else:
           return LS.getTags(options, req)
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
     of "info":
       if id != "":
@@ -750,7 +750,7 @@ result.headers = ctHeader("text/plain")
           setOrigin(LS, req, result.headers)
           result.content = contents
           result.code = Http200
-        except:
+        except CatchableError:
           return resError(Http500, "Unable to read file '$1'." % path)
       else:
         return resError(Http404, "File '$1' not found." % path)
@@ -785,4 +785,4 @@ if LS.readonly:
         return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
       return validate(req, LS, resource, id, patch)
     else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)

@@ -145,7 +145,7 @@ if pair.len < 2 or pair[1] == "":
     raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
   try:
     pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
+  except CatchableError:
     raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
   case pair[0]:
     of "filter":
@@ -165,32 +165,32 @@ options.tags = pair[1]
     of "created-after":
       try:
         options.createdAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid created-after value: $1" % getCurrentExceptionMsg())
     of "created-before":
       try:
         options.createdBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid created-before value: $1" % getCurrentExceptionMsg())
     of "modified-after":
       try:
         options.modifiedAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid modified.after value: $1" % getCurrentExceptionMsg())
     of "modified-before":
       try:
         options.modifiedBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid modified-before value: $1" % getCurrentExceptionMsg())
     of "limit":
       try:
         options.limit = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
     of "offset":
       try:
         options.offset = pair[1].parseInt
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
     of "sort":
       let orderby = pair[1].orderByClauses()
@@ -220,7 +220,7 @@ case ct:
         of "application/json":
           try:
             discard body.parseJson()
-          except:
+          except CatchableError:
             return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
         else:
           discard
@@ -290,7 +290,7 @@ raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
         else:
           d = d[index]
           dorig = dorig[index]
-      except:
+      except CatchableError:
         raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
     else:
       if c >= keys.len:
@@ -400,7 +400,7 @@ setOrigin(LS, req, result.headers)
         result.headers["Content-Length"] = "0"
         result.content = ""
         result.code = Http204
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to delete document '$1'" % id)
 
 proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
@@ -524,7 +524,7 @@ result.headers = ctJsonHeader()
     setOrigin(LS, req, result.headers)
     result.content = "{\"id\": \"$1\", \"field\": \"$2\"}" % [id, field]
     result.code = Http200
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to create index.")
 
@@ -540,7 +540,7 @@ setOrigin(LS, req, result.headers)
     result.headers["Content-Length"] = "0"
     result.content = ""
     result.code = Http204
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to delete index.")
 
@@ -556,7 +556,7 @@ result.content = doc
       result.code = Http201
     else:
       result = resError(Http500, "Unable to create document.")
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to create document.")
 
@@ -585,7 +585,7 @@ result.content = doc
         result.code = Http200
       else:
         result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to update document '$1'." % id)
 
 proc patchDocument*(LS: LiteStore, id: string, body: string, req: LSRequest): LSResponse =
@@ -610,7 +610,7 @@ if tags.contains("$subtype:json"):
     try:
       origData = jdoc["data"].getStr.parseJson
       data = origData.copy
-    except:
+    except CatchableError:
       discard
   var c = 1
   for item in jbody.items:
@@ -621,7 +621,7 @@ try:
         apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
         if not apply:
           break
-      except:
+      except CatchableError:
         return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
     else:
         return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
@@ -632,7 +632,7 @@ try:
         var doc = LS.store.updateDocument(id, data.pretty, "application/json")
         if doc == "":
           return resError(Http500, "Unable to patch document '$1'." % id)
-      except:
+      except CatchableError:
         return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
     if origTags != tags:
       try:
@@ -641,7 +641,7 @@ discard LS.store.destroyTag(t1.str, id, true)
         for t2 in tags:
           if t2 != "":
             LS.store.createTag(t2, id, true)
-      except:
+      except CatchableError:
         return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
   return LS.getRawDocument(id, newQueryOptions(), req)
 
@@ -760,7 +760,7 @@ result.content = ""
     else:
       result = LS.getRawDocuments(options, req)
       result.content = ""
-  except:
+  except CatchableError:
     return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
 
 proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
@@ -780,7 +780,7 @@ else:
             return LS.getDocument(id, options, req)
         else:
           return LS.getRawDocuments(options, req)
-      except:
+      except CatchableError:
         let e = getCurrentException()
         let trace = e.getStackTrace()
         echo trace
@@ -793,7 +793,7 @@ if id != "":
           return LS.getTag(id, options, req)
         else:
           return LS.getTags(options, req)
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
     of "indexes":
       var options = newQueryOptions()
@@ -803,7 +803,7 @@ if id != "":
           return LS.getIndex(id, options, req)
         else:
           return LS.getIndexes(options, req)
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
     of "info":
       if id != "":
@@ -824,7 +824,7 @@ if resource == "indexes":
       var field = ""
       try:
         field = parseJson(req.body.strip)["field"].getStr
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
       return LS.putIndex(id, field, req)
     else: # Assume docs
@@ -870,7 +870,7 @@ result.headers = ctHeader("text/plain")
           setOrigin(LS, req, result.headers)
           result.content = contents
           result.code = Http200
-        except:
+        except CatchableError:
           return resError(Http500, "Unable to read file '$1'." % path)
       else:
         return resError(Http404, "File '$1' not found." % path)
@@ -905,4 +905,4 @@ if LS.readonly:
         return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
       return validate(req, LS, resource, id, patch)
     else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)

@@ -1,1131 +1,1131 @@ 
-import
-  asynchttpserver,
-  strutils,
-  sequtils,
-  cgi,
-  strtabs,
-  pegs,
-  json,
-  os,
-  uri,
-  times
-import
-  types,
-  contenttypes,
-  core,
-  utils,
-  logger,
-  duktape
-
-# Helper procs
-
-proc sqlOp(op: string): string =
-  let table = newStringTable()
-  table["not eq"] = "<>"
-  table["eq"] = "=="
-  table["gt"] = ">"
-  table["gte"] = ">="
-  table["lt"] = "<"
-  table["lte"] = "<="
-  table["contains"] = "contains"
-  table["like"] = "like"
-  return table[op]
-
-proc orderByClauses*(str: string): string =
-  var clauses = newSeq[string]()
-  var fragments = str.split(",")
-  let clause = peg"""
-    clause <- {[-+]} {field}
-    field <- ('id' / 'created' / 'modified' / path)
-    path <- '$' (objField)+
-    ident <- [a-zA-Z0-9_]+
-    objField <- '.' ident
-  """
-  for f in fragments:
-    var matches = @["", ""]
-    if f.find(clause, matches) != -1:
-      var field = matches[1]
-      if field[0] == '$':
-        field = "json_extract(documents.data, '$1')" % matches[1]
-      if matches[0] == "-":
-        clauses.add("$1 COLLATE NOCASE DESC" % field)
-      else:
-        clauses.add("$1 COLLATE NOCASE ASC" % field)
-  return clauses.join(", ")
-
-proc selectClause*(str: string, options: var QueryOptions) =
-  let tokens = """
-    path <- '$' (objItem / objField)+
-    ident <- [a-zA-Z0-9_]+
-    objIndex <- '[' \d+ ']'
-    objField <- '.' ident
-    objItem <- objField objIndex
-  """
-  let fields = peg("""
-    fields <- ^{field} (\s* ',' \s* {field})*$
-    field <- path \s+ ('as' / 'AS') \s+ ident
-  """ & tokens)
-  let field = peg("""
-    field <- ^{path} \s+ ('as' / 'AS') \s+ {ident}$
-  """ & tokens)
-  var fieldMatches = newSeq[string](10)
-  if str.strip.match(fields, fieldMatches):
-    for m in fieldMatches:
-      if m.len > 0:
-        var rawTuple = newSeq[string](2)
-        if m.match(field, rawTuple):
-          options.jsonSelect.add((path: rawTuple[0], alias: rawTuple[1]))
-
-proc filterClauses*(str: string, options: var QueryOptions) =
-  let tokens = """
-    operator <- 'not eq' / 'eq' / 'gte' / 'gt' / 'lte' / 'lt' / 'contains' / 'like'
-    value <- string / number / 'null' / 'true' / 'false'
-    string <- '"' ('\\"' . / [^"])* '"'
-    number <- '-'? '0' / [1-9] [0-9]* ('.' [0-9]+)? (( 'e' / 'E' ) ( '+' / '-' )? [0-9]+)?
-    path <- '$' (objItem / objField)+
-    ident <- [a-zA-Z0-9_]+
-    objIndex <- '[' \d+ ']'
-    objField <- '.' ident
-    objItem <- objField objIndex
-  """
-  let clause = peg("""
-    clause <- {path} \s+ {operator} \s+ {value}
-  """ & tokens)
-  let andClauses = peg("""
-    andClauses <- ^{clause} (\s+ 'and' \s+ {clause})*$
-    clause <- path \s+ operator \s+ value
-  """ & tokens)
-  let orClauses = peg("""
-    orClauses <- ^{andClauses} (\s+ 'or' \s+ {andClauses})*$
-    andClauses <- clause (\s+ 'and' \s+ clause)*
-    clause <- path \s+ operator \s+ value
-  """ & tokens)
-  var orClausesMatches = newSeq[string](10)
-  discard str.strip.match(orClauses, orClausesMatches)
-  var parsedClauses = newSeq[seq[seq[string]]]()
-  for orClause in orClausesMatches:
-    if orClause.len > 0:
-      var andClausesMatches = newSeq[string](10)
-      discard orClause.strip.match(andClauses, andClausesMatches)
-      var parsedAndClauses = newSeq[seq[string]]()
-      for andClause in andClausesMatches:
-        if andClause.len > 0:
-          var clauses = newSeq[string](3)
-          discard andClause.strip.match(clause, clauses)
-          clauses[1] = sqlOp(clauses[1])
-          if clauses[2] == "true":
-            clauses[2] = "1"
-          elif clauses[2] == "false":
-            clauses[2] = "0"
-          parsedAndClauses.add clauses
-      if parsedAndClauses.len > 0:
-        parsedClauses.add parsedAndClauses
-  if parsedClauses.len == 0:
-    return
-  var currentArr = 0
-  var tables = newSeq[string]()
-  let resOrClauses = parsedClauses.map do (it: seq[seq[string]]) -> string:
-    let resAndClauses = it.map do (x: seq[string]) -> string:
-      if x[1] == "contains":
-        currentArr = currentArr + 1
-        tables.add "json_each(documents.data, '$1') AS arr$2" % [x[0], $currentArr]
-        return "arr$1.value == $2" % [$currentArr, x[2]]
-      else:
-        var arr = @[x[0], x[1], x[2]]
-        if x[1] == "like":
-          arr[2] = x[2].replace('*', '%')
-        return "json_extract(documents.data, '$1') $2 $3 " % arr
-    return resAndClauses.join(" AND ")
-  options.tables = options.tables & tables
-  options.jsonFilter = resOrClauses.join(" OR ")
-
-proc parseQueryOption*(fragment: string, options: var QueryOptions) =
-  if fragment == "":
-    return
-  var pair = fragment.split('=')
-  if pair.len < 2 or pair[1] == "":
-    raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
-  try:
-    pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
-    raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
-  case pair[0]:
-    of "filter":
-      filterClauses(pair[1], options)
-      if options.jsonFilter == "":
-        raise newException(EInvalidRequest, "Invalid filter clause: $1" % pair[1].replace("\"", "\\\""))
-    of "select":
-      selectClause(pair[1], options)
-      if options.jsonSelect.len == 0:
-        raise newException(EInvalidRequest, "Invalid select clause: $1" % pair[1].replace("\"", "\\\""))
-    of "like":
-      options.like = pair[1]
-    of "search":
-      options.search = pair[1]
-    of "tags":
-      options.tags = pair[1]
-    of "created-after":
-      try:
-        options.createdAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid created-after value: $1" % getCurrentExceptionMsg())
-    of "created-before":
-      try:
-        options.createdBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid created-before value: $1" % getCurrentExceptionMsg())
-    of "modified-after":
-      try:
-        options.modifiedAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid modified.after value: $1" % getCurrentExceptionMsg())
-    of "modified-before":
-      try:
-        options.modifiedBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid modified-before value: $1" % getCurrentExceptionMsg())
-    of "limit":
-      try:
-        options.limit = pair[1].parseInt
-      except:
-        raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
-    of "offset":
-      try:
-        options.offset = pair[1].parseInt
-      except:
-        raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
-    of "sort":
-      let orderby = pair[1].orderByClauses()
-      if orderby != "":
-        options.orderby = orderby
-      else:
-        raise newException(EInvalidRequest, "Invalid sort value: $1" % pair[1])
-    of "contents", "raw":
-      discard
-    else:
-      discard
-
-proc parseQueryOptions*(querystring: string, options: var QueryOptions) =
-  var fragments = querystring.split('&')
-  for f in fragments:
-    f.parseQueryOption(options)
-
-proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string, cb: proc(req: LSRequest, LS: LiteStore, resource: string, id: string):LSResponse): LSResponse =
-  if req.reqMethod == HttpPost or req.reqMethod == HttpPut or req.reqMethod == HttpPatch:
-    var ct =  ""
-    let body = req.body.strip
-    if body == "":
-      return resError(Http400, "Bad request: No content specified for document.")
-    if req.headers.hasKey("Content-Type"):
-      ct = req.headers["Content-Type"]
-      case ct:
-        of "application/json":
-          try:
-            discard body.parseJson()
-          except:
-            return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
-        else:
-          discard
-  return cb(req, LS, resource, id)
-
-proc patchTag(tags: var seq[string], index: int, op, path, value: string): bool =
-  LOG.debug("- PATCH -> $1 tag['$2'] = \"$3\" - Total tags: $4." % [op, $index, $value, $tags.len])
-  case op:
-    of "remove":
-      let tag = tags[index]
-      if not tag.startsWith("$"):
-        tags[index] = "" # Not removing element, otherwise subsequent indexes won't work!
-      else:
-        raise newException(EInvalidRequest, "cannot remove system tag: $1" % tag)
-    of "add":
-      if value.match(PEG_USER_TAG):
-        tags.insert(value, index)
-      else:
-        if value.strip == "":
-          raise newException(EInvalidRequest, "tag not specified." % value)
-        else:
-          raise newException(EInvalidRequest, "invalid tag: $1" % value)
-    of "replace":
-      if value.match(PEG_USER_TAG):
-        if tags[index].startsWith("$"):
-          raise newException(EInvalidRequest, "cannot replace system tag: $1" % tags[index])
-        else:
-          tags[index] = value
-      else:
-        if value.strip == "":
-          raise newException(EInvalidRequest, "tag not specified." % value)
-        else:
-          raise newException(EInvalidRequest, "invalid tag: $1" % value)
-    of "test":
-      if tags[index] != value:
-        return false
-    else:
-      raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
-  return true
-
-proc patchData*(data: var JsonNode, origData: JsonNode, op: string, path: string, value: JsonNode): bool =
-  LOG.debug("- PATCH -> $1 path $2 with $3" % [op, path, $value])
-  var keys = path.replace(peg"^\/data\/", "").split("/")
-  if keys.len == 0:
-    raise newException(EInvalidRequest, "no valid path specified: $1" % path)
-  var d = data
-  var dorig = origData
-  var c = 1
-  for key in keys:
-    if d.kind == JArray:
-      try:
-        var index = key.parseInt
-        if c >= keys.len:
-          d.elems[index] = value
-          case op:
-            of "remove":
-              d.elems.del(index)
-            of "add":
-              d.elems.insert(value, index)
-            of "replace":
-              d.elems[index] = value
-            of "test":
-              if d.elems[index] != value:
-                return false
-            else:
-              raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
-        else:
-          d = d[index]
-          dorig = dorig[index]
-      except:
-        raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
-    else:
-      if c >= keys.len:
-        case op:
-          of "remove":
-            if d.hasKey(key):
-              d.delete(key)
-            else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
-          of "add":
-            d[key] = value
-          of "replace":
-            if d.hasKey(key):
-              d[key] = value
-            else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
-          of "test":
-            if dorig.hasKey(key):
-              if dorig[key] != value:
-                return false
-            else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
-          else:
-            raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
-      else:
-        d = d[key]
-        dorig = dorig[key]
-    c += 1
-  return true
-
-
-proc applyPatchOperation*(data: var JsonNode, origData: JsonNode, tags: var seq[string], op: string, path: string, value: JsonNode): bool =
-  var matches = @[""]
-  let p = peg"""
-    path <- ^tagPath / fieldPath$
-    tagPath <- '\/tags\/' {\d+}
-    fieldPath <- '\/data\/' ident ('\/' ident)*
-    ident <- [a-zA-Z0-9_]+ / '-'
-  """
-  if path.find(p, matches) == -1:
-    raise newException(EInvalidRequest, "cannot patch path '$1'" % path)
-  if path.match(peg"^\/tags\/"):
-    let index = matches[0].parseInt
-    if value.kind != JString:
-      raise newException(EInvalidRequest, "tag '$1' is not a string." % $value)
-    let tag = value.getStr
-    return patchTag(tags, index, op, path, tag)
-  elif tags.contains("$subtype:json"):
-    return patchData(data, origData, op, path, value)
-  else:
-    raise newException(EInvalidRequest, "cannot patch data of a non-JSON document.")
-
-# Low level procs
-
-proc getTag*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveTag(id, options)
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  if doc == newJNull():
-    result = resTagNotFound(id)
-  else:
-    result.content = $doc
-    result.code = Http200
-
-proc getIndex*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveIndex(id, options)
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  if doc == newJNull():
-    result = resIndexNotFound(id)
-  else:
-    result.content = $doc
-    result.code = Http200
-
-proc getRawDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveRawDocument(id, options)
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  if doc == "":
-    result = resDocumentNotFound(id)
-  else:
-    result.content = doc
-    result.code = Http200
-
-proc getDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveDocument(id, options)
-  if doc.data == "":
-    result = resDocumentNotFound(id)
-  else:
-    result.headers = doc.contenttype.ctHeader
-    setOrigin(LS, req, result.headers)
-    result.content = doc.data
-    result.code = Http200
-
-proc deleteDocument*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveDocument(id)
-  if doc.data == "":
-    result = resDocumentNotFound(id)
-  else:
-    try:
-      let res = LS.store.destroyDocument(id)
-      if res == 0:
-        result = resError(Http500, "Unable to delete document '$1'" % id)
-      else:
-        result.headers = newHttpHeaders(TAB_HEADERS)
-        setOrigin(LS, req, result.headers)
-        result.headers["Content-Length"] = "0"
-        result.content = ""
-        result.code = Http204
-    except:
-      result = resError(Http500, "Unable to delete document '$1'" % id)
-
-proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
-  var options = options
-  let t0 = cpuTime()
-  let docs = LS.store.retrieveTags(options)
-  let orig_limit = options.limit
-  let orig_offset = options.offset
-  options.limit = 0
-  options.offset = 0
-  options.select = @["COUNT(tag_id)"]
-  let total = LS.store.countTags(prepareSelectTagsQuery(options), options.like.replace("*", "%"))
-  var content = newJObject()
-  if options.like != "":
-    content["like"] = %(options.like.decodeURL)
-  if orig_limit > 0:
-    content["limit"] = %orig_limit
-    if orig_offset > 0:
-      content["offset"] = %orig_offset
-  content["total"] = %total
-  content["execution_time"] = %(cputime()-t0)
-  content["results"] = docs
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc getIndexes*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
-  var options = options
-  let t0 = cpuTime()
-  let docs = LS.store.retrieveIndexes(options)
-  let orig_limit = options.limit
-  let orig_offset = options.offset
-  options.limit = 0
-  options.offset = 0
-  options.select = @["COUNT(name)"]
-  let total = LS.store.countIndexes(prepareSelectIndexesQuery(options), options.like.replace("*", "%"))
-  var content = newJObject()
-  if options.like != "":
-    content["like"] = %(options.like.decodeURL)
-  if orig_limit > 0:
-    content["limit"] = %orig_limit
-    if orig_offset > 0:
-      content["offset"] = %orig_offset
-  content["total"] = %total
-  content["execution_time"] = %(cputime()-t0)
-  content["results"] = docs
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
-  var options = options
-  let t0 = cpuTime()
-  let docs = LS.store.retrieveRawDocuments(options)
-  let orig_limit = options.limit
-  let orig_offset = options.offset
-  options.limit = 0
-  options.offset = 0
-  options.select = @["COUNT(docid)"]
-  let total = LS.store.retrieveRawDocuments(options)[0].num
-  var content = newJObject()
-  if options.folder != "":
-    content["folder"] = %(options.folder)
-  if options.search != "":
-    content["search"] = %(options.search.decodeURL)
-  if options.tags != "":
-    content["tags"] = newJArray()
-    for tag in options.tags.replace("+", "%2B").decodeURL.split(","):
-      content["tags"].add(%tag)
-  if orig_limit > 0:
-    content["limit"] = %orig_limit
-    if orig_offset > 0:
-      content["offset"] = %orig_offset
-  if options.orderby != "":
-    content["sort"] = %options.orderby
-  content["total"] = %total
-  content["execution_time"] = %(cputime()-t0)
-  content["results"] = docs
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc getInfo*(LS: LiteStore, req: LSRequest): LSResponse =
-  let info = LS.store.retrieveInfo()
-  let version = info[0]
-  let total_documents = info[1]
-  let total_tags = LS.store.countTags()
-  let tags = LS.store.retrieveTagsWithTotals()
-  var content = newJObject()
-  content["version"] = %(LS.appname & " v" & LS.appversion)
-  content["datastore_version"] = %version
-  content["size"] = %($((LS.file.getFileSize().float/(1024*1024)).formatFloat(ffDecimal, 2)) & " MB")
-  content["read_only"] = %LS.readonly
-  content["log_level"] = %LS.loglevel
-  if LS.directory.len == 0:
-    content["directory"] = newJNull()
-  else:
-    content["directory"] = %LS.directory
-  content["mount"] = %LS.mount
-  content["total_documents"] = %total_documents
-  content["total_tags"] = %total_tags
-  content["tags"] = tags
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc putIndex*(LS: LiteStore, id, field: string, req: LSRequest): LSResponse =
-  try:
-    if (not id.match(PEG_INDEX)):
-      return resError(Http400, "invalid index ID: $1" % id)
-    if (not field.match(PEG_JSON_FIELD)):
-      return resError(Http400, "invalid field path: $1" % field)
-    if (LS.store.retrieveIndex(id) != newJNull()):
-      return resError(Http409, "Index already exists: $1" % id)
-    LS.store.createIndex(id, field)
-    result.headers = ctJsonHeader()
-    setOrigin(LS, req, result.headers)
-    result.content = "{\"id\": \"$1\", \"field\": \"$2\"}" % [id, field]
-    result.code = Http200
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to create index.")
-
-proc deleteIndex*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
-  if (not id.match(PEG_INDEX)):
-    return resError(Http400, "invalid index ID: $1" % id)
-  if (LS.store.retrieveIndex(id) == newJNull()):
-    return resError(Http404, "Index not found: $1" % id)
-  try:
-    LS.store.dropIndex(id)
-    result.headers = newHttpHeaders(TAB_HEADERS)
-    setOrigin(LS, req, result.headers)
-    result.headers["Content-Length"] = "0"
-    result.content = ""
-    result.code = Http204
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to delete index.")
-
-proc postDocument*(LS: LiteStore, body: string, ct: string, folder="", req: LSRequest): LSResponse =
-  if not folder.isFolder:
-    return resError(Http400, "Invalid folder specified when creating document: $1" % folder)
-  try:
-    var doc = LS.store.createDocument(folder, body, ct)
-    if doc != "":
-      result.headers = ctJsonHeader()
-      setOrigin(LS, req, result.headers)
-      result.content = doc
-      result.code = Http201
-    else:
-      result = resError(Http500, "Unable to create document.")
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to create document.")
-
-proc putDocument*(LS: LiteStore, id: string, body: string, ct: string, req: LSRequest): LSResponse =
-  if id.isFolder:
-    return resError(Http400, "Invalid ID '$1' (Document IDs cannot end with '/')." % id)
-  let doc = LS.store.retrieveDocument(id)
-  if doc.data == "":
-    # Create a new document
-    var doc = LS.store.createDocument(id, body, ct)
-    if doc != "":
-      result.headers = ctJsonHeader()
-      setOrigin(LS, req, result.headers)
-      result.content = doc
-      result.code = Http201
-    else:
-      result = resError(Http500, "Unable to create document.")
-  else:
-    # Update existing document
-    try:
-      var doc = LS.store.updateDocument(id, body, ct)
-      if doc != "":
-        result.headers = ctJsonHeader()
-        setOrigin(LS, req, result.headers)
-        result.content = doc
-        result.code = Http200
-      else:
-        result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
-      result = resError(Http500, "Unable to update document '$1'." % id)
-
-proc patchDocument*(LS: LiteStore, id: string, body: string, req: LSRequest): LSResponse =
-  var apply = true
-  let jbody = body.parseJson
-  if jbody.kind != JArray:
-    return resError(Http400, "Bad request: PATCH request body is not an array.")
-  var options = newQueryOptions()
-  options.select = @["documents.id AS id", "created", "modified", "data"]
-  let doc = LS.store.retrieveRawDocument(id, options)
-  if doc == "":
-    return resDocumentNotFound(id)
-  let jdoc = doc.parseJson
-  var tags = newSeq[string]()
-  var origTags = newSeq[string]()
-  for tag in jdoc["tags"].items:
-    tags.add(tag.str)
-    origTags.add(tag.str)
-  var data: JsonNode
-  var origData: JsonNode
-  if tags.contains("$subtype:json"):
-    try:
-      origData = jdoc["data"].getStr.parseJson
-      data = origData.copy
-    except:
-      discard
-  var c = 1
-  for item in jbody.items:
-    if item.hasKey("op") and item.hasKey("path"):
-      if not item.hasKey("value"):
-        item["value"] = %""
-      try:
-        apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
-        if not apply:
-          break
-      except:
-        return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
-    else:
-        return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
-    c.inc
-  if apply:
-    if origData.len > 0 and origData != data:
-      try:
-        var doc = LS.store.updateDocument(id, data.pretty, "application/json")
-        if doc == "":
-          return resError(Http500, "Unable to patch document '$1'." % id)
-      except:
-        return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
-    if origTags != tags:
-      try:
-        for t1 in jdoc["tags"].items:
-          discard LS.store.destroyTag(t1.str, id, true)
-        for t2 in tags:
-          if t2 != "":
-            LS.store.createTag(t2, id, true)
-      except:
-        return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
-  return LS.getRawDocument(id, newQueryOptions(), req)
-
-# Main routing
-
-proc options*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  case resource:
-    of "info":
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      result.headers["Allow"] = "GET, OPTIONS"
-      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-      if id != "":
-        return resError(Http404, "Info '$1' not found." % id)
-      else:
-        result.code = Http204
-        result.content = ""
-    of "dir":
-      result.code = Http204
-      result.content = ""
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      result.headers["Allow"] = "GET, OPTIONS"
-      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    of "tags":
-      result.code = Http204
-      result.content = ""
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      result.headers["Allow"] = "GET, OPTIONS"
-      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    of "indexes":
-      result.code = Http204
-      result.content = ""
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      if id != "":
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-        else:
-          result.headers["Allow"] = "GET, OPTIONS, PUT, DELETE"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS, PUT, DELETE"
-      else:
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    of "docs":
-      var folder: string
-      if id.isFolder:
-        folder = id
-      if folder.len > 0:
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST, PUT"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST, PUT"
-      elif id != "":
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
-          result.headers["Allow-Patch"] = "application/json-patch+json"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
-      else:
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST"
-    else:
-      discard # never happens really.
-
-proc head*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  var options = newQueryOptions()
-  options.select = @["documents.id AS id", "created", "modified"]
-  if id.isFolder:
-    options.folder = id
-  try:
-    parseQueryOptions(req.url.query, options);
-    if id != "" and options.folder == "":
-      result = LS.getRawDocument(id, options, req)
-      result.content = ""
-    else:
-      result = LS.getRawDocuments(options, req)
-      result.content = ""
-  except:
-    return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
-
-proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  case resource:
-    of "docs":
-      var options = newQueryOptions()
-      if id.isFolder:
-        options.folder = id
-      if req.url.query.contains("contents=false"):
-        options.select = @["documents.id AS id", "created", "modified"]
-      try:
-        parseQueryOptions(req.url.query, options);
-        if id != "" and options.folder == "":
-          if req.url.query.contains("raw=true") or req.headers.hasKey("Accept") and req.headers["Accept"] == "application/json":
-            return LS.getRawDocument(id, options, req)
-          else:
-            return LS.getDocument(id, options, req)
-        else:
-          return LS.getRawDocuments(options, req)
-      except:
-        let e = getCurrentException()
-        let trace = e.getStackTrace()
-        echo trace
-        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
-    of "tags":
-      var options = newQueryOptions()
-      try:
-        parseQueryOptions(req.url.query, options);
-        if id != "":
-          return LS.getTag(id, options, req)
-        else:
-          return LS.getTags(options, req)
-      except:
-        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
-    of "indexes":
-      var options = newQueryOptions()
-      try:
-        parseQueryOptions(req.url.query, options);
-        if id != "":
-          return LS.getIndex(id, options, req)
-        else:
-          return LS.getIndexes(options, req)
-      except:
-        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
-    of "info":
-      if id != "":
-        return resError(Http404, "Info '$1' not found." % id)
-      return LS.getInfo(req)
-    else:
-      discard # never happens really.
-
-proc post*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  var ct = "text/plain"
-  if req.headers.hasKey("Content-Type"):
-    ct = req.headers["Content-Type"]
-  return LS.postDocument(req.body.strip, ct, id, req)
-
-proc put*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  if id != "":
-    if resource == "indexes":
-      var field = ""
-      try:
-        field = parseJson(req.body.strip)["field"].getStr
-      except:
-        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
-      return LS.putIndex(id, field, req)
-    else: # Assume docs
-      var ct = "text/plain"
-      if req.headers.hasKey("Content-Type"):
-        ct = req.headers["Content-Type"]
-      return LS.putDocument(id, req.body.strip, ct, req)
-  else:
-    return resError(Http400, "Bad request: document ID must be specified in PUT requests.")
-
-proc delete*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  if id != "":
-    if resource == "indexes":
-      return LS.deleteIndex(id, req)
-    else: # Assume docs
-      return LS.deleteDocument(id, req)
-  else:
-    return resError(Http400, "Bad request: document ID must be specified in DELETE requests.")
-
-proc patch*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  if id != "":
-    return LS.patchDocument(id, req.body, req)
-  else:
-    return resError(Http400, "Bad request: document ID must be specified in PATCH requests.")
-
-proc serveFile*(req: LSRequest, LS: LiteStore, id: string): LSResponse =
-  let path = LS.directory / id
-  var reqMethod = $req.reqMethod
-  if req.headers.hasKey("X-HTTP-Method-Override"):
-    reqMethod = req.headers["X-HTTP-Method-Override"]
-  case reqMethod.toUpperAscii:
-    of "OPTIONS":
-      return validate(req, LS, "dir", id, options)
-    of "GET":
-      if path.fileExists:
-        try:
-          let contents = path.readFile
-          let parts = path.splitFile
-          if CONTENT_TYPES.hasKey(parts.ext):
-            result.headers = CONTENT_TYPES[parts.ext].ctHeader
-          else:
-            result.headers = ctHeader("text/plain")
-          setOrigin(LS, req, result.headers)
-          result.content = contents
-          result.code = Http200
-        except:
-          return resError(Http500, "Unable to read file '$1'." % path)
-      else:
-        return resError(Http404, "File '$1' not found." % path)
-    else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-
-proc route*(req: LSRequest, LS: LiteStore, resource = "docs", id = ""): LSResponse =
-  var reqMethod = $req.reqMethod
-  if req.headers.hasKey("X-HTTP-Method-Override"):
-    reqMethod = req.headers["X-HTTP-Method-Override"]
-  case reqMethod.toUpperAscii:
-    of "POST":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, post)
-    of "PUT":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, put)
-    of "DELETE":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, delete)
-    of "HEAD":
-      return validate(req, LS, resource, id, head)
-    of "OPTIONS":
-      return validate(req, LS, resource, id, options)
-    of "GET":
-      return validate(req, LS, resource, id, get)
-    of "PATCH":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, patch)
-    else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-
-proc newSimpleLSRequest(meth: HttpMethod, resource, id,  body = "", params = "", headers = newHttpHeaders()): LSRequest =
-  result.reqMethod = meth
-  result.body = body
-  result.headers = headers
-  result.url = parseUri("$1://$2:$3/$4/$5?$6" % @["http", "localhost", "9500", resource, id, params])
-  
-proc get(resource, id: string, params = ""): LSResponse =
-  return newSimpleLSRequest(HttpGet, resource, id, "", params).get(LS, resource, id)
-
-proc post(resource, folder, body: string, ct = ""): LSResponse =
-  var headers = newHttpHeaders()
-  if ct != "":
-    headers["Content-Type"] = ct
-  return newSimpleLSRequest(HttpPost, resource, "", body, "", headers).post(LS, resource, folder & "/")
-
-proc put(resource, id, body: string, ct = ""): LSResponse =
-  var headers = newHttpHeaders()
-  if ct != "":
-    headers["Content-Type"] = ct
-  return newSimpleLSRequest(HttpPut, resource, id, body, "", headers).put(LS, resource, id)
-
-proc patch(resource, id, body: string): LSResponse =
-  var headers = newHttpHeaders()
-  headers["Content-Type"] = "application/json"
-  return newSimpleLSRequest(HttpPatch, resource, id, body, "", headers).patch(LS, resource, id)
-
-proc delete(resource, id: string): LSResponse =
-  return newSimpleLSRequest(HttpPatch, resource, id).delete(LS, resource, id)
-
-proc head(resource, id: string): LSResponse =
-  return newSimpleLSRequest(HttpHead, resource, id).head(LS, resource, id)
-
-proc registerStoreApi(LS: LiteStore, ctx: DTContext, origResource, origId: string) =
-  var api_idx = ctx.duk_push_object()
-  # GET
-  var get: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let params = duk_get_string(ctx, 2)
-    let resp = get($resource, $id, $params)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, get, 3)
-  discard ctx.duk_put_prop_string(api_idx, "get")
-  # POST
-  var post: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let folder = duk_get_string(ctx, 1)
-    let body = duk_get_string(ctx, 2)
-    let ct = duk_get_string(ctx, 3)
-    let resp = post($resource, $folder, $body, $ct)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, post, 4)
-  discard ctx.duk_put_prop_string(api_idx, "post")
-  # PUT
-  var put: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let body = duk_get_string(ctx, 2)
-    let ct = duk_get_string(ctx, 3)
-    let resp = put($resource, $id, $body, $ct)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, put, 4)
-  discard ctx.duk_put_prop_string(api_idx, "put")
-  # PATCH
-  var patch: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let body = duk_get_string(ctx, 2)
-    let resp = patch($resource, $id, $body)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, patch, 3)
-  discard ctx.duk_put_prop_string(api_idx, "patch")
-  # DELETE
-  var delete: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let resp = delete($resource, $id)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, delete, 2)
-  discard ctx.duk_put_prop_string(api_idx, "delete")
-  # HEAD
-  var head: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let resp = head($resource, $id)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, head, 2)
-  discard ctx.duk_put_prop_string(api_idx, "head")
-  discard ctx.duk_put_global_string("$store")
-
-proc jError(ctx: DTContext): LSResponse  =
-  return resError(Http500, "Middleware Error: " & $ctx.duk_safe_to_string(-1))
-
-proc getMiddleware*(LS: LiteStore, id: string): string =
-  if not LS.middleware.hasKey(id):
-    # Attempt to retrieve resource from system documents
-    let options = newQueryOptions(true)
-    let doc = LS.store.retrieveDocument("middleware/" & id & ".js", options)
-    result = doc.data
-    if result == "":
-      LOG.warn("Middleware '$1' not found" % id)
-  else:
-    result = LS.middleware[id]
-
-proc getMiddlewareSeq(resource, id, meth: string): seq[string] =
-  result = newSeq[string]() 
-  if LS.config.kind != JObject or not LS.config.hasKey("resources"):
-    return 
-  var reqUri = "/" & resource & "/" & id
-  if reqUri[^1] == '/':
-    reqUri.removeSuffix({'/'})
-  let parts = reqUri.split("/")
-  let ancestors = parts[1..parts.len-2]
-  var currentPath = ""
-  var currentPaths = ""
-  for p in ancestors:
-    currentPath &= "/" & p
-    currentPaths = currentPath & "/*"
-    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][meth].hasKey("middleware"):
-      let mw = LS.config["resources"][currentPaths][meth]["middleware"]
-      if (mw.kind == JArray):
-        for m in mw:
-          result.add m.getStr
-  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("middleware"):
-    let mw = LS.config["resources"][reqUri][meth]["middleware"]
-    if (mw.kind == JArray):
-      for m in mw:
-        result.add m.getStr
-
-proc execute*(req: var LSRequest, LS: LiteStore, resource, id: string): LSResponse =
-  let middleware = getMiddlewareSeq(resource, id, $req.reqMethod)
-  LOG.debug("Middleware: " & middleware.join(" -> "));
-  if middleware.len == 0:
-    return route(req, LS, resource, id)
-  var jReq = $(%* req)
-  LOG.debug("Request: " & jReq)
-  var jRes = """{
-    "code": 200,
-    "content": {},
-    "final": false,
-    "headers": {
-      "Access-Control-Allow-Origin": "*",
-      "Access-Control-Allow-Headers": "Authorization, Content-Type",
-      "Server": "$1",
-      "Content-Type": "application/json"
-    }
-  }""" % [LS.appname & "/" & LS.appversion]
-  var context = "{}"
-  # Create execution context
-  var ctx = duk_create_heap_default()
-  duk_console_init(ctx)
-  duk_print_alert_init(ctx)
-  LS.registerStoreApi(ctx, resource, id)
-  if ctx.duk_peval_string(cstring("($1)" % $jReq)) != 0:
-    return jError(ctx)
-  discard ctx.duk_put_global_string("$req")
-  if ctx.duk_peval_string(cstring("($1)" % $jRes)) != 0:
-    return jError(ctx)
-  discard ctx.duk_put_global_string("$res")
-  if ctx.duk_peval_string(cstring("($1)" % $context)) != 0:
-    return jError(ctx)
-  discard ctx.duk_put_global_string("$ctx")
-  # Middleware-specific functions
-  var i = 0
-  var abort = 0
-  while abort != 1 and i < middleware.len:
-    let code = LS.getMiddleware(middleware[i])
-    LOG.debug("Evaluating middleware '$1'" %  middleware[i])
-    if ctx.duk_peval_string(code.cstring) != 0:
-      return jError(ctx)
-    abort = ctx.duk_get_boolean(-1)
-    i.inc
-  # Retrieve response, and request
-  if ctx.duk_peval_string("JSON.stringify($res);") != 0:
-    return jError(ctx)
-  let fRes = parseJson($(ctx.duk_get_string(-1))).newLSResponse
-  if ctx.duk_peval_string("JSON.stringify($req);") != 0:
-    return jError(ctx)
-  let fReq = parseJson($(ctx.duk_get_string(-1))).newLSRequest()
-  ctx.duk_destroy_heap();
-  LOG.debug("abort: $1", [$abort])
-  if abort == 1:
-    return fRes
-  return route(fReq, LS, resource, id)
+import
+  asynchttpserver,
+  strutils,
+  sequtils,
+  cgi,
+  strtabs,
+  pegs,
+  json,
+  os,
+  uri,
+  times
+import
+  types,
+  contenttypes,
+  core,
+  utils,
+  logger,
+  duktape
+
+# Helper procs
+
+proc sqlOp(op: string): string =
+  let table = newStringTable()
+  table["not eq"] = "<>"
+  table["eq"] = "=="
+  table["gt"] = ">"
+  table["gte"] = ">="
+  table["lt"] = "<"
+  table["lte"] = "<="
+  table["contains"] = "contains"
+  table["like"] = "like"
+  return table[op]
+
+proc orderByClauses*(str: string): string =
+  var clauses = newSeq[string]()
+  var fragments = str.split(",")
+  let clause = peg"""
+    clause <- {[-+]} {field}
+    field <- ('id' / 'created' / 'modified' / path)
+    path <- '$' (objField)+
+    ident <- [a-zA-Z0-9_]+
+    objField <- '.' ident
+  """
+  for f in fragments:
+    var matches = @["", ""]
+    if f.find(clause, matches) != -1:
+      var field = matches[1]
+      if field[0] == '$':
+        field = "json_extract(documents.data, '$1')" % matches[1]
+      if matches[0] == "-":
+        clauses.add("$1 COLLATE NOCASE DESC" % field)
+      else:
+        clauses.add("$1 COLLATE NOCASE ASC" % field)
+  return clauses.join(", ")
+
+proc selectClause*(str: string, options: var QueryOptions) =
+  let tokens = """
+    path <- '$' (objItem / objField)+
+    ident <- [a-zA-Z0-9_]+
+    objIndex <- '[' \d+ ']'
+    objField <- '.' ident
+    objItem <- objField objIndex
+  """
+  let fields = peg("""
+    fields <- ^{field} (\s* ',' \s* {field})*$
+    field <- path \s+ ('as' / 'AS') \s+ ident
+  """ & tokens)
+  let field = peg("""
+    field <- ^{path} \s+ ('as' / 'AS') \s+ {ident}$
+  """ & tokens)
+  var fieldMatches = newSeq[string](10)
+  if str.strip.match(fields, fieldMatches):
+    for m in fieldMatches:
+      if m.len > 0:
+        var rawTuple = newSeq[string](2)
+        if m.match(field, rawTuple):
+          options.jsonSelect.add((path: rawTuple[0], alias: rawTuple[1]))
+
+proc filterClauses*(str: string, options: var QueryOptions) =
+  let tokens = """
+    operator <- 'not eq' / 'eq' / 'gte' / 'gt' / 'lte' / 'lt' / 'contains' / 'like'
+    value <- string / number / 'null' / 'true' / 'false'
+    string <- '"' ('\\"' . / [^"])* '"'
+    number <- '-'? '0' / [1-9] [0-9]* ('.' [0-9]+)? (( 'e' / 'E' ) ( '+' / '-' )? [0-9]+)?
+    path <- '$' (objItem / objField)+
+    ident <- [a-zA-Z0-9_]+
+    objIndex <- '[' \d+ ']'
+    objField <- '.' ident
+    objItem <- objField objIndex
+  """
+  let clause = peg("""
+    clause <- {path} \s+ {operator} \s+ {value}
+  """ & tokens)
+  let andClauses = peg("""
+    andClauses <- ^{clause} (\s+ 'and' \s+ {clause})*$
+    clause <- path \s+ operator \s+ value
+  """ & tokens)
+  let orClauses = peg("""
+    orClauses <- ^{andClauses} (\s+ 'or' \s+ {andClauses})*$
+    andClauses <- clause (\s+ 'and' \s+ clause)*
+    clause <- path \s+ operator \s+ value
+  """ & tokens)
+  var orClausesMatches = newSeq[string](10)
+  discard str.strip.match(orClauses, orClausesMatches)
+  var parsedClauses = newSeq[seq[seq[string]]]()
+  for orClause in orClausesMatches:
+    if orClause.len > 0:
+      var andClausesMatches = newSeq[string](10)
+      discard orClause.strip.match(andClauses, andClausesMatches)
+      var parsedAndClauses = newSeq[seq[string]]()
+      for andClause in andClausesMatches:
+        if andClause.len > 0:
+          var clauses = newSeq[string](3)
+          discard andClause.strip.match(clause, clauses)
+          clauses[1] = sqlOp(clauses[1])
+          if clauses[2] == "true":
+            clauses[2] = "1"
+          elif clauses[2] == "false":
+            clauses[2] = "0"
+          parsedAndClauses.add clauses
+      if parsedAndClauses.len > 0:
+        parsedClauses.add parsedAndClauses
+  if parsedClauses.len == 0:
+    return
+  var currentArr = 0
+  var tables = newSeq[string]()
+  let resOrClauses = parsedClauses.map do (it: seq[seq[string]]) -> string:
+    let resAndClauses = it.map do (x: seq[string]) -> string:
+      if x[1] == "contains":
+        currentArr = currentArr + 1
+        tables.add "json_each(documents.data, '$1') AS arr$2" % [x[0], $currentArr]
+        return "arr$1.value == $2" % [$currentArr, x[2]]
+      else:
+        var arr = @[x[0], x[1], x[2]]
+        if x[1] == "like":
+          arr[2] = x[2].replace('*', '%')
+        return "json_extract(documents.data, '$1') $2 $3 " % arr
+    return resAndClauses.join(" AND ")
+  options.tables = options.tables & tables
+  options.jsonFilter = resOrClauses.join(" OR ")
+
+proc parseQueryOption*(fragment: string, options: var QueryOptions) =
+  if fragment == "":
+    return
+  var pair = fragment.split('=')
+  if pair.len < 2 or pair[1] == "":
+    raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
+  try:
+    pair[1] = pair[1].replace("+", "%2B").decodeURL
+  except CatchableError:
+    raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
+  case pair[0]:
+    of "filter":
+      filterClauses(pair[1], options)
+      if options.jsonFilter == "":
+        raise newException(EInvalidRequest, "Invalid filter clause: $1" % pair[1].replace("\"", "\\\""))
+    of "select":
+      selectClause(pair[1], options)
+      if options.jsonSelect.len == 0:
+        raise newException(EInvalidRequest, "Invalid select clause: $1" % pair[1].replace("\"", "\\\""))
+    of "like":
+      options.like = pair[1]
+    of "search":
+      options.search = pair[1]
+    of "tags":
+      options.tags = pair[1]
+    of "created-after":
+      try:
+        options.createdAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid created-after value: $1" % getCurrentExceptionMsg())
+    of "created-before":
+      try:
+        options.createdBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid created-before value: $1" % getCurrentExceptionMsg())
+    of "modified-after":
+      try:
+        options.modifiedAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid modified.after value: $1" % getCurrentExceptionMsg())
+    of "modified-before":
+      try:
+        options.modifiedBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid modified-before value: $1" % getCurrentExceptionMsg())
+    of "limit":
+      try:
+        options.limit = pair[1].parseInt
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
+    of "offset":
+      try:
+        options.offset = pair[1].parseInt
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
+    of "sort":
+      let orderby = pair[1].orderByClauses()
+      if orderby != "":
+        options.orderby = orderby
+      else:
+        raise newException(EInvalidRequest, "Invalid sort value: $1" % pair[1])
+    of "contents", "raw":
+      discard
+    else:
+      discard
+
+proc parseQueryOptions*(querystring: string, options: var QueryOptions) =
+  var fragments = querystring.split('&')
+  for f in fragments:
+    f.parseQueryOption(options)
+
+proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string, cb: proc(req: LSRequest, LS: LiteStore, resource: string, id: string):LSResponse): LSResponse =
+  if req.reqMethod == HttpPost or req.reqMethod == HttpPut or req.reqMethod == HttpPatch:
+    var ct =  ""
+    let body = req.body.strip
+    if body == "":
+      return resError(Http400, "Bad request: No content specified for document.")
+    if req.headers.hasKey("Content-Type"):
+      ct = req.headers["Content-Type"]
+      case ct:
+        of "application/json":
+          try:
+            discard body.parseJson()
+          except CatchableError:
+            return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
+        else:
+          discard
+  return cb(req, LS, resource, id)
+
+proc patchTag(tags: var seq[string], index: int, op, path, value: string): bool =
+  LOG.debug("- PATCH -> $1 tag['$2'] = \"$3\" - Total tags: $4." % [op, $index, $value, $tags.len])
+  case op:
+    of "remove":
+      let tag = tags[index]
+      if not tag.startsWith("$"):
+        tags[index] = "" # Not removing element, otherwise subsequent indexes won't work!
+      else:
+        raise newException(EInvalidRequest, "cannot remove system tag: $1" % tag)
+    of "add":
+      if value.match(PEG_USER_TAG):
+        tags.insert(value, index)
+      else:
+        if value.strip == "":
+          raise newException(EInvalidRequest, "tag not specified." % value)
+        else:
+          raise newException(EInvalidRequest, "invalid tag: $1" % value)
+    of "replace":
+      if value.match(PEG_USER_TAG):
+        if tags[index].startsWith("$"):
+          raise newException(EInvalidRequest, "cannot replace system tag: $1" % tags[index])
+        else:
+          tags[index] = value
+      else:
+        if value.strip == "":
+          raise newException(EInvalidRequest, "tag not specified." % value)
+        else:
+          raise newException(EInvalidRequest, "invalid tag: $1" % value)
+    of "test":
+      if tags[index] != value:
+        return false
+    else:
+      raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
+  return true
+
+proc patchData*(data: var JsonNode, origData: JsonNode, op: string, path: string, value: JsonNode): bool =
+  LOG.debug("- PATCH -> $1 path $2 with $3" % [op, path, $value])
+  var keys = path.replace(peg"^\/data\/", "").split("/")
+  if keys.len == 0:
+    raise newException(EInvalidRequest, "no valid path specified: $1" % path)
+  var d = data
+  var dorig = origData
+  var c = 1
+  for key in keys:
+    if d.kind == JArray:
+      try:
+        var index = key.parseInt
+        if c >= keys.len:
+          d.elems[index] = value
+          case op:
+            of "remove":
+              d.elems.del(index)
+            of "add":
+              d.elems.insert(value, index)
+            of "replace":
+              d.elems[index] = value
+            of "test":
+              if d.elems[index] != value:
+                return false
+            else:
+              raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
+        else:
+          d = d[index]
+          dorig = dorig[index]
+      except CatchableError:
+        raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
+    else:
+      if c >= keys.len:
+        case op:
+          of "remove":
+            if d.hasKey(key):
+              d.delete(key)
+            else:
+              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+          of "add":
+            d[key] = value
+          of "replace":
+            if d.hasKey(key):
+              d[key] = value
+            else:
+              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+          of "test":
+            if dorig.hasKey(key):
+              if dorig[key] != value:
+                return false
+            else:
+              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+          else:
+            raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
+      else:
+        d = d[key]
+        dorig = dorig[key]
+    c += 1
+  return true
+
+
+proc applyPatchOperation*(data: var JsonNode, origData: JsonNode, tags: var seq[string], op: string, path: string, value: JsonNode): bool =
+  var matches = @[""]
+  let p = peg"""
+    path <- ^tagPath / fieldPath$
+    tagPath <- '\/tags\/' {\d+}
+    fieldPath <- '\/data\/' ident ('\/' ident)*
+    ident <- [a-zA-Z0-9_]+ / '-'
+  """
+  if path.find(p, matches) == -1:
+    raise newException(EInvalidRequest, "cannot patch path '$1'" % path)
+  if path.match(peg"^\/tags\/"):
+    let index = matches[0].parseInt
+    if value.kind != JString:
+      raise newException(EInvalidRequest, "tag '$1' is not a string." % $value)
+    let tag = value.getStr
+    return patchTag(tags, index, op, path, tag)
+  elif tags.contains("$subtype:json"):
+    return patchData(data, origData, op, path, value)
+  else:
+    raise newException(EInvalidRequest, "cannot patch data of a non-JSON document.")
+
+# Low level procs
+
+proc getTag*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveTag(id, options)
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  if doc == newJNull():
+    result = resTagNotFound(id)
+  else:
+    result.content = $doc
+    result.code = Http200
+
+proc getIndex*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveIndex(id, options)
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  if doc == newJNull():
+    result = resIndexNotFound(id)
+  else:
+    result.content = $doc
+    result.code = Http200
+
+proc getRawDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveRawDocument(id, options)
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  if doc == "":
+    result = resDocumentNotFound(id)
+  else:
+    result.content = doc
+    result.code = Http200
+
+proc getDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveDocument(id, options)
+  if doc.data == "":
+    result = resDocumentNotFound(id)
+  else:
+    result.headers = doc.contenttype.ctHeader
+    setOrigin(LS, req, result.headers)
+    result.content = doc.data
+    result.code = Http200
+
+proc deleteDocument*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveDocument(id)
+  if doc.data == "":
+    result = resDocumentNotFound(id)
+  else:
+    try:
+      let res = LS.store.destroyDocument(id)
+      if res == 0:
+        result = resError(Http500, "Unable to delete document '$1'" % id)
+      else:
+        result.headers = newHttpHeaders(TAB_HEADERS)
+        setOrigin(LS, req, result.headers)
+        result.headers["Content-Length"] = "0"
+        result.content = ""
+        result.code = Http204
+    except CatchableError:
+      result = resError(Http500, "Unable to delete document '$1'" % id)
+
+proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+  var options = options
+  let t0 = cpuTime()
+  let docs = LS.store.retrieveTags(options)
+  let orig_limit = options.limit
+  let orig_offset = options.offset
+  options.limit = 0
+  options.offset = 0
+  options.select = @["COUNT(tag_id)"]
+  let total = LS.store.countTags(prepareSelectTagsQuery(options), options.like.replace("*", "%"))
+  var content = newJObject()
+  if options.like != "":
+    content["like"] = %(options.like.decodeURL)
+  if orig_limit > 0:
+    content["limit"] = %orig_limit
+    if orig_offset > 0:
+      content["offset"] = %orig_offset
+  content["total"] = %total
+  content["execution_time"] = %(cputime()-t0)
+  content["results"] = docs
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc getIndexes*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+  var options = options
+  let t0 = cpuTime()
+  let docs = LS.store.retrieveIndexes(options)
+  let orig_limit = options.limit
+  let orig_offset = options.offset
+  options.limit = 0
+  options.offset = 0
+  options.select = @["COUNT(name)"]
+  let total = LS.store.countIndexes(prepareSelectIndexesQuery(options), options.like.replace("*", "%"))
+  var content = newJObject()
+  if options.like != "":
+    content["like"] = %(options.like.decodeURL)
+  if orig_limit > 0:
+    content["limit"] = %orig_limit
+    if orig_offset > 0:
+      content["offset"] = %orig_offset
+  content["total"] = %total
+  content["execution_time"] = %(cputime()-t0)
+  content["results"] = docs
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+  var options = options
+  let t0 = cpuTime()
+  let docs = LS.store.retrieveRawDocuments(options)
+  let orig_limit = options.limit
+  let orig_offset = options.offset
+  options.limit = 0
+  options.offset = 0
+  options.select = @["COUNT(docid)"]
+  let total = LS.store.retrieveRawDocuments(options)[0].num
+  var content = newJObject()
+  if options.folder != "":
+    content["folder"] = %(options.folder)
+  if options.search != "":
+    content["search"] = %(options.search.decodeURL)
+  if options.tags != "":
+    content["tags"] = newJArray()
+    for tag in options.tags.replace("+", "%2B").decodeURL.split(","):
+      content["tags"].add(%tag)
+  if orig_limit > 0:
+    content["limit"] = %orig_limit
+    if orig_offset > 0:
+      content["offset"] = %orig_offset
+  if options.orderby != "":
+    content["sort"] = %options.orderby
+  content["total"] = %total
+  content["execution_time"] = %(cputime()-t0)
+  content["results"] = docs
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc getInfo*(LS: LiteStore, req: LSRequest): LSResponse =
+  let info = LS.store.retrieveInfo()
+  let version = info[0]
+  let total_documents = info[1]
+  let total_tags = LS.store.countTags()
+  let tags = LS.store.retrieveTagsWithTotals()
+  var content = newJObject()
+  content["version"] = %(LS.appname & " v" & LS.appversion)
+  content["datastore_version"] = %version
+  content["size"] = %($((LS.file.getFileSize().float/(1024*1024)).formatFloat(ffDecimal, 2)) & " MB")
+  content["read_only"] = %LS.readonly
+  content["log_level"] = %LS.loglevel
+  if LS.directory.len == 0:
+    content["directory"] = newJNull()
+  else:
+    content["directory"] = %LS.directory
+  content["mount"] = %LS.mount
+  content["total_documents"] = %total_documents
+  content["total_tags"] = %total_tags
+  content["tags"] = tags
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc putIndex*(LS: LiteStore, id, field: string, req: LSRequest): LSResponse =
+  try:
+    if (not id.match(PEG_INDEX)):
+      return resError(Http400, "invalid index ID: $1" % id)
+    if (not field.match(PEG_JSON_FIELD)):
+      return resError(Http400, "invalid field path: $1" % field)
+    if (LS.store.retrieveIndex(id) != newJNull()):
+      return resError(Http409, "Index already exists: $1" % id)
+    LS.store.createIndex(id, field)
+    result.headers = ctJsonHeader()
+    setOrigin(LS, req, result.headers)
+    result.content = "{\"id\": \"$1\", \"field\": \"$2\"}" % [id, field]
+    result.code = Http200
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to create index.")
+
+proc deleteIndex*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
+  if (not id.match(PEG_INDEX)):
+    return resError(Http400, "invalid index ID: $1" % id)
+  if (LS.store.retrieveIndex(id) == newJNull()):
+    return resError(Http404, "Index not found: $1" % id)
+  try:
+    LS.store.dropIndex(id)
+    result.headers = newHttpHeaders(TAB_HEADERS)
+    setOrigin(LS, req, result.headers)
+    result.headers["Content-Length"] = "0"
+    result.content = ""
+    result.code = Http204
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to delete index.")
+
+proc postDocument*(LS: LiteStore, body: string, ct: string, folder="", req: LSRequest): LSResponse =
+  if not folder.isFolder:
+    return resError(Http400, "Invalid folder specified when creating document: $1" % folder)
+  try:
+    var doc = LS.store.createDocument(folder, body, ct)
+    if doc != "":
+      result.headers = ctJsonHeader()
+      setOrigin(LS, req, result.headers)
+      result.content = doc
+      result.code = Http201
+    else:
+      result = resError(Http500, "Unable to create document.")
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to create document.")
+
+proc putDocument*(LS: LiteStore, id: string, body: string, ct: string, req: LSRequest): LSResponse =
+  if id.isFolder:
+    return resError(Http400, "Invalid ID '$1' (Document IDs cannot end with '/')." % id)
+  let doc = LS.store.retrieveDocument(id)
+  if doc.data == "":
+    # Create a new document
+    var doc = LS.store.createDocument(id, body, ct)
+    if doc != "":
+      result.headers = ctJsonHeader()
+      setOrigin(LS, req, result.headers)
+      result.content = doc
+      result.code = Http201
+    else:
+      result = resError(Http500, "Unable to create document.")
+  else:
+    # Update existing document
+    try:
+      var doc = LS.store.updateDocument(id, body, ct)
+      if doc != "":
+        result.headers = ctJsonHeader()
+        setOrigin(LS, req, result.headers)
+        result.content = doc
+        result.code = Http200
+      else:
+        result = resError(Http500, "Unable to update document '$1'." % id)
+    except CatchableError:
+      result = resError(Http500, "Unable to update document '$1'." % id)
+
+proc patchDocument*(LS: LiteStore, id: string, body: string, req: LSRequest): LSResponse =
+  var apply = true
+  let jbody = body.parseJson
+  if jbody.kind != JArray:
+    return resError(Http400, "Bad request: PATCH request body is not an array.")
+  var options = newQueryOptions()
+  options.select = @["documents.id AS id", "created", "modified", "data"]
+  let doc = LS.store.retrieveRawDocument(id, options)
+  if doc == "":
+    return resDocumentNotFound(id)
+  let jdoc = doc.parseJson
+  var tags = newSeq[string]()
+  var origTags = newSeq[string]()
+  for tag in jdoc["tags"].items:
+    tags.add(tag.str)
+    origTags.add(tag.str)
+  var data: JsonNode
+  var origData: JsonNode
+  if tags.contains("$subtype:json"):
+    try:
+      origData = jdoc["data"].getStr.parseJson
+      data = origData.copy
+    except CatchableError:
+      discard
+  var c = 1
+  for item in jbody.items:
+    if item.hasKey("op") and item.hasKey("path"):
+      if not item.hasKey("value"):
+        item["value"] = %""
+      try:
+        apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
+        if not apply:
+          break
+      except CatchableError:
+        return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
+    else:
+        return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
+    c.inc
+  if apply:
+    if origData.len > 0 and origData != data:
+      try:
+        var doc = LS.store.updateDocument(id, data.pretty, "application/json")
+        if doc == "":
+          return resError(Http500, "Unable to patch document '$1'." % id)
+      except CatchableError:
+        return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
+    if origTags != tags:
+      try:
+        for t1 in jdoc["tags"].items:
+          discard LS.store.destroyTag(t1.str, id, true)
+        for t2 in tags:
+          if t2 != "":
+            LS.store.createTag(t2, id, true)
+      except CatchableError:
+        return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
+  return LS.getRawDocument(id, newQueryOptions(), req)
+
+# Main routing
+
+proc options*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  case resource:
+    of "info":
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      result.headers["Allow"] = "GET, OPTIONS"
+      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+      if id != "":
+        return resError(Http404, "Info '$1' not found." % id)
+      else:
+        result.code = Http204
+        result.content = ""
+    of "dir":
+      result.code = Http204
+      result.content = ""
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      result.headers["Allow"] = "GET, OPTIONS"
+      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+    of "tags":
+      result.code = Http204
+      result.content = ""
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      result.headers["Allow"] = "GET, OPTIONS"
+      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+    of "indexes":
+      result.code = Http204
+      result.content = ""
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      if id != "":
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+        else:
+          result.headers["Allow"] = "GET, OPTIONS, PUT, DELETE"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS, PUT, DELETE"
+      else:
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+    of "docs":
+      var folder: string
+      if id.isFolder:
+        folder = id
+      if folder.len > 0:
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST, PUT"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST, PUT"
+      elif id != "":
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
+          result.headers["Allow-Patch"] = "application/json-patch+json"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
+      else:
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST"
+    else:
+      discard # never happens really.
+
+proc head*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  var options = newQueryOptions()
+  options.select = @["documents.id AS id", "created", "modified"]
+  if id.isFolder:
+    options.folder = id
+  try:
+    parseQueryOptions(req.url.query, options);
+    if id != "" and options.folder == "":
+      result = LS.getRawDocument(id, options, req)
+      result.content = ""
+    else:
+      result = LS.getRawDocuments(options, req)
+      result.content = ""
+  except CatchableError:
+    return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
+
+proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  case resource:
+    of "docs":
+      var options = newQueryOptions()
+      if id.isFolder:
+        options.folder = id
+      if req.url.query.contains("contents=false"):
+        options.select = @["documents.id AS id", "created", "modified"]
+      try:
+        parseQueryOptions(req.url.query, options);
+        if id != "" and options.folder == "":
+          if req.url.query.contains("raw=true") or req.headers.hasKey("Accept") and req.headers["Accept"] == "application/json":
+            return LS.getRawDocument(id, options, req)
+          else:
+            return LS.getDocument(id, options, req)
+        else:
+          return LS.getRawDocuments(options, req)
+      except CatchableError:
+        let e = getCurrentException()
+        let trace = e.getStackTrace()
+        echo trace
+        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
+    of "tags":
+      var options = newQueryOptions()
+      try:
+        parseQueryOptions(req.url.query, options);
+        if id != "":
+          return LS.getTag(id, options, req)
+        else:
+          return LS.getTags(options, req)
+      except CatchableError:
+        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
+    of "indexes":
+      var options = newQueryOptions()
+      try:
+        parseQueryOptions(req.url.query, options);
+        if id != "":
+          return LS.getIndex(id, options, req)
+        else:
+          return LS.getIndexes(options, req)
+      except CatchableError:
+        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
+    of "info":
+      if id != "":
+        return resError(Http404, "Info '$1' not found." % id)
+      return LS.getInfo(req)
+    else:
+      discard # never happens really.
+
+proc post*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  var ct = "text/plain"
+  if req.headers.hasKey("Content-Type"):
+    ct = req.headers["Content-Type"]
+  return LS.postDocument(req.body.strip, ct, id, req)
+
+proc put*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  if id != "":
+    if resource == "indexes":
+      var field = ""
+      try:
+        field = parseJson(req.body.strip)["field"].getStr
+      except CatchableError:
+        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
+      return LS.putIndex(id, field, req)
+    else: # Assume docs
+      var ct = "text/plain"
+      if req.headers.hasKey("Content-Type"):
+        ct = req.headers["Content-Type"]
+      return LS.putDocument(id, req.body.strip, ct, req)
+  else:
+    return resError(Http400, "Bad request: document ID must be specified in PUT requests.")
+
+proc delete*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  if id != "":
+    if resource == "indexes":
+      return LS.deleteIndex(id, req)
+    else: # Assume docs
+      return LS.deleteDocument(id, req)
+  else:
+    return resError(Http400, "Bad request: document ID must be specified in DELETE requests.")
+
+proc patch*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  if id != "":
+    return LS.patchDocument(id, req.body, req)
+  else:
+    return resError(Http400, "Bad request: document ID must be specified in PATCH requests.")
+
+proc serveFile*(req: LSRequest, LS: LiteStore, id: string): LSResponse =
+  let path = LS.directory / id
+  var reqMethod = $req.reqMethod
+  if req.headers.hasKey("X-HTTP-Method-Override"):
+    reqMethod = req.headers["X-HTTP-Method-Override"]
+  case reqMethod.toUpperAscii:
+    of "OPTIONS":
+      return validate(req, LS, "dir", id, options)
+    of "GET":
+      if path.fileExists:
+        try:
+          let contents = path.readFile
+          let parts = path.splitFile
+          if CONTENT_TYPES.hasKey(parts.ext):
+            result.headers = CONTENT_TYPES[parts.ext].ctHeader
+          else:
+            result.headers = ctHeader("text/plain")
+          setOrigin(LS, req, result.headers)
+          result.content = contents
+          result.code = Http200
+        except CatchableError:
+          return resError(Http500, "Unable to read file '$1'." % path)
+      else:
+        return resError(Http404, "File '$1' not found." % path)
+    else:
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+
+proc route*(req: LSRequest, LS: LiteStore, resource = "docs", id = ""): LSResponse =
+  var reqMethod = $req.reqMethod
+  if req.headers.hasKey("X-HTTP-Method-Override"):
+    reqMethod = req.headers["X-HTTP-Method-Override"]
+  case reqMethod.toUpperAscii:
+    of "POST":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, post)
+    of "PUT":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, put)
+    of "DELETE":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, delete)
+    of "HEAD":
+      return validate(req, LS, resource, id, head)
+    of "OPTIONS":
+      return validate(req, LS, resource, id, options)
+    of "GET":
+      return validate(req, LS, resource, id, get)
+    of "PATCH":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, patch)
+    else:
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+
+proc newSimpleLSRequest(meth: HttpMethod, resource = "", id = "",  body = "", params = "", headers = newHttpHeaders()): LSRequest =
+  result.reqMethod = meth
+  result.body = body
+  result.headers = headers
+  result.url = parseUri("$1://$2:$3/$4/$5?$6" % @["http", "localhost", "9500", resource, id, params])
+  
+proc get(resource, id: string, params = ""): LSResponse =
+  return newSimpleLSRequest(HttpGet, resource, id, "", params).get(LS, resource, id)
+
+proc post(resource, folder, body: string, ct = ""): LSResponse =
+  var headers = newHttpHeaders()
+  if ct != "":
+    headers["Content-Type"] = ct
+  return newSimpleLSRequest(HttpPost, resource, "", body, "", headers).post(LS, resource, folder & "/")
+
+proc put(resource, id, body: string, ct = ""): LSResponse =
+  var headers = newHttpHeaders()
+  if ct != "":
+    headers["Content-Type"] = ct
+  return newSimpleLSRequest(HttpPut, resource, id, body, "", headers).put(LS, resource, id)
+
+proc patch(resource, id, body: string): LSResponse =
+  var headers = newHttpHeaders()
+  headers["Content-Type"] = "application/json"
+  return newSimpleLSRequest(HttpPatch, resource, id, body, "", headers).patch(LS, resource, id)
+
+proc delete(resource, id: string): LSResponse =
+  return newSimpleLSRequest(HttpPatch, resource, id).delete(LS, resource, id)
+
+proc head(resource, id: string): LSResponse =
+  return newSimpleLSRequest(HttpHead, resource, id).head(LS, resource, id)
+
+proc registerStoreApi(LS: LiteStore, ctx: DTContext, origResource, origId: string) =
+  var api_idx = ctx.duk_push_object()
+  # GET
+  var get: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let params = duk_get_string(ctx, 2)
+    let resp = get($resource, $id, $params)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, get, 3)
+  discard ctx.duk_put_prop_string(api_idx, "get")
+  # POST
+  var post: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let folder = duk_get_string(ctx, 1)
+    let body = duk_get_string(ctx, 2)
+    let ct = duk_get_string(ctx, 3)
+    let resp = post($resource, $folder, $body, $ct)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, post, 4)
+  discard ctx.duk_put_prop_string(api_idx, "post")
+  # PUT
+  var put: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let body = duk_get_string(ctx, 2)
+    let ct = duk_get_string(ctx, 3)
+    let resp = put($resource, $id, $body, $ct)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, put, 4)
+  discard ctx.duk_put_prop_string(api_idx, "put")
+  # PATCH
+  var patch: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let body = duk_get_string(ctx, 2)
+    let resp = patch($resource, $id, $body)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, patch, 3)
+  discard ctx.duk_put_prop_string(api_idx, "patch")
+  # DELETE
+  var delete: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let resp = delete($resource, $id)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, delete, 2)
+  discard ctx.duk_put_prop_string(api_idx, "delete")
+  # HEAD
+  var head: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let resp = head($resource, $id)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, head, 2)
+  discard ctx.duk_put_prop_string(api_idx, "head")
+  discard ctx.duk_put_global_string("$store")
+
+proc jError(ctx: DTContext): LSResponse  =
+  return resError(Http500, "Middleware Error: " & $ctx.duk_safe_to_string(-1))
+
+proc getMiddleware*(LS: LiteStore, id: string): string =
+  if not LS.middleware.hasKey(id):
+    # Attempt to retrieve resource from system documents
+    let options = newQueryOptions(true)
+    let doc = LS.store.retrieveDocument("middleware/" & id & ".js", options)
+    result = doc.data
+    if result == "":
+      LOG.warn("Middleware '$1' not found" % id)
+  else:
+    result = LS.middleware[id]
+
+proc getMiddlewareSeq(resource, id, meth: string): seq[string] =
+  result = newSeq[string]() 
+  if LS.config.kind != JObject or not LS.config.hasKey("resources"):
+    return 
+  var reqUri = "/" & resource & "/" & id
+  if reqUri[^1] == '/':
+    reqUri.removeSuffix({'/'})
+  let parts = reqUri.split("/")
+  let ancestors = parts[1..parts.len-2]
+  var currentPath = ""
+  var currentPaths = ""
+  for p in ancestors:
+    currentPath &= "/" & p
+    currentPaths = currentPath & "/*"
+    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][meth].hasKey("middleware"):
+      let mw = LS.config["resources"][currentPaths][meth]["middleware"]
+      if (mw.kind == JArray):
+        for m in mw:
+          result.add m.getStr
+  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("middleware"):
+    let mw = LS.config["resources"][reqUri][meth]["middleware"]
+    if (mw.kind == JArray):
+      for m in mw:
+        result.add m.getStr
+
+proc execute*(req: var LSRequest, LS: LiteStore, resource, id: string): LSResponse =
+  let middleware = getMiddlewareSeq(resource, id, $req.reqMethod)
+  LOG.debug("Middleware: " & middleware.join(" -> "));
+  if middleware.len == 0:
+    return route(req, LS, resource, id)
+  var jReq = $(%* req)
+  LOG.debug("Request: " & jReq)
+  var jRes = """{
+    "code": 200,
+    "content": {},
+    "final": false,
+    "headers": {
+      "Access-Control-Allow-Origin": "*",
+      "Access-Control-Allow-Headers": "Authorization, Content-Type",
+      "Server": "$1",
+      "Content-Type": "application/json"
+    }
+  }""" % [LS.appname & "/" & LS.appversion]
+  var context = "{}"
+  # Create execution context
+  var ctx = duk_create_heap_default()
+  duk_console_init(ctx)
+  duk_print_alert_init(ctx)
+  LS.registerStoreApi(ctx, resource, id)
+  if ctx.duk_peval_string(cstring("($1)" % $jReq)) != 0:
+    return jError(ctx)
+  discard ctx.duk_put_global_string("$req")
+  if ctx.duk_peval_string(cstring("($1)" % $jRes)) != 0:
+    return jError(ctx)
+  discard ctx.duk_put_global_string("$res")
+  if ctx.duk_peval_string(cstring("($1)" % $context)) != 0:
+    return jError(ctx)
+  discard ctx.duk_put_global_string("$ctx")
+  # Middleware-specific functions
+  var i = 0
+  var abort = 0
+  while abort != 1 and i < middleware.len:
+    let code = LS.getMiddleware(middleware[i])
+    LOG.debug("Evaluating middleware '$1'" %  middleware[i])
+    if ctx.duk_peval_string(code.cstring) != 0:
+      return jError(ctx)
+    abort = ctx.duk_get_boolean(-1)
+    i.inc
+  # Retrieve response, and request
+  if ctx.duk_peval_string("JSON.stringify($res);") != 0:
+    return jError(ctx)
+  let fRes = parseJson($(ctx.duk_get_string(-1))).newLSResponse
+  if ctx.duk_peval_string("JSON.stringify($req);") != 0:
+    return jError(ctx)
+  let fReq = parseJson($(ctx.duk_get_string(-1))).newLSRequest()
+  ctx.duk_destroy_heap();
+  LOG.debug("abort: $1", [$abort])
+  if abort == 1:
+    return fRes
+  return route(fReq, LS, resource, id)

@@ -1,1269 +1,1269 @@ 
-import
-  asynchttpserver,
-  strutils,
-  sequtils,
-  cgi,
-  strtabs,
-  pegs,
-  json,
-  os,
-  uri,
-  tables,
-  times
-import
-  types,
-  contenttypes,
-  core,
-  utils,
-  logger,
-  duktape
-
-# Helper procs
-
-proc sqlOp(op: string): string =
-  let table = newStringTable()
-  table["not eq"] = "<>"
-  table["eq"] = "=="
-  table["gt"] = ">"
-  table["gte"] = ">="
-  table["lt"] = "<"
-  table["lte"] = "<="
-  table["contains"] = "contains"
-  table["like"] = "like"
-  return table[op]
-
-proc orderByClauses*(str: string): string =
-  var clauses = newSeq[string]()
-  var fragments = str.split(",")
-  let clause = peg"""
-    clause <- {[-+]} {field}
-    field <- ('id' / 'created' / 'modified' / path)
-    path <- '$' (objField)+
-    ident <- [a-zA-Z0-9_]+
-    objField <- '.' ident
-  """
-  for f in fragments:
-    var matches = @["", ""]
-    if f.find(clause, matches) != -1:
-      var field = matches[1]
-      if field[0] == '$':
-        field = "json_extract(documents.data, '$1')" % matches[1]
-      if matches[0] == "-":
-        clauses.add("$1 COLLATE NOCASE DESC" % field)
-      else:
-        clauses.add("$1 COLLATE NOCASE ASC" % field)
-  return clauses.join(", ")
-
-proc selectClause*(str: string, options: var QueryOptions) =
-  let tokens = """
-    path <- '$' (objItem / objField)+
-    ident <- [a-zA-Z0-9_]+
-    objIndex <- '[' \d+ ']'
-    objField <- '.' ident
-    objItem <- objField objIndex
-  """
-  let fields = peg("""
-    fields <- ^{field} (\s* ',' \s* {field})*$
-    field <- path \s+ ('as' / 'AS') \s+ ident
-  """ & tokens)
-  let field = peg("""
-    field <- ^{path} \s+ ('as' / 'AS') \s+ {ident}$
-  """ & tokens)
-  var fieldMatches = newSeq[string](10)
-  if str.strip.match(fields, fieldMatches):
-    for m in fieldMatches:
-      if m.len > 0:
-        var rawTuple = newSeq[string](2)
-        if m.match(field, rawTuple):
-          options.jsonSelect.add((path: rawTuple[0], alias: rawTuple[1]))
-
-proc filterClauses*(str: string, options: var QueryOptions) =
-  let tokens = """
-    operator <- 'not eq' / 'eq' / 'gte' / 'gt' / 'lte' / 'lt' / 'contains' / 'like'
-    value <- string / number / 'null' / 'true' / 'false'
-    string <- '"' ('\\"' . / [^"])* '"'
-    number <- '-'? '0' / [1-9] [0-9]* ('.' [0-9]+)? (( 'e' / 'E' ) ( '+' / '-' )? [0-9]+)?
-    path <- '$' (objItem / objField)+
-    ident <- [a-zA-Z0-9_]+
-    objIndex <- '[' \d+ ']'
-    objField <- '.' ident
-    objItem <- objField objIndex
-  """
-  let clause = peg("""
-    clause <- {path} \s+ {operator} \s+ {value}
-  """ & tokens)
-  let andClauses = peg("""
-    andClauses <- ^{clause} (\s+ 'and' \s+ {clause})*$
-    clause <- path \s+ operator \s+ value
-  """ & tokens)
-  let orClauses = peg("""
-    orClauses <- ^{andClauses} (\s+ 'or' \s+ {andClauses})*$
-    andClauses <- clause (\s+ 'and' \s+ clause)*
-    clause <- path \s+ operator \s+ value
-  """ & tokens)
-  var orClausesMatches = newSeq[string](10)
-  discard str.strip.match(orClauses, orClausesMatches)
-  var parsedClauses = newSeq[seq[seq[string]]]()
-  for orClause in orClausesMatches:
-    if orClause.len > 0:
-      var andClausesMatches = newSeq[string](10)
-      discard orClause.strip.match(andClauses, andClausesMatches)
-      var parsedAndClauses = newSeq[seq[string]]()
-      for andClause in andClausesMatches:
-        if andClause.len > 0:
-          var clauses = newSeq[string](3)
-          discard andClause.strip.match(clause, clauses)
-          clauses[1] = sqlOp(clauses[1])
-          if clauses[2] == "true":
-            clauses[2] = "1"
-          elif clauses[2] == "false":
-            clauses[2] = "0"
-          parsedAndClauses.add clauses
-      if parsedAndClauses.len > 0:
-        parsedClauses.add parsedAndClauses
-  if parsedClauses.len == 0:
-    return
-  var currentArr = 0
-  var tables = newSeq[string]()
-  let resOrClauses = parsedClauses.map do (it: seq[seq[string]]) -> string:
-    let resAndClauses = it.map do (x: seq[string]) -> string:
-      if x[1] == "contains":
-        currentArr = currentArr + 1
-        tables.add "json_each(documents.data, '$1') AS arr$2" % [x[0], $currentArr]
-        return "arr$1.value == $2" % [$currentArr, x[2]]
-      else:
-        var arr = @[x[0], x[1], x[2]]
-        if x[1] == "like":
-          arr[2] = x[2].replace('*', '%')
-        return "json_extract(documents.data, '$1') $2 $3 " % arr
-    return resAndClauses.join(" AND ")
-  options.tables = options.tables & tables
-  options.jsonFilter = resOrClauses.join(" OR ")
-
-proc parseQueryOption*(fragment: string, options: var QueryOptions) =
-  if fragment == "":
-    return
-  var pair = fragment.split('=')
-  if pair.len < 2 or pair[1] == "":
-    raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
-  try:
-    pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
-    raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
-  case pair[0]:
-    of "filter":
-      filterClauses(pair[1], options)
-      if options.jsonFilter == "":
-        raise newException(EInvalidRequest, "Invalid filter clause: $1" % pair[1].replace("\"", "\\\""))
-    of "select":
-      selectClause(pair[1], options)
-      if options.jsonSelect.len == 0:
-        raise newException(EInvalidRequest, "Invalid select clause: $1" % pair[1].replace("\"", "\\\""))
-    of "like":
-      options.like = pair[1]
-    of "search":
-      options.search = pair[1]
-    of "tags":
-      options.tags = pair[1]
-    of "created-after":
-      try:
-        options.createdAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid created-after value: $1" % getCurrentExceptionMsg())
-    of "created-before":
-      try:
-        options.createdBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid created-before value: $1" % getCurrentExceptionMsg())
-    of "modified-after":
-      try:
-        options.modifiedAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid modified.after value: $1" % getCurrentExceptionMsg())
-    of "modified-before":
-      try:
-        options.modifiedBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid modified-before value: $1" % getCurrentExceptionMsg())
-    of "limit":
-      try:
-        options.limit = pair[1].parseInt
-      except:
-        raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
-    of "offset":
-      try:
-        options.offset = pair[1].parseInt
-      except:
-        raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
-    of "sort":
-      let orderby = pair[1].orderByClauses()
-      if orderby != "":
-        options.orderby = orderby
-      else:
-        raise newException(EInvalidRequest, "Invalid sort value: $1" % pair[1])
-    of "contents", "raw":
-      discard
-    else:
-      discard
-
-proc parseQueryOptions*(querystring: string, options: var QueryOptions) =
-  var q = querystring
-  if q.startsWith("?"):
-    q = q[1 .. q.len - 1]
-  var fragments = q.split('&')
-  for f in fragments:
-    f.parseQueryOption(options)
-
-proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string, cb: proc(req: LSRequest, LS: LiteStore, resource: string, id: string):LSResponse): LSResponse =
-  if req.reqMethod == HttpPost or req.reqMethod == HttpPut or req.reqMethod == HttpPatch:
-    var ct =  ""
-    let body = req.body.strip
-    if body == "":
-      return resError(Http400, "Bad request: No content specified for document.")
-    if req.headers.hasKey("Content-Type"):
-      ct = req.headers["Content-Type"]
-      case ct:
-        of "application/json":
-          try:
-            discard body.parseJson()
-          except:
-            return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
-        else:
-          discard
-  return cb(req, LS, resource, id)
-
-proc patchTag(tags: var seq[string], index: int, op, path, value: string): bool =
-  LOG.debug("- PATCH -> $1 tag['$2'] = \"$3\" - Total tags: $4." % [op, $index, $value, $tags.len])
-  case op:
-    of "remove":
-      let tag = tags[index]
-      if not tag.startsWith("$"):
-        tags[index] = "" # Not removing element, otherwise subsequent indexes won't work!
-      else:
-        raise newException(EInvalidRequest, "cannot remove system tag: $1" % tag)
-    of "add":
-      if value.match(PEG_USER_TAG):
-        tags.insert(value, index)
-      else:
-        if value.strip == "":
-          raise newException(EInvalidRequest, "tag not specified." % value)
-        else:
-          raise newException(EInvalidRequest, "invalid tag: $1" % value)
-    of "replace":
-      if value.match(PEG_USER_TAG):
-        if tags[index].startsWith("$"):
-          raise newException(EInvalidRequest, "cannot replace system tag: $1" % tags[index])
-        else:
-          tags[index] = value
-      else:
-        if value.strip == "":
-          raise newException(EInvalidRequest, "tag not specified." % value)
-        else:
-          raise newException(EInvalidRequest, "invalid tag: $1" % value)
-    of "test":
-      if tags[index] != value:
-        return false
-    else:
-      raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
-  return true
-
-proc patchData*(data: var JsonNode, origData: JsonNode, op: string, path: string, value: JsonNode): bool =
-  LOG.debug("- PATCH -> $1 path $2 with $3" % [op, path, $value])
-  var keys = path.replace(peg"^\/data\/", "").split("/")
-  if keys.len == 0:
-    raise newException(EInvalidRequest, "no valid path specified: $1" % path)
-  var d = data
-  var dorig = origData
-  var c = 1
-  for key in keys:
-    if d.kind == JArray:
-      try:
-        var index = key.parseInt
-        if c >= keys.len:
-          d.elems[index] = value
-          case op:
-            of "remove":
-              d.elems.del(index)
-            of "add":
-              d.elems.insert(value, index)
-            of "replace":
-              d.elems[index] = value
-            of "test":
-              if d.elems[index] != value:
-                return false
-            else:
-              raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
-        else:
-          d = d[index]
-          dorig = dorig[index]
-      except:
-        raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
-    else:
-      if c >= keys.len:
-        case op:
-          of "remove":
-            if d.hasKey(key):
-              d.delete(key)
-            else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
-          of "add":
-            d[key] = value
-          of "replace":
-            if d.hasKey(key):
-              d[key] = value
-            else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
-          of "test":
-            if dorig.hasKey(key):
-              if dorig[key] != value:
-                return false
-            else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
-          else:
-            raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
-      else:
-        d = d[key]
-        dorig = dorig[key]
-    c += 1
-  return true
-
-
-proc applyPatchOperation*(data: var JsonNode, origData: JsonNode, tags: var seq[string], op: string, path: string, value: JsonNode): bool =
-  var matches = @[""]
-  let p = peg"""
-    path <- ^tagPath / fieldPath$
-    tagPath <- '\/tags\/' {\d+}
-    fieldPath <- '\/data\/' ident ('\/' ident)*
-    ident <- [a-zA-Z0-9_]+ / '-'
-  """
-  if path.find(p, matches) == -1:
-    raise newException(EInvalidRequest, "cannot patch path '$1'" % path)
-  if path.match(peg"^\/tags\/"):
-    let index = matches[0].parseInt
-    if value.kind != JString:
-      raise newException(EInvalidRequest, "tag '$1' is not a string." % $value)
-    let tag = value.getStr
-    return patchTag(tags, index, op, path, tag)
-  elif tags.contains("$subtype:json"):
-    return patchData(data, origData, op, path, value)
-  else:
-    raise newException(EInvalidRequest, "cannot patch data of a non-JSON document.")
-
-# Low level procs
-
-proc getTag*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveTag(id, options)
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  if doc == newJNull():
-    result = resTagNotFound(id)
-  else:
-    result.content = $doc
-    result.code = Http200
-
-proc getStore*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  if (not LSDICT.hasKey(id)):
-    return resStoreNotFound(id)
-  let store = LSDICT[id]
-  var doc = newJObject()
-  doc["id"] = %id
-  doc["file"] = %store.file
-  doc["config"] = store.config
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = $doc
-  result.code = Http200
-
-proc getIndex*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveIndex(id, options)
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  if doc == newJNull():
-    result = resIndexNotFound(id)
-  else:
-    result.content = $doc
-    result.code = Http200
-
-proc getRawDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveRawDocument(id, options)
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  if doc == "":
-    result = resDocumentNotFound(id)
-  else:
-    result.content = doc
-    result.code = Http200
-
-proc getDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveDocument(id, options)
-  if doc.data == "":
-    result = resDocumentNotFound(id)
-  else:
-    result.headers = doc.contenttype.ctHeader
-    setOrigin(LS, req, result.headers)
-    result.content = doc.data
-    result.code = Http200
-
-proc deleteDocument*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
-  let doc = LS.store.retrieveDocument(id)
-  if doc.data == "":
-    result = resDocumentNotFound(id)
-  else:
-    try:
-      let res = LS.store.destroyDocument(id)
-      if res == 0:
-        result = resError(Http500, "Unable to delete document '$1'" % id)
-      else:
-        result.headers = newHttpHeaders(TAB_HEADERS)
-        setOrigin(LS, req, result.headers)
-        result.headers["Content-Length"] = "0"
-        result.content = ""
-        result.code = Http204
-    except:
-      result = resError(Http500, "Unable to delete document '$1'" % id)
-
-proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
-  var options = options
-  let t0 = cpuTime()
-  let docs = LS.store.retrieveTags(options)
-  let orig_limit = options.limit
-  let orig_offset = options.offset
-  options.limit = 0
-  options.offset = 0
-  options.select = @["COUNT(tag_id)"]
-  let total = LS.store.countTags(prepareSelectTagsQuery(options), options.like.replace("*", "%"))
-  var content = newJObject()
-  if options.like != "":
-    content["like"] = %(options.like.decodeURL)
-  if orig_limit > 0:
-    content["limit"] = %orig_limit
-    if orig_offset > 0:
-      content["offset"] = %orig_offset
-  content["total"] = %total
-  content["execution_time"] = %(cputime()-t0)
-  content["results"] = docs
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc getStores(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
-  let t0 = cpuTime()
-  var docs = newJArray()
-  for k, v in LSDICT.pairs:
-    var store = newJObject()
-    store["id"] = %k
-    store["file"] = %v.file
-    store["config"] = v.config
-    docs.add(store)
-  var content = newJObject()
-  content["total"] = %LSDICT.len
-  content["execution_time"] = %(cputime()-t0)
-  content["results"] = docs
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc getIndexes*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
-  var options = options
-  let t0 = cpuTime()
-  let docs = LS.store.retrieveIndexes(options)
-  let orig_limit = options.limit
-  let orig_offset = options.offset
-  options.limit = 0
-  options.offset = 0
-  options.select = @["COUNT(name)"]
-  let total = LS.store.countIndexes(prepareSelectIndexesQuery(options), options.like.replace("*", "%"))
-  var content = newJObject()
-  if options.like != "":
-    content["like"] = %(options.like.decodeURL)
-  if orig_limit > 0:
-    content["limit"] = %orig_limit
-    if orig_offset > 0:
-      content["offset"] = %orig_offset
-  content["total"] = %total
-  content["execution_time"] = %(cputime()-t0)
-  content["results"] = docs
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
-  var options = options
-  let t0 = cpuTime()
-  let docs = LS.store.retrieveRawDocuments(options)
-  let orig_limit = options.limit
-  let orig_offset = options.offset
-  options.limit = 0
-  options.offset = 0
-  options.select = @["COUNT(docid)"]
-  let total = LS.store.retrieveRawDocuments(options)[0].num
-  var content = newJObject()
-  if options.folder != "":
-    content["folder"] = %(options.folder)
-  if options.search != "":
-    content["search"] = %(options.search.decodeURL)
-  if options.tags != "":
-    content["tags"] = newJArray()
-    for tag in options.tags.replace("+", "%2B").decodeURL.split(","):
-      content["tags"].add(%tag)
-  if orig_limit > 0:
-    content["limit"] = %orig_limit
-    if orig_offset > 0:
-      content["offset"] = %orig_offset
-  if options.orderby != "":
-    content["sort"] = %options.orderby
-  content["total"] = %total
-  content["execution_time"] = %(cputime()-t0)
-  content["results"] = docs
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc getInfo*(LS: LiteStore, req: LSRequest): LSResponse =
-  let info = LS.store.retrieveInfo()
-  let version = info[0]
-  let total_documents = info[1]
-  let total_tags = LS.store.countTags()
-  let tags = LS.store.retrieveTagsWithTotals()
-  var content = newJObject()
-  content["version"] = %(LS.appname & " v" & LS.appversion)
-  content["datastore_version"] = %version
-  content["api_version"] = %7
-  content["size"] = %($((LS.file.getFileSize().float/(1024*1024)).formatFloat(ffDecimal, 2)) & " MB")
-  content["read_only"] = %LS.readonly
-  content["log_level"] = %LS.loglevel
-  if LS.directory.len == 0:
-    content["directory"] = newJNull()
-  else:
-    content["directory"] = %LS.directory
-  content["mount"] = %LS.mount
-  if LS.config != newJNull() and LS.config.hasKey("stores") and LS.config["stores"].len > 0:
-    content["additional_stores"] = %toSeq(LS.config["stores"].keys)
-  else:
-    content["additional_stores"] = newJArray()
-  if LS.auth != newJNull():
-    content["auth"] = %true
-  else:
-    content["auth"] = %false
-  content["total_documents"] = %total_documents
-  content["total_tags"] = %total_tags
-  content["tags"] = tags
-  result.headers = ctJsonHeader()
-  setOrigin(LS, req, result.headers)
-  result.content = content.pretty
-  result.code = Http200
-
-proc putIndex*(LS: LiteStore, id, field: string, req: LSRequest): LSResponse =
-  try:
-    if (not id.match(PEG_INDEX)):
-      return resError(Http400, "invalid index ID: $1" % id)
-    if (not field.match(PEG_JSON_FIELD)):
-      return resError(Http400, "invalid field path: $1" % field)
-    if (LS.store.retrieveIndex(id) != newJNull()):
-      return resError(Http409, "Index already exists: $1" % id)
-    LS.store.createIndex(id, field)
-    result.headers = ctJsonHeader()
-    setOrigin(LS, req, result.headers)
-    result.content = "{\"id\": \"$1\", \"field\": \"$2\"}" % [id, field]
-    result.code = Http201
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to create index.")
-
-proc putStore*(LS: LiteStore, id: string, config: JsonNode, req: LSRequest): LSResponse =
-  try:
-    if (not id.match(PEG_STORE) or id == "master"):
-      return resError(Http400, "invalid store ID: $1" % id)
-    if (LSDICT.hasKey(id)):
-      return resError(Http409, "Store already exists: $1" % id)
-    let store = LS.addStore(id, id & ".db", config)
-    LS.updateConfig()
-    LSDICT[id] = store
-    result = getStore(LS, id, newQueryOptions(), req)
-    result.code = Http201
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to create store.")
-
-proc deleteIndex*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
-  if (not id.match(PEG_INDEX)):
-    return resError(Http400, "invalid index ID: $1" % id)
-  if (LS.store.retrieveIndex(id) == newJNull()):
-    return resError(Http404, "Index not found: $1" % id)
-  try:
-    LS.store.dropIndex(id)
-    result.headers = newHttpHeaders(TAB_HEADERS)
-    setOrigin(LS, req, result.headers)
-    result.headers["Content-Length"] = "0"
-    result.content = ""
-    result.code = Http204
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to delete index.")
-
-proc deleteStore*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
-  if (not id.match(PEG_STORE)):
-    return resError(Http400, "invalid store ID: $1" % id)
-  if (not LSDICT.hasKey(id)):
-    return resError(Http404, "Store not found: $1" % id)
-  try:
-    LSDICT.del(id)
-    if LS.config.hasKey("stores") and LS.config["stores"].hasKey(id):
-      LS.config["stores"].delete(id)
-    LS.updateConfig()
-    result.headers = newHttpHeaders(TAB_HEADERS)
-    setOrigin(LS, req, result.headers)
-    result.headers["Content-Length"] = "0"
-    result.content = ""
-    result.code = Http204
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to delete index.")
-
-proc postDocument*(LS: LiteStore, body: string, ct: string, folder="", req: LSRequest): LSResponse =
-  if not folder.isFolder:
-    return resError(Http400, "Invalid folder specified when creating document: $1" % folder)
-  try:
-    var doc = LS.store.createDocument(folder, body, ct)
-    if doc != "":
-      result.headers = ctJsonHeader()
-      setOrigin(LS, req, result.headers)
-      result.content = doc
-      result.code = Http201
-    else:
-      result = resError(Http500, "Unable to create document.")
-  except:
-    eWarn()
-    result = resError(Http500, "Unable to create document.")
-
-proc putDocument*(LS: LiteStore, id: string, body: string, ct: string, req: LSRequest): LSResponse =
-  if id.isFolder:
-    return resError(Http400, "Invalid ID '$1' (Document IDs cannot end with '/')." % id)
-  let doc = LS.store.retrieveDocument(id)
-  if doc.data == "":
-    # Create a new document
-    var doc = LS.store.createDocument(id, body, ct)
-    if doc != "":
-      result.headers = ctJsonHeader()
-      setOrigin(LS, req, result.headers)
-      result.content = doc
-      result.code = Http201
-    else:
-      result = resError(Http500, "Unable to create document.")
-  else:
-    # Update existing document
-    try:
-      var doc = LS.store.updateDocument(id, body, ct)
-      if doc != "":
-        result.headers = ctJsonHeader()
-        setOrigin(LS, req, result.headers)
-        result.content = doc
-        result.code = Http200
-      else:
-        result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
-      result = resError(Http500, "Unable to update document '$1'." % id)
-
-proc patchDocument*(LS: LiteStore, id: string, body: string, req: LSRequest): LSResponse =
-  var apply = true
-  let jbody = body.parseJson
-  if jbody.kind != JArray:
-    return resError(Http400, "Bad request: PATCH request body is not an array.")
-  var options = newQueryOptions()
-  options.select = @["documents.id AS id", "created", "modified", "data"]
-  let doc = LS.store.retrieveRawDocument(id, options)
-  if doc == "":
-    return resDocumentNotFound(id)
-  let jdoc = doc.parseJson
-  var tags = newSeq[string]()
-  var origTags = newSeq[string]()
-  for tag in jdoc["tags"].items:
-    tags.add(tag.str)
-    origTags.add(tag.str)
-  var data: JsonNode
-  var origData: JsonNode
-  if tags.contains("$subtype:json"):
-    try:
-      origData = jdoc["data"].getStr.parseJson
-      data = origData.copy
-    except:
-      discard
-  var c = 1
-  for item in jbody.items:
-    if item.hasKey("op") and item.hasKey("path"):
-      if not item.hasKey("value"):
-        item["value"] = %""
-      try:
-        apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
-        if not apply:
-          break
-      except:
-        return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
-    else:
-        return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
-    c.inc
-  if apply:
-    # when document is not JSON the origData is not defined
-    # the extra check allows editing tags for non-JSON documents
-    if origData != nil and origData.len > 0 and origData != data:
-      try:
-        var doc = LS.store.updateDocument(id, data.pretty, "application/json")
-        if doc == "":
-          return resError(Http500, "Unable to patch document '$1'." % id)
-      except:
-        return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
-    if origTags != tags:
-      try:
-        for t1 in jdoc["tags"].items:
-          discard LS.store.destroyTag(t1.str, id, true)
-        for t2 in tags:
-          if t2 != "":
-            LS.store.createTag(t2, id, true)
-      except:
-        return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
-  return LS.getRawDocument(id, newQueryOptions(), req)
-
-# Main routing
-
-proc options*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  case resource:
-    of "info":
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      result.headers["Allow"] = "GET, OPTIONS"
-      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-      if id != "":
-        return resError(Http404, "Info '$1' not found." % id)
-      else:
-        result.code = Http204
-        result.content = ""
-    of "dir":
-      result.code = Http204
-      result.content = ""
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      result.headers["Allow"] = "GET, OPTIONS"
-      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    of "tags":
-      result.code = Http204
-      result.content = ""
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      result.headers["Allow"] = "GET, OPTIONS"
-      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    of "indexes":
-      result.code = Http204
-      result.content = ""
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      if id != "":
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-        else:
-          result.headers["Allow"] = "GET, OPTIONS, PUT, DELETE"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS, PUT, DELETE"
-      else:
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    of "docs":
-      var folder: string
-      if id.isFolder:
-        folder = id
-      if folder.len > 0:
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST, PUT"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST, PUT"
-      elif id != "":
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
-          result.headers["Allow-Patch"] = "application/json-patch+json"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
-      else:
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST"
-          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST"
-    of "stores":
-      result.code = Http204
-      result.content = ""
-      result.headers = newHttpHeaders(TAB_HEADERS)
-      setOrigin(LS, req, result.headers)
-      if id != "":
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-        else:
-          result.headers["Allow"] = "GET, OPTIONS, PUT, DELETE"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS, PUT, DELETE"
-      else:
-        result.code = Http204
-        result.content = ""
-        if LS.readonly:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-        else:
-          result.headers = newHttpHeaders(TAB_HEADERS)
-          setOrigin(LS, req, result.headers)
-          result.headers["Allow"] = "GET, OPTIONS"
-          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    else:
-      discard # never happens really.
-
-proc head*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  var options = newQueryOptions()
-  options.select = @["documents.id AS id", "created", "modified"]
-  if id.isFolder:
-    options.folder = id
-  try:
-    parseQueryOptions(req.url.query, options);
-    if id != "" and options.folder == "":
-      result = LS.getRawDocument(id, options, req)
-      result.content = ""
-    else:
-      result = LS.getRawDocuments(options, req)
-      result.content = ""
-  except:
-    return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
-
-proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  case resource:
-    of "docs":
-      var options = newQueryOptions()
-      if id.isFolder:
-        options.folder = id
-      if req.url.query.contains("contents=false"):
-        options.select = @["documents.id AS id", "created", "modified"]
-      try:
-        parseQueryOptions(req.url.query, options);
-        if id != "" and options.folder == "":
-          if req.url.query.contains("raw=true") or req.headers.hasKey("Accept") and req.headers["Accept"] == "application/json":
-            return LS.getRawDocument(id, options, req)
-          else:
-            return LS.getDocument(id, options, req)
-        else:
-          return LS.getRawDocuments(options, req)
-      except:
-        let e = getCurrentException()
-        let trace = e.getStackTrace()
-        echo trace
-        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
-    of "tags":
-      var options = newQueryOptions()
-      try:
-        parseQueryOptions(req.url.query, options);
-        if id != "":
-          return LS.getTag(id, options, req)
-        else:
-          return LS.getTags(options, req)
-      except:
-        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
-    of "indexes":
-      var options = newQueryOptions()
-      try:
-        parseQueryOptions(req.url.query, options);
-        if id != "":
-          return LS.getIndex(id, options, req)
-        else:
-          return LS.getIndexes(options, req)
-      except:
-        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
-    of "stores":
-      var options = newQueryOptions()
-      try:
-        parseQueryOptions(req.url.query, options);
-        if id != "":
-          return LS.getStore(id, options, req)
-        else:
-          return LS.getStores(options, req)
-      except:
-        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
-    of "info":
-      if id != "":
-        return resError(Http404, "Info '$1' not found." % id)
-      return LS.getInfo(req)
-    else:
-      discard # never happens really.
-
-proc post*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  var ct = "text/plain"
-  if req.headers.hasKey("Content-Type"):
-    ct = req.headers["Content-Type"]
-  return LS.postDocument(req.body.strip, ct, id, req)
-
-proc put*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  if id != "":
-    if resource == "indexes":
-      var field = ""
-      try:
-        field = parseJson(req.body.strip)["field"].getStr
-      except:
-        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
-      return LS.putIndex(id, field, req)
-    elif resource == "stores":
-      var config = newJNull()
-      try:
-        config = parseJson(req.body)
-      except:
-        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
-      return LS.putStore(id, config, req)
-    else: # Assume docs
-      var ct = "text/plain"
-      if req.headers.hasKey("Content-Type"):
-        ct = req.headers["Content-Type"]
-      return LS.putDocument(id, req.body.strip, ct, req)
-  else:
-    return resError(Http400, "Bad request: document ID must be specified in PUT requests.")
-
-proc delete*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  if id != "":
-    if resource == "indexes":
-      return LS.deleteIndex(id, req)
-    elif resource == "stores":
-      return LS.deleteStore(id, req)
-    else: # Assume docs
-      return LS.deleteDocument(id, req)
-  else:
-    return resError(Http400, "Bad request: document ID must be specified in DELETE requests.")
-
-proc patch*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
-  if id != "":
-    return LS.patchDocument(id, req.body, req)
-  else:
-    return resError(Http400, "Bad request: document ID must be specified in PATCH requests.")
-
-proc serveFile*(req: LSRequest, LS: LiteStore, id: string): LSResponse =
-  let path = LS.directory / id
-  var reqMethod = $req.reqMethod
-  if req.headers.hasKey("X-HTTP-Method-Override"):
-    reqMethod = req.headers["X-HTTP-Method-Override"]
-  case reqMethod.toUpperAscii:
-    of "OPTIONS":
-      return validate(req, LS, "dir", id, options)
-    of "GET":
-      if path.fileExists:
-        try:
-          let contents = path.readFile
-          let parts = path.splitFile
-          if CONTENT_TYPES.hasKey(parts.ext):
-            result.headers = CONTENT_TYPES[parts.ext].ctHeader
-          else:
-            result.headers = ctHeader("text/plain")
-          setOrigin(LS, req, result.headers)
-          result.content = contents
-          result.code = Http200
-        except:
-          return resError(Http500, "Unable to read file '$1'." % path)
-      else:
-        return resError(Http404, "File '$1' not found." % path)
-    else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-
-proc route*(req: LSRequest, LS: LiteStore, resource = "docs", id = ""): LSResponse =
-  var reqMethod = $req.reqMethod
-  if req.headers.hasKey("X-HTTP-Method-Override"):
-    reqMethod = req.headers["X-HTTP-Method-Override"]
-  LOG.debug("ROUTE - resource: " & resource & " id: " & id)
-  case reqMethod.toUpperAscii:
-    of "POST":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, post)
-    of "PUT":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, put)
-    of "DELETE":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, delete)
-    of "HEAD":
-      return validate(req, LS, resource, id, head)
-    of "OPTIONS":
-      return validate(req, LS, resource, id, options)
-    of "GET":
-      return validate(req, LS, resource, id, get)
-    of "PATCH":
-      if LS.readonly:
-        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-      return validate(req, LS, resource, id, patch)
-    else:
-      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
-
-proc multiRoute(req: LSRequest, resource, id: string): LSResponse =
-  var matches = @["", "", ""]
-  if req.url.path.find(PEG_STORE_URL, matches) != -1:
-    let id = matches[0]
-    let path = "/v7/" & matches[1]
-    matches = @["", "", ""]
-    discard path.find(PEG_URL, matches)
-    return req.route(LSDICT[id], matches[1], matches[2])
-  return req.route(LS, resource, id)
-
-proc newSimpleLSRequest(meth: HttpMethod, resource, id,  body = "", params = "", headers = newHttpHeaders()): LSRequest =
-  result.reqMethod = meth
-  result.body = body
-  result.headers = headers
-  result.url = parseUri("$1://$2:$3/$4/$5?$6" % @["http", "localhost", "9500", resource, id, params])
-  
-proc get(resource, id: string, params = ""): LSResponse =
-  return newSimpleLSRequest(HttpGet, resource, id, "", params).multiRoute(resource, id)
-
-proc post(resource, folder, body: string, ct = ""): LSResponse =
-  var headers = newHttpHeaders()
-  if ct != "":
-    headers["Content-Type"] = ct
-  return newSimpleLSRequest(HttpPost, resource, folder, body, "", headers).multiRoute(resource, folder & "/")
-
-proc put(resource, id, body: string, ct = ""): LSResponse =
-  var headers = newHttpHeaders()
-  if ct != "":
-    headers["Content-Type"] = ct
-  return newSimpleLSRequest(HttpPut, resource, id, body, "", headers).multiRoute(resource, id)
-
-proc patch(resource, id, body: string): LSResponse =
-  var headers = newHttpHeaders()
-  headers["Content-Type"] = "application/json"
-  return newSimpleLSRequest(HttpPatch, resource, id, body, "", headers).multiRoute(resource, id)
-
-proc delete(resource, id: string): LSResponse =
-  return newSimpleLSRequest(HttpDelete, resource, id).multiRoute(resource, id)
-
-proc head(resource, id: string): LSResponse =
-  return newSimpleLSRequest(HttpHead, resource, id).multiRoute(resource, id)
-
-proc registerStoreApi(LS: LiteStore, ctx: DTContext, origResource, origId: string) =
-  var api_idx = ctx.duk_push_object()
-  # GET
-  var get: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let params = duk_get_string(ctx, 2)
-    let resp = get($resource, $id, $params)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, get, 3)
-  discard ctx.duk_put_prop_string(api_idx, "get")
-  # POST
-  var post: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let folder = duk_get_string(ctx, 1)
-    let body = duk_get_string(ctx, 2)
-    let ct = duk_get_string(ctx, 3)
-    let resp = post($resource, $folder, $body, $ct)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, post, 4)
-  discard ctx.duk_put_prop_string(api_idx, "post")
-  # PUT
-  var put: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let body = duk_get_string(ctx, 2)
-    let ct = duk_get_string(ctx, 3)
-    let resp = put($resource, $id, $body, $ct)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, put, 4)
-  discard ctx.duk_put_prop_string(api_idx, "put")
-  # PATCH
-  var patch: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let body = duk_get_string(ctx, 2)
-    let resp = patch($resource, $id, $body)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, patch, 3)
-  discard ctx.duk_put_prop_string(api_idx, "patch")
-  # DELETE
-  var delete: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let resp = delete($resource, $id)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, delete, 2)
-  discard ctx.duk_put_prop_string(api_idx, "delete")
-  # HEAD
-  var head: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
-    let resource = duk_get_string(ctx, 0)
-    let id = duk_get_string(ctx, 1)
-    let resp = head($resource, $id)
-    var res_idx = ctx.duk_push_object()
-    ctx.duk_push_int(cast[cint](resp.code))
-    discard ctx.duk_put_prop_string(res_idx, "code")
-    discard ctx.duk_push_string(resp.content.cstring)
-    discard ctx.duk_put_prop_string(res_idx, "content")
-    return 1
-  )
-  discard duk_push_c_function(ctx, head, 2)
-  discard ctx.duk_put_prop_string(api_idx, "head")
-  discard ctx.duk_put_global_string("$store")
-
-proc jError(ctx: DTContext): LSResponse  =
-  return resError(Http500, "Middleware Error: " & $ctx.duk_safe_to_string(-1))
-
-proc getMiddleware*(LS: LiteStore, id: string): string =
-  if not LS.middleware.hasKey(id):
-    # Attempt to retrieve resource from system documents
-    let options = newQueryOptions(true)
-    let doc = LS.store.retrieveDocument("middleware/" & id & ".js", options)
-    result = doc.data
-    if result == "":
-      LOG.warn("Middleware '$1' not found" % id)
-  else:
-    result = LS.middleware[id]
-
-proc getMiddlewareSeq(LS: LiteStore, resource, id, meth: string): seq[string] =
-  result = newSeq[string]() 
-  if LS.config.kind != JObject or not LS.config.hasKey("resources"):
-    return 
-  var reqUri = "/" & resource & "/" & id
-  if reqUri[^1] == '/':
-    reqUri.removeSuffix({'/'})
-  let parts = reqUri.split("/")
-  let ancestors = parts[1..parts.len-2]
-  var currentPath = ""
-  var currentPaths = ""
-  for p in ancestors:
-    currentPath &= "/" & p
-    currentPaths = currentPath & "/*"
-    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][meth].hasKey("middleware"):
-      let mw = LS.config["resources"][currentPaths][meth]["middleware"]
-      if (mw.kind == JArray):
-        for m in mw:
-          result.add m.getStr
-  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("middleware"):
-    let mw = LS.config["resources"][reqUri][meth]["middleware"]
-    if (mw.kind == JArray):
-      for m in mw:
-        result.add m.getStr
-
-proc execute*(req: var LSRequest, LS: LiteStore, resource, id: string): LSResponse =
-  let middleware = getMiddlewareSeq(LS, resource, id, $req.reqMethod)
-  if middleware.len > 0:
-    LOG.debug("Middleware: " & middleware.join(" -> "));
-  if middleware.len == 0:
-    return route(req, LS, resource, id)
-  var jReq = $(%* req)
-  LOG.debug("Request: " & jReq)
-  var jRes = """{
-    "code": 200,
-    "content": {},
-    "final": false,
-    "headers": {
-      "Access-Control-Allow-Origin": "*",
-      "Access-Control-Allow-Headers": "Authorization, Content-Type",
-      "Server": "$1",
-      "Content-Type": "application/json"
-    }
-  }""" % [LS.appname & "/" & LS.appversion]
-  var context = "{}"
-  # Create execution context
-  var ctx = duk_create_heap_default()
-  duk_console_init(ctx)
-  duk_print_alert_init(ctx)
-  LS.registerStoreApi(ctx, resource, id)
-  if ctx.duk_peval_string(cstring("($1)" % $jReq)) != 0:
-    return jError(ctx)
-  discard ctx.duk_put_global_string("$req")
-  if ctx.duk_peval_string(cstring("($1)" % $jRes)) != 0:
-    return jError(ctx)
-  discard ctx.duk_put_global_string("$res")
-  if ctx.duk_peval_string(cstring("($1)" % $context)) != 0:
-    return jError(ctx)
-  discard ctx.duk_put_global_string("$ctx")
-  # Middleware-specific functions
-  var i = 0
-  var abort = 0
-  while abort != 1 and i < middleware.len:
-    let code = LS.getMiddleware(middleware[i])
-    LOG.debug("Evaluating middleware '$1'" %  middleware[i])
-    if ctx.duk_peval_string(code.cstring) != 0:
-      return jError(ctx)
-    abort = ctx.duk_get_boolean(-1)
-    i.inc
-  # Retrieve response, and request
-  if ctx.duk_peval_string("JSON.stringify($res);") != 0:
-    return jError(ctx)
-  let fRes = parseJson($(ctx.duk_get_string(-1))).newLSResponse
-  if ctx.duk_peval_string("JSON.stringify($req);") != 0:
-    return jError(ctx)
-  let fReq = parseJson($(ctx.duk_get_string(-1))).newLSRequest()
-  ctx.duk_destroy_heap();
-  LOG.debug("abort: $1", [$abort])
-  if abort == 1:
-    return fRes
-  return route(fReq, LS, resource, id)
+import
+  asynchttpserver,
+  strutils,
+  sequtils,
+  cgi,
+  strtabs,
+  pegs,
+  json,
+  os,
+  uri,
+  tables,
+  times
+import
+  types,
+  contenttypes,
+  core,
+  utils,
+  logger,
+  duktape
+
+# Helper procs
+
+proc sqlOp(op: string): string =
+  let table = newStringTable()
+  table["not eq"] = "<>"
+  table["eq"] = "=="
+  table["gt"] = ">"
+  table["gte"] = ">="
+  table["lt"] = "<"
+  table["lte"] = "<="
+  table["contains"] = "contains"
+  table["like"] = "like"
+  return table[op]
+
+proc orderByClauses*(str: string): string =
+  var clauses = newSeq[string]()
+  var fragments = str.split(",")
+  let clause = peg"""
+    clause <- {[-+]} {field}
+    field <- ('id' / 'created' / 'modified' / path)
+    path <- '$' (objField)+
+    ident <- [a-zA-Z0-9_]+
+    objField <- '.' ident
+  """
+  for f in fragments:
+    var matches = @["", ""]
+    if f.find(clause, matches) != -1:
+      var field = matches[1]
+      if field[0] == '$':
+        field = "json_extract(documents.data, '$1')" % matches[1]
+      if matches[0] == "-":
+        clauses.add("$1 COLLATE NOCASE DESC" % field)
+      else:
+        clauses.add("$1 COLLATE NOCASE ASC" % field)
+  return clauses.join(", ")
+
+proc selectClause*(str: string, options: var QueryOptions) =
+  let tokens = """
+    path <- '$' (objItem / objField)+
+    ident <- [a-zA-Z0-9_]+
+    objIndex <- '[' \d+ ']'
+    objField <- '.' ident
+    objItem <- objField objIndex
+  """
+  let fields = peg("""
+    fields <- ^{field} (\s* ',' \s* {field})*$
+    field <- path \s+ ('as' / 'AS') \s+ ident
+  """ & tokens)
+  let field = peg("""
+    field <- ^{path} \s+ ('as' / 'AS') \s+ {ident}$
+  """ & tokens)
+  var fieldMatches = newSeq[string](10)
+  if str.strip.match(fields, fieldMatches):
+    for m in fieldMatches:
+      if m.len > 0:
+        var rawTuple = newSeq[string](2)
+        if m.match(field, rawTuple):
+          options.jsonSelect.add((path: rawTuple[0], alias: rawTuple[1]))
+
+proc filterClauses*(str: string, options: var QueryOptions) =
+  let tokens = """
+    operator <- 'not eq' / 'eq' / 'gte' / 'gt' / 'lte' / 'lt' / 'contains' / 'like'
+    value <- string / number / 'null' / 'true' / 'false'
+    string <- '"' ('\\"' . / [^"])* '"'
+    number <- '-'? '0' / [1-9] [0-9]* ('.' [0-9]+)? (( 'e' / 'E' ) ( '+' / '-' )? [0-9]+)?
+    path <- '$' (objItem / objField)+
+    ident <- [a-zA-Z0-9_]+
+    objIndex <- '[' \d+ ']'
+    objField <- '.' ident
+    objItem <- objField objIndex
+  """
+  let clause = peg("""
+    clause <- {path} \s+ {operator} \s+ {value}
+  """ & tokens)
+  let andClauses = peg("""
+    andClauses <- ^{clause} (\s+ 'and' \s+ {clause})*$
+    clause <- path \s+ operator \s+ value
+  """ & tokens)
+  let orClauses = peg("""
+    orClauses <- ^{andClauses} (\s+ 'or' \s+ {andClauses})*$
+    andClauses <- clause (\s+ 'and' \s+ clause)*
+    clause <- path \s+ operator \s+ value
+  """ & tokens)
+  var orClausesMatches = newSeq[string](10)
+  discard str.strip.match(orClauses, orClausesMatches)
+  var parsedClauses = newSeq[seq[seq[string]]]()
+  for orClause in orClausesMatches:
+    if orClause.len > 0:
+      var andClausesMatches = newSeq[string](10)
+      discard orClause.strip.match(andClauses, andClausesMatches)
+      var parsedAndClauses = newSeq[seq[string]]()
+      for andClause in andClausesMatches:
+        if andClause.len > 0:
+          var clauses = newSeq[string](3)
+          discard andClause.strip.match(clause, clauses)
+          clauses[1] = sqlOp(clauses[1])
+          if clauses[2] == "true":
+            clauses[2] = "1"
+          elif clauses[2] == "false":
+            clauses[2] = "0"
+          parsedAndClauses.add clauses
+      if parsedAndClauses.len > 0:
+        parsedClauses.add parsedAndClauses
+  if parsedClauses.len == 0:
+    return
+  var currentArr = 0
+  var tables = newSeq[string]()
+  let resOrClauses = parsedClauses.map do (it: seq[seq[string]]) -> string:
+    let resAndClauses = it.map do (x: seq[string]) -> string:
+      if x[1] == "contains":
+        currentArr = currentArr + 1
+        tables.add "json_each(documents.data, '$1') AS arr$2" % [x[0], $currentArr]
+        return "arr$1.value == $2" % [$currentArr, x[2]]
+      else:
+        var arr = @[x[0], x[1], x[2]]
+        if x[1] == "like":
+          arr[2] = x[2].replace('*', '%')
+        return "json_extract(documents.data, '$1') $2 $3 " % arr
+    return resAndClauses.join(" AND ")
+  options.tables = options.tables & tables
+  options.jsonFilter = resOrClauses.join(" OR ")
+
+proc parseQueryOption*(fragment: string, options: var QueryOptions) =
+  if fragment == "":
+    return
+  var pair = fragment.split('=')
+  if pair.len < 2 or pair[1] == "":
+    raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
+  try:
+    pair[1] = pair[1].replace("+", "%2B").decodeURL
+  except CatchableError:
+    raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
+  case pair[0]:
+    of "filter":
+      filterClauses(pair[1], options)
+      if options.jsonFilter == "":
+        raise newException(EInvalidRequest, "Invalid filter clause: $1" % pair[1].replace("\"", "\\\""))
+    of "select":
+      selectClause(pair[1], options)
+      if options.jsonSelect.len == 0:
+        raise newException(EInvalidRequest, "Invalid select clause: $1" % pair[1].replace("\"", "\\\""))
+    of "like":
+      options.like = pair[1]
+    of "search":
+      options.search = pair[1]
+    of "tags":
+      options.tags = pair[1]
+    of "created-after":
+      try:
+        options.createdAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid created-after value: $1" % getCurrentExceptionMsg())
+    of "created-before":
+      try:
+        options.createdBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid created-before value: $1" % getCurrentExceptionMsg())
+    of "modified-after":
+      try:
+        options.modifiedAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid modified.after value: $1" % getCurrentExceptionMsg())
+    of "modified-before":
+      try:
+        options.modifiedBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid modified-before value: $1" % getCurrentExceptionMsg())
+    of "limit":
+      try:
+        options.limit = pair[1].parseInt
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
+    of "offset":
+      try:
+        options.offset = pair[1].parseInt
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
+    of "sort":
+      let orderby = pair[1].orderByClauses()
+      if orderby != "":
+        options.orderby = orderby
+      else:
+        raise newException(EInvalidRequest, "Invalid sort value: $1" % pair[1])
+    of "contents", "raw":
+      discard
+    else:
+      discard
+
+proc parseQueryOptions*(querystring: string, options: var QueryOptions) =
+  var q = querystring
+  if q.startsWith("?"):
+    q = q[1 .. q.len - 1]
+  var fragments = q.split('&')
+  for f in fragments:
+    f.parseQueryOption(options)
+
+proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string, cb: proc(req: LSRequest, LS: LiteStore, resource: string, id: string):LSResponse): LSResponse =
+  if req.reqMethod == HttpPost or req.reqMethod == HttpPut or req.reqMethod == HttpPatch:
+    var ct =  ""
+    let body = req.body.strip
+    if body == "":
+      return resError(Http400, "Bad request: No content specified for document.")
+    if req.headers.hasKey("Content-Type"):
+      ct = req.headers["Content-Type"]
+      case ct:
+        of "application/json":
+          try:
+            discard body.parseJson()
+          except CatchableError:
+            return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
+        else:
+          discard
+  return cb(req, LS, resource, id)
+
+proc patchTag(tags: var seq[string], index: int, op, path, value: string): bool =
+  LOG.debug("- PATCH -> $1 tag['$2'] = \"$3\" - Total tags: $4." % [op, $index, $value, $tags.len])
+  case op:
+    of "remove":
+      let tag = tags[index]
+      if not tag.startsWith("$"):
+        tags[index] = "" # Not removing element, otherwise subsequent indexes won't work!
+      else:
+        raise newException(EInvalidRequest, "cannot remove system tag: $1" % tag)
+    of "add":
+      if value.match(PEG_USER_TAG):
+        tags.insert(value, index)
+      else:
+        if value.strip == "":
+          raise newException(EInvalidRequest, "tag not specified." % value)
+        else:
+          raise newException(EInvalidRequest, "invalid tag: $1" % value)
+    of "replace":
+      if value.match(PEG_USER_TAG):
+        if tags[index].startsWith("$"):
+          raise newException(EInvalidRequest, "cannot replace system tag: $1" % tags[index])
+        else:
+          tags[index] = value
+      else:
+        if value.strip == "":
+          raise newException(EInvalidRequest, "tag not specified." % value)
+        else:
+          raise newException(EInvalidRequest, "invalid tag: $1" % value)
+    of "test":
+      if tags[index] != value:
+        return false
+    else:
+      raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
+  return true
+
+proc patchData*(data: var JsonNode, origData: JsonNode, op: string, path: string, value: JsonNode): bool =
+  LOG.debug("- PATCH -> $1 path $2 with $3" % [op, path, $value])
+  var keys = path.replace(peg"^\/data\/", "").split("/")
+  if keys.len == 0:
+    raise newException(EInvalidRequest, "no valid path specified: $1" % path)
+  var d = data
+  var dorig = origData
+  var c = 1
+  for key in keys:
+    if d.kind == JArray:
+      try:
+        var index = key.parseInt
+        if c >= keys.len:
+          d.elems[index] = value
+          case op:
+            of "remove":
+              d.elems.del(index)
+            of "add":
+              d.elems.insert(value, index)
+            of "replace":
+              d.elems[index] = value
+            of "test":
+              if d.elems[index] != value:
+                return false
+            else:
+              raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
+        else:
+          d = d[index]
+          dorig = dorig[index]
+      except CatchableError:
+        raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
+    else:
+      if c >= keys.len:
+        case op:
+          of "remove":
+            if d.hasKey(key):
+              d.delete(key)
+            else:
+              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+          of "add":
+            d[key] = value
+          of "replace":
+            if d.hasKey(key):
+              d[key] = value
+            else:
+              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+          of "test":
+            if dorig.hasKey(key):
+              if dorig[key] != value:
+                return false
+            else:
+              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+          else:
+            raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
+      else:
+        d = d[key]
+        dorig = dorig[key]
+    c += 1
+  return true
+
+
+proc applyPatchOperation*(data: var JsonNode, origData: JsonNode, tags: var seq[string], op: string, path: string, value: JsonNode): bool =
+  var matches = @[""]
+  let p = peg"""
+    path <- ^tagPath / fieldPath$
+    tagPath <- '\/tags\/' {\d+}
+    fieldPath <- '\/data\/' ident ('\/' ident)*
+    ident <- [a-zA-Z0-9_]+ / '-'
+  """
+  if path.find(p, matches) == -1:
+    raise newException(EInvalidRequest, "cannot patch path '$1'" % path)
+  if path.match(peg"^\/tags\/"):
+    let index = matches[0].parseInt
+    if value.kind != JString:
+      raise newException(EInvalidRequest, "tag '$1' is not a string." % $value)
+    let tag = value.getStr
+    return patchTag(tags, index, op, path, tag)
+  elif tags.contains("$subtype:json"):
+    return patchData(data, origData, op, path, value)
+  else:
+    raise newException(EInvalidRequest, "cannot patch data of a non-JSON document.")
+
+# Low level procs
+
+proc getTag*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveTag(id, options)
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  if doc == newJNull():
+    result = resTagNotFound(id)
+  else:
+    result.content = $doc
+    result.code = Http200
+
+proc getStore*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  if (not LSDICT.hasKey(id)):
+    return resStoreNotFound(id)
+  let store = LSDICT[id]
+  var doc = newJObject()
+  doc["id"] = %id
+  doc["file"] = %store.file
+  doc["config"] = store.config
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = $doc
+  result.code = Http200
+
+proc getIndex*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveIndex(id, options)
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  if doc == newJNull():
+    result = resIndexNotFound(id)
+  else:
+    result.content = $doc
+    result.code = Http200
+
+proc getRawDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveRawDocument(id, options)
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  if doc == "":
+    result = resDocumentNotFound(id)
+  else:
+    result.content = doc
+    result.code = Http200
+
+proc getDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveDocument(id, options)
+  if doc.data == "":
+    result = resDocumentNotFound(id)
+  else:
+    result.headers = doc.contenttype.ctHeader
+    setOrigin(LS, req, result.headers)
+    result.content = doc.data
+    result.code = Http200
+
+proc deleteDocument*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
+  let doc = LS.store.retrieveDocument(id)
+  if doc.data == "":
+    result = resDocumentNotFound(id)
+  else:
+    try:
+      let res = LS.store.destroyDocument(id)
+      if res == 0:
+        result = resError(Http500, "Unable to delete document '$1'" % id)
+      else:
+        result.headers = newHttpHeaders(TAB_HEADERS)
+        setOrigin(LS, req, result.headers)
+        result.headers["Content-Length"] = "0"
+        result.content = ""
+        result.code = Http204
+    except CatchableError:
+      result = resError(Http500, "Unable to delete document '$1'" % id)
+
+proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+  var options = options
+  let t0 = cpuTime()
+  let docs = LS.store.retrieveTags(options)
+  let orig_limit = options.limit
+  let orig_offset = options.offset
+  options.limit = 0
+  options.offset = 0
+  options.select = @["COUNT(tag_id)"]
+  let total = LS.store.countTags(prepareSelectTagsQuery(options), options.like.replace("*", "%"))
+  var content = newJObject()
+  if options.like != "":
+    content["like"] = %(options.like.decodeURL)
+  if orig_limit > 0:
+    content["limit"] = %orig_limit
+    if orig_offset > 0:
+      content["offset"] = %orig_offset
+  content["total"] = %total
+  content["execution_time"] = %(cputime()-t0)
+  content["results"] = docs
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc getStores(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+  let t0 = cpuTime()
+  var docs = newJArray()
+  for k, v in LSDICT.pairs:
+    var store = newJObject()
+    store["id"] = %k
+    store["file"] = %v.file
+    store["config"] = v.config
+    docs.add(store)
+  var content = newJObject()
+  content["total"] = %LSDICT.len
+  content["execution_time"] = %(cputime()-t0)
+  content["results"] = docs
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc getIndexes*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+  var options = options
+  let t0 = cpuTime()
+  let docs = LS.store.retrieveIndexes(options)
+  let orig_limit = options.limit
+  let orig_offset = options.offset
+  options.limit = 0
+  options.offset = 0
+  options.select = @["COUNT(name)"]
+  let total = LS.store.countIndexes(prepareSelectIndexesQuery(options), options.like.replace("*", "%"))
+  var content = newJObject()
+  if options.like != "":
+    content["like"] = %(options.like.decodeURL)
+  if orig_limit > 0:
+    content["limit"] = %orig_limit
+    if orig_offset > 0:
+      content["offset"] = %orig_offset
+  content["total"] = %total
+  content["execution_time"] = %(cputime()-t0)
+  content["results"] = docs
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+  var options = options
+  let t0 = cpuTime()
+  let docs = LS.store.retrieveRawDocuments(options)
+  let orig_limit = options.limit
+  let orig_offset = options.offset
+  options.limit = 0
+  options.offset = 0
+  options.select = @["COUNT(docid)"]
+  let total = LS.store.retrieveRawDocuments(options)[0].num
+  var content = newJObject()
+  if options.folder != "":
+    content["folder"] = %(options.folder)
+  if options.search != "":
+    content["search"] = %(options.search.decodeURL)
+  if options.tags != "":
+    content["tags"] = newJArray()
+    for tag in options.tags.replace("+", "%2B").decodeURL.split(","):
+      content["tags"].add(%tag)
+  if orig_limit > 0:
+    content["limit"] = %orig_limit
+    if orig_offset > 0:
+      content["offset"] = %orig_offset
+  if options.orderby != "":
+    content["sort"] = %options.orderby
+  content["total"] = %total
+  content["execution_time"] = %(cputime()-t0)
+  content["results"] = docs
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc getInfo*(LS: LiteStore, req: LSRequest): LSResponse =
+  let info = LS.store.retrieveInfo()
+  let version = info[0]
+  let total_documents = info[1]
+  let total_tags = LS.store.countTags()
+  let tags = LS.store.retrieveTagsWithTotals()
+  var content = newJObject()
+  content["version"] = %(LS.appname & " v" & LS.appversion)
+  content["datastore_version"] = %version
+  content["api_version"] = %7
+  content["size"] = %($((LS.file.getFileSize().float/(1024*1024)).formatFloat(ffDecimal, 2)) & " MB")
+  content["read_only"] = %LS.readonly
+  content["log_level"] = %LS.loglevel
+  if LS.directory.len == 0:
+    content["directory"] = newJNull()
+  else:
+    content["directory"] = %LS.directory
+  content["mount"] = %LS.mount
+  if LS.config != newJNull() and LS.config.hasKey("stores") and LS.config["stores"].len > 0:
+    content["additional_stores"] = %toSeq(LS.config["stores"].keys)
+  else:
+    content["additional_stores"] = newJArray()
+  if LS.auth != newJNull():
+    content["auth"] = %true
+  else:
+    content["auth"] = %false
+  content["total_documents"] = %total_documents
+  content["total_tags"] = %total_tags
+  content["tags"] = tags
+  result.headers = ctJsonHeader()
+  setOrigin(LS, req, result.headers)
+  result.content = content.pretty
+  result.code = Http200
+
+proc putIndex*(LS: LiteStore, id, field: string, req: LSRequest): LSResponse =
+  try:
+    if (not id.match(PEG_INDEX)):
+      return resError(Http400, "invalid index ID: $1" % id)
+    if (not field.match(PEG_JSON_FIELD)):
+      return resError(Http400, "invalid field path: $1" % field)
+    if (LS.store.retrieveIndex(id) != newJNull()):
+      return resError(Http409, "Index already exists: $1" % id)
+    LS.store.createIndex(id, field)
+    result.headers = ctJsonHeader()
+    setOrigin(LS, req, result.headers)
+    result.content = "{\"id\": \"$1\", \"field\": \"$2\"}" % [id, field]
+    result.code = Http201
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to create index.")
+
+proc putStore*(LS: LiteStore, id: string, config: JsonNode, req: LSRequest): LSResponse =
+  try:
+    if (not id.match(PEG_STORE) or id == "master"):
+      return resError(Http400, "invalid store ID: $1" % id)
+    if (LSDICT.hasKey(id)):
+      return resError(Http409, "Store already exists: $1" % id)
+    let store = LS.addStore(id, id & ".db", config)
+    LS.updateConfig()
+    LSDICT[id] = store
+    result = getStore(LS, id, newQueryOptions(), req)
+    result.code = Http201
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to create store.")
+
+proc deleteIndex*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
+  if (not id.match(PEG_INDEX)):
+    return resError(Http400, "invalid index ID: $1" % id)
+  if (LS.store.retrieveIndex(id) == newJNull()):
+    return resError(Http404, "Index not found: $1" % id)
+  try:
+    LS.store.dropIndex(id)
+    result.headers = newHttpHeaders(TAB_HEADERS)
+    setOrigin(LS, req, result.headers)
+    result.headers["Content-Length"] = "0"
+    result.content = ""
+    result.code = Http204
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to delete index.")
+
+proc deleteStore*(LS: LiteStore, id: string, req: LSRequest): LSResponse =
+  if (not id.match(PEG_STORE)):
+    return resError(Http400, "invalid store ID: $1" % id)
+  if (not LSDICT.hasKey(id)):
+    return resError(Http404, "Store not found: $1" % id)
+  try:
+    LSDICT.del(id)
+    if LS.config.hasKey("stores") and LS.config["stores"].hasKey(id):
+      LS.config["stores"].delete(id)
+    LS.updateConfig()
+    result.headers = newHttpHeaders(TAB_HEADERS)
+    setOrigin(LS, req, result.headers)
+    result.headers["Content-Length"] = "0"
+    result.content = ""
+    result.code = Http204
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to delete index.")
+
+proc postDocument*(LS: LiteStore, body: string, ct: string, folder="", req: LSRequest): LSResponse =
+  if not folder.isFolder:
+    return resError(Http400, "Invalid folder specified when creating document: $1" % folder)
+  try:
+    var doc = LS.store.createDocument(folder, body, ct)
+    if doc != "":
+      result.headers = ctJsonHeader()
+      setOrigin(LS, req, result.headers)
+      result.content = doc
+      result.code = Http201
+    else:
+      result = resError(Http500, "Unable to create document.")
+  except CatchableError:
+    eWarn()
+    result = resError(Http500, "Unable to create document.")
+
+proc putDocument*(LS: LiteStore, id: string, body: string, ct: string, req: LSRequest): LSResponse =
+  if id.isFolder:
+    return resError(Http400, "Invalid ID '$1' (Document IDs cannot end with '/')." % id)
+  let doc = LS.store.retrieveDocument(id)
+  if doc.data == "":
+    # Create a new document
+    var doc = LS.store.createDocument(id, body, ct)
+    if doc != "":
+      result.headers = ctJsonHeader()
+      setOrigin(LS, req, result.headers)
+      result.content = doc
+      result.code = Http201
+    else:
+      result = resError(Http500, "Unable to create document.")
+  else:
+    # Update existing document
+    try:
+      var doc = LS.store.updateDocument(id, body, ct)
+      if doc != "":
+        result.headers = ctJsonHeader()
+        setOrigin(LS, req, result.headers)
+        result.content = doc
+        result.code = Http200
+      else:
+        result = resError(Http500, "Unable to update document '$1'." % id)
+    except CatchableError:
+      result = resError(Http500, "Unable to update document '$1'." % id)
+
+proc patchDocument*(LS: LiteStore, id: string, body: string, req: LSRequest): LSResponse =
+  var apply = true
+  let jbody = body.parseJson
+  if jbody.kind != JArray:
+    return resError(Http400, "Bad request: PATCH request body is not an array.")
+  var options = newQueryOptions()
+  options.select = @["documents.id AS id", "created", "modified", "data"]
+  let doc = LS.store.retrieveRawDocument(id, options)
+  if doc == "":
+    return resDocumentNotFound(id)
+  let jdoc = doc.parseJson
+  var tags = newSeq[string]()
+  var origTags = newSeq[string]()
+  for tag in jdoc["tags"].items:
+    tags.add(tag.str)
+    origTags.add(tag.str)
+  var data: JsonNode
+  var origData: JsonNode
+  if tags.contains("$subtype:json"):
+    try:
+      origData = jdoc["data"].getStr.parseJson
+      data = origData.copy
+    except CatchableError:
+      discard
+  var c = 1
+  for item in jbody.items:
+    if item.hasKey("op") and item.hasKey("path"):
+      if not item.hasKey("value"):
+        item["value"] = %""
+      try:
+        apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
+        if not apply:
+          break
+      except CatchableError:
+        return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
+    else:
+        return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
+    c.inc
+  if apply:
+    # when document is not JSON the origData is not defined
+    # the extra check allows editing tags for non-JSON documents
+    if origData != nil and origData.len > 0 and origData != data:
+      try:
+        var doc = LS.store.updateDocument(id, data.pretty, "application/json")
+        if doc == "":
+          return resError(Http500, "Unable to patch document '$1'." % id)
+      except CatchableError:
+        return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
+    if origTags != tags:
+      try:
+        for t1 in jdoc["tags"].items:
+          discard LS.store.destroyTag(t1.str, id, true)
+        for t2 in tags:
+          if t2 != "":
+            LS.store.createTag(t2, id, true)
+      except CatchableError:
+        return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
+  return LS.getRawDocument(id, newQueryOptions(), req)
+
+# Main routing
+
+proc options*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  case resource:
+    of "info":
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      result.headers["Allow"] = "GET, OPTIONS"
+      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+      if id != "":
+        return resError(Http404, "Info '$1' not found." % id)
+      else:
+        result.code = Http204
+        result.content = ""
+    of "dir":
+      result.code = Http204
+      result.content = ""
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      result.headers["Allow"] = "GET, OPTIONS"
+      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+    of "tags":
+      result.code = Http204
+      result.content = ""
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      result.headers["Allow"] = "GET, OPTIONS"
+      result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+    of "indexes":
+      result.code = Http204
+      result.content = ""
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      if id != "":
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+        else:
+          result.headers["Allow"] = "GET, OPTIONS, PUT, DELETE"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS, PUT, DELETE"
+      else:
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+    of "docs":
+      var folder: string
+      if id.isFolder:
+        folder = id
+      if folder.len > 0:
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST, PUT"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST, PUT"
+      elif id != "":
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
+          result.headers["Allow-Patch"] = "application/json-patch+json"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, PUT, PATCH, DELETE"
+      else:
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "HEAD, GET, OPTIONS, POST"
+          result.headers["Access-Control-Allow-Methods"] = "HEAD, GET, OPTIONS, POST"
+    of "stores":
+      result.code = Http204
+      result.content = ""
+      result.headers = newHttpHeaders(TAB_HEADERS)
+      setOrigin(LS, req, result.headers)
+      if id != "":
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+        else:
+          result.headers["Allow"] = "GET, OPTIONS, PUT, DELETE"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS, PUT, DELETE"
+      else:
+        result.code = Http204
+        result.content = ""
+        if LS.readonly:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+        else:
+          result.headers = newHttpHeaders(TAB_HEADERS)
+          setOrigin(LS, req, result.headers)
+          result.headers["Allow"] = "GET, OPTIONS"
+          result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+    else:
+      discard # never happens really.
+
+proc head*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  var options = newQueryOptions()
+  options.select = @["documents.id AS id", "created", "modified"]
+  if id.isFolder:
+    options.folder = id
+  try:
+    parseQueryOptions(req.url.query, options);
+    if id != "" and options.folder == "":
+      result = LS.getRawDocument(id, options, req)
+      result.content = ""
+    else:
+      result = LS.getRawDocuments(options, req)
+      result.content = ""
+  except CatchableError:
+    return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
+
+proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  case resource:
+    of "docs":
+      var options = newQueryOptions()
+      if id.isFolder:
+        options.folder = id
+      if req.url.query.contains("contents=false"):
+        options.select = @["documents.id AS id", "created", "modified"]
+      try:
+        parseQueryOptions(req.url.query, options);
+        if id != "" and options.folder == "":
+          if req.url.query.contains("raw=true") or req.headers.hasKey("Accept") and req.headers["Accept"] == "application/json":
+            return LS.getRawDocument(id, options, req)
+          else:
+            return LS.getDocument(id, options, req)
+        else:
+          return LS.getRawDocuments(options, req)
+      except CatchableError:
+        let e = getCurrentException()
+        let trace = e.getStackTrace()
+        echo trace
+        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
+    of "tags":
+      var options = newQueryOptions()
+      try:
+        parseQueryOptions(req.url.query, options);
+        if id != "":
+          return LS.getTag(id, options, req)
+        else:
+          return LS.getTags(options, req)
+      except CatchableError:
+        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
+    of "indexes":
+      var options = newQueryOptions()
+      try:
+        parseQueryOptions(req.url.query, options);
+        if id != "":
+          return LS.getIndex(id, options, req)
+        else:
+          return LS.getIndexes(options, req)
+      except CatchableError:
+        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
+    of "stores":
+      var options = newQueryOptions()
+      try:
+        parseQueryOptions(req.url.query, options);
+        if id != "":
+          return LS.getStore(id, options, req)
+        else:
+          return LS.getStores(options, req)
+      except CatchableError:
+        return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
+    of "info":
+      if id != "":
+        return resError(Http404, "Info '$1' not found." % id)
+      return LS.getInfo(req)
+    else:
+      discard # never happens really.
+
+proc post*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  var ct = "text/plain"
+  if req.headers.hasKey("Content-Type"):
+    ct = req.headers["Content-Type"]
+  return LS.postDocument(req.body.strip, ct, id, req)
+
+proc put*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  if id != "":
+    if resource == "indexes":
+      var field = ""
+      try:
+        field = parseJson(req.body.strip)["field"].getStr
+      except CatchableError:
+        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
+      return LS.putIndex(id, field, req)
+    elif resource == "stores":
+      var config = newJNull()
+      try:
+        config = parseJson(req.body)
+      except CatchableError:
+        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
+      return LS.putStore(id, config, req)
+    else: # Assume docs
+      var ct = "text/plain"
+      if req.headers.hasKey("Content-Type"):
+        ct = req.headers["Content-Type"]
+      return LS.putDocument(id, req.body.strip, ct, req)
+  else:
+    return resError(Http400, "Bad request: document ID must be specified in PUT requests.")
+
+proc delete*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  if id != "":
+    if resource == "indexes":
+      return LS.deleteIndex(id, req)
+    elif resource == "stores":
+      return LS.deleteStore(id, req)
+    else: # Assume docs
+      return LS.deleteDocument(id, req)
+  else:
+    return resError(Http400, "Bad request: document ID must be specified in DELETE requests.")
+
+proc patch*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+  if id != "":
+    return LS.patchDocument(id, req.body, req)
+  else:
+    return resError(Http400, "Bad request: document ID must be specified in PATCH requests.")
+
+proc serveFile*(req: LSRequest, LS: LiteStore, id: string): LSResponse =
+  let path = LS.directory / id
+  var reqMethod = $req.reqMethod
+  if req.headers.hasKey("X-HTTP-Method-Override"):
+    reqMethod = req.headers["X-HTTP-Method-Override"]
+  case reqMethod.toUpperAscii:
+    of "OPTIONS":
+      return validate(req, LS, "dir", id, options)
+    of "GET":
+      if path.fileExists:
+        try:
+          let contents = path.readFile
+          let parts = path.splitFile
+          if CONTENT_TYPES.hasKey(parts.ext):
+            result.headers = CONTENT_TYPES[parts.ext].ctHeader
+          else:
+            result.headers = ctHeader("text/plain")
+          setOrigin(LS, req, result.headers)
+          result.content = contents
+          result.code = Http200
+        except CatchableError:
+          return resError(Http500, "Unable to read file '$1'." % path)
+      else:
+        return resError(Http404, "File '$1' not found." % path)
+    else:
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+
+proc route*(req: LSRequest, LS: LiteStore, resource = "docs", id = ""): LSResponse =
+  var reqMethod = $req.reqMethod
+  if req.headers.hasKey("X-HTTP-Method-Override"):
+    reqMethod = req.headers["X-HTTP-Method-Override"]
+  LOG.debug("ROUTE - resource: " & resource & " id: " & id)
+  case reqMethod.toUpperAscii:
+    of "POST":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, post)
+    of "PUT":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, put)
+    of "DELETE":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, delete)
+    of "HEAD":
+      return validate(req, LS, resource, id, head)
+    of "OPTIONS":
+      return validate(req, LS, resource, id, options)
+    of "GET":
+      return validate(req, LS, resource, id, get)
+    of "PATCH":
+      if LS.readonly:
+        return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+      return validate(req, LS, resource, id, patch)
+    else:
+      return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
+
+proc multiRoute(req: LSRequest, resource, id: string): LSResponse =
+  var matches = @["", "", ""]
+  if req.url.path.find(PEG_STORE_URL, matches) != -1:
+    let id = matches[0]
+    let path = "/v7/" & matches[1]
+    matches = @["", "", ""]
+    discard path.find(PEG_URL, matches)
+    return req.route(LSDICT[id], matches[1], matches[2])
+  return req.route(LS, resource, id)
+
+proc newSimpleLSRequest(meth: HttpMethod, resource = "", id = "",  body = "", params = "", headers = newHttpHeaders()): LSRequest =
+  result.reqMethod = meth
+  result.body = body
+  result.headers = headers
+  result.url = parseUri("$1://$2:$3/$4/$5?$6" % @["http", "localhost", "9500", resource, id, params])
+  
+proc get(resource, id: string, params = ""): LSResponse =
+  return newSimpleLSRequest(HttpGet, resource, id, "", params).multiRoute(resource, id)
+
+proc post(resource, folder, body: string, ct = ""): LSResponse =
+  var headers = newHttpHeaders()
+  if ct != "":
+    headers["Content-Type"] = ct
+  return newSimpleLSRequest(HttpPost, resource, folder, body, "", headers).multiRoute(resource, folder & "/")
+
+proc put(resource, id, body: string, ct = ""): LSResponse =
+  var headers = newHttpHeaders()
+  if ct != "":
+    headers["Content-Type"] = ct
+  return newSimpleLSRequest(HttpPut, resource, id, body, "", headers).multiRoute(resource, id)
+
+proc patch(resource, id, body: string): LSResponse =
+  var headers = newHttpHeaders()
+  headers["Content-Type"] = "application/json"
+  return newSimpleLSRequest(HttpPatch, resource, id, body, "", headers).multiRoute(resource, id)
+
+proc delete(resource, id: string): LSResponse =
+  return newSimpleLSRequest(HttpDelete, resource, id).multiRoute(resource, id)
+
+proc head(resource, id: string): LSResponse =
+  return newSimpleLSRequest(HttpHead, resource, id).multiRoute(resource, id)
+
+proc registerStoreApi(LS: LiteStore, ctx: DTContext, origResource, origId: string) =
+  var api_idx = ctx.duk_push_object()
+  # GET
+  var get: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let params = duk_get_string(ctx, 2)
+    let resp = get($resource, $id, $params)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, get, 3)
+  discard ctx.duk_put_prop_string(api_idx, "get")
+  # POST
+  var post: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let folder = duk_get_string(ctx, 1)
+    let body = duk_get_string(ctx, 2)
+    let ct = duk_get_string(ctx, 3)
+    let resp = post($resource, $folder, $body, $ct)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, post, 4)
+  discard ctx.duk_put_prop_string(api_idx, "post")
+  # PUT
+  var put: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let body = duk_get_string(ctx, 2)
+    let ct = duk_get_string(ctx, 3)
+    let resp = put($resource, $id, $body, $ct)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, put, 4)
+  discard ctx.duk_put_prop_string(api_idx, "put")
+  # PATCH
+  var patch: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let body = duk_get_string(ctx, 2)
+    let resp = patch($resource, $id, $body)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, patch, 3)
+  discard ctx.duk_put_prop_string(api_idx, "patch")
+  # DELETE
+  var delete: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let resp = delete($resource, $id)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, delete, 2)
+  discard ctx.duk_put_prop_string(api_idx, "delete")
+  # HEAD
+  var head: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let resource = duk_get_string(ctx, 0)
+    let id = duk_get_string(ctx, 1)
+    let resp = head($resource, $id)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.content.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    return 1
+  )
+  discard duk_push_c_function(ctx, head, 2)
+  discard ctx.duk_put_prop_string(api_idx, "head")
+  discard ctx.duk_put_global_string("$store")
+
+proc jError(ctx: DTContext): LSResponse  =
+  return resError(Http500, "Middleware Error: " & $ctx.duk_safe_to_string(-1))
+
+proc getMiddleware*(LS: LiteStore, id: string): string =
+  if not LS.middleware.hasKey(id):
+    # Attempt to retrieve resource from system documents
+    let options = newQueryOptions(true)
+    let doc = LS.store.retrieveDocument("middleware/" & id & ".js", options)
+    result = doc.data
+    if result == "":
+      LOG.warn("Middleware '$1' not found" % id)
+  else:
+    result = LS.middleware[id]
+
+proc getMiddlewareSeq(LS: LiteStore, resource, id, meth: string): seq[string] =
+  result = newSeq[string]() 
+  if LS.config.kind != JObject or not LS.config.hasKey("resources"):
+    return 
+  var reqUri = "/" & resource & "/" & id
+  if reqUri[^1] == '/':
+    reqUri.removeSuffix({'/'})
+  let parts = reqUri.split("/")
+  let ancestors = parts[1..parts.len-2]
+  var currentPath = ""
+  var currentPaths = ""
+  for p in ancestors:
+    currentPath &= "/" & p
+    currentPaths = currentPath & "/*"
+    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][meth].hasKey("middleware"):
+      let mw = LS.config["resources"][currentPaths][meth]["middleware"]
+      if (mw.kind == JArray):
+        for m in mw:
+          result.add m.getStr
+  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("middleware"):
+    let mw = LS.config["resources"][reqUri][meth]["middleware"]
+    if (mw.kind == JArray):
+      for m in mw:
+        result.add m.getStr
+
+proc execute*(req: var LSRequest, LS: LiteStore, resource, id: string): LSResponse =
+  let middleware = getMiddlewareSeq(LS, resource, id, $req.reqMethod)
+  if middleware.len > 0:
+    LOG.debug("Middleware: " & middleware.join(" -> "));
+  if middleware.len == 0:
+    return route(req, LS, resource, id)
+  var jReq = $(%* req)
+  LOG.debug("Request: " & jReq)
+  var jRes = """{
+    "code": 200,
+    "content": {},
+    "final": false,
+    "headers": {
+      "Access-Control-Allow-Origin": "*",
+      "Access-Control-Allow-Headers": "Authorization, Content-Type",
+      "Server": "$1",
+      "Content-Type": "application/json"
+    }
+  }""" % [LS.appname & "/" & LS.appversion]
+  var context = "{}"
+  # Create execution context
+  var ctx = duk_create_heap_default()
+  duk_console_init(ctx)
+  duk_print_alert_init(ctx)
+  LS.registerStoreApi(ctx, resource, id)
+  if ctx.duk_peval_string(cstring("($1)" % $jReq)) != 0:
+    return jError(ctx)
+  discard ctx.duk_put_global_string("$req")
+  if ctx.duk_peval_string(cstring("($1)" % $jRes)) != 0:
+    return jError(ctx)
+  discard ctx.duk_put_global_string("$res")
+  if ctx.duk_peval_string(cstring("($1)" % $context)) != 0:
+    return jError(ctx)
+  discard ctx.duk_put_global_string("$ctx")
+  # Middleware-specific functions
+  var i = 0
+  var abort = 0
+  while abort != 1 and i < middleware.len:
+    let code = LS.getMiddleware(middleware[i])
+    LOG.debug("Evaluating middleware '$1'" %  middleware[i])
+    if ctx.duk_peval_string(code.cstring) != 0:
+      return jError(ctx)
+    abort = ctx.duk_get_boolean(-1)
+    i.inc
+  # Retrieve response, and request
+  if ctx.duk_peval_string("JSON.stringify($res);") != 0:
+    return jError(ctx)
+  let fRes = parseJson($(ctx.duk_get_string(-1))).newLSResponse
+  if ctx.duk_peval_string("JSON.stringify($req);") != 0:
+    return jError(ctx)
+  let fReq = parseJson($(ctx.duk_get_string(-1))).newLSRequest()
+  ctx.duk_destroy_heap();
+  LOG.debug("abort: $1", [$abort])
+  if abort == 1:
+    return fRes
+  return route(fReq, LS, resource, id)

@@ -1,5 +1,6 @@ 
 import
-  asynchttpserver,
+  std/[asynchttpserver,
+  httpclient,
   strutils,
   sequtils,
   cgi,
@@ -9,7 +10,7 @@ json,
   os,
   uri,
   tables,
-  times
+  times]
 import
   types,
   contenttypes,
@@ -148,17 +149,19 @@ if pair.len < 2 or pair[1] == "":
     raise newException(EInvalidRequest, "Invalid query string fragment '$1'" % fragment)
   try:
     pair[1] = pair[1].replace("+", "%2B").decodeURL
-  except:
+  except CatchableError:
     raise newException(EInvalidRequest, "Unable to decode query string fragment '$1'" % fragment)
   case pair[0]:
     of "filter":
       filterClauses(pair[1], options)
       if options.jsonFilter == "":
-        raise newException(EInvalidRequest, "Invalid filter clause: $1" % pair[1].replace("\"", "\\\""))
+        raise newException(EInvalidRequest, "Invalid filter clause: $1" % pair[
+            1].replace("\"", "\\\""))
     of "select":
       selectClause(pair[1], options)
       if options.jsonSelect.len == 0:
-        raise newException(EInvalidRequest, "Invalid select clause: $1" % pair[1].replace("\"", "\\\""))
+        raise newException(EInvalidRequest, "Invalid select clause: $1" % pair[
+            1].replace("\"", "\\\""))
     of "like":
       options.like = pair[1]
     of "search":
@@ -168,33 +171,39 @@ options.tags = pair[1]
     of "created-after":
       try:
         options.createdAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid created-after value: $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid created-after value: $1" %
+            getCurrentExceptionMsg())
     of "created-before":
       try:
         options.createdBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid created-before value: $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid created-before value: $1" %
+            getCurrentExceptionMsg())
     of "modified-after":
       try:
         options.modifiedAfter = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid modified.after value: $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid modified.after value: $1" %
+            getCurrentExceptionMsg())
     of "modified-before":
       try:
         options.modifiedBefore = pair[1].parseInt.fromUnix.utc.format("yyyy-MM-dd'T'HH:mm:ss'Z'")
-      except:
-        raise newException(EInvalidRequest, "Invalid modified-before value: $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        raise newException(EInvalidRequest,
+            "Invalid modified-before value: $1" % getCurrentExceptionMsg())
     of "limit":
       try:
         options.limit = pair[1].parseInt
-      except:
-        raise newException(EInvalidRequest, "Invalid limit value: $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid limit value: $1" %
+            getCurrentExceptionMsg())
     of "offset":
       try:
         options.offset = pair[1].parseInt
-      except:
-        raise newException(EInvalidRequest, "Invalid offset value: $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        raise newException(EInvalidRequest, "Invalid offset value: $1" %
+            getCurrentExceptionMsg())
     of "sort":
       let orderby = pair[1].orderByClauses()
       if orderby != "":
@@ -214,9 +223,11 @@ var fragments = q.split('&')
   for f in fragments:
     f.parseQueryOption(options)
 
-proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string, cb: proc(req: LSRequest, LS: LiteStore, resource: string, id: string):LSResponse): LSResponse =
+proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string,
+    cb: proc(req: LSRequest, LS: LiteStore, resource: string,
+    id: string): LSResponse): LSResponse =
   if req.reqMethod == HttpPost or req.reqMethod == HttpPut or req.reqMethod == HttpPatch:
-    var ct =  ""
+    var ct = ""
     let body = req.body.strip
     if body == "":
       return resError(Http400, "Bad request: No content specified for document.")
@@ -226,14 +237,17 @@ case ct:
         of "application/json":
           try:
             discard body.parseJson()
-          except:
-            return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
+          except CatchableError:
+            return resError(Http400, "Invalid JSON content - $1" %
+                getCurrentExceptionMsg())
         else:
           discard
   return cb(req, LS, resource, id)
 
-proc patchTag(tags: var seq[string], index: int, op, path, value: string): bool =
-  LOG.debug("- PATCH -> $1 tag['$2'] = \"$3\" - Total tags: $4." % [op, $index, $value, $tags.len])
+proc patchTag(tags: var seq[string], index: int, op, path,
+    value: string): bool =
+  LOG.debug("- PATCH -> $1 tag['$2'] = \"$3\" - Total tags: $4." % [op, $index,
+      $value, $tags.len])
   case op:
     of "remove":
       let tag = tags[index]
@@ -252,7 +266,8 @@ raise newException(EInvalidRequest, "invalid tag: $1" % value)
     of "replace":
       if value.match(PEG_USER_TAG):
         if tags[index].startsWith("$"):
-          raise newException(EInvalidRequest, "cannot replace system tag: $1" % tags[index])
+          raise newException(EInvalidRequest, "cannot replace system tag: $1" %
+              tags[index])
         else:
           tags[index] = value
       else:
@@ -267,7 +282,8 @@ else:
       raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
   return true
 
-proc patchData*(data: var JsonNode, origData: JsonNode, op: string, path: string, value: JsonNode): bool =
+proc patchData*(data: var JsonNode, origData: JsonNode, op: string,
+    path: string, value: JsonNode): bool =
   LOG.debug("- PATCH -> $1 path $2 with $3" % [op, path, $value])
   var keys = path.replace(peg"^\/data\/", "").split("/")
   if keys.len == 0:
@@ -292,12 +308,14 @@ of "test":
               if d.elems[index] != value:
                 return false
             else:
-              raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
+              raise newException(EInvalidRequest,
+                  "invalid patch operation: $1" % op)
         else:
           d = d[index]
           dorig = dorig[index]
-      except:
-        raise newException(EInvalidRequest, "invalid index key '$1' in path '$2'" % [key, path])
+      except CatchableError:
+        raise newException(EInvalidRequest,
+            "invalid index key '$1' in path '$2'" % [key, path])
     else:
       if c >= keys.len:
         case op:
@@ -305,20 +323,23 @@ of "remove":
             if d.hasKey(key):
               d.delete(key)
             else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+              raise newException(EInvalidRequest,
+                  "key '$1' not found in path '$2'" % [key, path])
           of "add":
             d[key] = value
           of "replace":
             if d.hasKey(key):
               d[key] = value
             else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+              raise newException(EInvalidRequest,
+                  "key '$1' not found in path '$2'" % [key, path])
           of "test":
             if dorig.hasKey(key):
               if dorig[key] != value:
                 return false
             else:
-              raise newException(EInvalidRequest, "key '$1' not found in path '$2'" % [key, path])
+              raise newException(EInvalidRequest,
+                  "key '$1' not found in path '$2'" % [key, path])
           else:
             raise newException(EInvalidRequest, "invalid patch operation: $1" % op)
       else:
@@ -328,7 +349,8 @@ c += 1
   return true
 
 
-proc applyPatchOperation*(data: var JsonNode, origData: JsonNode, tags: var seq[string], op: string, path: string, value: JsonNode): bool =
+proc applyPatchOperation*(data: var JsonNode, origData: JsonNode, tags: var seq[
+    string], op: string, path: string, value: JsonNode): bool =
   var matches = @[""]
   let p = peg"""
     path <- ^tagPath / fieldPath$
@@ -351,7 +373,8 @@ raise newException(EInvalidRequest, "cannot patch data of a non-JSON document.")
 
 # Low level procs
 
-proc getTag*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+proc getTag*(LS: LiteStore, id: string, options = newQueryOptions(),
+    req: LSRequest): LSResponse =
   let doc = LS.store.retrieveTag(id, options)
   result.headers = ctJsonHeader()
   setOrigin(LS, req, result.headers)
@@ -361,7 +384,8 @@ else:
     result.content = $doc
     result.code = Http200
 
-proc getStore*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+proc getStore*(LS: LiteStore, id: string, options = newQueryOptions(),
+    req: LSRequest): LSResponse =
   if (not LSDICT.hasKey(id)):
     return resStoreNotFound(id)
   let store = LSDICT[id]
@@ -374,7 +398,8 @@ setOrigin(LS, req, result.headers)
   result.content = $doc
   result.code = Http200
 
-proc getIndex*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+proc getIndex*(LS: LiteStore, id: string, options = newQueryOptions(),
+    req: LSRequest): LSResponse =
   let doc = LS.store.retrieveIndex(id, options)
   result.headers = ctJsonHeader()
   setOrigin(LS, req, result.headers)
@@ -384,7 +409,8 @@ else:
     result.content = $doc
     result.code = Http200
 
-proc getRawDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+proc getRawDocument*(LS: LiteStore, id: string, options = newQueryOptions(),
+    req: LSRequest): LSResponse =
   let doc = LS.store.retrieveRawDocument(id, options)
   result.headers = ctJsonHeader()
   setOrigin(LS, req, result.headers)
@@ -394,7 +420,8 @@ else:
     result.content = doc
     result.code = Http200
 
-proc getDocument*(LS: LiteStore, id: string, options = newQueryOptions(), req: LSRequest): LSResponse =
+proc getDocument*(LS: LiteStore, id: string, options = newQueryOptions(),
+    req: LSRequest): LSResponse =
   let doc = LS.store.retrieveDocument(id, options)
   if doc.data == "":
     result = resDocumentNotFound(id)
@@ -419,10 +446,11 @@ setOrigin(LS, req, result.headers)
         result.headers["Content-Length"] = "0"
         result.content = ""
         result.code = Http204
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to delete document '$1'" % id)
 
-proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+proc getTags*(LS: LiteStore, options: QueryOptions = newQueryOptions(),
+    req: LSRequest): LSResponse =
   var options = options
   let t0 = cpuTime()
   let docs = LS.store.retrieveTags(options)
@@ -431,7 +459,8 @@ let orig_offset = options.offset
   options.limit = 0
   options.offset = 0
   options.select = @["COUNT(tag_id)"]
-  let total = LS.store.countTags(prepareSelectTagsQuery(options), options.like.replace("*", "%"))
+  let total = LS.store.countTags(prepareSelectTagsQuery(options),
+      options.like.replace("*", "%"))
   var content = newJObject()
   if options.like != "":
     content["like"] = %(options.like.decodeURL)
@@ -447,7 +476,8 @@ setOrigin(LS, req, result.headers)
   result.content = content.pretty
   result.code = Http200
 
-proc getStores(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+proc getStores(LS: LiteStore, options: QueryOptions = newQueryOptions(),
+    req: LSRequest): LSResponse =
   let t0 = cpuTime()
   var docs = newJArray()
   for k, v in LSDICT.pairs:
@@ -465,7 +495,8 @@ setOrigin(LS, req, result.headers)
   result.content = content.pretty
   result.code = Http200
 
-proc getIndexes*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+proc getIndexes*(LS: LiteStore, options: QueryOptions = newQueryOptions(),
+    req: LSRequest): LSResponse =
   var options = options
   let t0 = cpuTime()
   let docs = LS.store.retrieveIndexes(options)
@@ -474,7 +505,8 @@ let orig_offset = options.offset
   options.limit = 0
   options.offset = 0
   options.select = @["COUNT(name)"]
-  let total = LS.store.countIndexes(prepareSelectIndexesQuery(options), options.like.replace("*", "%"))
+  let total = LS.store.countIndexes(prepareSelectIndexesQuery(options),
+      options.like.replace("*", "%"))
   var content = newJObject()
   if options.like != "":
     content["like"] = %(options.like.decodeURL)
@@ -490,7 +522,8 @@ setOrigin(LS, req, result.headers)
   result.content = content.pretty
   result.code = Http200
 
-proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions(), req: LSRequest): LSResponse =
+proc getRawDocuments*(LS: LiteStore, options: QueryOptions = newQueryOptions(),
+    req: LSRequest): LSResponse =
   var options = options
   let t0 = cpuTime()
   let docs = LS.store.retrieveRawDocuments(options)
@@ -533,7 +566,8 @@ var content = newJObject()
   content["version"] = %(LS.appname & " v" & LS.appversion)
   content["datastore_version"] = %version
   content["api_version"] = %7
-  content["size"] = %($((LS.file.getFileSize().float/(1024*1024)).formatFloat(ffDecimal, 2)) & " MB")
+  content["size"] = %($((LS.file.getFileSize().float/(1024*1024)).formatFloat(
+      ffDecimal, 2)) & " MB")
   content["read_only"] = %LS.readonly
   content["log_level"] = %LS.loglevel
   if LS.directory.len == 0:
@@ -541,7 +575,8 @@ content["directory"] = newJNull()
   else:
     content["directory"] = %LS.directory
   content["mount"] = %LS.mount
-  if LS.config != newJNull() and LS.config.hasKey("stores") and LS.config["stores"].len > 0:
+  if LS.config != newJNull() and LS.config.hasKey("stores") and LS.config[
+      "stores"].len > 0:
     content["additional_stores"] = %toSeq(LS.config["stores"].keys)
   else:
     content["additional_stores"] = newJArray()
@@ -570,11 +605,12 @@ result.headers = ctJsonHeader()
     setOrigin(LS, req, result.headers)
     result.content = "{\"id\": \"$1\", \"field\": \"$2\"}" % [id, field]
     result.code = Http201
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to create index.")
 
-proc putStore*(LS: LiteStore, id: string, config: JsonNode, req: LSRequest): LSResponse =
+proc putStore*(LS: LiteStore, id: string, config: JsonNode,
+    req: LSRequest): LSResponse =
   try:
     if (not id.match(PEG_STORE) or id == "master"):
       return resError(Http400, "invalid store ID: $1" % id)
@@ -585,7 +621,7 @@ LS.updateConfig()
     LSDICT[id] = store
     result = getStore(LS, id, newQueryOptions(), req)
     result.code = Http201
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to create store.")
 
@@ -601,7 +637,7 @@ setOrigin(LS, req, result.headers)
     result.headers["Content-Length"] = "0"
     result.content = ""
     result.code = Http204
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to delete index.")
 
@@ -620,11 +656,12 @@ setOrigin(LS, req, result.headers)
     result.headers["Content-Length"] = "0"
     result.content = ""
     result.code = Http204
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to delete index.")
 
-proc postDocument*(LS: LiteStore, body: string, ct: string, folder="", req: LSRequest): LSResponse =
+proc postDocument*(LS: LiteStore, body: string, ct: string, folder = "",
+    req: LSRequest): LSResponse =
   if not folder.isFolder:
     return resError(Http400, "Invalid folder specified when creating document: $1" % folder)
   try:
@@ -636,11 +673,12 @@ result.content = doc
       result.code = Http201
     else:
       result = resError(Http500, "Unable to create document.")
-  except:
+  except CatchableError:
     eWarn()
     result = resError(Http500, "Unable to create document.")
 
-proc putDocument*(LS: LiteStore, id: string, body: string, ct: string, req: LSRequest): LSResponse =
+proc putDocument*(LS: LiteStore, id: string, body: string, ct: string,
+    req: LSRequest): LSResponse =
   if id.isFolder:
     return resError(Http400, "Invalid ID '$1' (Document IDs cannot end with '/')." % id)
   let doc = LS.store.retrieveDocument(id)
@@ -665,10 +703,11 @@ result.content = doc
         result.code = Http200
       else:
         result = resError(Http500, "Unable to update document '$1'." % id)
-    except:
+    except CatchableError:
       result = resError(Http500, "Unable to update document '$1'." % id)
 
-proc patchDocument*(LS: LiteStore, id: string, body: string, req: LSRequest): LSResponse =
+proc patchDocument*(LS: LiteStore, id: string, body: string,
+    req: LSRequest): LSResponse =
   var apply = true
   let jbody = body.parseJson
   if jbody.kind != JArray:
@@ -690,7 +729,7 @@ if tags.contains("$subtype:json"):
     try:
       origData = jdoc["data"].getStr.parseJson
       data = origData.copy
-    except:
+    except CatchableError:
       discard
   var c = 1
   for item in jbody.items:
@@ -698,13 +737,14 @@ if item.hasKey("op") and item.hasKey("path"):
       if not item.hasKey("value"):
         item["value"] = %""
       try:
-        apply = applyPatchOperation(data, origData, tags, item["op"].str, item["path"].str, item["value"])
+        apply = applyPatchOperation(data, origData, tags, item["op"].str, item[
+            "path"].str, item["value"])
         if not apply:
           break
-      except:
+      except CatchableError:
         return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
     else:
-        return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
+      return resError(Http400, "Bad request: patch operation #$1 is malformed." % $c)
     c.inc
   if apply:
     # when document is not JSON the origData is not defined
@@ -714,8 +754,9 @@ try:
         var doc = LS.store.updateDocument(id, data.pretty, "application/json")
         if doc == "":
           return resError(Http500, "Unable to patch document '$1'." % id)
-      except:
-        return resError(Http500, "Unable to patch document '$1' - $2" % id, getCurrentExceptionMsg())
+      except CatchableError:
+        return resError(Http500, "Unable to patch document '$1' - $2" % id,
+            getCurrentExceptionMsg())
     if origTags != tags:
       try:
         for t1 in jdoc["tags"].items:
@@ -723,13 +764,15 @@ discard LS.store.destroyTag(t1.str, id, true)
         for t2 in tags:
           if t2 != "":
             LS.store.createTag(t2, id, true)
-      except:
-        return resError(Http500, "Unable to patch document '$1' - $2" % [id, getCurrentExceptionMsg()])
+      except CatchableError:
+        return resError(Http500, "Unable to patch document '$1' - $2" % [id,
+            getCurrentExceptionMsg()])
   return LS.getRawDocument(id, newQueryOptions(), req)
 
 # Main routing
 
-proc options*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+proc options*(req: LSRequest, LS: LiteStore, resource: string,
+    id = ""): LSResponse =
   case resource:
     of "info":
       result.headers = newHttpHeaders(TAB_HEADERS)
@@ -863,7 +906,8 @@ result.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
     else:
       discard # never happens really.
 
-proc head*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+proc head*(req: LSRequest, LS: LiteStore, resource: string,
+    id = ""): LSResponse =
   var options = newQueryOptions()
   options.select = @["documents.id AS id", "created", "modified"]
   if id.isFolder:
@@ -876,10 +920,11 @@ result.content = ""
     else:
       result = LS.getRawDocuments(options, req)
       result.content = ""
-  except:
+  except CatchableError:
     return resError(Http400, "Bad request - $1" % getCurrentExceptionMsg())
 
-proc get*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+proc get*(req: LSRequest, LS: LiteStore, resource: string,
+    id = ""): LSResponse =
   case resource:
     of "docs":
       var options = newQueryOptions()
@@ -890,13 +935,14 @@ options.select = @["documents.id AS id", "created", "modified"]
       try:
         parseQueryOptions(req.url.query, options);
         if id != "" and options.folder == "":
-          if req.url.query.contains("raw=true") or req.headers.hasKey("Accept") and req.headers["Accept"] == "application/json":
+          if req.url.query.contains("raw=true") or req.headers.hasKey(
+              "Accept") and req.headers["Accept"] == "application/json":
             return LS.getRawDocument(id, options, req)
           else:
             return LS.getDocument(id, options, req)
         else:
           return LS.getRawDocuments(options, req)
-      except:
+      except CatchableError:
         let e = getCurrentException()
         let trace = e.getStackTrace()
         echo trace
@@ -913,9 +959,9 @@ else:
           options.folder = ""
           result = LS.getDocument(id & "index.html", options, req)
           if result.code == Http404:
-            result = LS.getDocument(id & "index.htm", options, req) 
+            result = LS.getDocument(id & "index.htm", options, req)
           return result
-      except:
+      except CatchableError:
         let e = getCurrentException()
         let trace = e.getStackTrace()
         echo trace
@@ -928,7 +974,7 @@ if id != "":
           return LS.getTag(id, options, req)
         else:
           return LS.getTags(options, req)
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
     of "indexes":
       var options = newQueryOptions()
@@ -938,7 +984,7 @@ if id != "":
           return LS.getIndex(id, options, req)
         else:
           return LS.getIndexes(options, req)
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
     of "stores":
       var options = newQueryOptions()
@@ -948,7 +994,7 @@ if id != "":
           return LS.getStore(id, options, req)
         else:
           return LS.getStores(options, req)
-      except:
+      except CatchableError:
         return resError(Http400, "Bad Request - $1" % getCurrentExceptionMsg())
     of "info":
       if id != "":
@@ -957,27 +1003,31 @@ return LS.getInfo(req)
     else:
       discard # never happens really.
 
-proc post*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+proc post*(req: LSRequest, LS: LiteStore, resource: string,
+    id = ""): LSResponse =
   var ct = "text/plain"
   if req.headers.hasKey("Content-Type"):
     ct = req.headers["Content-Type"]
   return LS.postDocument(req.body.strip, ct, id, req)
 
-proc put*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+proc put*(req: LSRequest, LS: LiteStore, resource: string,
+    id = ""): LSResponse =
   if id != "":
     if resource == "indexes":
       var field = ""
       try:
         field = parseJson(req.body.strip)["field"].getStr
-      except:
-        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        return resError(Http400, "Bad Request - Invalid JSON body - $1" %
+            getCurrentExceptionMsg())
       return LS.putIndex(id, field, req)
     elif resource == "stores":
       var config = newJNull()
       try:
         config = parseJson(req.body)
-      except:
-        return resError(Http400, "Bad Request - Invalid JSON body - $1" % getCurrentExceptionMsg())
+      except CatchableError:
+        return resError(Http400, "Bad Request - Invalid JSON body - $1" %
+            getCurrentExceptionMsg())
       return LS.putStore(id, config, req)
     else: # Assume docs
       var ct = "text/plain"
@@ -987,7 +1037,8 @@ return LS.putDocument(id, req.body.strip, ct, req)
   else:
     return resError(Http400, "Bad request: document ID must be specified in PUT requests.")
 
-proc delete*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+proc delete*(req: LSRequest, LS: LiteStore, resource: string,
+    id = ""): LSResponse =
   if id != "":
     if resource == "indexes":
       return LS.deleteIndex(id, req)
@@ -998,7 +1049,8 @@ return LS.deleteDocument(id, req)
   else:
     return resError(Http400, "Bad request: document ID must be specified in DELETE requests.")
 
-proc patch*(req: LSRequest, LS: LiteStore, resource: string, id = ""): LSResponse =
+proc patch*(req: LSRequest, LS: LiteStore, resource: string,
+    id = ""): LSResponse =
   if id != "":
     return LS.patchDocument(id, req.body, req)
   else:
@@ -1024,14 +1076,15 @@ result.headers = ctHeader("text/plain")
           setOrigin(LS, req, result.headers)
           result.content = contents
           result.code = Http200
-        except:
+        except CatchableError:
           return resError(Http500, "Unable to read file '$1'." % path)
       else:
         return resError(Http404, "File '$1' not found." % path)
     else:
       return resError(Http405, "Method not allowed: $1" % $req.reqMethod)
 
-proc route*(req: LSRequest, LS: LiteStore, resource = "docs", id = ""): LSResponse =
+proc route*(req: LSRequest, LS: LiteStore, resource = "docs",
+    id = ""): LSResponse =
   var reqMethod = $req.reqMethod
   if req.headers.hasKey("X-HTTP-Method-Override"):
     reqMethod = req.headers["X-HTTP-Method-Override"]
@@ -1072,31 +1125,37 @@ discard path.find(PEG_URL, matches)
     return req.route(LSDICT[id], matches[1], matches[2])
   return req.route(LS, resource, id)
 
-proc newSimpleLSRequest(meth: HttpMethod, resource, id,  body = "", params = "", headers = newHttpHeaders()): LSRequest =
+proc newSimpleLSRequest(meth: HttpMethod, resource = "", id = "", body = "",
+    params = "", headers = newHttpHeaders()): LSRequest =
   result.reqMethod = meth
   result.body = body
   result.headers = headers
-  result.url = parseUri("$1://$2:$3/$4/$5?$6" % @["http", "localhost", "9500", resource, id, params])
-  
+  result.url = parseUri("$1://$2:$3/$4/$5?$6" % @["http", "localhost", "9500",
+      resource, id, params])
+
 proc get(resource, id: string, params = ""): LSResponse =
-  return newSimpleLSRequest(HttpGet, resource, id, "", params).multiRoute(resource, id)
+  return newSimpleLSRequest(HttpGet, resource, id, "", params).multiRoute(
+      resource, id)
 
 proc post(resource, folder, body: string, ct = ""): LSResponse =
   var headers = newHttpHeaders()
   if ct != "":
     headers["Content-Type"] = ct
-  return newSimpleLSRequest(HttpPost, resource, folder, body, "", headers).multiRoute(resource, folder & "/")
+  return newSimpleLSRequest(HttpPost, resource, folder, body, "",
+      headers).multiRoute(resource, folder & "/")
 
 proc put(resource, id, body: string, ct = ""): LSResponse =
   var headers = newHttpHeaders()
   if ct != "":
     headers["Content-Type"] = ct
-  return newSimpleLSRequest(HttpPut, resource, id, body, "", headers).multiRoute(resource, id)
+  return newSimpleLSRequest(HttpPut, resource, id, body, "",
+      headers).multiRoute(resource, id)
 
 proc patch(resource, id, body: string): LSResponse =
   var headers = newHttpHeaders()
   headers["Content-Type"] = "application/json"
-  return newSimpleLSRequest(HttpPatch, resource, id, body, "", headers).multiRoute(resource, id)
+  return newSimpleLSRequest(HttpPatch, resource, id, body, "",
+      headers).multiRoute(resource, id)
 
 proc delete(resource, id: string): LSResponse =
   return newSimpleLSRequest(HttpDelete, resource, id).multiRoute(resource, id)
@@ -1104,7 +1163,133 @@ 
 proc head(resource, id: string): LSResponse =
   return newSimpleLSRequest(HttpHead, resource, id).multiRoute(resource, id)
 
-proc registerStoreApi(LS: LiteStore, ctx: DTContext, origResource, origId: string) =
+proc toHeaders(obj: JsonNode): HttpHeaders =
+  var headers = newSeq[tuple[key: string, val: string]](0)
+  for k, v in obj.pairs:
+    headers.add (key: k, val: v.getstr)
+  return newHttpHeaders(headers)
+
+proc toJson(headers: HttpHeaders): JsonNode =
+  result = newJObject()
+  for k, v in headers.pairs:
+    result[k] = newJString(v)
+
+proc getHeadersArg(ctx: DTContext): HttpHeaders =
+  duk_enum(ctx, 1, 0)
+  var headers = newSeq[tuple[key: string, val: string]](0)
+  while duk_next(ctx, -1, 1) == 1:
+    let key = $duk_safe_to_string(ctx, -2)
+    let val = $duk_safe_to_string(ctx, -1)
+    duk_pop_2(ctx)
+    headers.add (key: key, val: val)
+  return newHttpHeaders(headers)
+
+
+proc registerHttpApi(LS: LiteStore, ctx: DTContext) =
+  var api_idx = ctx.duk_push_object()
+  # GET
+  var get: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let url = $duk_get_string(ctx, 0)
+    let client = newHttpClient(headers = ctx.getHeadersArg)
+    let resp = client.get(url)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.body.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    discard ctx.duk_push_string(resp.headers.toJson.pretty.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "headers")
+    return 1
+  )
+  discard duk_push_c_function(ctx, get, 2)
+  discard ctx.duk_put_prop_string(api_idx, "get")
+  # HEAD
+  var head: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let url = $duk_get_string(ctx, 0)
+    let client = newHttpClient(headers = ctx.getHeadersArg)
+    let resp = client.head(url)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.body.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    discard ctx.duk_push_string(resp.headers.toJson.pretty.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "headers")
+    return 1
+  )
+  discard duk_push_c_function(ctx, head, 2)
+  discard ctx.duk_put_prop_string(api_idx, "head")
+  # DELETE
+  var delete: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let url = $duk_get_string(ctx, 0)
+    let client = newHttpClient(headers = ctx.getHeadersArg)
+    let resp = client.delete(url)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.body.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    discard ctx.duk_push_string(resp.headers.toJson.pretty.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "headers")
+    return 1
+  )
+  discard duk_push_c_function(ctx, delete, 2)
+  discard ctx.duk_put_prop_string(api_idx, "head")
+  # POST
+  var post: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let url = $duk_get_string(ctx, 0)
+    let client = newHttpClient(headers = ctx.getHeadersArg)
+    let body = $duk_get_string(ctx, 2)
+    let resp = client.post(url, body)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.body.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    discard ctx.duk_push_string(resp.headers.toJson.pretty.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "headers")
+    return 1
+  )
+  discard duk_push_c_function(ctx, post, 3)
+  discard ctx.duk_put_prop_string(api_idx, "post")
+  # PUT
+  var put: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let url = $duk_get_string(ctx, 0)
+    let client = newHttpClient(headers = ctx.getHeadersArg)
+    let body = $duk_get_string(ctx, 2)
+    let resp = client.put(url, body)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.body.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    discard ctx.duk_push_string(resp.headers.toJson.pretty.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "headers")
+    return 1
+  )
+  discard duk_push_c_function(ctx, put, 3)
+  discard ctx.duk_put_prop_string(api_idx, "put")
+  # PATCH
+  var patch: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
+    let url = $duk_get_string(ctx, 0)
+    let client = newHttpClient(headers = ctx.getHeadersArg)
+    let body = $duk_get_string(ctx, 2)
+    let resp = client.patch(url, body)
+    var res_idx = ctx.duk_push_object()
+    ctx.duk_push_int(cast[cint](resp.code))
+    discard ctx.duk_put_prop_string(res_idx, "code")
+    discard ctx.duk_push_string(resp.body.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "content")
+    discard ctx.duk_push_string(resp.headers.toJson.pretty.cstring)
+    discard ctx.duk_put_prop_string(res_idx, "headers")
+    return 1
+  )
+  discard duk_push_c_function(ctx, patch, 3)
+  discard ctx.duk_put_prop_string(api_idx, "patch")
+  discard ctx.duk_put_global_string("$http")
+
+proc registerStoreApi(LS: LiteStore, ctx: DTContext, origResource,
+    origId: string) =
   var api_idx = ctx.duk_push_object()
   # GET
   var get: DTCFunction = (proc (ctx: DTContext): cint{.stdcall.} =
@@ -1198,7 +1383,7 @@ discard duk_push_c_function(ctx, head, 2)
   discard ctx.duk_put_prop_string(api_idx, "head")
   discard ctx.duk_put_global_string("$store")
 
-proc jError(ctx: DTContext): LSResponse  =
+proc jError(ctx: DTContext): LSResponse =
   return resError(Http500, "Middleware Error: " & $ctx.duk_safe_to_string(-1))
 
 proc getMiddleware*(LS: LiteStore, id: string): string =
@@ -1213,9 +1398,9 @@ else:
     result = LS.middleware[id]
 
 proc getMiddlewareSeq(LS: LiteStore, resource, id, meth: string): seq[string] =
-  result = newSeq[string]() 
+  result = newSeq[string]()
   if LS.config.kind != JObject or not LS.config.hasKey("resources"):
-    return 
+    return
   var reqUri = "/" & resource & "/" & id
   if reqUri[^1] == '/':
     reqUri.removeSuffix({'/'})
@@ -1226,24 +1411,28 @@ var currentPaths = ""
   for p in ancestors:
     currentPath &= "/" & p
     currentPaths = currentPath & "/*"
-    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][meth].hasKey("middleware"):
+    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][
+        currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][
+        meth].hasKey("middleware"):
       let mw = LS.config["resources"][currentPaths][meth]["middleware"]
       if (mw.kind == JArray):
         for m in mw:
           result.add m.getStr
-  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("middleware"):
+  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][
+      reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("middleware"):
     let mw = LS.config["resources"][reqUri][meth]["middleware"]
     if (mw.kind == JArray):
       for m in mw:
         result.add m.getStr
 
-proc execute*(req: var LSRequest, LS: LiteStore, resource, id: string): LSResponse =
+proc execute*(req: var LSRequest, LS: LiteStore, resource,
+    id: string): LSResponse =
   let middleware = getMiddlewareSeq(LS, resource, id, $req.reqMethod)
   if middleware.len > 0:
     LOG.debug("Middleware: " & middleware.join(" -> "));
   if middleware.len == 0:
     return route(req, LS, resource, id)
-  var jReq = $(%* req)
+  var jReq = $( %* req)
   LOG.debug("Request: " & jReq)
   var jRes = """{
     "code": 200,
@@ -1262,6 +1451,7 @@ var ctx = duk_create_heap_default()
   duk_console_init(ctx)
   duk_print_alert_init(ctx)
   LS.registerStoreApi(ctx, resource, id)
+  LS.registerHttpApi(ctx)
   if ctx.duk_peval_string(cstring("($1)" % $jReq)) != 0:
     return jError(ctx)
   discard ctx.duk_put_global_string("$req")
@@ -1276,7 +1466,7 @@ var i = 0
   var abort = 0
   while abort != 1 and i < middleware.len:
     let code = LS.getMiddleware(middleware[i])
-    LOG.debug("Evaluating middleware '$1'" %  middleware[i])
+    LOG.debug("Evaluating middleware '$1'" % middleware[i])
     if ctx.duk_peval_string(code.cstring) != 0:
       return jError(ctx)
     abort = ctx.duk_get_boolean(-1)

@@ -1,12 +1,12 @@ 
 const
-  pkgName*        = "litestore"
-  pkgVersion*     = "1.12.1"
-  pkgAuthor*      = "Fabio Cevasco"
+  pkgName* = "litestore"
+  pkgVersion* = "1.13.0"
+  pkgAuthor* = "Fabio Cevasco"
   pkgDescription* = "Self-contained, lightweight, RESTful document store."
-  pkgLicense*     = "MIT"
-  appname*        = "LiteStore"
+  pkgLicense* = "MIT"
+  appname* = "LiteStore"
 
 var
-  file*           = "data.db"
-  address*        = "127.0.0.1"
-  port*           = 9500
+  file* = "data.db"
+  address* = "127.0.0.1"
+  port* = 9500

@@ -1,15 +1,18 @@ 
 import
-  x_sqlite3,
-  x_db_sqlite as db,
+  db_connector/sqlite3,
+  db_connector/db_sqlite as db,
+  std/[
   os,
+  paths,
   oids,
   json,
   pegs,
   strtabs,
   strutils,
   sequtils,
+  httpclient,
   base64,
-  math
+  math]
 import
   types,
   contenttypes,
@@ -52,7 +55,7 @@ 
 proc closeDatastore*(store: Datastore) =
   try:
     db.close(store.db)
-  except:
+  except CatchableError:
     raise newException(EDatastoreUnavailable,
         "Datastore '$1' cannot be closed." % store.path)
 
@@ -61,7 +64,7 @@ try:
     if store.path.fileExists():
       store.closeDataStore()
       store.path.removeFile()
-  except:
+  except CatchableError:
     raise newException(EDatastoreUnavailable,
         "Datastore '$1' cannot destroyed." % store.path)
 
@@ -79,7 +82,7 @@ try:
       store.db.exec(SQL_CREATE_SYSTEM_DOCUMENTS_TABLE)
       store.db.exec(SQL_UPDATE_VERSION, 2)
       LOG.debug("Done.")
-    except:
+    except CatchableError:
       store.closeDatastore()
       store.path.removeFile()
       copyFile(bkp_path, store.path)
@@ -106,7 +109,7 @@ discard result.db.tryExec("PRAGMA foreign_keys = ON".sql)
     LOG.debug("Done.")
     result.path = file
     result.mount = ""
-  except:
+  except CatchableError:
     raise newException(EDatastoreUnavailable,
         "Datastore '$1' cannot be opened." % file)
 
@@ -136,7 +139,8 @@ 
 # Manage Indexes
 
 proc createIndex*(store: Datastore, indexId, field: string) =
-  let query = sql("CREATE INDEX json_index_$1 ON documents(json_extract(data, ?) COLLATE NOCASE) WHERE json_valid(data)" % [indexId])
+  let query = sql("CREATE INDEX json_index_$1 ON documents(json_extract(data, ?) COLLATE NOCASE) WHERE json_valid(data)" %
+      [indexId])
   store.begin()
   store.db.exec(query, field)
   store.commit()
@@ -147,7 +151,8 @@ store.begin()
   store.db.exec(query)
   store.commit()
 
-proc retrieveIndex*(store: Datastore, id: string, options: QueryOptions = newQueryOptions()): JsonNode =
+proc retrieveIndex*(store: Datastore, id: string,
+    options: QueryOptions = newQueryOptions()): JsonNode =
   var options = options
   options.single = true
   let query = prepareSelectIndexesQuery(options)
@@ -167,7 +172,7 @@ if (options.like[options.like.len-1] == '*' and options.like[0] != '*'):
       let str = "json_index_" & options.like.substr(0, options.like.len-2)
       raw_indexes = store.db.getAllRows(query.sql, str, str & "{")
     else:
-      let str =  "json_index_" & options.like.replace("*", "%")
+      let str = "json_index_" & options.like.replace("*", "%")
       raw_indexes = store.db.getAllRows(query.sql, str)
   else:
     raw_indexes = store.db.getAllRows(query.sql)
@@ -176,7 +181,8 @@ for index in raw_indexes:
     var matches: array[0..0, string]
     let fieldPeg = peg"'CREATE INDEX json_index_test ON documents(json_extract(data, \'' {[^']+}"
     discard index[1].match(fieldPeg, matches)
-    indexes.add(%[("id", %index[0].replace("json_index_", "")), ("field", %matches[0])])
+    indexes.add(%[("id", %index[0].replace("json_index_", "")), ("field",
+        %matches[0])])
   return %indexes
 
 proc countIndexes*(store: Datastore, q = "", like = ""): int64 =
@@ -286,7 +292,7 @@ if contenttype == "application/json":
     # Validate JSON data
     try:
       discard data.parseJson
-    except:
+    except CatchableError:
       raise newException(JsonParsingError, "Invalid JSON content - " &
           getCurrentExceptionMsg())
   if id == "":
@@ -318,7 +324,7 @@ raise newException(EFileExists, "File already exists: $1" % filename)
     if singleOp:
       store.commit()
     return $store.retrieveRawDocument(id)
-  except:
+  except CatchableError:
     store.rollback()
     eWarn()
     raise
@@ -334,7 +340,7 @@ if contenttype == "application/json":
     # Validate JSON data
     try:
       discard data.parseJson
-    except:
+    except CatchableError:
       raise newException(JsonParsingError, "Invalid JSON content - " &
           getCurrentExceptionMsg())
   if id == "":
@@ -350,7 +356,7 @@ binary, currentTime())
     if singleOp:
       store.commit()
     return $store.retrieveRawDocument(id)
-  except:
+  except CatchableError:
     store.rollback()
     eWarn()
     raise
@@ -365,21 +371,21 @@ if contenttype == "application/json":
     # Validate JSON data
     try:
       discard data.parseJson
-    except:
+    except CatchableError:
       raise newException(JsonParsingError, "Invalid JSON content - " &
           getCurrentExceptionMsg())
   try:
     LOG.debug("Updating system document '$1'" % id)
     store.begin()
-    var res = store.db.execAffectedRows(SQL_UPDATE_SYSTEM_DOCUMENT, data, contenttype,
-        binary, currentTime(), id)
+    var res = store.db.execAffectedRows(SQL_UPDATE_SYSTEM_DOCUMENT, data,
+        contenttype, binary, currentTime(), id)
     if res > 0:
       result = $store.retrieveRawDocument(id)
     else:
       result = ""
     if singleOp:
       store.commit()
-  except:
+  except CatchableError:
     eWarn()
     store.rollback()
     raise
@@ -394,7 +400,7 @@ if contenttype == "application/json":
     # Validate JSON data
     try:
       discard data.parseJson
-    except:
+    except CatchableError:
       raise newException(JsonParsingError, "Invalid JSON content - " &
           getCurrentExceptionMsg())
   var searchable = searchable
@@ -421,7 +427,7 @@ else:
       result = ""
     if singleOp:
       store.commit()
-  except:
+  except CatchableError:
     eWarn()
     store.rollback()
     raise
@@ -446,11 +452,11 @@ else:
           raise newException(EFileNotFound, "File not found: $1" % filename)
     if singleOp:
       store.commit()
-  except:
+  except CatchableError:
     eWarn()
     store.rollback()
 
-proc findDocumentId*(store: Datastore, pattern: string): string =  
+proc findDocumentId*(store: Datastore, pattern: string): string =
   var select = "SELECT id FROM documents WHERE id LIKE ? ESCAPE '\\' "
   var raw_document = store.db.getRow(select.sql, pattern)
   LOG.debug("Retrieving document '$1'" % pattern)
@@ -496,7 +502,8 @@ 
 proc countDocuments*(store: Datastore): int64 =
   return store.db.getRow(SQL_COUNT_DOCUMENTS)[0].parseInt
 
-proc importFile*(store: Datastore, f: string, dir = "/", system = false, notSearchable = false): string  =
+proc importFile*(store: Datastore, f: string, dir = "/", system = false,
+    notSearchable = false): string =
   if not f.fileExists:
     raise newException(EFileNotFound, "File '$1' not found." % f)
   let split = f.splitFile
@@ -530,7 +537,7 @@ else:
       discard store.createDocument(d_id, d_contents, d_ct, d_binary, d_searchable)
     if dir != "/" and not system:
       store.db.exec(SQL_INSERT_TAG, "$dir:"&dir, d_id)
-  except:
+  except CatchableError:
     store.rollback()
     eWarn()
     raise
@@ -544,7 +551,7 @@ store.begin()
   try:
     for tag in tags:
       store.db.exec(SQL_INSERT_TAG, tag, d_id)
-  except:
+  except CatchableError:
     store.rollback()
     eWarn()
     raise
@@ -562,7 +569,7 @@ LOG.debug("Optimixing full-text index...")
     store.db.exec(SQL_OPTIMIZE)
     store.commit()
     LOG.debug("Done")
-  except:
+  except CatchableError:
     eWarn()
 
 proc vacuum*(file: string) =
@@ -570,7 +577,7 @@ let data = db.open(file, "", "", "")
   try:
     data.exec(SQL_VACUUM)
     db.close(data)
-  except:
+  except CatchableError:
     eWarn()
     quit(203)
   quit(0)
@@ -580,21 +587,22 @@ result = newSeq[string]()
   let tags_file = f.splitFile.dir / "_tags"
   if tags_file.fileExists:
     for tag in tags_file.lines:
-      result.add(tag) 
+      result.add(tag)
 
 
-proc importDir*(store: Datastore, dir: string, system = false, importTags = false, notSearchable = false) =
+proc importDir*(store: Datastore, dir: string, system = false,
+    importTags = false, notSearchable = false) =
   var files = newSeq[string]()
   if not dir.dirExists:
     raise newException(EDirectoryNotFound, "Directory '$1' not found." % dir)
   for f in dir.walkDirRec():
     if f.dirExists:
       continue
-    let dirs = f.split(DirSep)  
+    let dirs = f.split(DirSep)
     if dirs.any(proc (s: string): bool = return s.startsWith(".")):
       # Ignore hidden directories and files
-      continue  
-    let fileName = f.splitFile.name    
+      continue
+    let fileName = f.splitFile.name
     if fileName == "_tags" and not importTags:
       # Ignore tags file unless the CLI flag was set
       continue
@@ -621,7 +629,7 @@ cBatches.inc
         store.commit()
         LOG.info("Importing batch $1/$2...", cBatches, nBatches)
         store.begin()
-    except:
+    except CatchableError:
       LOG.warn("Unable to import file: $1", f)
       eWarn()
       store.rollback()
@@ -685,17 +693,37 @@ LOG.level = lvNone
     else:
       fail(103, "Invalid log level '$1'" % val)
 
-proc processAuthConfig(configuration: JsonNode, auth: var JsonNode) =
-  if auth == newJNull() and configuration != newJNull() and configuration.hasKey("signature"):
-    LOG.debug("Authentication: Signature found, processing authentication rules in configuration.")
-    auth = newJObject();
-    auth["access"] = newJObject();
-    auth["signature"] = configuration["signature"]
-    for k, v in configuration["resources"].pairs:
-      auth["access"][k] = newJObject()
+proc downloadJwks*(LS: LiteStore, uri: string) =
+  let file = LS.jwksPath
+  let client = newHttpClient()
+  client.downloadFile(uri, file)
+
+proc processAuthConfig(LS: var LiteStore) =
+  if LS.auth == newJNull() and LS.config != newJNull():
+    LS.auth = newJObject();
+    LS.auth["access"] = newJObject();
+    if LS.config.hasKey("jwks_uri"):
+      LOG.debug("Authentication: Downloading JWKS file.")
+      try:
+        LS.downloadJwks(LS.config["jwks_uri"].getStr)
+      except CatchableError:
+        LOG.warn "Unable to download JWKS file."
+        eWarn()
+      try:
+        LS.jwks = LS.jwksPath.parseFile
+      except:
+        LOG.warn "Unable to parse JWKS file."
+        eWarn()
+    elif LS.config.hasKey("signature"):
+      LOG.debug("Authentication: Signature found, processing authentication rules in configuration.")
+      LS.auth["signature"] = LS.config["signature"].getStr.replace(
+          "-----BEGIN CERTIFICATE-----\n", "").replace(
+          "\n-----END CERTIFICATE-----").strip().newJString
+    for k, v in LS.config["resources"].pairs:
+      LS.auth["access"][k] = newJObject()
       for meth, content in v.pairs:
         if content.hasKey("auth"):
-          auth["access"][k][meth] = content["auth"]
+          LS.auth["access"][k][meth] = content["auth"]
 
 proc processConfigSettings(LS: var LiteStore) =
   # Process config settings if present and if no cli settings are set
@@ -727,7 +755,7 @@ proc setup*(LS: var LiteStore, open = true) {.gcsafe.} =
   if not LS.file.fileExists:
     try:
       LS.file.createDatastore()
-    except:
+    except CatchableError:
       eWarn()
       fail(200, "Unable to create datastore '$1'" % [LS.file])
   if (open):
@@ -735,15 +763,15 @@ try:
       LS.store = LS.file.openDatastore()
       try:
         LS.store.upgradeDatastore()
-      except:
+      except CatchableError:
         fail(203, "Unable to upgrade datastore '$1'" % [LS.file])
       if LS.mount:
         try:
           LS.store.mountDir(LS.directory)
-        except:
+        except CatchableError:
           eWarn()
           fail(202, "Unable to mount directory '$1'" % [LS.directory])
-    except:
+    except CatchableError:
       fail(201, "Unable to open datastore '$1'" % [LS.file])
 
 proc initStore*(LS: var LiteStore) =
@@ -759,7 +787,7 @@ # Process config settings
     LS.processConfigSettings()
     # Process auth from config settings
     LOG.debug("Authentication: Checking configuration for auth rules - Store file: " & LS.file)
-    processAuthConfig(LS.config, LS.auth)
+    LS.processAuthConfig()
 
   if LS.auth == newJNull():
     # Attempt to retrieve auth.json from system documents

@@ -0,0 +1,142 @@ 
+import std/[
+    openssl, base64, strutils, macros, json, times, pegs, sequtils, os
+    ]
+import types, core
+
+when defined(windows) and defined(amd64):
+    {.passL: "-static -L"&getProjectPath()&"/litestorepkg/vendor/openssl/windows -lssl -lcrypto -lbcrypt".}
+elif defined(linux) and defined(amd64):
+    {.passL: "-static -L"&getProjectPath()&"/litestorepkg/vendor/openssl/linux -lssl -lcrypto".}
+elif defined(macosx) and defined(amd64):
+    {.passL: "-Bstatic -L"&getProjectPath()&"/litestorepkg/vendor/openssl/macosx -lssl -lcrypto -Bdynamic".}
+
+
+proc EVP_PKEY_new(): EVP_PKEY {.cdecl, importc.}
+proc X509_get_pubkey(cert: PX509): EVP_PKEY {.cdecl, importc.}
+proc EVP_DigestVerifyInit(ctx: EVP_MD_CTX; pctx: ptr EVP_PKEY_CTX; typ: EVP_MD;
+        e: ENGINE; pkey: EVP_PKEY): cint {.cdecl, importc.}
+proc EVP_DigestVerifyUpdate(ctx: EVP_MD_CTX; data: pointer;
+        len: cuint): cint {.cdecl, importc.}
+proc EVP_DigestVerifyFinal(ctx: EVP_MD_CTX; data: pointer;
+        len: cuint): cint {.cdecl, importc.}
+
+proc getLastError(): string =
+    return $ERR_error_string(ERR_get_error(), nil)
+
+proc raiseJwtError(msg: string) =
+    let err = getLastError()
+    raise newException(EJwtValidationError, msg&"\n"&err)
+
+proc raiseX509Error(msg: string) =
+    let err = getLastError()
+    raise newException(EX509Error, msg&"\n"&err)
+
+proc getX5c*(LS: LiteStore; token: JWT): string =
+    let keys = LS.jwks["keys"]
+    if token.header.hasKey("kid"):
+        let kid = token.header["kid"].getStr
+        return keys.filterIt(it["kid"].getStr == kid)[0]["x5c"][0].getStr
+    return keys[0]["x5c"][0].getStr
+
+proc base64UrlDecode(encoded: string): string =
+    let padding = 4 - (encoded.len mod 4)
+    let base64String = encoded.replace("-", "+").replace("_", "/") & repeat("=", padding)
+    result = base64.decode(base64String)
+
+proc newJwt*(token: string): JWT =
+    let parts = token.split(".")
+    result.token = token
+    result.payload = parts[0]&"."&parts[1]
+    result.header = parts[0].base64UrlDecode.parseJson
+    result.claims = parts[1].base64UrlDecode.parseJson
+    result.signature = parts[2].base64UrlDecode
+
+proc verifyTimeClaims*(jwt: JWT) =
+    let t = now().toTime.toUnix
+    if jwt.claims.hasKey("nbf") and jwt.claims["nbf"].getInt > t:
+        raiseJwtError("Token cannot be used yet.")
+    if jwt.claims.hasKey("exp") and jwt.claims["exp"].getInt < t:
+        raiseJwtError("Token has expired.")
+
+proc verifyAlgorithm*(jwt: JWT) =
+    let alg = jwt.header["alg"].getStr
+    if alg != "RS256":
+        raiseJwtError("Algorithm not supported: " & alg)
+
+proc verifyScope*(jwt: JWT; reqScope: seq[string] = @[]) =
+    if reqScope.len == 0:
+        return
+    var scp = newSeq[string](0)
+    if jwt.claims.hasKey("scp"):
+        scp = jwt.claims["scp"].getStr.split(peg"\s")
+    elif jwt.claims.hasKey("scope"):
+        scp = jwt.claims["scope"].getStr.split(peg"\s")
+    if scp.len == 0:
+        raiseJwtError("No scp or scope claim found in token")
+    var authorized = ""
+    for s in scp:
+        for r in reqScope:
+            if r == s:
+                authorized = s
+                break
+    if authorized == "":
+        raise newException(EUnauthorizedError, "Unauthorized")
+
+proc verifySignature*(jwt: JWT; x5c: string) =
+    let sig = jwt.signature
+    let payload = jwt.payload
+    let cert = x5c.decode
+    var pkeyctx: EVP_PKEY_CTX
+    var mdctx: EVP_MD_CTX
+    let alg = EVP_sha256();
+    var x509: PX509
+    var pubkey = EVP_PKEY_new()
+    try:
+        ### Validate Signature (Only RS256 supported)
+        x509 = d2i_X509(cert)
+        if x509.isNil:
+            raiseX509Error("Invalid X509 certificate")
+
+        pubkey = X509_get_pubkey(x509)
+        if pubkey.isNil:
+            raiseX509Error("An error occurred while retrieving the public key")
+
+        mdctx = EVP_MD_CTX_create()
+        if mdctx.isNil:
+            raiseX509Error("Unable to initialize MD CTX")
+
+        pkeyctx = EVP_PKEY_CTX_new(pubkey, nil)
+        if pkeyctx.isNil:
+            raiseX509Error("Unable to initialize PKEY CTX")
+
+        if EVP_DigestVerifyInit(mdctx, addr pkeyctx, alg, nil, pubkey) != 1:
+            raiseJwtError("Unable to initialize digest verification")
+
+        if EVP_DigestVerifyUpdate(mdctx, addr payload[0], payload.len.cuint) != 1:
+            raiseJwtError("Unable to update digest verification")
+
+        if EVP_DigestVerifyFinal(mdctx, addr sig[0], sig.len.cuint) != 1:
+            raiseJwtError("Verification failed")
+    except CatchableError:
+        let err = getCurrentException()
+        if not mdctx.isNil:
+            EVP_MD_CTX_destroy(mdctx)
+        if not pkeyctx.isNil:
+            EVP_PKEY_CTX_free(pkeyctx)
+        if not pubkey.isNil:
+            EVP_PKEY_free(pubkey)
+        if not x509.isNil:
+            X509_free(x509)
+        raise err
+
+
+when isMainModule:
+
+    let token = "token.txt".readFile
+    let x5c = "x5c.cert".readFile
+    let jwt = token.newJwt
+
+    echo token
+    echo "---"
+    echo x5c
+    jwt.verifySignature(x5c)

@@ -1,4 +1,4 @@ 
-import x_db_sqlite
+import db_connector/db_sqlite
 
 
 # SQL QUERIES

@@ -1,22 +1,19 @@ 
 import
   asynchttpserver,
   asyncdispatch,
-  times,
   strutils,
   pegs,
   logger,
   cgi,
-  os,
   json,
   tables,
   strtabs,
-  base64,
   asyncnet,
-  jwt,
   sequtils
-import 
-  types, 
-  utils, 
+import
+  types,
+  utils,
+  jwt,
   api_v1,
   api_v2,
   api_v3,
@@ -27,17 +24,7 @@ api_v7,
   api_v8
 
 export
-  api_v5
-
-
-proc decodeUrlSafeAsString*(s: string): string =
-  var s = s.replace('-', '+').replace('_', '/')
-  while s.len mod 4 > 0:
-    s &= "="
-  base64.decode(s)
-
-proc decodeUrlSafe*(s: string): seq[byte] =
-  cast[seq[byte]](decodeUrlSafeAsString(s))
+  api_v8
 
 proc getReqInfo(req: LSRequest): string =
   var url = req.url.path
@@ -51,37 +38,44 @@ proc handleCtrlC() {.noconv.} =
   echo ""
   LOG.info("Exiting...")
   quit()
-  
-template auth(uri: string, jwt: JWT, LS: LiteStore): void =
+
+template auth(uri: string, LS: LiteStore, jwt: JWT): void =
   let cfg = access[uri]
   if cfg.hasKey(reqMethod):
     LOG.debug("Authenticating: " & reqMethod & " " & uri)
-    if not req.headers.hasKey("Authorization"): 
+    if not req.headers.hasKey("Authorization"):
       return resError(Http401, "Unauthorized - No token")
     let token = req.headers["Authorization"].replace(peg"^ 'Bearer '", "")
     # Validate token
     try:
-      jwt = token.toJwt()
-      let parts = token.split(".")
-      var sig = LS.auth["signature"].getStr 
-      discard verifySignature(parts[0] & "." & parts[1], decodeUrlSafe(parts[2]), sig, RS256)
-      verifyTimeClaims(jwt)
-      let scopes = cfg[reqMethod]
-      # Validate scope
-      var authorized = ""
-      let reqScopes = ($jwt.claims["scope"].node.str).split(peg"\s+")
-      LOG.debug("Resource scopes: " & $scopes)
-      LOG.debug("Request scopes: " & $reqScopes)
-      for scope in scopes:
-        for reqScope in reqScopes:
-          if reqScope == scope.getStr:
-            authorized = scope.getStr
-            break
-      if authorized == "":
-        return resError(Http403, "Forbidden - You are not permitted to access this resource")
-      LOG.debug("Authorization successful: " & authorized)
-    except:
-      echo getCurrentExceptionMsg()
+      jwt = token.newJwt
+      var x5c: string
+      if LS.config.hasKey("jwks_uri"):
+        LOG.debug("Selecting x5c...")
+        x5c = LS.getX5c(jwt)
+      else:
+        LOG.debug("Using stored signature...")
+        x5c = LS.config["signature"].getStr
+      LOG.debug("Verifying algorithm...")
+      jwt.verifyAlgorithm()
+      LOG.debug("Verifying signature...")
+      try:
+        jwt.verifySignature(x5c)
+      except EX509Error:
+        LOG.warn getCurrentExceptionMsg()
+        writeStackTrace()
+      LOG.debug("Verifying claims...")
+      jwt.verifyTimeClaims()
+      let scope = cfg[reqMethod].mapIt(it.getStr)
+      LOG.debug("Verifying scope...")
+      jwt.verifyScope(scope)
+      LOG.debug("Authorization successful")
+    except EUnauthorizedError:
+      LOG.warn getCurrentExceptionMsg()
+      writeStackTrace()
+      return resError(Http403, "Forbidden - You are not permitted to access this resource")
+    except CatchableError:
+      LOG.warn getCurrentExceptionMsg()
       writeStackTrace()
       return resError(Http401, "Unauthorized - Invalid token")
 
@@ -100,17 +94,21 @@ var currentPaths = ""
   for p in ancestors:
     currentPath &= "/" & p
     currentPaths = currentPath & "/*"
-    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][meth].hasKey("allowed"):
+    if LS.config["resources"].hasKey(currentPaths) and LS.config["resources"][
+        currentPaths].hasKey(meth) and LS.config["resources"][currentPaths][
+        meth].hasKey("allowed"):
       let allowed = LS.config["resources"][currentPaths][meth]["allowed"]
       if (allowed == %false):
         return false;
-  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("allowed"):
+  if LS.config["resources"].hasKey(reqUri) and LS.config["resources"][
+      reqUri].hasKey(meth) and LS.config["resources"][reqUri][meth].hasKey("allowed"):
     let allowed = LS.config["resources"][reqUri][meth]["allowed"]
     if (allowed == %false):
       return false
   return true
 
-proc processApiUrl(req: LSRequest, LS: LiteStore, info: ResourceInfo): LSResponse = 
+proc processApiUrl(req: LSRequest, LS: LiteStore,
+    info: ResourceInfo): LSResponse =
   var reqUri = "/" & info.resource & "/" & info.id
   if reqUri[^1] == '/':
     reqUri.removeSuffix({'/'})
@@ -125,12 +123,12 @@ let access = LS.auth["access"]
     while true:
       # Match exact url
       if access.hasKey(uri):
-        auth(uri, jwt, LS)
+        auth(uri, LS, jwt)
         break
       # Match exact url adding /* (e.g. /docs would match also /docs/* in auth.json)
       elif uri[^1] != '*' and uri[^1] != '/':
         if access.hasKey(uri & "/*"):
-          auth(uri & "/*", jwt, LS)
+          auth(uri & "/*", LS, jwt)
           break
       var parts = uri.split("/")
       if parts[^1] == "*":
@@ -143,7 +141,7 @@ else:
         # If at the end of the URL, check generic URL
         uri = "/*"
         if access.hasKey(uri):
-          auth(uri, jwt, LS)
+          auth(uri, LS, jwt)
         break
   if info.version == "v8":
     if info.resource.match(peg"^assets / docs / info / tags / indexes / stores$"):
@@ -235,7 +233,8 @@ return resError(Http400, "Bad Request - Not serving any directory." % info.version)
     else:
       return resError(Http404, "Resource Not Found: $1" % info.resource)
   else:
-    if info.version == "v1" or info.version == "v2" or info.version == "v3" or info.version == "v4" or info.version == "v5":
+    if info.version == "v1" or info.version == "v2" or info.version == "v3" or
+        info.version == "v4" or info.version == "v5":
       return resError(Http400, "Bad Request - Invalid API version: $1" % info.version)
     else:
       if info.resource.decodeURL.strip == "":
@@ -243,7 +242,7 @@ return resError(Http400, "Bad Request - No resource specified." % info.resource)
       else:
         return resError(Http404, "Resource Not Found: $1" % info.resource)
 
-proc process*(req: LSRequest, LS: LiteStore): LSResponse {.gcsafe.}=
+proc process*(req: LSRequest, LS: LiteStore): LSResponse {.gcsafe.} =
   var matches = @["", "", ""]
   template route(req: LSRequest, peg: Peg, op: untyped): untyped =
     if req.url.path.find(peg, matches) != -1:
@@ -273,14 +272,17 @@ raise newException(EInvalidRequest, req.getReqInfo())
   except EInvalidRequest:
     let e = (ref EInvalidRequest)(getCurrentException())
     let trace = e.getStackTrace()
-    return resError(Http404, "Resource Not Found: $1" % getCurrentExceptionMsg().split(" ")[2], trace)
-  except:
+    return resError(Http404, "Resource Not Found: $1" % getCurrentExceptionMsg(
+      ).split(" ")[2], trace)
+  except CatchableError:
     let e = getCurrentException()
     let trace = e.getStackTrace()
-    return resError(Http500, "Internal Server Error: $1" % getCurrentExceptionMsg(), trace)
+    return resError(Http500, "Internal Server Error: $1" %
+        getCurrentExceptionMsg(), trace)
 
 
-proc process*(req: LSRequest, LSDICT: OrderedTable[string, LiteStore]): LSResponse {.gcsafe.}=
+proc process*(req: LSRequest, LSDICT: OrderedTable[string,
+    LiteStore]): LSResponse {.gcsafe.} =
   var matches = @["", ""]
   if req.url.path.find(PEG_STORE_URL, matches) != -1:
     let id = matches[0]
@@ -335,7 +337,8 @@ LOG.info(getReqInfo(req).replace("$", "$$"))
     let res = req.process(LSDICT)
     var newReq = newRequest(req, client)
     await newReq.respond(res.code, res.content, res.headers)
-  echo(LS.appname & " v" & LS.appversion & " started on " & LS.address & ":" & $LS.port & ".")
+  echo(LS.appname & " v" & LS.appversion & " started on " & LS.address & ":" &
+      $LS.port & ".")
   printCfg("master")
   let storeIds = toSeq(LSDICT.keys)
   if (storeIds.len > 1):

@@ -1,21 +1,21 @@ 
-import 
-  x_db_sqlite, 
-  asynchttpserver, 
+import
+  db_connector/db_sqlite,
+  std/[asynchttpserver,
   asyncnet,
   uri,
-  pegs, 
+  pegs,
   json,
   strtabs,
+  os,
   strutils,
   sequtils,
   nativesockets,
-  jwt,
-  tables
+  tables]
 import
   config
 
 type
-  EDatastoreExists* = object of CatchableError 
+  EDatastoreExists* = object of CatchableError
   EDatastoreDoesNotExist* = object of CatchableError
   EDatastoreUnavailable* = object of CatchableError
   EInvalidTag* = object of CatchableError
@@ -23,6 +23,9 @@ EDirectoryNotFound* = object of CatchableError
   EFileNotFound* = object of CatchableError
   EFileExists* = object of CatchableError
   EInvalidRequest* = object of CatchableError
+  EJwtValidationError* = object of CatchableError
+  EUnauthorizedError* = object of CatchableError
+  EX509Error* = object of CatchableError
   ConfigFiles* = object
     auth*: string
     config*: string
@@ -41,8 +44,8 @@ tables*: seq[string]
     jsonFilter*: string
     jsonSelect*: seq[tuple[path: string, alias: string]]
     select*: seq[string]
-    single*:bool
-    system*:bool
+    single*: bool
+    system*: bool
     limit*: int
     offset*: int
     orderby*: string
@@ -59,6 +62,12 @@ tag*: string
     startswith*: bool
     endswith*: bool
     negated*: bool
+  JWT* = object
+    header*: JsonNode
+    claims*: JsonNode
+    signature*: string
+    payload*: string
+    token*: string
   Operation* = enum
     opRun,
     opImport,
@@ -83,6 +92,7 @@ port*: int
     operation*: Operation
     config*: JsonNode
     configFile*: string
+    jwks*: JsonNode
     cliSettings*: JsonNode
     directory*: string
     manageSystemData*: bool
@@ -96,15 +106,15 @@ middleware*: StringTableRef
     appversion*: string
     auth*: JsonNode
     authFile*: string
-    favicon*:string
-    loglevel*:string
+    favicon*: string
+    loglevel*: string
   LSRequest* = object
     reqMethod*: HttpMethod
     headers*: HttpHeaders
     protocol*: tuple[orig: string, major, minor: int]
     url*: Uri
     jwt*: JWT
-    hostname*: string 
+    hostname*: string
     body*: string
   LSResponse* = object
     code*: HttpCode
@@ -116,7 +126,10 @@ id: string,
     version: string
   ]
 
-proc initLiteStore*(): LiteStore = 
+proc jwksPath*(LS: LiteStore): string =
+  return "$#/$#_jwks.json" % [getCurrentDir(), LS.file.splitFile.name]
+
+proc initLiteStore*(): LiteStore =
   result.config = newJNull()
   result.configFile = ""
   result.cliSettings = newJObject()
@@ -147,7 +160,7 @@ of "DELETE":
       return HttpDelete
     else:
       return HttpGet
-  
+
 
 proc `%`*(protocol: tuple[orig: string, major: int, minor: int]): JsonNode =
   result = newJObject()
@@ -201,7 +214,7 @@ result.headers = newHttpHeaders()
   for k, v in req["headers"].pairs:
     result.headers[k] = v.getStr
   let protocol = req["protocol"].getStr
-  let  parts = protocol.split("/")
+  let parts = protocol.split("/")
   let version = parts[1].split(".")
   result.protocol = (orig: parts[0], major: version[0].parseInt, minor: version[1].parseInt)
   result.url = initUri()
@@ -232,8 +245,8 @@ 
 var
   PEG_TAG* {.threadvar.}: Peg
   PEG_USER_TAG* {.threadvar.}: Peg
-  PEG_INDEX* {.threadvar}: Peg
-  PEG_STORE* {.threadvar}: Peg
+  PEG_INDEX* {.threadvar.}: Peg
+  PEG_STORE* {.threadvar.}: Peg
   PEG_JSON_FIELD* {.threadvar.}: Peg
   PEG_DEFAULT_URL* {.threadvar.}: Peg
   PEG_STORE_URL* {.threadvar.}: Peg
@@ -252,7 +265,7 @@ # Initialize LiteStore
 var LS* {.threadvar.}: LiteStore
 var LSDICT* {.threadvar.}: OrderedTable[string, LiteStore]
 var TAB_HEADERS* {.threadvar.}: array[0..2, (string, string)]
-LSDICT  = initOrderedTable[string, LiteStore]()
+LSDICT = initOrderedTable[string, LiteStore]()
 
 LS.appversion = pkgVersion
 LS.appname = appname
@@ -264,9 +277,14 @@ "Server": LS.appname & "/" & LS.appversion
 }
 
 proc newQueryOptions*(system = false): QueryOptions =
-  var select = @["documents.id AS id", "documents.data AS data", "content_type", "binary", "searchable", "created", "modified"]
+  var select = @["documents.id AS id", "documents.data AS data", "content_type",
+      "binary", "searchable", "created", "modified"]
   if system:
-    select = @["system_documents.id AS id", "system_documents.data AS data", "content_type", "binary", "created", "modified"]
+    select = @["system_documents.id AS id", "system_documents.data AS data",
+        "content_type", "binary", "created", "modified"]
   return QueryOptions(select: select,
-    single: false, limit: 0, offset: 0, orderby: "", tags: "", search: "", folder: "", like: "", system: system,
-    createdAfter: "", createdBefore: "", modifiedAfter: "", modifiedBefore: "", jsonFilter: "", jsonSelect: newSeq[tuple[path: string, alias: string]](), tables: newSeq[string]())
+    single: false, limit: 0, offset: 0, orderby: "", tags: "", search: "",
+    folder: "", like: "", system: system,
+    createdAfter: "", createdBefore: "", modifiedAfter: "", modifiedBefore: "",
+    jsonFilter: "", jsonSelect: newSeq[tuple[path: string, alias: string]](),
+        tables: newSeq[string]())

@@ -1,6 +1,6 @@ 
 import
-  x_sqlite3,
-  x_db_sqlite,
+  db_connector/sqlite3,
+  db_connector/db_sqlite,
   json,
   strutils,
   pegs,
@@ -248,7 +248,7 @@ var tags = peg"""'<' [^>]+ '>'"""
   var special_chars = peg"""\*\*+ / \_\_+ / \-\-+ / \#\#+ / \+\++ / \~\~+ / \`\`+ """
   try:
     json = s.parseJson()
-  except:
+  except CatchableError:
     discard
   if not json.isNil:
     if json.kind == JObject:
@@ -324,7 +324,7 @@ var e = getCurrentException()
   LOG.warn(e.msg)
   LOG.debug(getStackTrace(e))
 
-proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string, cb: proc(req: LSRequest, LS: LiteStore, resource: string, id: string):LSResponse): LSResponse =
+proc validate*(req: LSRequest, LS: LiteStore, resource: string, id: string, cb: proc(req: LSRequest, LS: LiteStore, resource: string, id: string):LSResponse): LSResponse {.gcsafe.} =
   if req.reqMethod == HttpPost or req.reqMethod == HttpPut or req.reqMethod == HttpPatch:
     var ct =  ""
     let body = req.body.strip
@@ -336,7 +336,7 @@ case ct:
         of "application/json":
           try:
             discard body.parseJson()
-          except:
+          except CatchableError:
             return resError(Http400, "Invalid JSON content - $1" % getCurrentExceptionMsg())
         else:
           discard

@@ -1,638 +0,0 @@ 
-#
-#
-#            Nim's Runtime Library
-#        (c) Copyright 2015 Andreas Rumpf
-#
-#    See the file "copying.txt", included in this
-#    distribution, for details about the copyright.
-#
-
-## A higher level `SQLite`:idx: database wrapper. This interface
-## is implemented for other databases too.
-##
-## Basic usage
-## ===========
-##
-## The basic flow of using this module is:
-##
-## 1. Open database connection
-## 2. Execute SQL query
-## 3. Close database connection
-##
-## Parameter substitution
-## ----------------------
-##
-## All ``db_*`` modules support the same form of parameter substitution.
-## That is, using the ``?`` (question mark) to signify the place where a
-## value should be placed. For example:
-##
-## .. code-block:: Nim
-##
-##    sql"INSERT INTO my_table (colA, colB, colC) VALUES (?, ?, ?)"
-##
-## Opening a connection to a database
-## ----------------------------------
-##
-## .. code-block:: Nim
-##
-##    import db_sqlite
-##
-##    # user, password, database name can be empty.
-##    # These params are not used on db_sqlite module.
-##    let db = open("mytest.db", "", "", "")
-##    db.close()
-##
-## Creating a table
-## ----------------
-##
-## .. code-block:: Nim
-##
-##    db.exec(sql"DROP TABLE IF EXISTS my_table")
-##    db.exec(sql"""CREATE TABLE my_table (
-##                     id   INTEGER,
-##                     name VARCHAR(50) NOT NULL
-##                  )""")
-##
-## Inserting data
-## --------------
-##
-## .. code-block:: Nim
-##
-##    db.exec(sql"INSERT INTO my_table (id, name) VALUES (0, ?)",
-##            "Jack")
-##
-## Larger example
-## --------------
-##
-## .. code-block:: nim
-##
-##    import db_sqlite, math
-##
-##    let db = open("mytest.db", "", "", "")
-##
-##    db.exec(sql"DROP TABLE IF EXISTS my_table")
-##    db.exec(sql"""CREATE TABLE my_table (
-##                     id    INTEGER PRIMARY KEY,
-##                     name  VARCHAR(50) NOT NULL,
-##                     i     INT(11),
-##                     f     DECIMAL(18, 10)
-##                  )""")
-##
-##    db.exec(sql"BEGIN")
-##    for i in 1..1000:
-##      db.exec(sql"INSERT INTO my_table (name, i, f) VALUES (?, ?, ?)",
-##              "Item#" & $i, i, sqrt(i.float))
-##    db.exec(sql"COMMIT")
-##
-##    for x in db.fastRows(sql"SELECT * FROM my_table"):
-##      echo x
-##
-##    let id = db.tryInsertId(sql"""INSERT INTO my_table (name, i, f)
-##                                  VALUES (?, ?, ?)""",
-##                            "Item#1001", 1001, sqrt(1001.0))
-##    echo "Inserted item: ", db.getValue(sql"SELECT name FROM my_table WHERE id=?", id)
-##
-##    db.close()
-##
-## See also
-## ========
-##
-## * `db_odbc module <db_odbc.html>`_ for ODBC database wrapper
-## * `db_mysql module <db_mysql.html>`_ for MySQL database wrapper
-## * `db_postgres module <db_postgres.html>`_ for PostgreSQL database wrapper
-
-{.deadCodeElim: on.}  # dce option deprecated
-
-import x_sqlite3 as sqlite3 # h3rald
-
-import db_common
-export db_common
-
-type
-  DbConn* = PSqlite3  ## Encapsulates a database connection.
-  Row* = seq[string]  ## A row of a dataset. `NULL` database values will be
-                      ## converted to an empty string.
-  InstantRow* = PStmt ## A handle that can be used to get a row's column
-                      ## text on demand.
-
-proc dbError*(db: DbConn) {.noreturn.} =
-  ## Raises a `DbError` exception.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##    if not db.tryExec(sql"SELECT * FROM not_exist_table"):
-  ##      dbError(db)
-  ##    db.close()
-  var e: ref DbError
-  new(e)
-  e.msg = $sqlite3.errmsg(db)
-  raise e
-
-proc dbQuote*(s: string): string =
-  ## Escapes the `'` (single quote) char to `''`.
-  ## Because single quote is used for defining `VARCHAR` in SQL.
-  runnableExamples:
-    doAssert dbQuote("'") == "''''"
-    doAssert dbQuote("A Foobar's pen.") == "'A Foobar''s pen.'"
-
-  result = "'"
-  for c in items(s):
-    if c == '\'': add(result, "''")
-    else: add(result, c)
-  add(result, '\'')
-
-proc dbFormat(formatstr: SqlQuery, args: varargs[string]): string =
-  result = ""
-  var a = 0
-  for c in items(string(formatstr)):
-    if c == '?':
-      add(result, dbQuote(args[a]))
-      inc(a)
-    else:
-      add(result, c)
-
-proc tryExec*(db: DbConn, query: SqlQuery,
-              args: varargs[string, `$`]): bool {.
-              tags: [ReadDbEffect, WriteDbEffect].} =
-  ## Tries to execute the query and returns `true` if successful, `false` otherwise.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##    if not db.tryExec(sql"SELECT * FROM my_table"):
-  ##      dbError(db)
-  ##    db.close()
-  assert(not db.isNil, "Database not connected.")
-  var q = dbFormat(query, args)
-  var stmt: sqlite3.PStmt
-  if prepare_v2(db, q.cstring, q.cstring.len.cint, stmt, nil) == SQLITE_OK:
-    let x = step(stmt)
-    if x in {SQLITE_DONE, SQLITE_ROW}:
-      result = finalize(stmt) == SQLITE_OK
-
-proc exec*(db: DbConn, query: SqlQuery, args: varargs[string, `$`])  {.
-  tags: [ReadDbEffect, WriteDbEffect].} =
-  ## Executes the query and raises a `DbError` exception if not successful.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##    try:
-  ##      db.exec(sql"INSERT INTO my_table (id, name) VALUES (?, ?)",
-  ##              1, "item#1")
-  ##    except:
-  ##      stderr.writeLine(getCurrentExceptionMsg())
-  ##    finally:
-  ##      db.close()
-  if not tryExec(db, query, args): dbError(db)
-
-proc newRow(L: int): Row =
-  newSeq(result, L)
-  for i in 0..L-1: result[i] = ""
-
-proc setupQuery(db: DbConn, query: SqlQuery,
-                args: varargs[string]): PStmt =
-  assert(not db.isNil, "Database not connected.")
-  var q = dbFormat(query, args)
-  if prepare_v2(db, q.cstring, q.len.cint, result, nil) != SQLITE_OK: dbError(db)
-
-proc setRow(stmt: PStmt, r: var Row, cols: cint) =
-  for col in 0'i32..cols-1:
-    setLen(r[col], column_bytes(stmt, col)) # set capacity
-    setLen(r[col], 0)
-    let x = column_text(stmt, col)
-    if not isNil(x): add(r[col], x)
-
-iterator fastRows*(db: DbConn, query: SqlQuery,
-                   args: varargs[string, `$`]): Row {.tags: [ReadDbEffect].} =
-  ## Executes the query and iterates over the result dataset.
-  ##
-  ## This is very fast, but potentially dangerous. Use this iterator only
-  ## if you require **ALL** the rows.
-  ##
-  ## **Note:** Breaking the `fastRows()` iterator during a loop will cause the
-  ## next database query to raise a `DbError` exception ``unable to close due
-  ## to ...``.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    for row in db.fastRows(sql"SELECT id, name FROM my_table"):
-  ##      echo row
-  ##
-  ##    # Output:
-  ##    # @["1", "item#1"]
-  ##    # @["2", "item#2"]
-  ##
-  ##    db.close()
-  var stmt = setupQuery(db, query, args)
-  var L = (column_count(stmt))
-  var result = newRow(L)
-  try:
-    while step(stmt) == SQLITE_ROW:
-      setRow(stmt, result, L)
-      yield result
-  finally:
-    if finalize(stmt) != SQLITE_OK: dbError(db)
-
-iterator instantRows*(db: DbConn, query: SqlQuery,
-                      args: varargs[string, `$`]): InstantRow
-                      {.tags: [ReadDbEffect].} =
-  ## Similar to `fastRows iterator <#fastRows.i,DbConn,SqlQuery,varargs[string,]>`_
-  ## but returns a handle that can be used to get column text
-  ## on demand using `[]`. Returned handle is valid only within the iterator body.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    for row in db.instantRows(sql"SELECT * FROM my_table"):
-  ##      echo "id:" & row[0]
-  ##      echo "name:" & row[1]
-  ##      echo "length:" & $len(row)
-  ##
-  ##    # Output:
-  ##    # id:1
-  ##    # name:item#1
-  ##    # length:2
-  ##    # id:2
-  ##    # name:item#2
-  ##    # length:2
-  ##
-  ##    db.close()
-  var stmt = setupQuery(db, query, args)
-  try:
-    while step(stmt) == SQLITE_ROW:
-      yield stmt
-  finally:
-    if finalize(stmt) != SQLITE_OK: dbError(db)
-
-proc toTypeKind(t: var DbType; x: int32) =
-  case x
-  of SQLITE_INTEGER:
-    t.kind = dbInt
-    t.size = 8
-  of SQLITE_FLOAT:
-    t.kind = dbFloat
-    t.size = 8
-  of SQLITE_BLOB: t.kind = dbBlob
-  of SQLITE_NULL: t.kind = dbNull
-  of SQLITE_TEXT: t.kind = dbVarchar
-  else: t.kind = dbUnknown
-
-proc setColumns(columns: var DbColumns; x: PStmt) =
-  let L = column_count(x)
-  setLen(columns, L)
-  for i in 0'i32 ..< L:
-    columns[i].name = $column_name(x, i)
-    columns[i].typ.name = $column_decltype(x, i)
-    toTypeKind(columns[i].typ, column_type(x, i))
-    columns[i].tableName = $column_table_name(x, i)
-
-iterator instantRows*(db: DbConn; columns: var DbColumns; query: SqlQuery,
-                      args: varargs[string, `$`]): InstantRow
-                      {.tags: [ReadDbEffect].} =
-  ## Similar to `instantRows iterator <#instantRows.i,DbConn,SqlQuery,varargs[string,]>`_,
-  ## but sets information about columns to `columns`.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    var columns: DbColumns
-  ##    for row in db.instantRows(columns, sql"SELECT * FROM my_table"):
-  ##      discard
-  ##    echo columns[0]
-  ##
-  ##    # Output:
-  ##    # (name: "id", tableName: "my_table", typ: (kind: dbNull,
-  ##    # notNull: false, name: "INTEGER", size: 0, maxReprLen: 0, precision: 0,
-  ##    # scale: 0, min: 0, max: 0, validValues: @[]), primaryKey: false,
-  ##    # foreignKey: false)
-  ##
-  ##    db.close()
-  var stmt = setupQuery(db, query, args)
-  setColumns(columns, stmt)
-  try:
-    while step(stmt) == SQLITE_ROW:
-      yield stmt
-  finally:
-    if finalize(stmt) != SQLITE_OK: dbError(db)
-
-proc `[]`*(row: InstantRow, col: int32): string {.inline.} =
-  ## Returns text for given column of the row.
-  ##
-  ## See also:
-  ## * `instantRows iterator <#instantRows.i,DbConn,SqlQuery,varargs[string,]>`_
-  ##   example code
-  $column_text(row, col)
-
-proc unsafeColumnAt*(row: InstantRow, index: int32): cstring {.inline.} =
-  ## Returns cstring for given column of the row.
-  ##
-  ## See also:
-  ## * `instantRows iterator <#instantRows.i,DbConn,SqlQuery,varargs[string,]>`_
-  ##   example code
-  column_text(row, index)
-
-proc len*(row: InstantRow): int32 {.inline.} =
-  ## Returns number of columns in a row.
-  ##
-  ## See also:
-  ## * `instantRows iterator <#instantRows.i,DbConn,SqlQuery,varargs[string,]>`_
-  ##   example code
-  column_count(row)
-
-proc getRow*(db: DbConn, query: SqlQuery,
-             args: varargs[string, `$`]): Row {.tags: [ReadDbEffect].} =
-  ## Retrieves a single row. If the query doesn't return any rows, this proc
-  ## will return a `Row` with empty strings for each column.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    doAssert db.getRow(sql"SELECT id, name FROM my_table"
-  ##                       ) == Row(@["1", "item#1"])
-  ##    doAssert db.getRow(sql"SELECT id, name FROM my_table WHERE id = ?",
-  ##                       2) == Row(@["2", "item#2"])
-  ##
-  ##    # Returns empty.
-  ##    doAssert db.getRow(sql"INSERT INTO my_table (id, name) VALUES (?, ?)",
-  ##                       3, "item#3") == @[]
-  ##    doAssert db.getRow(sql"DELETE FROM my_table WHERE id = ?", 3) == @[]
-  ##    doAssert db.getRow(sql"UPDATE my_table SET name = 'ITEM#1' WHERE id = ?",
-  ##                       1) == @[]
-  ##    db.close()
-  var stmt = setupQuery(db, query, args)
-  var L = (column_count(stmt))
-  result = newRow(L)
-  if step(stmt) == SQLITE_ROW:
-    setRow(stmt, result, L)
-  if finalize(stmt) != SQLITE_OK: dbError(db)
-
-proc getAllRows*(db: DbConn, query: SqlQuery,
-                 args: varargs[string, `$`]): seq[Row] {.tags: [ReadDbEffect].} =
-  ## Executes the query and returns the whole result dataset.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    doAssert db.getAllRows(sql"SELECT id, name FROM my_table") == @[Row(@["1", "item#1"]), Row(@["2", "item#2"])]
-  ##    db.close()
-  result = @[]
-  for r in fastRows(db, query, args):
-    result.add(r)
-
-iterator rows*(db: DbConn, query: SqlQuery,
-               args: varargs[string, `$`]): Row {.tags: [ReadDbEffect].} =
-  ## Similar to `fastRows iterator <#fastRows.i,DbConn,SqlQuery,varargs[string,]>`_,
-  ## but slower and safe.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    for row in db.rows(sql"SELECT id, name FROM my_table"):
-  ##      echo row
-  ##
-  ##    ## Output:
-  ##    ## @["1", "item#1"]
-  ##    ## @["2", "item#2"]
-  ##
-  ##    db.close()
-  for r in fastRows(db, query, args): yield r
-
-proc getValue*(db: DbConn, query: SqlQuery,
-               args: varargs[string, `$`]): string {.tags: [ReadDbEffect].} =
-  ## Executes the query and returns the first column of the first row of the
-  ## result dataset. Returns `""` if the dataset contains no rows or the database
-  ## value is `NULL`.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    doAssert db.getValue(sql"SELECT name FROM my_table WHERE id = ?",
-  ##                         2) == "item#2"
-  ##    doAssert db.getValue(sql"SELECT id, name FROM my_table") == "1"
-  ##    doAssert db.getValue(sql"SELECT name, id FROM my_table") == "item#1"
-  ##
-  ##    db.close()
-  var stmt = setupQuery(db, query, args)
-  if step(stmt) == SQLITE_ROW:
-    let cb = column_bytes(stmt, 0)
-    if cb == 0:
-      result = ""
-    else:
-      result = newStringOfCap(cb)
-      add(result, column_text(stmt, 0))
-  else:
-    result = ""
-  if finalize(stmt) != SQLITE_OK: dbError(db)
-
-proc tryInsertID*(db: DbConn, query: SqlQuery,
-                  args: varargs[string, `$`]): int64
-                  {.tags: [WriteDbEffect], raises: [].} =
-  ## Executes the query (typically "INSERT") and returns the
-  ## generated ID for the row or -1 in case of an error.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##    db.exec(sql"CREATE TABLE my_table (id INTEGER, name VARCHAR(50) NOT NULL)")
-  ##
-  ##    doAssert db.tryInsertID(sql"INSERT INTO not_exist_table (id, name) VALUES (?, ?)",
-  ##                            1, "item#1") == -1
-  ##    db.close()
-  assert(not db.isNil, "Database not connected.")
-  var q = dbFormat(query, args)
-  var stmt: sqlite3.PStmt
-  result = -1
-  if prepare_v2(db, q.cstring, q.cstring.len.cint, stmt, nil) == SQLITE_OK:
-    if step(stmt) == SQLITE_DONE:
-      result = last_insert_rowid(db)
-    if finalize(stmt) != SQLITE_OK:
-      result = -1
-
-proc insertID*(db: DbConn, query: SqlQuery,
-               args: varargs[string, `$`]): int64 {.tags: [WriteDbEffect].} =
-  ## Executes the query (typically "INSERT") and returns the
-  ## generated ID for the row.
-  ##
-  ## Raises a `DbError` exception when failed to insert row.
-  ## For Postgre this adds ``RETURNING id`` to the query, so it only works
-  ## if your primary key is named ``id``.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##    db.exec(sql"CREATE TABLE my_table (id INTEGER, name VARCHAR(50) NOT NULL)")
-  ##
-  ##    for i in 0..2:
-  ##      let id = db.insertID(sql"INSERT INTO my_table (id, name) VALUES (?, ?)", i, "item#" & $i)
-  ##      echo "LoopIndex = ", i, ", InsertID = ", id
-  ##
-  ##    # Output:
-  ##    # LoopIndex = 0, InsertID = 1
-  ##    # LoopIndex = 1, InsertID = 2
-  ##    # LoopIndex = 2, InsertID = 3
-  ##
-  ##    db.close()
-  result = tryInsertID(db, query, args)
-  if result < 0: dbError(db)
-
-proc execAffectedRows*(db: DbConn, query: SqlQuery,
-                       args: varargs[string, `$`]): int64 {.
-                       tags: [ReadDbEffect, WriteDbEffect].} =
-  ## Executes the query (typically "UPDATE") and returns the
-  ## number of affected rows.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##
-  ##    # Records of my_table:
-  ##    # | id | name     |
-  ##    # |----|----------|
-  ##    # |  1 | item#1   |
-  ##    # |  2 | item#2   |
-  ##
-  ##    doAssert db.execAffectedRows(sql"UPDATE my_table SET name = 'TEST'") == 2
-  ##
-  ##    db.close()
-  exec(db, query, args)
-  result = changes(db)
-
-proc close*(db: DbConn) {.tags: [DbEffect].} =
-  ## Closes the database connection.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    let db = open("mytest.db", "", "", "")
-  ##    db.close()
-  if sqlite3.close(db) != SQLITE_OK: dbError(db)
-
-proc open*(connection, user, password, database: string): DbConn {.
-  tags: [DbEffect].} =
-  ## Opens a database connection. Raises a `DbError` exception if the connection
-  ## could not be established.
-  ##
-  ## **Note:** Only the ``connection`` parameter is used for ``sqlite``.
-  ##
-  ## **Examples:**
-  ##
-  ## .. code-block:: Nim
-  ##
-  ##    try:
-  ##      let db = open("mytest.db", "", "", "")
-  ##      ## do something...
-  ##      ## db.getAllRows(sql"SELECT * FROM my_table")
-  ##      db.close()
-  ##    except:
-  ##      stderr.writeLine(getCurrentExceptionMsg())
-  var db: DbConn
-  if sqlite3.open(connection, db) == SQLITE_OK:
-    result = db
-  else:
-    dbError(db)
-
-proc setEncoding*(connection: DbConn, encoding: string): bool {.
-  tags: [DbEffect].} =
-  ## Sets the encoding of a database connection, returns `true` for
-  ## success, `false` for failure.
-  ##
-  ## **Note:** The encoding cannot be changed once it's been set.
-  ## According to SQLite3 documentation, any attempt to change
-  ## the encoding after the database is created will be silently
-  ## ignored.
-  exec(connection, sql"PRAGMA encoding = ?", [encoding])
-  result = connection.getValue(sql"PRAGMA encoding") == encoding
-
-when not defined(testing) and isMainModule:
-  var db = open("db.sql", "", "", "")
-  exec(db, sql"create table tbl1(one varchar(10), two smallint)", [])
-  exec(db, sql"insert into tbl1 values('hello!',10)", [])
-  exec(db, sql"insert into tbl1 values('goodbye', 20)", [])
-  #db.query("create table tbl1(one varchar(10), two smallint)")
-  #db.query("insert into tbl1 values('hello!',10)")
-  #db.query("insert into tbl1 values('goodbye', 20)")
-  for r in db.rows(sql"select * from tbl1", []):
-    echo(r[0], r[1])
-  for r in db.instantRows(sql"select * from tbl1", []):
-    echo(r[0], r[1])
-
-  x_db_sqlite.close(db) # h3rald