Merge pull request #296 from KenEucker/develop

v3.5.0

Author: KenEucker

.vscode/settings.json

@@ -7,5 +7,8 @@
   },
   "[vue]": {
     "editor.defaultFormatter": "Vue.volar"
+  },
+  "[scss]": {
+    "editor.defaultFormatter": "vscode.css-language-features"
   }
 }

README.md

@@ -97,7 +97,7 @@ Below you will find some of the primary settings for testing all features of the
 # Used for internal authentication
 [email protected]
 HOST_KEY=anythingyouwantititobe
-ACCESS_TOKEN=BIKETAGACCESSTOKEN
+CLIENT_KEY=BIKETAGACCESSKEY
 # Used for uploading new BikeTag posts
 IMGUR_CLIENT_ID=IMGURCLIENTID
 IMGUR_CLIENT_SECRET=IMGURCLIENTSECRET

functions/achievements-background.ts functions/achievements-background.mtsfunctions/achievements-background.ts renamed to functions/achievements-background.mts

@@ -1,13 +1,11 @@
-import { Handler } from '@netlify/functions'
-import BikeTagClient from 'biketag'
-import { Achievement, Game, Player, Tag } from 'biketag/dist/common/schema'
+import BikeTagClient, { Achievement, Game, Player, Tag } from 'biketag'
 import { getSupportedGames } from '../src/common'
-import { getBikeTagClientOpts } from './common'
+import { getBikeTagClientOpts, log } from './common'
 import { HttpStatusCode } from './common/constants'
 import { BackgroundProcessResults } from './common/types'
 
 export const assignAchievements = async (): Promise<BackgroundProcessResults> => {
-  if (process.env.SKIP_AUTOPOST_FUNCTION) {
+  if (process.env.SKIP_ACHIEVEMENTS_FUNCTION === "true") {
     return Promise.resolve({
       results: ['function skipped'],
       errors: false,
@@ -62,13 +60,13 @@ export const assignAchievements = async (): Promise<BackgroundProcessResults> =>
           if (players.length > 20) {
             /// Only award achievements if at least 20 players have logged in
           } else {
-            console.log(`[${game.name}] does not have enough players to award achievements`)
+            log(`[${game.name}] does not have enough players to award achievements`, { playersCount: players.length }, 'warn')
           }
         }
       }
     }
   } else {
-    console.log('couldnt get games', gamesResponse)
+    log('couldnt get games', gamesResponse, 'error')
   }
 
   return {
@@ -77,24 +75,18 @@ export const assignAchievements = async (): Promise<BackgroundProcessResults> =>
   }
 }
 
-const assignAchievementsHandler: Handler = async () => {
+export default async (req: Request) => {
   const { results, errors } = await assignAchievements()
 
   if (results.length) {
-    console.log('achievements assigning attempted', { results })
-    return {
-      statusCode: errors ? HttpStatusCode.BadRequest : HttpStatusCode.Ok,
-      body: JSON.stringify(results),
-    }
+    log('achievements assigning attempted', { results }, 'info')
+    return new Response(JSON.stringify(results), {
+      status: errors ? HttpStatusCode.BadRequest : HttpStatusCode.Ok,
+    })
   } else {
-    console.log('nothing to report')
-    return {
-      statusCode: errors ? HttpStatusCode.BadRequest : HttpStatusCode.Ok,
-      body: '',
-    }
+    log('nothing to report')
+    return new Response('', {
+      status: errors ? HttpStatusCode.BadRequest : HttpStatusCode.Ok,
+    })
   }
-}
-
-const handler = assignAchievementsHandler
-
-export { handler }
+}

functions/achievements.mts

