implemented suggested changes

src/middleware/withDelegationStubs.js

@@ -57,7 +57,7 @@ export const withDelegationStubs = (handler) => async (request, env, ctx) => {
   return handler(request, env, {
     ...ctx,
     delegationsStorage: {
-      find: async () => ({ ok: stubDelegations[0] }),
+      find: async () => ({ ok: stubDelegations }),
       store: async () => ({ ok: {} })
     },
     locator:

src/middleware/withUcanInvocationHandler.js

@@ -27,8 +27,7 @@ export function withUcanInvocationHandler (handler) {
 
     const { headers, body, status } = await server.request({
       body: new Uint8Array(await request.arrayBuffer()),
-      // @ts-expect-error: TODO: fix the .entries() type
-      headers: Object.fromEntries(request.headers.entries())
+      headers: Object.fromEntries(request.headers)
     })
 
     return new Response(body, { headers, status: status ?? 200 })

src/server/service.js

@@ -20,14 +20,14 @@ export function createService (ctx) {
           capability: AccessCapabilities.delegate,
           audience: Schema.did({ method: 'web' }),
           handler: async ({ capability, invocation, context }) => {
-            const result = extractContentServeDelegations(ctx.gatewayIdentity, capability, invocation.proofs)
+            const result = extractContentServeDelegations(capability, invocation.proofs)
             if (result.error) {
               console.error('error while extracting delegation', result.error)
               return result
             }
 
             const delegations = result.ok
-            for (const delegation of delegations) {
+            const validationResults = await Promise.all(delegations.map(async (delegation) => {
               const validationResult = await claim(
                 SpaceCapabilities.contentServe,
                 [delegation],
@@ -43,7 +43,13 @@ export function createService (ctx) {
 
               const space = capability.with
               return ctx.delegationsStorage.store(space, delegation)
+            }))
+
+            const errorResult = validationResults.find(result => result.error)
+            if (errorResult) {
+              return errorResult
             }
+
             return ok({})
           }
 

src/server/utils.js

@@ -1,18 +1,16 @@
 import { Access as AccessCapabilities, Space as SpaceCapabilities } from '@web3-storage/capabilities'
 import { InvalidDelegation } from '../middleware/withDelegationsStorage.js'
-import { Delegation } from '@storacha/client/delegation'
 
 /**
  * Checks if the space/content/serve/* delegation is for the gateway and it is not expired.
  *
- * @param {import('@ucanto/interface').Signer} gatewayIdentity - The signer of the gateway identity
  * @param {import('@ucanto/interface').InferInvokedCapability<typeof AccessCapabilities.delegate>} capability - The capability to validate
  * @param {import('@ucanto/interface').Proof[]} proofs - The proofs to validate
  */
-export const extractContentServeDelegations = (gatewayIdentity, capability, proofs) => {
+export const extractContentServeDelegations = (capability, proofs) => {
   const nbDelegations = new Set(Object.values(capability.nb.delegations))
-  if (nbDelegations.size === 0) {
-    return { error: new InvalidDelegation('nb.delegations can not be empty') }
+  if (nbDelegations.size !== 1) {
+    return { error: new InvalidDelegation('nb.delegations has more than one delegation') }
   }
   const delegations = []
   for (const delegationLink of nbDelegations) {

test/unit/middleware/withDelegationsStorage.spec.js

@@ -3,7 +3,7 @@
    `no-unused-expressions` doesn't understand that several of Chai's assertions
    are implemented as getters rather than explicit function calls; it thinks
    the assertions are unused expressions. */
-import { describe, it, afterEach, before } from 'mocha'
+import { describe, it, afterEach } from 'mocha'
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { ed25519 } from '@ucanto/principal'
@@ -22,13 +22,6 @@ const kvStoreMock = {
  * @typedef {import('../../../src/middleware/withDelegationsStorage.types.js').DelegationsStorageContext} DelegationsStorageContext
  */
 
-const env =
-  /** @satisfies {DelegationsStorageEnvironment} */
-  ({
-    FF_DELEGATIONS_STORAGE_ENABLED: 'true',
-    CONTENT_SERVE_DELEGATIONS_STORE: kvStoreMock
-  })
-
 const gatewaySigner = (await ed25519.Signer.generate()).signer
 const gatewayIdentity = gatewaySigner.withDID('did:web:test.w3s.link')
 
@@ -57,7 +50,7 @@ describe('withDelegationsStorage', async () => {
 
   describe('-> Successful Requests', () => {
     it('should set delegationsStorage in context when FF_DELEGATIONS_STORAGE_ENABLED is true', async () => {
-      const mockHandler = sinon.stub().callsFake((request, env, ctx) => ctx)
+      const mockHandler = sinon.fake((request, env, ctx) => ctx)
       const request = new Request('http://example.com/')
       const env = {
         FF_DELEGATIONS_STORAGE_ENABLED: 'true',
@@ -76,7 +69,7 @@ describe('withDelegationsStorage', async () => {
   })
 
   it('should not set delegationsStorage in context when FF_DELEGATIONS_STORAGE_ENABLED is not true', async () => {
-    const mockHandler = sinon.stub().callsFake((request, env, ctx) => ctx)
+    const mockHandler = sinon.fake((request, env, ctx) => ctx)
     const request = new Request('http://example.com/')
     const env = {
       FF_DELEGATIONS_STORAGE_ENABLED: 'false',

test/unit/middleware/withEgressTracker.spec.js

@@ -44,8 +44,6 @@ const EgressClient = () => {
 }
 const gatewaySigner = (await ed25519.Signer.generate()).signer
 const gatewayIdentity = gatewaySigner.withDID('did:web:test.w3s.link')
-/** @type {import('@ucanto/interface').Delegation<import('@ucanto/interface').Capabilities>[]} */
-const stubDelegations = []
 
 const ctx =
   /** @satisfies {EgressTrackerContext} */

test/unit/middleware/withUcanInvocationHandler.spec.js

@@ -3,7 +3,7 @@
    `no-unused-expressions` doesn't understand that several of Chai's assertions
    are implemented as getters rather than explicit function calls; it thinks
    the assertions are unused expressions. */
-import { describe, it } from 'mocha'
+import { describe, it, afterEach } from 'mocha'
 import { expect } from 'chai'
 import sinon from 'sinon'
 import { ed25519 } from '@ucanto/principal'

tsconfig.json

@@ -14,7 +14,7 @@
     "moduleResolution": "NodeNext",
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "lib": ["ES2022", "DOM"],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "target": "ES2022",
     "sourceMap": true
   }