Skip to content

Commit fcbbfa8

Browse files
0xFlicker0xFlicker
committed
integrated leaderboard
1 parent 7e8eb1a commit fcbbfa8

22 files changed

+1382
-416
lines changed

‎.eslintignore

-2
This file was deleted.

‎.eslintrc.js

+18-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
module.exports = {
2-
parser: "@typescript-eslint/parser",
3-
parserOptions: {
4-
ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
5-
sourceType: "module"
6-
},
7-
extends: [
8-
"plugin:@typescript-eslint/recommended", // recommended rules from the @typescript-eslint/eslint-plugin
9-
"plugin:prettier/recommended" // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
10-
],
11-
rules: {
12-
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
13-
// e.g. "@typescript-eslint/explicit-function-return-type": "off",
14-
}
15-
};
2+
parser: "@typescript-eslint/parser",
3+
parserOptions: {
4+
ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
5+
sourceType: "module"
6+
},
7+
extends: [
8+
"plugin:@typescript-eslint/recommended", // recommended rules from the @typescript-eslint/eslint-plugin
9+
"plugin:prettier/recommended" // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
10+
],
11+
rules: {
12+
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
13+
// e.g. "@typescript-eslint/explicit-function-return-type": "off",
14+
},
15+
ignorePatterns: [
16+
"node_modules/",
17+
"lib/",
18+
]
19+
};

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -210,3 +210,4 @@ $RECYCLE.BIN/
210210

211211
node_modules
212212
lib
213+
.layers

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@0xflicker:registry=https://npm.pkg.github.com

‎.vscode/launch.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Jest",
9+
"port": 9229,
10+
"request": "attach",
11+
"skipFiles": ["<node_internals>/**"],
12+
"type": "node"
13+
}
14+
]
15+
}

‎Makefile

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
.PHONY: build-RuntimeDependenciesLayer build-lambda-common
2+
.PHONY: secrets
3+
4+
build-DiscordFunction:
5+
$(MAKE) build-lambda-common
6+
$(MAKE) build-RuntimeDependenciesLayer
7+
8+
build-lambda-common:
9+
yarn build
10+
cp -r lib "$(ARTIFACTS_DIR)/"
11+
12+
build-RuntimeDependenciesLayer:
13+
# mkdir -p "$(ARTIFACTS_DIR)/nodejs"
14+
cp package.json yarn.lock "$(ARTIFACTS_DIR)/"
15+
yarn --production --cwd "$(ARTIFACTS_DIR)/"
16+
# rm "$(ARTIFACTS_DIR)/package.json" # to avoid rebuilding when changes doesn't relate to dependencies
17+
18+
update-secrets:
19+
@aws secretsmanager update-secret --secret-id "degen-bot-secrets" --secret-string '$(shell sops --decrypt secrets/degen-bot-secrets.json)'
20+
create-secrets:
21+
@aws secretsmanager create-secret --name "degen-bot-secrets" --secret-string '$(shell sops --decrypt secrets/degen-bot-secrets.json)'

‎deploy/src/stack/discord.ts

+81-8
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ import { fileURLToPath } from "url";
22
import path from "path";
33
import * as cdk from "aws-cdk-lib";
44
import * as s3 from "aws-cdk-lib/aws-s3";
5+
import * as eventSources from "aws-cdk-lib/aws-lambda-event-sources";
56
import * as lambda from "aws-cdk-lib/aws-lambda";
67
import * as dynamodb from "aws-cdk-lib/aws-dynamodb";
78
import * as acm from "aws-cdk-lib/aws-certificatemanager";
9+
import * as sns from "aws-cdk-lib/aws-sns";
10+
import * as sqs from "aws-cdk-lib/aws-sqs";
11+
import * as subs from "aws-cdk-lib/aws-sns-subscriptions";
812
import * as s3deploy from "aws-cdk-lib/aws-s3-deployment";
913
import * as apigateway from "aws-cdk-lib/aws-apigateway";
1014
import * as targets from "aws-cdk-lib/aws-route53-targets";
@@ -31,6 +35,28 @@ export class DiscordStack extends cdk.Stack {
3135
},
3236
tableClass: dynamodb.TableClass.STANDARD,
3337
});
38+
const rankBoardTable = new dynamodb.Table(this, "boards", {
39+
partitionKey: { name: "Name", type: dynamodb.AttributeType.STRING },
40+
tableClass: dynamodb.TableClass.STANDARD,
41+
billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
42+
});
43+
const rankScoresTable = new dynamodb.Table(this, "scores", {
44+
partitionKey: { name: "Board_Name", type: dynamodb.AttributeType.STRING },
45+
sortKey: { name: "Player_ID", type: dynamodb.AttributeType.STRING },
46+
tableClass: dynamodb.TableClass.STANDARD,
47+
billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
48+
});
49+
const rankNodesTable = new dynamodb.Table(this, "nodes-2", {
50+
partitionKey: { name: "Board_Name", type: dynamodb.AttributeType.STRING },
51+
sortKey: { name: "Node_ID", type: dynamodb.AttributeType.STRING },
52+
tableClass: dynamodb.TableClass.STANDARD,
53+
billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
54+
});
55+
const rankLeaderboardsTable = new dynamodb.Table(this, "leaderboards", {
56+
partitionKey: { name: "Board_Name", type: dynamodb.AttributeType.STRING },
57+
tableClass: dynamodb.TableClass.STANDARD,
58+
billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
59+
});
3460

