p2e

Author: 0xFlicker

deploy/src/stack/discord.ts

@@ -188,6 +188,26 @@ export class DiscordStack extends cdk.Stack {
     rankNodesTable.grantReadData(leaderboardHandler);
     rankLeaderboardsTable.grantReadData(leaderboardHandler);
 
+    const leaderboardFetchHandler = new lambda.Function(
+      this,
+      "leaderboardFetchHandler",
+      {
+        runtime: lambda.Runtime.NODEJS_14_X,
+        code: lambda.Code.fromAsset(
+          path.join(__dirname, "../../../.layers/leaderboard-fetch")
+        ),
+        handler: "index.handler",
+        timeout: cdk.Duration.seconds(10),
+        memorySize: 256,
+        environment: {
+          MINIMUM_LOG_LEVEL: "INFO",
+          TABLE_NAME_RANKER_BOARDS: rankBoardTable.tableName,
+        },
+      }
+    );
+
+    rankBoardTable.grantReadData(leaderboardFetchHandler);
+
     const deferredMessageHandler = new lambda.Function(
       this,
       "deferredMessageHandler",
@@ -330,6 +350,13 @@ export class DiscordStack extends cdk.Stack {
     const discordResource = discordApi.root.addResource("discord");
     discordResource.addMethod("POST", discordIntegration);
     const experienceResource = leaderboardApi.root.addResource("{experience}");
+    experienceResource.addMethod(
+      "GET",
+      new apigateway.LambdaIntegration(leaderboardFetchHandler),
+      {
+        apiKeyRequired: true,
+      }
+    );
     const leaderboardResource = experienceResource.addResource("leaderboard");
     leaderboardResource.addMethod(
       "GET",

fakeScores.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 aws sns publish \
     --message-group-id 'potato' \
-    --message '{"boardName":"potato","scoreDeltas":[{"playerId":"dd3cb41b-6428-45b8-81e6-82d57f5a5508","score":[-3]},{"playerId":"7b53dd5f-33b3-4815-be6b-d40d831b365c","score":[31]}]}' \
+    --message '{"boardName":"potato.v1","scoreDeltas":[{"playerId":"dd3cb41b-6428-45b8-81e6-82d57f5a5508","score": [-1]}]}' \
     --topic-arn "arn:aws:sns:us-west-2:163871723185:score-fifo-topic-2.fifo"

package.json

@@ -5,11 +5,12 @@
   "author": "0xFlick <cmdrnft@protonmail.com>",
   "license": "MIT",
   "scripts": {
-    "build": "yarn discord:build && yarn leaderboard:build && yarn players:build && yarn ingest:build && yarn deferred:build",
+    "build": "yarn discord:build && yarn leaderboard:build && yarn players:build && yarn ingest:build && yarn deferred:build && yarn leaderboard-fetch:build",
     "discord:cli": "yarn discord:cli:build && node .layers/discord-cli/index.cjs",
     "discord:cli:build": "esbuild src/cli.ts --platform=node --target=node14.19 --bundle --outfile=.layers/discord-cli/index.cjs",
     "discord:build": "esbuild src/lambda/discord.ts --platform=node --target=node14.19 --minify --bundle --outfile=.layers/discord/index.js",
     "leaderboard:build": "esbuild src/lambda/leaderboard.ts --platform=node --target=node14.19 --minify --bundle --outfile=.layers/leaderboard/index.js",
+    "leaderboard-fetch:build": "esbuild src/lambda/leaderboard-fetch.ts --platform=node --target=node14.19 --minify --bundle --outfile=.layers/leaderboard-fetch/index.js",
     "players:build": "esbuild src/lambda/players.ts --platform=node --target=node14.19 --minify --bundle --outfile=.layers/players/index.js",
     "ingest:build": "esbuild src/lambda/ingest.ts --platform=node --target=node14.19 --minify --bundle --outfile=.layers/ingest/index.js",
     "deferred:build": "esbuild src/lambda/deferred.ts --platform=node --target=node14.19 --minify --bundle --outfile=.layers/deferred/index.js",

src/lambda/intest.test.ts src/lambda/ingest.test.ts

@@ -3,11 +3,10 @@ import { v4 as createUuid } from "uuid";
 import { handler } from "./ingest";
 import { SQSEvent, SNSEventRecord, Context } from "aws-lambda";
 import { initRanker } from "../ranker";
-import { Experiences } from "../commands/leaderboard/common";
 
 function scoringEvent(
   records: {
-    boardName: Experiences;
+    boardName: string;
     scores?: ScoreInput[];
     scoreDeltas?: ScoreInput[];
   }[]

src/lambda/ingest.ts

@@ -1,10 +1,8 @@
 import { ScoreInput, config } from "@0xflicker/ranker";
-import { TableScores } from "@0xflicker/ranker/lib/db/dynamodb";
 import { SQSHandler } from "aws-lambda";
 import { initRanker } from "../ranker";
 import { createLogger } from "../utils/logging";
 
-const KNOWN_LEADERBOARDS = [Experiences.POTATO];
 const logger = createLogger();
 
 export const handler: SQSHandler = async (event) => {
@@ -20,10 +18,6 @@ export const handler: SQSHandler = async (event) => {
       scores?: ScoreInput[];
       scoreDeltas?: ScoreInput[];
     } = JSON.parse(message);
-    if (!KNOWN_LEADERBOARDS.includes(boardName)) {
-      logger.info("Unknown leaderboard");
-      continue;
-    }
     try {
       const l = await initRanker(boardName);
       if (scores) {

src/lambda/leaderboard-fetch.ts

@@ -0,0 +1,45 @@
+import { APIGatewayProxyHandler } from "aws-lambda";
+import { fetchBoard } from "../ranker";
+import { createLogger } from "../utils/logging";
+import { TableBoard } from "@0xflicker/ranker/lib/db/dynamodb";
+
+const logger = createLogger();
+
+export const handler: APIGatewayProxyHandler = logger.handler(async (event) => {
+  if (event.httpMethod !== "GET") {
+    return {
+      statusCode: 405,
+      body: "Method Not Allowed",
+    };
+  }
+  const experience = event.pathParameters?.experience;
+  if (!experience) {
+    return {
+      statusCode: 400,
+      body: "Bad Request",
+    };
+  }
+
+  const board = await fetchBoard(experience);
+  if (!board) {
+    return {
+      statusCode: 404,
+      body: "Not Found",
+    };
+  }
+  return {
+    statusCode: 200,
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(transformBoard(board)),
+  };
+});
+
+function transformBoard(board: TableBoard) {
+  return {
+    id: board.Name,
+    displayName: board.Display_Name,
+    description: board.Description,
+  };
+}

src/ranker/index.ts

@@ -1,15 +1,6 @@
 import Ranker, * as ranker from "@0xflicker/ranker";
 import { getDb } from "../storage/db/dynamo";
 
-// const rankerOptions = {
-//   [Experiences.POTATO]: {
-//     rootKey: Experiences.POTATO,
-//     branchingFactor: 100,
-//     leaderboardSize: 100,
-//     scoreRange: [0, 100000],
-//   },
-// };
-
 export async function initRanker(name: string) {
   return await Ranker({
     db: getDb(),