use environment variable to swap

.github/workflows/deploy.yml

@@ -38,13 +38,15 @@ jobs:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           environment: ${{ github.event.workflow_run.head_branch == 'main' && 'production' || 'staging' }}
           vars: |
+            KV_NAMESPACE
             DISCORD_APP_ID
             DISCORD_PUBLIC_KEY
             XBOX_USERNAME
           secrets: |
             DISCORD_TOKEN
             XBOX_PASSWORD
         env:
+          KV_NAMESPACE: ${{ vars.KV_NAMESPACE }}
           DISCORD_APP_ID: ${{ vars.DISCORD_APP_ID }}
           DISCORD_PUBLIC_KEY: ${{ vars.DISCORD_PUBLIC_KEY }}
           DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}

src/services/install.mts

@@ -1,8 +1,10 @@
 import { DiscordService } from "./discord/discord.mjs";
 import { HaloService } from "./halo/halo.mjs";
+import { KvService } from "./kv/kv.mjs";
 import { XboxService } from "./xbox/xbox.mjs";
 
 export interface Services {
+  kvService: KvService;
   discordService: DiscordService;
   xboxService: XboxService;
   haloService: HaloService;
@@ -13,11 +15,13 @@ interface InstallServicesOpts {
 }
 
 export function installServices({ env }: InstallServicesOpts): Services {
+  const kvService = new KvService({ env });
   const discordService = new DiscordService({ env });
-  const xboxService = new XboxService({ env });
+  const xboxService = new XboxService({ env, kvService });
   const haloService = new HaloService({ xboxService });
 
   return {
+    kvService,
     discordService,
     xboxService,
     haloService,

src/services/kv/kv.mts

@@ -0,0 +1,19 @@
+interface KvServiceOpts {
+  env: Env;
+}
+
+export class KvService {
+  private readonly env: Env;
+
+  constructor({ env }: KvServiceOpts) {
+    this.env = env;
+  }
+
+  get kv() {
+    const kv = this.env[this.env.KV_NAMESPACE as keyof Env];
+    if (!kv) {
+      throw new Error(`KV namespace ${this.env.KV_NAMESPACE} not found`);
+    }
+    return kv as KVNamespace;
+  }
+}

src/services/xbox/xbox.mts

@@ -1,4 +1,5 @@
 import { authenticate, CredentialsAuthenticateInitialResponse } from "@xboxreplay/xboxlive-auth";
+import { KvService } from "../kv/kv.mjs";
 
 enum TokenInfoKey {
   XSTSToken,
@@ -7,14 +8,17 @@ enum TokenInfoKey {
 
 interface XboxServiceOpts {
   env: Env;
+  kvService: KvService;
 }
 
 export class XboxService {
   private readonly env: Env;
+  private readonly kvService: KvService;
   private tokenInfoMap = new Map<TokenInfoKey, string>();
 
-  constructor({ env }: XboxServiceOpts) {
+  constructor({ env, kvService }: XboxServiceOpts) {
     this.env = env;
+    this.kvService = kvService;
 
     void this.loadCredentials();
   }
@@ -33,11 +37,11 @@ export class XboxService {
 
   clearToken() {
     this.tokenInfoMap.clear();
-    void this.env.SERVICE_API_TOKENS.delete("xbox");
+    void this.kvService.kv.delete("xbox");
   }
 
   private async loadCredentials() {
-    const tokenInfo = await this.env.SERVICE_API_TOKENS.get("xbox");
+    const tokenInfo = await this.kvService.kv.get("xbox");
     console.log("loading token info", tokenInfo);
     if (tokenInfo) {
       try {
@@ -57,7 +61,7 @@ export class XboxService {
     this.tokenInfoMap.set(TokenInfoKey.expiresOn, credentialsResponse.expires_on);
 
     console.log("updating token info...");
-    await this.env.SERVICE_API_TOKENS.put("xbox", JSON.stringify(Array.from(this.tokenInfoMap.entries())), {
+    await this.kvService.kv.put("xbox", JSON.stringify(Array.from(this.tokenInfoMap.entries())), {
       expirationTtl: Math.floor((new Date(credentialsResponse.expires_on).getTime() - new Date().getTime()) / 1000),
     });
     console.log("updated token info");

worker-configuration.d.ts

@@ -1,10 +1,13 @@
 // Generated by Wrangler by running `wrangler types --experimental-include-runtime`
 
 interface Env {
-	SERVICE_API_TOKENS: KVNamespace;
+	SERVICE_API_TOKENS_DEV: KVNamespace;
+	SERVICE_API_TOKENS_STAGING: KVNamespace;
+	SERVICE_API_TOKENS_PRODUCTION: KVNamespace;
 	DISCORD_APP_ID: string;
 	DISCORD_TOKEN: string;
 	DISCORD_PUBLIC_KEY: string;
 	XBOX_USERNAME: string;
 	XBOX_PASSWORD: string;
+	KV_NAMESPACE: string;
 }

wrangler.toml

@@ -8,14 +8,18 @@ upload_source_maps = true
 enabled = true
 head_sampling_rate = 1 # optional. default = 1.
 
+[[kv_namespaces]]
+binding = "SERVICE_API_TOKENS_DEV"
+id = "09cd8999e6974145bd11b533f9f8afaa"
+
 [env.staging]
 name = "guilty-spark-staging"
 [[kv_namespaces]]
-binding = "SERVICE_API_TOKENS"
-id = "ced62798d67d44e89104646327a0b44c"
+binding = "SERVICE_API_TOKENS_STAGING"
+id = "0bda29a4f4f046c18495f498dc3ff926"
 
 [env.production]
 name = "guilty-spark"
 [[kv_namespaces]]
-binding = "SERVICE_API_TOKENS"
-id = "7332bc767e3e43738ec3bdbd6d22db15"
+binding = "SERVICE_API_TOKENS_PRODUCTION"
+id = "627e6ea829d347ff848dc11cebc43923"