3561
// Bucket with a single image
3662
const staticAssetBucket = new s3.Bucket(this, "static-assets-bucket-3", {
@@ -46,7 +72,11 @@ export class DiscordStack extends cdk.Stack {
4672
sources: [s3deploy.Source.asset(path.join(__dirname, "../../images/"))],
4773
destinationBucket: staticAssetBucket,
4874
});
49-
75+
const node16Layer = lambda.LayerVersion.fromLayerVersionArn(
76+
this,
77+
"node16Layer",
78+
`arn:aws:lambda:${props.env?.region}:072686360478:layer:node-16_4_2:3`
79+
);
5080
const discordHandler = new lambda.Function(this, "discordLambda", {
5181
runtime: lambda.Runtime.PROVIDED,
5282
code: lambda.Code.fromAsset(
@@ -55,24 +85,62 @@ export class DiscordStack extends cdk.Stack {
5585
handler: "index.handler",
5686
timeout: cdk.Duration.seconds(10),
5787
memorySize: 128,
58-
layers: [
59-
lambda.LayerVersion.fromLayerVersionArn(
60-
this,
61-
"node16Layer",
62-
`arn:aws:lambda:${props.env?.region}:072686360478:layer:node-16_4_2:3`
63-
),
64-
],
88+
layers: [node16Layer],
6589
environment: {
6690
PUBLIC_KEY: publicKey,
6791
STATIC_IMAGE_URL: `https://${staticAssetBucket.bucketName}.s3.amazonaws.com`,
6892
MINIMUM_LOG_LEVEL: "DEBUG",
6993
TABLE_NAME_MINECRAFT_PLAYER: minecraftPlayerTable.tableName,
94+
TABLE_NAME_RANKER_BOARDS: rankBoardTable.tableName,
95+
TABLE_NAME_RANKER_SCORES: rankScoresTable.tableName,
96+
TABLE_NAME_RANKER_NODES: rankNodesTable.tableName,
97+
TABLE_NAME_RANKER_LEADERBOARDS: rankLeaderboardsTable.tableName,
7098
CURRENT_LEADERBOARD: "potato",
7199
LEADERBOARD_BASE: leaderboardApi,
72100
},
73101
});
74102

75103
minecraftPlayerTable.grantReadWriteData(discordHandler);
104+
rankBoardTable.grantReadWriteData(discordHandler);
105+
rankScoresTable.grantReadWriteData(discordHandler);
106+
rankNodesTable.grantReadWriteData(discordHandler);
107+
rankLeaderboardsTable.grantReadWriteData(discordHandler);
108+
109+
const scoreQueue = new sqs.Queue(this, "scoreQueue-2", {
110+
visibilityTimeout: cdk.Duration.seconds(300),
111+
retentionPeriod: cdk.Duration.days(1),
112+
fifo: true,
113+
contentBasedDeduplication: true,
114+
});
115+
const scoreTopic = new sns.Topic(this, "scoreTopic-2", {
116+
fifo: true,
117+
topicName: "score-fifo-topic-2",
118+
contentBasedDeduplication: true,
119+
});
120+
scoreTopic.addSubscription(new subs.SqsSubscription(scoreQueue));
121+
122+
const scoreHandler = new lambda.Function(this, "scoreHandler", {
123+
runtime: lambda.Runtime.PROVIDED,
124+
code: lambda.Code.fromAsset(
125+
path.join(__dirname, "../../../.layers/ingest")
126+
),
127+
handler: "index.handler",
128+
timeout: cdk.Duration.seconds(10),
129+
memorySize: 256,
130+
layers: [node16Layer],
131+
environment: {
132+
TABLE_NAME_RANKER_BOARDS: rankBoardTable.tableName,
133+
TABLE_NAME_RANKER_SCORES: rankScoresTable.tableName,
134+
TABLE_NAME_RANKER_NODES: rankNodesTable.tableName,
135+
TABLE_NAME_RANKER_LEADERBOARDS: rankLeaderboardsTable.tableName,
136+
},
137+
events: [new eventSources.SqsEventSource(scoreQueue, { batchSize: 10 })],
138+
});
139+
140+
rankBoardTable.grantReadWriteData(scoreHandler);
141+
rankScoresTable.grantReadWriteData(scoreHandler);
142+
rankNodesTable.grantReadWriteData(scoreHandler);
143+
rankLeaderboardsTable.grantReadWriteData(scoreHandler);
76144

77145
// Domain
78146
const domains = domain instanceof Array ? domain : [domain];
@@ -110,5 +178,10 @@ export class DiscordStack extends cdk.Stack {
110178
recordName: domainName,
111179
target: route53.RecordTarget.fromAlias(new targets.ApiGateway(api)),
112180
});
181+
182+
new cdk.CfnOutput(this, "snsScoreTopicArn", {
183+
value: scoreTopic.topicArn,
184+
description: "The arn of the SNS score topic",
185+
});
113186
}
114187
}

