@nxtedition/lib 19.0.50 → 19.1.0

package/couch.js

@@ -1,9 +1,9 @@
 import assert from 'node:assert'
+import querystring from 'node:querystring'
 import createError from 'http-errors'
 import { makeWeakCache } from './weakCache.js'
 import tp from 'timers/promises'
 import { defaultDelay as delay } from './http.js'
-import querystring from 'querystring'
 import urljoin from 'url-join'
 import undici from 'undici'
 import { AbortError } from './errors.js'
@@ -560,93 +560,7 @@ export function makeCouch(opts) {
 
     const { client = getClient(pathname), signal, idempotent = true, ...options } = opts
 
-    const params = {}
-    const headers = ['Accept', 'application/json']
-
-    let method = 'GET'
-    let body
-
-    if (options.conflicts) {
-      params.conflicts = true
-    }
-
-    if (options.update_seq) {
-      params.update_seq = true
-    }
-
-    if (options.descending) {
-      params.descending = true
-    }
-
-    if (options.include_docs) {
-      params.include_docs = true
-    }
-
-    if (options.include_docs) {
-      params.include_docs = true
-    }
-
-    if (options.sorted) {
-      params.sorted = true
-    }
-
-    if (options.key != null) {
-      params.key = JSON.stringify(options.key)
-    }
-
-    if (options.start_key != null) {
-      options.startkey = options.start_key
-    }
-
-    if (options.startkey != null) {
-      params.startkey = JSON.stringify(options.startkey)
-    }
-
-    if (options.startkey_docid != null) {
-      params.startkey_docid = JSON.stringify(options.startkey_docid)
-    }
-
-    if (options.end_key != null) {
-      options.endkey = options.end_key
-    }
-
-    if (options.endkey != null) {
-      params.endkey = JSON.stringify(options.endkey)
-    }
-
-    if (options.inclusive_end != null) {
-      params.inclusive_end = !!options.inclusive_end
-    }
-
-    if (options.limit != null) {
-      params.limit = options.limit
-    }
-
-    if (options.skip != null) {
-      params.skip = options.skip
-    }
-
-    if (options.stale != null) {
-      params.stale = options.stale
-    }
-
-    if (options.reduce != null) {
-      params.reduce = options.reduce
-    }
-
-    if (options.group != null) {
-      params.group = options.group
-    }
-
-    if (options.group_level != null) {
-      params.group_level = options.group_level
-    }
-
-    if (options.keys != null) {
-      method = 'POST'
-      body = { keys: options.keys }
-      headers.push('Content-Type', 'application/json')
-    }
+    const { params, method, headers, body } = _normalizeAllDocsOptions(options)
 
     const req = {
       pathname: pathname || '_all_docs',
@@ -848,3 +762,300 @@ export function makeCouch(opts) {
     up,
   })
 }