@@ -0,0 +1,66 @@
+import { BikeTagClient, Game } from 'biketag'
+import {
+  acceptCorsHeaders,
+  getBikeTagClientOpts,
+  getPayloadOpts,
+  HttpStatusCode,
+  log,
+} from './common'
+
+export default async (req: Request) => {
+  const headers = acceptCorsHeaders()
+
+  log('[get-achievements] Incoming request', { method: req.method, url: req.url })
+
+  if (req.method === 'OPTIONS') {
+    log('[get-achievements] OPTIONS preflight handled')
+    return new Response(undefined, {
+      status: HttpStatusCode.NoContent,
+      headers,
+    })
+  }
+
+  try {
+    const biketagOpts = getBikeTagClientOpts(req, true)
+    log('[get-achievements] Parsed BikeTagClient options', biketagOpts)
+
+    const biketag = new BikeTagClient(biketagOpts)
+
+    const game = (await biketag.game(biketagOpts.game, {
+      source: 'sanity',
+      concise: true,
+    })) as unknown as Game
+    log('[get-achievements] Retrieved game', { name: game.name, awsRegion: game.awsRegion })
+
+    const biketagPayload = await getPayloadOpts(req, {
+      imgur: { hash: game.mainhash },
+      game: biketagOpts.game,
+    })
+    log('[get-achievements] Prepared biketag payload', biketagPayload)
+
+    const imageSource = game.awsRegion ? 'aws' : 'imgur'
+    log('[get-achievements] Using image source', { imageSource })
+
+    const achievementsResponse = await biketag.getAchievements(biketagPayload, {
+      source: imageSource,
+    })
+    log('[get-achievements] getAchievements response', {
+      success: achievementsResponse.success,
+      status: achievementsResponse.status,
+      count: Array.isArray(achievementsResponse.data) ? achievementsResponse.data.length : 0,
+    })
+
+    const { success, data } = achievementsResponse
+
+    return new Response(JSON.stringify(success ? data : achievementsResponse), {
+      status: achievementsResponse.status,
+      headers,
+    })
+  } catch (err: any) {
+    log('[get-achievements] Unexpected error', err, 'error')
+    return new Response(JSON.stringify({ error: 'Internal server error' }), {
+      status: HttpStatusCode.InternalServerError,
+      headers,
+    })
+  }
+}

functions/achievements.ts

@@ -0,0 +1,77 @@
+import { BikeTagClient, Game } from 'biketag'
+import {
+  acceptCorsHeaders,
+  getBikeTagClientOpts,
+  getPayloadOpts,
+  HttpStatusCode,
+  log,
+} from './common'
+
+export default async (req: Request) => {
+  const headers = acceptCorsHeaders()
+
+  log('[ambassadors] Incoming request', { method: req.method, url: req.url })
+
+  if (req.method === 'OPTIONS') {
+    log('[ambassadors] OPTIONS preflight handled')
+    return new Response(undefined, {
+      status: HttpStatusCode.NoContent,
+      headers,
+    })
+  }
+
+  try {
+    const biketagOpts = getBikeTagClientOpts(req, true)
+    log('[ambassadors] Parsed BikeTagClient options', biketagOpts)
+
+    const biketag = new BikeTagClient(biketagOpts)
+
+    const game = (await biketag.game(biketagOpts.game, {
+      source: 'sanity',
+      concise: true,
+    })) as unknown as Game
+    log('[ambassadors] Retrieved game', {
+      name: game.name,
+      id: game._id,
+      region: game.awsRegion ?? 'imgur',
+    })
+
+    const biketagPayload = await getPayloadOpts(req, {
+      imgur: { hash: game.mainhash },
+      game: biketagOpts.game,
+    })
+    log('[ambassadors] Prepared payload for getAmbassadors', biketagPayload)
+
+    const imageSource = game.awsRegion ? 'aws' : 'imgur'
+    log('[ambassadors] Using image source', { imageSource })
+
+    const ambassadorsResponse = await biketag.getAmbassadors(biketagPayload, {
+      source: imageSource,
+    })
+    log('[ambassadors] getAmbassadors response', {
+      success: ambassadorsResponse.success,
+      status: ambassadorsResponse.status,
+      count: Array.isArray(ambassadorsResponse.data) ? ambassadorsResponse.data.length : 0,
+    })
+
+    return new Response(
+      JSON.stringify(ambassadorsResponse.success ? ambassadorsResponse.data : ambassadorsResponse),
+      {
+        status: ambassadorsResponse.status,
+        headers,
+      },
+    )
+  } catch (err: any) {
+    log('[ambassadors] Unexpected error', err, 'error')
+    return new Response(
+      JSON.stringify({
+        success: false,
+        error: err.message ?? 'Unknown error',
+      }),
+      {
+        status: HttpStatusCode.InternalServerError,
+        headers,
+      },
+    )
+  }
+}