wip

Signed-off-by: Felipe Forbeck <[email protected]>

Author: fforbeck

src/bindings.d.ts

@@ -14,4 +14,5 @@ export interface Environment
   VERSION: string
   CONTENT_CLAIMS_SERVICE_URL?: string
   HONEYCOMB_API_KEY: string
+  FF_TELEMETRY_ENABLED: string
 }

src/index.js

@@ -20,16 +20,16 @@ import {
   withVersionHeader,
   withAuthToken,
   withCarBlockHandler,
+  withGatewayIdentity,
   withRateLimit,
   withEgressTracker,
+  withEgressClient,
   withAuthorizedSpace,
   withLocator,
   withDelegationStubs
 } from './middleware/index.js'
 import { instrument } from '@microlabs/otel-cf-workers'
 import { NoopSpanProcessor } from '@opentelemetry/sdk-trace-base'
-import { withEgressClient } from './middleware/withEgressClient.js'
-import { withGatewayIdentity } from './middleware/withGatewayIdentity.js'
 
 /**
  * @import {
@@ -106,7 +106,6 @@ function config(env, _trigger) {
     service: { name: 'freeway' },
   }
 }
-
 export default process.env.FF_TELEMETRY_ENABLED === 'true'
   ? instrument(handler, config)
   : handler

src/middleware/index.js

@@ -7,4 +7,5 @@ export { withAuthorizedSpace } from './withAuthorizedSpace.js'
 export { withLocator } from './withLocator.js'
 export { withEgressTracker } from './withEgressTracker.js'
 export { withEgressClient } from './withEgressClient.js'
-export { withDelegationStubs } from './withDelegationStubs.js'
+export { withDelegationStubs } from './withDelegationStubs.js'
+export { withGatewayIdentity } from './withGatewayIdentity.js'

src/middleware/withAuthorizedSpace.js

@@ -28,7 +28,7 @@ import { Schema } from '@ucanto/client'
  *   >
  * )}
  */
-export function withAuthorizedSpace(handler) {
+export function withAuthorizedSpace (handler) {
   return async (request, env, ctx) => {
     const { locator, dataCid } = ctx
     const locRes = await locator.locate(dataCid.multihash)

src/middleware/withEgressClient.js

@@ -18,6 +18,9 @@ import { DID } from '@ucanto/core'
  */
 export function withEgressClient(handler) {
   return async (req, env, ctx) => {
+    if (env.FF_EGRESS_TRACKER_ENABLED !== 'true') {
+      return handler(req, env, ctx)
+    }
     const egressClient = await create(env, ctx)
     return handler(req, env, { ...ctx, egressClient })
   }

src/middleware/withEgressClient.types.ts

@@ -4,6 +4,7 @@ import { GatewayIdentityContext } from './withGatewayIdentity.types.js'
 import { DelegationsStorageContext } from './withAuthorizedSpace.types.js'
 
 export interface Environment extends MiddlewareEnvironment {
+  FF_EGRESS_TRACKER_ENABLED: string
   GATEWAY_PRINCIPAL_KEY: string
   UPLOAD_API_URL: string
   UPLOAD_SERVICE_DID: string

test/miniflare/freeway.spec.js

@@ -53,6 +53,7 @@ describe('freeway', () => {
         CONTENT_CLAIMS_SERVICE_URL: claimsService.url.toString(),
         CARPARK_PUBLIC_BUCKET_URL: url.toString()
       },
+      inspectorPort: 9898,
       scriptPath: 'dist/worker.mjs',
       modules: true,
       compatibilityFlags: ['nodejs_compat'],