chore: add test for CORS OPTIONS handler

packages/api/src/utils/logs.js

@@ -42,6 +42,7 @@ export class Logging {
     this.logEventsBatch = []
     this.startTs = Date.now()
     this.currentTs = this.startTs
+    this._finished = false
 
     const cf = request.cf
     let rCf
@@ -145,6 +146,12 @@ export class Logging {
    * @param {Response} response
    */
   async end (response) {
+    if (this._finished) {
+      throw new Error(
+        `end() has already been called on this Logging instance.
+        You must make a new instance per request.`
+      )
+    }
     if (this.opts?.debug) {
       response.headers.set('Server-Timing', this._timersString())
     }
@@ -171,7 +178,7 @@ export class Logging {
       await this.postBatch()
     }
     this.ctx.waitUntil(run())
-
+    this._finished = true
     return response
   }
 
@@ -276,7 +283,7 @@ export class Logging {
     if (!timeObj) {
       return console.warn(`No such name ${name}`)
     }
-
+    this._times.delete(name)
     const end = Date.now()
     const duration = end - timeObj.start
     const value = duration

packages/api/test/cors.spec.js

@@ -25,4 +25,19 @@ describe('CORS', () => {
     assert.strictEqual(res.status, 500, 'Expected 500 on /error')
     assert.strictEqual(res.headers.get('Access-Control-Allow-Origin'), '*')
   })
+
+  it('correctly responds to preflight request', async () => {
+    const res = await fetch(new URL('version', endpoint), {
+      method: 'OPTIONS',
+      headers: {
+        Origin: 'web3.storage',
+        'Access-Control-Request-Method': 'whatever',
+        'Access-Control-Request-Headers': 'whatever'
+      }
+    })
+    assert(res.ok)
+    assert.strictEqual(res.status, 204, 'Expected 204 status for OPTIONS request')
+    assert.strictEqual(res.headers.get('Access-Control-Allow-Origin'), 'web3.storage')
+    assert.strictEqual(res.headers.get('Access-Control-Allow-Methods'), 'GET,POST,DELETE,OPTIONS')
+  })
 })