chore: release v0.0.12

.github/workflows/cd.yaml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Build and Push website
         uses: docker/build-push-action@v6
-        if: matrix.target == 'website'
+        if: github.ref_type == 'branch'
         with:
           push: true
           platforms: linux/amd64,linux/arm64
@@ -50,14 +50,14 @@ jobs:
           tags: ghcr.io/premid/${{ matrix.target }}:beta-${{ github.sha }}-${{ github.run_number }}
 
       - name: Get package.json version
-        if: matrix.target != 'website'
         id: get_version
-        run: echo ::set-output name=version::$(node -p "require('./apps/${{ matrix.target }}/package.json').version")
+        run: echo ::set-output name=version::$(echo "${GITHUB_REF##*/}" | sed -E 's/^.+-v([0-9]+\.[0-9]+\.[0-9]+)$/\1/')
         shell: bash
+        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Build and push other images
         uses: docker/build-push-action@v6
-        if: matrix.target != 'website' && startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           push: true
           platforms: linux/amd64,linux/arm64

apps/api-master/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@premid/api-master",
 	"type": "module",
-	"version": "0.0.18",
+	"version": "0.0.22",
 	"private": true,
 	"description": "PreMiD's api master",
 	"license": "MPL-2.0",
@@ -14,7 +14,6 @@
 		"dev": "node --watch --env-file .env --enable-source-maps ."
 	},
 	"dependencies": {
-		"@discordjs/rest": "^2.3.0",
 		"@envelop/sentry": "^9.0.0",
 		"@opentelemetry/api": "^1.9.0",
 		"@opentelemetry/exporter-prometheus": "^0.52.1",
@@ -23,6 +22,7 @@
 		"cron": "^3.1.7",
 		"debug": "^4.3.6",
 		"ioredis": "^5.3.2",
+		"ky": "^1.7.2",
 		"p-limit": "^6.1.0"
 	},
 	"devDependencies": {

apps/api-master/src/functions/clearOldSessions.ts

@@ -1,5 +1,5 @@
-import { REST } from "@discordjs/rest";
 import pLimit from "p-limit";
+import ky, { HTTPError, TimeoutError } from "ky";
 import { mainLog, redis } from "../index.js";
 
 let inProgress = false;
@@ -77,41 +77,29 @@ export async function clearOldSessions() {
 }
 
 async function deleteSession(session: { token: string; session: string }, key: string): Promise<string> {
-	const abortController = new AbortController();
-	const timeoutId = setTimeout(() => abortController.abort(), 5000); //* 5 second timeout
-
 	try {
-		const discord = new REST({ version: "10", authPrefix: "Bearer" });
-		discord.setToken(session.token);
-
-		await discord.post("/users/@me/headless-sessions/delete", {
-			signal: abortController.signal,
-			body: {
+		await ky.post("https://discord.com/api/v10/users/@me/headless-sessions/delete", {
+			json: {
 				token: session.session,
 			},
+			headers: {
+				Authorization: `Bearer ${session.token}`,
+			},
+			retry: 3,
+			timeout: 5000,
 		});
-
-		clearTimeout(timeoutId);
-		return key;
 	}
 	catch (error) {
-		clearTimeout(timeoutId);
-		//* Log detailed error information
-		mainLog(`Delete session error for key ${key}:`, {
-			errorName: error instanceof Error ? error.name : "Unknown",
-			errorMessage: error instanceof Error ? error.message : String(error),
-			errorStack: error instanceof Error ? error.stack : "No stack trace",
-		});
-
-		if (error instanceof Error && error.name === "AbortError") {
+		if (error instanceof TimeoutError) {
 			mainLog(`Session deletion aborted due to timeout for key ${key}`);
 		}
-		else if (error instanceof Error) {
-			mainLog(`Failed to delete session for key ${key}: ${error.message}`);
+		else if (error instanceof HTTPError) {
+			mainLog(`Failed to delete session for key ${key}: [${error.name}] ${error.message} ${JSON.stringify(await error.response.json())}`);
 		}
 		else {
 			mainLog(`Failed to delete session for key ${key}: Unknown error`);
 		}
-		return key;
 	}
+
+	return key;
 }

apps/api-master/src/functions/updateActivePresenceGauge.ts

@@ -0,0 +1,40 @@
+import { redis } from "../index.js";
+import { activePresenceGauge } from "../tracing.js";
+
+//* Track previously recorded services
+const previousServices = new Set<string>();
+
+//* Function to update the gauge with per-service counts
+export async function updateActivePresenceGauge() {
+	const pattern = "pmd-api.heartbeatUpdates.*.*";
+	let cursor: string = "0";
+	const serviceCounts = new Map<string, number>();
+
+	do {
+		const [newCursor, keys] = await redis.scan(cursor, "MATCH", pattern, "COUNT", 1000); //* Use SCAN with COUNT for memory efficiency
+		cursor = newCursor;
+		for (const key of keys) {
+			const parts = key.split(".");
+			const service = parts[parts.length - 1]!;
+			const hash = await redis.hgetall(key);
+			const version = hash.version; //* Get version from hash
+			serviceCounts.set(`${service}:${version}`, (serviceCounts.get(`${service}:${version}`) || 0) + 1);
+		}
+	} while (cursor !== "0");
+
+	// Set current counts and remove from previousServices
+	serviceCounts.forEach((count, serviceVersion) => {
+		const [service, version] = serviceVersion.split(":");
+		activePresenceGauge.record(count, { service, version }); //* Include version in labels
+		previousServices.delete(serviceVersion);
+	});
+
+	// Set gauge to 0 for services that are no longer active
+	previousServices.forEach((serviceVersion) => {
+		const [service, version] = serviceVersion.split(":");
+		activePresenceGauge.record(0, { service, version });
+	});
+
+	// Update the set of previous services
+	serviceCounts.forEach((_, serviceVersion) => previousServices.add(serviceVersion));
+}

apps/api-master/src/index.ts

@@ -5,12 +5,13 @@ import { clearOldSessions } from "./functions/clearOldSessions.js";
 import createRedis from "./functions/createRedis.js";
 import { setCounter } from "./functions/setCounter.js";
 import "./tracing.js";
+import { updateActivePresenceGauge } from "./functions/updateActivePresenceGauge.js"; //* Added import
 
 export const redis = createRedis();
 
 export const mainLog = debug("api-master");
 
-debug("Starting cron job to clear old sessions");
+debug("Starting cron jobs");
 
 void new CronJob(
 	// Every 5 seconds
@@ -31,3 +32,13 @@ void new CronJob(
 	undefined,
 	true,
 );
+
+void new CronJob(
+	// Every 5 seconds
+	"*/5 * * * * *",
+	() => {
+		updateActivePresenceGauge();
+	},
+	undefined,
+	true,
+);

apps/api-master/src/tracing.ts

@@ -15,4 +15,10 @@ export const counter = meter.createUpDownCounter("active_activites", {
 	valueType: ValueType.INT,
 });
 
+// * Replace Observable Gauge with regular Gauge
+export const activePresenceGauge = meter.createGauge("active_presence_names", {
+	description: "Number of active presence names per service",
+	valueType: ValueType.INT,
+});
+
 prometheusExporter.startServer();

apps/api-worker/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@premid/api-worker",
 	"type": "module",
-	"version": "0.0.8",
+	"version": "0.0.12",
 	"private": true,
 	"description": "PreMiD's api",
 	"license": "MPL-2.0",

apps/api-worker/src/constants.ts

@@ -0,0 +1,10 @@
+import process from "node:process";
+import { defu } from "defu";
+
+const disabledFlags = process.env.DISABLED_FEATURE_FLAGS?.split(",") ?? [];
+const flags = Object.fromEntries(disabledFlags.map(flag => [flag, false]));
+
+export const featureFlags = defu(flags, {
+	WebSocketManager: true,
+	SessionKeepAlive: true,
+});

apps/api-worker/src/functions/createServer.ts

@@ -1,13 +1,11 @@
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
-import process from "node:process";
 import { useSentry } from "@envelop/sentry";
 import { maxAliasesPlugin } from "@escape.tech/graphql-armor-max-aliases";
 import { maxDepthPlugin } from "@escape.tech/graphql-armor-max-depth";
 import { maxDirectivesPlugin } from "@escape.tech/graphql-armor-max-directives";
 import { maxTokensPlugin } from "@escape.tech/graphql-armor-max-tokens";
 import fastifyWebsocket from "@fastify/websocket";
-import { defu } from "defu";
 import fastify from "fastify";
 
 import { createSchema, createYoga } from "graphql-yoga";
@@ -15,6 +13,7 @@ import type { FastifyReply, FastifyRequest } from "fastify";
 import { Socket } from "../classes/Socket.js";
 import { resolvers } from "../graphql/resolvers/v5/index.js";
 import { sessionKeepAlive } from "../routes/sessionKeepAlive.js";
+import { featureFlags } from "../constants.js";
 import createRedis from "./createRedis.js";
 
 export interface FastifyContext {
@@ -48,7 +47,7 @@ export default async function createServer() {
 			maxDepthPlugin(),
 			maxDirectivesPlugin(),
 			maxTokensPlugin(),
-			useSentry(),
+			/* useSentry(), */
 		],
 		schema: createSchema<FastifyContext>({
 			resolvers,
@@ -87,15 +86,7 @@ export default async function createServer() {
 	});
 
 	app.get("/v5/feature-flags", async (request, reply) => {
-		const disabledFlags = process.env.DISABLED_FEATURE_FLAGS?.split(",") ?? [];
-		const flags = Object.fromEntries(disabledFlags.map(flag => [flag, false]));
-
-		const test = defu(flags, {
-			WebSocketManager: true,
-			SessionKeepAlive: true,
-		});
-
-		void reply.send(test);
+		void reply.send(featureFlags);
 	});
 
 	app.post("/v5/session-keep-alive", sessionKeepAlive);

apps/api-worker/src/graphql/resolvers/v5/Mutation/heartbeat.ts

@@ -1,9 +1,10 @@
 import { type } from "arktype";
 import type { MutationResolvers } from "../../../../generated/graphql-v5.js";
+import { redis } from "../../../../functions/createServer.js";
 
 const heartbeatSchema = type({
 	identifier: "string.uuid & string.lower",
-	presences: {
+	presence: {
 		service: "string.trim",
 		version: "string.semver",
 		language: "string.trim",
@@ -25,13 +26,19 @@ const mutation: MutationResolvers["heartbeat"] = async (_parent, input) => {
 	if (out instanceof type.errors)
 		throw new Error(out.summary);
 
-	// ! Disabled for now
-	/* await redis.setex(
-		`pmd-api.heartbeatUpdates.${data.identifier}`,
-		// 5 minutes
-		300,
-		JSON.stringify(data)
-	); */
+	// * Use Redis Hash with 'service' in the key to store heartbeat data
+	const redisKey = `pmd-api.heartbeatUpdates.${out.identifier}.${out.presence.service}`;
+	await redis.hset(redisKey, {
+		service: out.presence.service,
+		version: out.presence.version,
+		language: out.presence.language,
+		since: out.presence.since.toString(),
+		extension_version: out.extension.version,
+		extension_language: out.extension.language,
+		extension_connected_app: out.extension.connected?.app?.toString() || "",
+		extension_connected_discord: out.extension.connected?.discord?.toString() || "",
+	});
+	await redis.expire(redisKey, 300);
 
 	return {
 		__typename: "HeartbeatResult",

apps/api-worker/src/index.ts

@@ -3,8 +3,6 @@ import process from "node:process";
 import * as Sentry from "@sentry/node";
 import { connect } from "mongoose";
 import "./tracing.js";
-
-// eslint-disable-next-line perfectionist/sort-imports
 import createServer from "./functions/createServer.js";
 
 // TODO SETUP SENTRY

apps/api-worker/src/routes/sessionKeepAlive.ts

@@ -4,17 +4,25 @@ import { type } from "arktype";
 import { Routes } from "discord-api-types/v10";
 import type { FastifyReply, FastifyRequest } from "fastify";
 import { redis } from "../functions/createServer.js";
+import { featureFlags } from "../constants.js";
 
 const schema = type({
 	token: "string.trim",
 	session: "string.trim",
+	version: "string.semver & string.trim",
+	scienceId: "string.trim",
 });
 
 export async function sessionKeepAlive(request: FastifyRequest, reply: FastifyReply) {
-	//* Get the 2 headers
+	if (!featureFlags.SessionKeepAlive)
+		return reply.status(202).send();
+
+	//* Get the headers
 	const out = schema({
 		token: request.headers["x-token"],
 		session: request.headers["x-session"],
+		version: request.headers["x-version"] ?? "2.6.8",
+		scienceId: request.headers["x-science-id"] ?? request.headers["x-token"],
 	});
 
 	if (out instanceof type.errors)
@@ -25,7 +33,7 @@ export async function sessionKeepAlive(request: FastifyRequest, reply: FastifyRe
 
 	await redis.hset(
 		"pmd-api.sessions",
-		out.token,
+		out.scienceId,
 		JSON.stringify({
 			session: out.session,
 			token: out.token,

pnpm-lock.yaml

@@ -53,9 +53,6 @@ importers:
 
   apps/api-master:
     dependencies:
-      '@discordjs/rest':
-        specifier: ^2.3.0
-        version: 2.4.0
       '@envelop/sentry':
         specifier: ^9.0.0
         version: 9.0.0(@envelop/core@5.0.2)(@sentry/node@8.30.0)(graphql@16.9.0)
@@ -80,6 +77,9 @@ importers:
       ioredis:
         specifier: ^5.3.2
         version: 5.4.1
+      ky:
+        specifier: ^1.7.2
+        version: 1.7.2
       p-limit:
         specifier: ^6.1.0
         version: 6.1.0
@@ -2959,7 +2959,6 @@ packages:
 
   '@rollup/rollup-linux-arm64-gnu@4.21.2':
     resolution: {integrity: sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==}
-    cpu: [arm64]
     os: [linux]
 
   '@rollup/rollup-linux-arm64-musl@4.18.1':
@@ -6147,6 +6146,10 @@ packages:
   kolorist@1.8.0:
     resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
 
+  ky@1.7.2:
+    resolution: {integrity: sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==}
+    engines: {node: '>=18'}
+
   launch-editor@2.9.1:
     resolution: {integrity: sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==}
 
@@ -13514,7 +13517,7 @@ snapshots:
       pathe: 1.1.2
       sirv: 2.0.4
       tinyrainbow: 1.2.0
-      vitest: 2.0.5(@types/node@20.16.5)(@vitest/ui@2.0.5)(happy-dom@15.7.4)(sass@1.78.0)(terser@5.32.0)
+      vitest: 2.0.5(@types/node@22.5.4)(@vitest/ui@2.0.5)(happy-dom@15.0.0)(sass@1.78.0)(terser@5.32.0)
 
   '@vitest/utils@2.0.5':
     dependencies:
@@ -16739,6 +16742,8 @@ snapshots:
 
   kolorist@1.8.0: {}
 
+  ky@1.7.2: {}
+
   launch-editor@2.9.1:
     dependencies:
       picocolors: 1.1.0