refactor: read web dids from env

Author: fforbeck

src/middleware/index.js

@@ -7,7 +7,4 @@ 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 const GATEWAY_DID = 'did:web:staging.w3s.link'
-export const UPLOAD_DID = 'did:web:staging.web3.storage'
+export { withDelegationStubs } from './withDelegationStubs.js'

src/middleware/withEgressClient.js

@@ -76,7 +76,7 @@ async function connect(serverUrl, principal) {
  * @returns {Promise<void>}
  */
 async function record(space, resource, bytes, servedAt, env, ctx) {
-  const uploadServicePrincipal = DID.parse('did:web:staging.web3.storage') // TODO move to env var
+  const uploadServicePrincipal = DID.parse(env.UPLOAD_SERVICE_DID)
   const connection = await connect(env.UPLOAD_API_URL, uploadServicePrincipal)
 
   const invocation = Space.egressRecord.invoke({

src/middleware/withEgressClient.types.ts

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

src/middleware/withGatewayIdentity.js

@@ -1,5 +1,3 @@
-import { Signer } from '@ucanto/principal/ed25519'
-import { GATEWAY_DID } from './index.js'
 import { ed25519 } from '@ucanto/principal'
 
 /**
@@ -17,6 +15,10 @@ export function withGatewayIdentity(handler) {
     const gatewaySigner = env.GATEWAY_PRINCIPAL_KEY
       ? ed25519.Signer.parse(env.GATEWAY_PRINCIPAL_KEY)
       : await ed25519.Signer.generate()
-    return handler(req, env, { ...ctx, gatewaySigner, gatewayIdentity: gatewaySigner.withDID(GATEWAY_DID) })
+    
+    const gatewayIdentity = gatewaySigner.withDID(
+      /** @type {`did:${string}:${string}`} */ (env.GATEWAY_SERVICE_DID)
+    )
+    return handler(req, env, { ...ctx, gatewaySigner, gatewayIdentity })
   }
 }

src/middleware/withGatewayIdentity.types.ts

@@ -4,6 +4,7 @@ import { EdSigner } from '@ucanto/principal/ed25519'
 
 export interface Environment extends MiddlewareEnvironment {
   GATEWAY_PRINCIPAL_KEY: string
+  GATEWAY_SERVICE_DID: string
 }
 
 export interface GatewayIdentityContext extends MiddlewareContext {

wrangler.toml

@@ -8,6 +8,9 @@ r2_buckets = [
 
 [vars]
 CONTENT_CLAIMS_SERVICE_URL = "https://dev.claims.web3.storage"
+GATEWAY_SERVICE_DID = "did:web:staging.w3s.link"
+UPLOAD_SERVICE_DID = "did:web:staging.web3.storage"
+UPLOAD_API_URL = "https://staging.up.web3.storage"
 
 [build]
 command = "npm run build:debug"
@@ -46,8 +49,11 @@ MAX_SHARDS = "825"
 FF_RATE_LIMITER_ENABLED = "false"
 FF_EGRESS_TRACKER_ENABLED = "false"
 FF_TELEMETRY_ENABLED = "true"
+GATEWAY_SERVICE_DID = "did:web:w3s.link"
+UPLOAD_SERVICE_DID = "did:web:web3.storage"
 CONTENT_CLAIMS_SERVICE_URL = "https://claims.web3.storage"
 CARPARK_PUBLIC_BUCKET_URL = "https://carpark-prod-0.r2.w3s.link"
+UPLOAD_API_URL = "https://up.web3.storage"
 
 # Staging!
 [env.staging]
@@ -65,7 +71,10 @@ MAX_SHARDS = "825"
 FF_RATE_LIMITER_ENABLED = "false"
 FF_EGRESS_TRACKER_ENABLED = "false"
 FF_TELEMETRY_ENABLED = "false"
+GATEWAY_SERVICE_DID = "did:web:staging.w3s.link"
+UPLOAD_SERVICE_DID = "did:web:staging.web3.storage"
 CONTENT_CLAIMS_SERVICE_URL = "https://staging.claims.web3.storage"
+UPLOAD_API_URL = "https://staging.up.web3.storage"
 CARPARK_PUBLIC_BUCKET_URL = "https://carpark-staging-0.r2.w3s.link"
 
 # Test!
@@ -81,7 +90,10 @@ FF_RATE_LIMITER_ENABLED = "false"
 FF_EGRESS_TRACKER_ENABLED = "false"
 FF_TELEMETRY_ENABLED = "true"
 MAX_SHARDS = "120"
+GATEWAY_SERVICE_DID = "did:web:staging.w3s.link"
+UPLOAD_SERVICE_DID = "did:web:staging.web3.storage"
 CONTENT_CLAIMS_SERVICE_URL = "https://test.claims.web3.storage"
+UPLOAD_API_URL = "https://staging.up.web3.storage"
 
 [env.alanshaw]
 workers_dev = true
@@ -95,7 +107,10 @@ DEBUG = "true"
 FF_RATE_LIMITER_ENABLED = "false"
 FF_EGRESS_TRACKER_ENABLED = "false"
 FF_TELEMETRY_ENABLED = "true"
+GATEWAY_SERVICE_DID = "did:web:staging.w3s.link"
+UPLOAD_SERVICE_DID = "did:web:staging.web3.storage"
 CONTENT_CLAIMS_SERVICE_URL = "https://dev.claims.web3.storage"
+UPLOAD_API_URL = "https://staging.up.web3.storage"
 
 [env.fforbeck]
 name = "freeway-fforbeck"
@@ -114,17 +129,13 @@ r2_buckets = [
 
 [env.fforbeck.vars]
 DEBUG = "true"
-# Feature Flags
 FF_RATE_LIMITER_ENABLED = "false"
 FF_EGRESS_TRACKER_ENABLED = "true"
 FF_TELEMETRY_ENABLED = "false"
-# DIDs
 GATEWAY_SERVICE_DID = "did:web:staging.w3s.link"
 UPLOAD_SERVICE_DID = "did:web:staging.web3.storage"
-# SERVICE URLs
 CONTENT_CLAIMS_SERVICE_URL = "https://staging.claims.web3.storage"
 UPLOAD_API_URL = "https://staging.up.web3.storage"
-#UPLOAD_API_URL = "https://pr435.up.storacha.network"
 
 [[env.fforbeck.unsafe.bindings]]
 name = "RATE_LIMITER"
@@ -150,8 +161,11 @@ DEBUG = "true"
 FF_RATE_LIMITER_ENABLED = "false"
 FF_EGRESS_TRACKER_ENABLED = "false"
 FF_TELEMETRY_ENABLED = "true"
+GATEWAY_SERVICE_DID = "did:web:staging.w3s.link"
+UPLOAD_SERVICE_DID = "did:web:staging.web3.storage"
 CONTENT_CLAIMS_SERVICE_URL = "https://claims.web3.storage"
 CARPARK_PUBLIC_BUCKET_URL = "https://carpark-prod-0.r2.w3s.link"
+UPLOAD_API_URL = "https://staging.up.web3.storage"
 
 ### Integration Tests Configuration
 [env.integration]
@@ -167,7 +181,10 @@ DEBUG = "true"
 FF_RATE_LIMITER_ENABLED = "true"
 FF_EGRESS_TRACKER_ENABLED = "true"
 FF_TELEMETRY_ENABLED = "true"
+GATEWAY_SERVICE_DID = "did:web:staging.w3s.link"
+UPLOAD_SERVICE_DID = "did:web:staging.web3.storage"
 CONTENT_CLAIMS_SERVICE_URL = "https://staging.claims.web3.storage"
+UPLOAD_API_URL = "https://staging.up.web3.storage"
 
 [[env.integration.unsafe.bindings]]
 name = "RATE_LIMITER"