update github gql to use octokit

what could go wrong right?

Author: Techbot121

.gitignore

@@ -10,6 +10,7 @@ resources/game-server-status/style.css
 
 # Our files
 .env
+*.pem
 *.json
 !*.example.json
 deploy.sh

app/services/Github.ts

@@ -0,0 +1,22 @@
+import { Container, Service } from "../Container.js";
+import { Octokit } from "octokit";
+import { createAppAuth } from "@octokit/auth-app";
+import config from "@/config/github.json" with { type: "json" };
+
+export class Github extends Service {
+	name = "Github";
+
+	octokit = new Octokit({
+		authStrategy: createAppAuth,
+		auth: {
+			appId: config.appId,
+			privateKey: config.privateKey,
+			clientId: config.clientId,
+			clientSecret: config.clientSecret,
+		},
+	});
+}
+
+export default (container: Container): Service => {
+	return new Github(container);
+};

app/services/index.ts

@@ -4,6 +4,7 @@ import DataProvider, { Data } from "./Data.js";
 import DiscordBotProvider, { DiscordBot } from "./discord/index.js";
 import DiscordMetadataProvider, { DiscordMetadata } from "./DiscordMetadata.js";
 import GameBridgeProvider, { GameBridge } from "./gamebridge/index.js";
+import GithubProvider, { Github } from "./Github.js";
 import IRCProvider, { IRC } from "./IRC.js";
 import MarkovProvider, { Markov } from "./Markov.js";
 import MotdProvider, { Motd } from "./Motd.js";
@@ -20,6 +21,7 @@ export default [
 	DiscordBotProvider,
 	DiscordMetadataProvider,
 	GameBridgeProvider,
+	GithubProvider,
 	IRCProvider,
 	MarkovProvider,
 	MotdProvider,
@@ -37,6 +39,7 @@ export {
 	DiscordBot,
 	DiscordMetadata,
 	GameBridge,
+	Github,
 	IRC,
 	Markov,
 	Motd,
@@ -54,6 +57,7 @@ export type ServiceMap = {
 	DiscordBot: DiscordBot;
 	DiscordMetadata: DiscordMetadata;
 	GameBridge: GameBridge;
+	Github: Github;
 	IRC: IRC;
 	Markov: Markov;
 	Motd: Motd;

config/apikeys.example.json

@@ -1,5 +1,4 @@
 {
-    "github": "",
     "gitlab": "",
     "steam": ""
 }

config/github.example.json

@@ -0,0 +1,6 @@
+{
+    "appId": "",
+    "clientId": "",
+    "clientSecret": "",
+    "privateKey": ""
+}

package.json

@@ -24,7 +24,7 @@
 		"@ffmpeg.wasm/main": "^0.13.1",
 		"@microsoft/signalr": "^8.0.7",
 		"@napi-rs/canvas": "^0.1.37",
-		"@octokit/webhooks": "^13.8.2",
+		"@octokit/auth-app": "^8.1.1",
 		"ajv": "^8.17.1",
 		"audio-buffer": "^5.0.0",
 		"axios": "^1.9.0",
@@ -44,6 +44,7 @@
 		"node-schedule": "^2.1.1",
 		"node-ssh": "^13.0.0",
 		"node-wav": "^0.0.2",
+		"octokit": "^5.0.3",
 		"pg": "^8.8.0",
 		"pug": "^3.0.2",
 		"qs": "^6.11.0",

utils.ts

@@ -80,9 +80,9 @@ export const getAsBase64 = async (url: string): Promise<string | null> => {
 
 interface GithubResponse {
 	repository: {
-		content: {
+		object: {
 			text: string;
-		};
+		} | null;
 	};
 }
 interface GitlabResponse {
@@ -115,26 +115,13 @@ export const getOrFetchGmodFile = async (path: PathLike) => {
 			const provider = url.match(/([^\.\/]+)\.com/);
 			if (!provider) return;
 			const isGithub = provider[1] === "github";
-			const endpoint = isGithub
-				? "https://api.github.com/graphql"
-				: "https://gitlab.com/api/graphql";
+			const gitlabEndpoint = "https://gitlab.com/api/graphql";
 			const repo = addon;
 			const owner = url.match(/\.com\/(.+?)\//);
 			const branch = url.split("/").at(-2);
 
 			if (!owner) return;
-			const query = isGithub
-				? gql`{
-			repository(owner:"${owner[1]}", name:"${repo}") {
-				content: object(expression:"${branch}:${path}") {
-					... on Blob {
-						text
-					}
-				}
-			}
-	}
-	`
-				: gql`{
+			const query = gql`{
 		project(fullPath:"${url.match(/\.com\/(.+?)\/\-/)?.[1]}") {
 			repository {
 				blobs(paths:"${path}"){
@@ -145,23 +132,40 @@ export const getOrFetchGmodFile = async (path: PathLike) => {
 	}
 	`;
 			try {
-				const data = await request<GithubResponse | GitlabResponse>(
-					endpoint,
-					query,
-					{},
-					{
-						authorization: `Bearer ${isGithub ? apikeys.github : apikeys.gitlab}`,
+				if (isGithub) {
+					const github = await globalThis.MetaConcord.container.getService("Github");
+					const request: { data: GithubResponse } = await github.octokit.graphql(
+						`query text($owner: String!, $repo: String!) {
+							repository(owner: $owner, name: $repo) {
+								object(expression: "${branch ?? "HEAD"}:${path}") {
+								... on Blob {
+									text
+								}
+							}
+						}`,
+						{ owner, repo }
+					);
+					if (request.data.repository.object?.text)
+						return request.data.repository.object.text;
+					return;
+				} else {
+					const data = await request<GithubResponse | GitlabResponse>(
+						gitlabEndpoint,
+						query,
+						{},
+						{
+							authorization: `Bearer ${apikeys.gitlab}`,
+						}
+					);
+					if (data) {
+						const filecontent = (data as GitlabResponse).project.repository.blobs
+							.nodes[0].rawTextBlob;
+						return linenos
+							? getStackLines(filecontent, Number(linenos), Number(linenoe))
+							: filecontent;
 					}
-				);
-				if (data) {
-					const filecontent = isGithub
-						? (data as GithubResponse).repository.content.text
-						: (data as GitlabResponse).project.repository.blobs.nodes[0].rawTextBlob;
-					return linenos
-						? getStackLines(filecontent, Number(linenos), Number(linenoe))
-						: filecontent;
+					return;
 				}
-				return;
 			} catch (err) {
 				console.error(JSON.stringify(err, undefined, 2));
 				return;