‎fakeScores.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
aws sns publish \
3+
--message-group-id 'potato' \
4+
--message '{"boardName":"potato","scores":[{"playerId":"dd3cb41b-6428-45b8-81e6-82d57f5a5508","score":[146]},{"playerId":"b5ad4c7d-f43d-4c96-ae98-637d43f8f88d","score":[31]}]}' \
5+
--topic-arn "arn:aws:sns:us-west-2:163871723185:score-fifo-topic-2.fifo"

‎jest-dynamodb-config.js

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
module.exports = {
2+
tables: [
3+
{
4+
TableName: `MinecraftPlayer`,
5+
KeySchema: [
6+
{ AttributeName: 'uuid', KeyType: 'HASH' },
7+
],
8+
AttributeDefinitions: [
9+
{ AttributeName: 'uuid', AttributeType: 'S' },
10+
],
11+
BillingMode: 'PAY_PER_REQUEST',
12+
},
13+
{
14+
TableName: `boards`,
15+
KeySchema: [{ AttributeName: "Name", KeyType: "HASH" }],
16+
AttributeDefinitions: [{ AttributeName: "Name", AttributeType: "S" }],
17+
BillingMode: "PAY_PER_REQUEST",
18+
},
19+
{
20+
TableName: `scores`,
21+
KeySchema: [
22+
{ AttributeName: "Board_Name", KeyType: "HASH" },
23+
{ AttributeName: "Player_ID", KeyType: "RANGE" },
24+
],
25+
AttributeDefinitions: [
26+
{ AttributeName: "Board_Name", AttributeType: "S" },
27+
{ AttributeName: "Player_ID", AttributeType: "S" },
28+
],
29+
BillingMode: "PAY_PER_REQUEST",
30+
},
31+
{
32+
TableName: `nodes`,
33+
KeySchema: [
34+
{ AttributeName: "Board_Name", KeyType: "HASH" },
35+
{ AttributeName: "Node_ID", KeyType: "RANGE" },
36+
],
37+
AttributeDefinitions: [
38+
{ AttributeName: "Node_ID", AttributeType: "S" },
39+
{ AttributeName: "Board_Name", AttributeType: "S" },
40+
],
41+
BillingMode: "PAY_PER_REQUEST",
42+
},
43+
{
44+
TableName: `leaderboards`,
45+
KeySchema: [{ AttributeName: "Board_Name", KeyType: "HASH" }],
46+
AttributeDefinitions: [
47+
{ AttributeName: "Board_Name", AttributeType: "S" },
48+
],
49+
BillingMode: "PAY_PER_REQUEST",
50+
},
51+
],
52+
};

