@nxtedition/lib 21.10.1 → 22.0.0

package/app.js

@@ -47,7 +47,7 @@ export function makeApp(appConfig, onTerminate) {
   let trace
 
   try {
-    mkdirSync('./nxt')
+    mkdirSync('./.nxt')
   } catch (err) {
     if (err.code !== 'EEXIST') {
       throw err
@@ -329,7 +329,7 @@ export function makeApp(appConfig, onTerminate) {
   if (appConfig.couchdb || appConfig.couch) {
     const couchConfig = fp.mergeAll(
       [
-        { userAgent, url: isProduction ? null : 'ws://127.0.0.1:5984/nxt' },
+        { userAgent, url: isProduction ? 'http://couchdb:5984/nxt' : 'http://127.0.0.1:5984/nxt' },
         appConfig.couchdb,
         appConfig.couch,
         config.couchdb,
@@ -356,7 +356,10 @@ export function makeApp(appConfig, onTerminate) {
   if (appConfig.deepstream) {
     let dsConfig = fp.mergeAll(
       [
-        { userAgent, url: isProduction ? null : 'ws://127.0.0.1:6020/deepstream' },
+        {
+          userAgent,
+          url: isProduction ? 'ws://deepstream:6020/deepstream' : 'ws://127.0.0.1:6020/deepstream',
+        },
         appConfig.deepstream,
         config.deepstream,
       ].map((x) => {
@@ -582,6 +585,7 @@ export function makeApp(appConfig, onTerminate) {
         [
           status$.pipe(
             rx.filter(Boolean),
+            rx.map((xs) => (Array.isArray(xs) ? { messages: xs } : xs)),
             rx.catchError((err) => {
               logger.error({ err }, 'monitor.status')
               return rxjs.of([

package/http.js

@@ -65,20 +65,20 @@ export class Context {
     return this.#userAgent
   }
 
-  get [kAbortController]() {
-    return this.#ac
-  }
-
-  get signal() {
-    this.#ac ??= new AbortController()
-    return this.#ac.signal
+  /** @deprecated */
+  get method() {
+    return this.#req.method
   }
 
+  /** @deprecated */
   get url() {
-    this.#url ??= requestTarget(this.#req)
+    if (this.#url === undefined) {
+      this.#url = requestTarget(this.#req)
+    }
     return this.#url
   }
 
+  /** @deprecated */
   set url(value) {
     if (typeof value !== 'string') {
       throw new Error('url must be a string')
@@ -89,6 +89,7 @@ export class Context {
     this.#query = undefined
   }
 
+  /** @deprecated */
   get query() {
     if (this.#query === undefined) {
       this.#query = this.url.search.length > 1 ? querystring.parse(this.url.search.slice(1)) : {}
@@ -108,8 +109,13 @@ export class Context {
     return this.#res
   }
 
-  get method() {
-    return this.#req.method
+  get [kAbortController]() {
+    return this.#ac
+  }
+
+  get signal() {
+    this.#ac ??= new AbortController()
+    return this.#ac.signal
   }
 }
 
@@ -117,7 +123,7 @@ function noop() {}
 
 const pendingSet = (globalThis._nxt_lib_http_pending ??= new Set())
 
-export async function request2(ctx, next) {
+export async function requestMiddleware(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
 

package/package.json

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