+
+/* eslint-disable camelcase */
+function _normalizeAllDocsOptions({
+  conflicts,
+  update_seq,
+  descending,
+  include_docs,
+  sorted,
+  key,
+  startkey,
+  start_key,
+  startkey_docid,
+  endkey,
+  end_key,
+  endkey_docid,
+  inclusive_end,
+  limit,
+  skip,
+  stale,
+  reduce,
+  stable,
+  update,
+  keys,
+  group,
+  group_level,
+  ...rest
+}) {
+  if (Object.keys(rest).length > 0) {
+    throw new Error('invalid options: ' + JSON.stringify(rest))
+  }
+  const params = {}
+  const headers = {
+    Accept: 'application/json',
+  }
+
+  let method = 'GET'
+  let body
+
+  if (conflicts) {
+    params.conflicts = true
+  }
+
+  if (update_seq) {
+    params.update_seq = true
+  }
+
+  if (descending) {
+    params.descending = true
+  }
+
+  if (include_docs) {
+    params.include_docs = true
+  }
+
+  if (sorted) {
+    params.sorted = true
+  }
+
+  if (key != null) {
+    params.key = JSON.stringify(key)
+  }
+
+  if (startkey != null || start_key != null) {
+    params.startkey = JSON.stringify(startkey ?? start_key)
+  }
+
+  if (startkey_docid != null) {
+    params.startkey_docid = JSON.stringify(startkey_docid)
+  }
+
+  if (endkey != null || end_key != null) {
+    params.endkey = JSON.stringify(endkey ?? end_key)
+  }
+
+  if (inclusive_end != null) {
+    params.inclusive_end = !!inclusive_end
+  }
+
+  if (limit != null) {
+    params.limit = limit
+  }
+
+  if (skip != null) {
+    params.skip = skip
+  }
+
+  if (stale != null) {
+    params.stale = stale
+  }
+
+  if (reduce != null) {
+    params.reduce = reduce
+  }
+
+  if (group != null) {
+    params.group = group
+  }
+
+  if (group_level != null) {
+    params.group_level = group_level
+  }
+
+  if (update != null) {
+    params.update = update
+  }
+
+  if (stable != null) {
+    params.stable = stable
+  }
+
+  if (keys != null) {
+    method = 'POST'
+    body = JSON.stringify({ keys })
+    headers['Content-Type'] = 'application/json'
+  }
+
+  return {
+    method,
+    params,
+    headers,
+    body,
+  }
+}
+
+class Handler {
+  #state = 0
+  #str = ''
+  #decoder = new TextDecoder()
+  #resolve
+  #reject
+  #resume
+  #abort
+  #onAbort
+  #signal
+  #next
+  #statusCode
+  #statusText
+  #opts
+
+  constructor({ opts, signal, resolve, reject, next }) {
+    this.#next = next
+    this.#opts = opts
+    this.#resolve = resolve
+    this.#reject = reject
+    this.#signal = signal
+  }
+
+  onConnect(abort) {
+    if (this.#signal?.aborted) {
+      abort(this.#signal.reason)
+    } else {
+      this.#abort = abort
+      if (this.#signal) {
+        this.#onAbort = () => abort(this.#signal.reason)
+        this.#signal.addEventListener('abort', this.#onAbort)
+      }
+    }
+  }
+
+  onHeaders(statusCode, rawHeaders, resume, statusText) {
+    this.#statusCode = statusCode
+    this.#statusText = statusText
+    this.#resume = resume
+
+    if (this.#statusCode >= 200 && this.#statusCode < 300) {
+      this.#next = null
+    }
+  }
+
+  onData(data) {
+    if (!this.#next) {
+      this.#str += this.#decoder.decode(data, { stream: true })
+    } else {
+      const lines = this.#decoder.decode(data, { stream: true }).split(/\r?\n+/)
+      lines[0] = this.#str + lines[0]
+      this.#str = lines.pop() ?? ''
+
+      const rows = []
+      for (const line of lines) {
+        if (this.#state === 0) {
+          if (line.endsWith('[')) {
+            this.#state = 1
+          } else {
+            throw new Error('unexpected data')
+          }
+        } else if (this.#state === 1) {
+          if (line.startsWith(']')) {
+            this.#state = 2
+          } else {
+            rows.push(JSON.parse(line.slice(0, line.lastIndexOf('}') + 1)))
+          }
+        }
+      }
+
+      if (rows.length === 0) {
+        return true
+      }
+
+      const thenable = this.#next(rows)
+
+      if (!thenable) {
+        return true
+      }
+
+      thenable.then(this.#resume, this.#abort)
+
+      return false
+    }
+  }
+
+  onComplete() {
+    assert(!this.#next || this.#state === 2)
+
+    if (!this.#next) {
+      this.#str += this.#decoder.decode(undefined, { stream: false })
+
+      if (this.#statusCode >= 200 && this.#statusCode < 300) {
+        this.onFinally(null, this.#next ? null : JSON.parse(this.#str))
+      } else {
+        let body
+        let reason
+        let error
+        try {
+          body = JSON.parse(this.#str)
+          reason = body.reason
+          error = body.error
+        } catch {
+          // Do nothing...
+        }
+
+        this.onFinally(
+          Object.assign(new Error(this.#statusText ?? reason), {
+            reason,
+            error,
+            data: {
+              req: this.#opts,
+              res: {
+                body,
+                statusCode: this.#statusCode,
+              },
+            },
+          }),
+        )
+      }
+    } else {
+      this.onFinally(null)
+    }
+  }
+
+  onError(err) {
+    this.onFinally(err)
+  }
+
+  onFinally(err, val) {
+    if (this.#signal) {
+      this.#signal.removeEventListener('abort', this.#onAbort)
+    }
+
+    if (err) {
+      this.#reject(err)
+    } else {
+      this.#resolve(val)
+    }
+  }
+}
+
+export async function request(
+  url,
+  {
+    body,
+    method = body ? 'POST' : 'GET',
+    query,
+    headers,
+    dispatcher = undici.getGlobalDispatcher(),
+    signal,
+  },
+  next,
+) {
+  url = new URL(url)
+  if (url.search) {
+    throw new Error('invalid url: ' + url.href)
+  }
+  const opts = {
+    origin: url.origin,
+    path: url.pathname + '?' + querystring.stringify(query),
+    method,
+    headers: {
+      'content-type': body != null && typeof body === 'object' ? 'application/json' : 'plain/text',
+      accept: 'application/json',
+      ...headers,
+    },
+    body: body != null && typeof body === 'object' ? JSON.stringify(body) : body,
+  }
+  return new Promise((resolve, reject) => {
+    dispatcher.dispatch(opts, new Handler({ opts, signal, resolve, reject, next }))
+  })
+}

package/deepstream.js

@@ -138,12 +138,12 @@ function getRecord(ds, name, ...args) {
   )
 }
 
-function query(
-  ds,
-  designId,
-  { startkey, endkey, key, sorted, descending, limit },
-  state = ds.record.PROVIDER,
-) {
+function query(ds, designId, params, state = ds.record.PROVIDER) {
+  if (params.key) {
+    // TODO (fix): params.key?
+    throw new Error('params.key is not supported')
+  }
+
   const next = (startkey, prevRows, limit) =>
     Number.isFinite(limit) && limit <= 0
       ? rxjs.of({ rows: prevRows })
@@ -151,11 +151,8 @@ function query(
           .observe(
             `${designId}:design?${qs.stringify(
               {
+                ...params,
                 startkey,
-                endkey,
-                key,
-                sorted,
-                descending,
                 limit: Number.isFinite(limit) ? limit : null,
               },
               { skipNulls: true },
@@ -179,7 +176,7 @@ function query(
               }
             }),
           )
-  return next(startkey, [], limit ?? Infinity)
+  return next(params.startkey, [], params.limit ?? Infinity)
 }
 
 export function makeDeepstream(ds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.0.50",
+  "version": "19.1.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",