@nxtedition/lib 26.4.4 → 26.4.5

package/package.json

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

package/rxjs/auditMap.js

@@ -5,6 +5,7 @@ function auditMapImpl(project) {
     let pendingValue = null
     let hasPendingValue = false
     let isComplete = false
+    let abortController = null
 
     let innerSubscription = null
     let outerSubscription = null
@@ -15,6 +16,7 @@ function auditMapImpl(project) {
 
     function _innerComplete() {
       innerSubscription = null
+      abortController = null
 
       if (hasPendingValue) {
         const value = pendingValue
@@ -30,9 +32,30 @@ function auditMapImpl(project) {
       o.next(val)
     }
 
+    function _drain() {
+      if (!hasPendingValue) {
+        return
+      }
+      const value = pendingValue
+      pendingValue = null
+      hasPendingValue = false
+      return { value }
+    }
+
     function _tryNext(value) {
       try {
-        const result = project(value)
+        const result = project(value, {
+          get signal() {
+            if (!abortController) {
+              abortController = new AbortController()
+              if (hasPendingValue) {
+                abortController.abort()
+              }
+            }
+            return abortController.signal
+          },
+          _drain,
+        })
         const observable = typeof result.then === 'function' ? from(result) : result
         innerSubscription = observable.subscribe({
           next: _innerNext,
@@ -51,6 +74,7 @@ function auditMapImpl(project) {
       if (innerSubscription) {
         pendingValue = value
         hasPendingValue = true
+        abortController?.abort()
       } else {
         _tryNext(value)
       }
@@ -60,6 +84,8 @@ function auditMapImpl(project) {
       isComplete = true
       if (!innerSubscription) {
         o.complete()
+      } else {
+        abortController?.abort()
       }
     }
 

package/rxjs/auditMap.test.js

@@ -0,0 +1,64 @@
+import { test } from 'node:test'
+import assert from 'node:assert'
+import auditMap from './auditMap.js'
+import * as rxjs from 'rxjs'
+import tp from 'node:timers/promises'
+
+test('auditMap sync', (t) => {
+  t.plan(1, { wait: true })
+  rxjs
+    .of(1, 2, 3)
+    .pipe(
+      auditMap((val) => rxjs.of(val * 2)),
+      rxjs.toArray(),
+    )
+    .subscribe((val) => {
+      t.assert.deepStrictEqual(val, [2, 4, 6])
+    })
+})
+
+test('auditMap async', (t) => {
+  t.plan(1, { wait: true })
+  rxjs
+    .of(1, 2, 3)
+    .pipe(
+      auditMap(async (val) => val * 2),
+      rxjs.toArray(),
+    )
+    .subscribe((val) => {
+      t.assert.deepStrictEqual(val, [2, 6])
+    })
+})
+
+test('auditMap drain', (t) => {
+  t.plan(1, { wait: true })
+  rxjs
+    .of(1, 2, 3)
+    .pipe(
+      auditMap(async (val, { _drain }) => {
+        await tp.setTimeout(1)
+        return _drain()?.value ?? val
+      }),
+      rxjs.toArray(),
+    )
+    .subscribe((val) => {
+      t.assert.deepStrictEqual(val, [3])
+    })
+})
+
+test('auditMap signal', (t) => {
+  t.plan(1, { wait: true })
+  rxjs
+    .of(1, 2, 3)
+    .pipe(
+      auditMap(async (val, { signal }) => {
+        await tp.setTimeout(1)
+        assert.strictEqual(signal.aborted, val === 1)
+        return val
+      }),
+      rxjs.toArray(),
+    )
+    .subscribe((val) => {
+      t.assert.deepStrictEqual(val, [1, 3])
+    })
+})

package/s3.js

@@ -327,7 +327,16 @@ function getTransformedHeaders(headers) {
    */
   const transformedHeaders = {}
 
+  const isRangedResponse = headers['content-range'] != null
+
   for (const name of Object.keys(headers)) {
+    // Google Cloud S3 returns checksums for the full object
+    // even with range requests, which causes checksum mismatches.
+    // I assume the checksum headers shouldn't be sent with ranged responses.
+    if (isRangedResponse && /^x-amz-checksum-/i.test(name)) {
+      continue
+    }
+
     const headerValues = headers[name]
     transformedHeaders[name] = Array.isArray(headerValues)
       ? headerValues.join(',')