‎package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"discord:cli": "yarn discord:cli:build && node .layers/discord-cli/index.cjs",
1010
"discord:cli:build": "esbuild src/cli.ts --platform=node --target=node16.14 --bundle --outfile=.layers/discord-cli/index.cjs",
1111
"discord:build": "esbuild src/lambda/discord.ts --platform=node --target=node16.14 --bundle --outfile=.layers/discord/index.js",
12+
"ingest:build": "esbuild src/lambda/ingest.ts --platform=node --target=node16.14 --bundle --outfile=.layers/ingest/index.js",
1213
"test": "jest test",
1314
"open:gen": "openapi --input swagger.json --client axios --output ./src/swagger-gen"
1415
},
@@ -25,7 +26,9 @@
2526
"typescript": "^4.6.3"
2627
},
2728
"dependencies": {
28-
"@aws-sdk/client-dynamodb": "^3.75.0",
29+
"@0xflicker/ranker": "^1.0.6",
30+
"@aws-sdk/client-dynamodb": "^3.85.0",
31+
"@aws-sdk/lib-dynamodb": "^3.85.0",
2932
"@discordjs/builders": "^0.13.0",
3033
"@discordjs/rest": "^0.4.1",
3134
"@twitter-api-v2/plugin-token-refresher": "^1.0.0",

‎samconfig.toml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version=0.1
2+
[default.global.parameters]
3+
stack_name = "degen-bot"
4+
5+
[default.build.parameters]
6+
beta_features = true
7+
8+
[default.sync.parameters]
9+
beta_features = true
10+
11+
[default.deploy]
12+
[default.deploy.parameters]
13+
s3_bucket = "aws-sam-cli-managed-default-samclisourcebucket-1vbvsm4vrjhoa"
14+
s3_prefix = "degen-bot"
15+
region = "us-west-2"
16+
capabilities = "CAPABILITY_IAM"
17+
image_repositories = []
18+

‎src/commands/leaderboard.ts

+14-27
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import { InteractionResponseType } from "discord-api-types/v10";
22
import { MessageEmbed } from "discord.js";
33
import { register } from "../interactions/command.js";
44
import { createLogger } from "../utils/logging";
5+
import { createRankerInstance } from "../ranker/index.js";
56
import { LeaderboardService, Experiences } from "../swagger-gen/index.js";
67
import { playerByUuid } from "../model/CachedMinecraftPlayer.js";
8+
import { APIGatewayProxyResult } from "aws-lambda";
79

810
const logger = createLogger();
911
logger.setKey("command", "leaderboard");
1012

1113
const KNOWN_LEADERBOARDS = [Experiences.POTATO];
12-
const ONLY_PERIOD = "alltime";
1314

1415
register({
1516
handler: async (interaction) => {
@@ -30,37 +31,23 @@ register({
3031
};
3132
}
3233
logger.info("Fetching leaderboard");
33-
const lb = await LeaderboardService.getLeaderboard(
34-
leaderboardName,
35-
ONLY_PERIOD,
36-
10
37-
);
38-
// collect all player_ids
39-
if (typeof lb.items === "undefined") {
40-
logger.info("No leaderboard items");
41-
const message = new MessageEmbed();
42-
message.setTitle("Leaderboard is empty");
43-
return {
44-
statusCode: 200,
45-
type: InteractionResponseType.ChannelMessageWithSource,
46-
data: {
47-
embeds: [message],
48-
},
49-
};
50-
}
51-
logger.info(`Found ${lb.items.length} leaderboard items`);
52-
const items = lb.items.filter((item) => item.Player_ID);
34+
const leaderboard = await createRankerInstance(leaderboardName);
35+
const lb = await leaderboard.leaderboard();
36+
logger.info(`Found ${lb.length} leaderboard items`);
37+
const items = lb.filter((item) => item.Player_ID);
5338
const playerIds = items.map((item) => item.Player_ID as string);
5439

5540
if (playerIds.length === 0) {
5641
const message = new MessageEmbed();
5742
message.setTitle("Leaderboard is empty");
5843
return {
5944
statusCode: 200,
60-
type: InteractionResponseType.ChannelMessageWithSource,
61-
data: {
62-
embeds: [message],
63-
},
45+
body: JSON.stringify({
46+
type: InteractionResponseType.ChannelMessageWithSource,
47+
data: {
48+
embeds: [message],
49+
},
50+
}),
6451
};
6552
}
6653

@@ -70,11 +57,11 @@ register({
7057
logger.info(`Found ${players.length} players`);
7158
const message = new MessageEmbed()
7259
.setTitle(`Example leaderboard`)
73-
.setDescription(`1st place: ${players[0].name}`)
60+
.setDescription(`Leader: ${players[0].name}`)
7461
.setImage(`https://crafatar.com/renders/body/${playerIds[0]}`)
7562
.setFooter({ text: "Thank you to crafatar.com for providing avatars." });
7663

77-
for (let i = 1; i < players.length; i++) {
64+
for (let i = 0; i < players.length; i++) {
7865
message.addField(
7966
`${`${i + 1}`.padStart(3)}: ${players[i].name}`,
8067
`${items[i]?.Score?.[0]}` || "0"

0 commit comments

Comments
 (0)