@nxtedition/lib 15.0.58 → 15.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.58",
+  "version": "15.1.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -72,6 +72,7 @@
     "/__tests__"
   ],
   "dependencies": {
+    "@nxtedition/nxt-undici": "^1.4.3",
     "date-fns": "^2.29.3",
     "fast-querystring": "^1.1.1",
     "hasha": "^5.2.2",
@@ -90,16 +91,16 @@
     "smpte-timecode": "^1.3.3",
     "split-string": "^6.0.0",
     "toobusy-js": "^0.5.1",
-    "undici": "^5.27.1",
+    "undici": "^5.27.2",
     "url-join": "^4.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.8.10",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-n": "^16.3.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^8.0.3",
@@ -108,7 +109,7 @@
     "prettier": "^3.0.3",
     "rxjs": "^7.5.6",
     "send": "^0.18.0",
-    "tap": "^18.5.6"
+    "tap": "^18.5.7"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",

package/serializers.js

@@ -40,8 +40,16 @@ module.exports = {
       err = err.length === 1 ? err[0] : new AggregateError(err)
     }
 
+    if (err == null) {
+      return undefined
+    }
+
     const ret = serializers.err(err)
 
+    if (ret == null) {
+      return undefined
+    }
+
     if (ret.data !== null && typeof ret.data === 'object') {
       ret.data = JSON.stringify(ret.data)
     }

package/util/template/javascript.js

@@ -5,6 +5,7 @@ const vm = require('node:vm')
 const objectHash = require('object-hash')
 const datefns = require('date-fns')
 const JSON5 = require('json5')
+const { request } = require('@nxtedition/nxt-undici')
 const undici = require('undici')
 
 const kSuspend = Symbol('kSuspend')
@@ -14,7 +15,7 @@ const maxInt = 2147483647
 class TimerEntry {
   constructor(key, refresh, delay) {
     this.key = key
-    this.counter = null
+    this.counter = -1
 
     this.timer = setTimeout(refresh, delay)
   }
@@ -26,39 +27,53 @@ class TimerEntry {
   }
 }
 
+const fetchClient = new undici.Agent({
+  connections: 128,
+  pipelining: 8,
+})
+
 class FetchEntry {
   constructor(key, refresh, { resource, options }) {
     this.key = key
-    this.counter = null
+    this.counter = -1
+    this.ac = new AbortController()
 
     this.refresh = refresh
-    this.ac = new AbortController()
-    this.signal = this.ac.signal
     this.body = null
     this.status = null
     this.error = null
 
-    // TODO (fix): options.signal
-    // TODO (fix): cache...
-    // TODO (fix): expire...
-
-    undici
-      .fetch(resource, { ...options, signal: this.signal })
-      .then(async (res) => {
-        if (this.refresh) {
-          // TODO (fix): max size...
-          this.body = Buffer.from(await res.arrayBuffer())
-          this.status = res.status
-          this.headers = res.headers
-          this.refresh()
-        }
+    try {
+      request(resource, {
+        ...options,
+        signal: this.ac.signal,
+        dispatcher: fetchClient,
       })
-      .catch((err) => {
-        if (this.refresh) {
+        .then(async (res) => {
+          try {
+            // TODO (fix): max size...
+            this.status = res.statusCode
+            this.headers = res.headers
+            this.body = await res.text()
+          } catch (err) {
+            this.error = err
+          }
+
+          if (this.refresh) {
+            this.refresh()
+          }
+        })
+        .catch((err) => {
           this.error = err
-          this.refresh()
-        }
-      })
+
+          if (this.refresh) {
+            this.refresh()
+          }
+        })
+    } catch (err) {
+      this.error = err
+      this.refresh()
+    }
   }
 
   dispose() {
@@ -72,7 +87,7 @@ class FetchEntry {
 class RecordEntry {
   constructor(key, refresh, ds) {
     this.key = key
-    this.counter = null
+    this.counter = -1
 
     this.refresh = refresh
     this.record = ds.record.getRecord(key)
@@ -100,7 +115,7 @@ class RecordEntry {
 class ObservableEntry {
   constructor(key, refresh, observable) {
     this.key = key
-    this.counter = null
+    this.counter = -1
     this.value = kEmpty
     this.error = null
     this.refresh = refresh
@@ -126,7 +141,7 @@ class ObservableEntry {
 class PromiseEntry {
   constructor(key, refresh, promise) {
     this.key = key
-    this.counter = null
+    this.counter = -1
     this.value = kEmpty
     this.error = null
     this.refresh = refresh
@@ -143,7 +158,7 @@ class PromiseEntry {
           this.error = err
           this.refresh()
         }
-      }
+      },
     )
   }
 
@@ -342,7 +357,7 @@ module.exports = ({ ds, proxify, compiler }) => {
           Object.assign(new Error('expression failed'), {
             cause: err,
             data: self._expression,
-          })
+          }),
         )
       } finally {
         compiler.current = previous
@@ -518,7 +533,7 @@ module.exports = ({ ds, proxify, compiler }) => {
       const data = this._getRecord(
         id + ':asset.rawTypes?',
         state ?? ds.record.PROVIDER,
-        suspend ?? true
+        suspend ?? true,
       )
       return data && Array.isArray(data.value) && data.value.includes(type) ? id : null
     }