diff --git a/README.md b/README.md index 278317b..1c6f4a0 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,8 @@ These are endpoints provided by volunteers. Please use these in moderation. -- [https://trophygithubreadmelang.cybee.dpdns.org/](https://trophygithubreadmelang.cybee.dpdns.org/) by [Cyberbee-pro](https://github.com/Cyberbee-pro) +- [https://trophygithubreadmelang.cybee.dpdns.org/](https://trophygithubreadmelang.cybee.dpdns.org/) + by [Cyberbee-pro](https://github.com/Cyberbee-pro) - [https://github-profile-trophy-liard-delta.vercel.app](https://github-profile-trophy-liard-delta.vercel.app/) by [Adwitya](https://github.com/Adwitya) - [https://github-profile-trophy-fork-two.vercel.app](https://github-profile-trophy-fork-two.vercel.app) @@ -70,9 +71,12 @@ These are endpoints provided by volunteers. Please use these in moderation. by [reiyua](https://github.com/reiyua) - [https://github-profile-trophy-sigma-one.vercel.app](https://github-profile-trophy-sigma-one.vercel.app/)) by [namankoolwal](https://github.com/namankoolwal) -- [https://trophy.benkou.dev/](https://trophy.benkou.dev/) by [Ben](https://github.com/0x5b62656e5d) -- [https://github-trophies.devomb.com/](https://github-trophies.devomb.com/) by [DevomB](https://github.com/DevomB/Github-Trophies) -- [https://github-profile-trophy-unserori.vercel.app/](https://github-profile-trophy-unserori.vercel.app/) by [unSerori](https://github.com/unSerori) +- [https://trophy.benkou.dev/](https://trophy.benkou.dev/) by + [Ben](https://github.com/0x5b62656e5d) +- [https://github-trophies.devomb.com/](https://github-trophies.devomb.com/) by + [DevomB](https://github.com/DevomB/Github-Trophies) +- [https://github-profile-trophy-unserori.vercel.app/](https://github-profile-trophy-unserori.vercel.app/) + by [unSerori](https://github.com/unSerori) # Quick Start @@ -614,6 +618,40 @@ Usage: token: ${{ secrets.GITHUB_TOKEN }} ``` +## Self-hosting on Vercel + +By self-hosting you avoid rate-limits, instances getting paused and you bypass +the #439 issue. + +1. For people who do not have this repo forked, you need to do that before you + can deploy anything. + +2. Make an account, connect your GitHub account to Vercel, and import your repo. + +3. Go back to GitHub, generate a token, and copy it. + +4. Set your token scopes to `read:user` + `public_repo` (only use `repo` if you + want private contributions counted). + +5. On Vercel's configure screen, add two environment variables and paste the + token as the value of each — you can use the same token for both: + +``` +GITHUB_TOKEN1=your_token +GITHUB_TOKEN2=your_token +``` + +6. After that you can deploy it. + +7. Set Vercel Authentication -> Only Preview Deployments, or your card shows + blank. + +8. You get a domain which you can use/test, it looks something like this: + +``` +https://.vercel.app/?username=USERNAME +``` + # Contribution Guide Check [CONTRIBUTING.md](./CONTRIBUTING.md) for more details. diff --git a/api/index.ts b/api/index.ts index 48797d7..8ad6aa0 100644 --- a/api/index.ts +++ b/api/index.ts @@ -2,7 +2,7 @@ import { Card } from "../src/card.ts"; import { CONSTANTS, parseParams } from "../src/utils.ts"; import { COLORS, Theme } from "../src/theme.ts"; import { Error400 } from "../src/error_page.ts"; -import "https://deno.land/x/dotenv@v0.5.0/load.ts"; +import "@std/dotenv/load"; import { staticRenderRegeneration } from "../src/StaticRenderRegeneration/index.ts"; import { GithubRepositoryService } from "../src/Repository/GithubRepository.ts"; import { GithubApiService } from "../src/Services/GithubApiService.ts"; diff --git a/deno.json b/deno.json index 66acc4b..2424e78 100644 --- a/deno.json +++ b/deno.json @@ -5,5 +5,8 @@ "format": "deno fmt", "lint": "deno lint", "test": "ENV_TYPE=test deno test --allow-env" + }, + "imports": { + "@std/dotenv": "jsr:@std/dotenv@^0.224.0" } } diff --git a/main.ts b/main.ts index a85cf03..0163488 100644 --- a/main.ts +++ b/main.ts @@ -1,4 +1,4 @@ -import { serve } from "https://deno.land/std@0.125.0/http/server.ts"; +import { serve } from "https://deno.land/std@0.224.0/http/server.ts"; import requestHandler from "./api/index.ts"; serve(requestHandler, { port: Number(Deno.env.get("PORT")) || 8080 }); diff --git a/src/Schemas/index.ts b/src/Schemas/index.ts index 8e09dbb..9f93cff 100644 --- a/src/Schemas/index.ts +++ b/src/Schemas/index.ts @@ -51,9 +51,7 @@ export const queryUserRepository = ` name } } - stargazers { - totalCount - } + stargazerCount createdAt } } @@ -93,9 +91,7 @@ export const queryUserAll = ` name } } - stargazers { - totalCount - } + stargazerCount createdAt } } diff --git a/src/Services/GithubApiService.ts b/src/Services/GithubApiService.ts index 167525d..fbcc8f0 100644 --- a/src/Services/GithubApiService.ts +++ b/src/Services/GithubApiService.ts @@ -94,7 +94,7 @@ export class GithubApiService extends GithubRepository { ); }); } catch (error) { - if (error.cause instanceof ServiceError) { + if (error instanceof Error && error.cause instanceof ServiceError) { Logger.error(error.cause.message); return error.cause; } diff --git a/src/Services/__mocks__/successGithubResponse.json b/src/Services/__mocks__/successGithubResponse.json index d8198b5..0137cac 100644 --- a/src/Services/__mocks__/successGithubResponse.json +++ b/src/Services/__mocks__/successGithubResponse.json @@ -13,9 +13,7 @@ } ] }, - "stargazers": { - "totalCount": 23 - } + "stargazerCount": 23 }, { "languages": { @@ -25,9 +23,7 @@ } ] }, - "stargazers": { - "totalCount": 11 - } + "stargazerCount": 11 }, { "languages": { @@ -37,9 +33,7 @@ } ] }, - "stargazers": { - "totalCount": 9 - } + "stargazerCount": 9 }, { "languages": { @@ -49,9 +43,7 @@ } ] }, - "stargazers": { - "totalCount": 6 - } + "stargazerCount": 6 }, { "languages": { @@ -61,9 +53,7 @@ } ] }, - "stargazers": { - "totalCount": 6 - } + "stargazerCount": 6 }, { "languages": { @@ -73,9 +63,7 @@ } ] }, - "stargazers": { - "totalCount": 5 - } + "stargazerCount": 5 }, { "languages": { @@ -85,9 +73,7 @@ } ] }, - "stargazers": { - "totalCount": 5 - } + "stargazerCount": 5 }, { "languages": { @@ -97,9 +83,7 @@ } ] }, - "stargazers": { - "totalCount": 5 - } + "stargazerCount": 5 }, { "languages": { @@ -109,9 +93,7 @@ } ] }, - "stargazers": { - "totalCount": 4 - } + "stargazerCount": 4 }, { "languages": { @@ -121,9 +103,7 @@ } ] }, - "stargazers": { - "totalCount": 3 - } + "stargazerCount": 3 }, { "languages": { @@ -133,9 +113,7 @@ } ] }, - "stargazers": { - "totalCount": 2 - } + "stargazerCount": 2 }, { "languages": { @@ -145,9 +123,7 @@ } ] }, - "stargazers": { - "totalCount": 2 - } + "stargazerCount": 2 }, { "languages": { @@ -157,17 +133,13 @@ } ] }, - "stargazers": { - "totalCount": 2 - } + "stargazerCount": 2 }, { "languages": { "nodes": [] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -177,9 +149,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -195,9 +165,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -213,9 +181,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -225,9 +191,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -243,9 +207,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -261,9 +223,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -279,9 +239,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -294,9 +252,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -312,9 +268,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -327,9 +281,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -345,9 +297,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -363,9 +313,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -375,9 +323,7 @@ } ] }, - "stargazers": { - "totalCount": 1 - } + "stargazerCount": 1 }, { "languages": { @@ -393,9 +339,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -411,9 +355,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -429,25 +371,19 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { "nodes": [] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { "nodes": [] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -463,9 +399,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -475,9 +409,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -487,9 +419,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -505,9 +435,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -523,17 +451,13 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { "nodes": [] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -546,9 +470,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -564,9 +486,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -582,9 +502,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -597,9 +515,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -615,9 +531,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -633,9 +547,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -651,9 +563,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -669,9 +579,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -687,9 +595,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -699,9 +605,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -714,9 +618,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -732,9 +634,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -744,9 +644,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -759,9 +657,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -771,9 +667,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -783,9 +677,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -801,9 +693,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -819,9 +709,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -831,9 +719,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -846,9 +732,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -864,9 +748,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -882,9 +764,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -894,17 +774,13 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { "nodes": [] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -917,9 +793,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -935,9 +809,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -953,9 +825,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -971,9 +841,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -989,9 +857,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1001,9 +867,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1019,9 +883,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1031,9 +893,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1049,9 +909,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1064,9 +922,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1079,9 +935,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1097,9 +951,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1115,9 +967,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1133,9 +983,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1145,9 +993,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1163,9 +1009,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1175,9 +1019,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1193,9 +1035,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1211,9 +1051,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1223,9 +1061,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1238,9 +1074,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1250,9 +1084,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1268,9 +1100,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1283,9 +1113,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1301,9 +1129,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1319,9 +1145,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1337,9 +1161,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1355,9 +1177,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1373,9 +1193,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1391,9 +1209,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1409,9 +1225,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1427,9 +1241,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1445,9 +1257,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1463,9 +1273,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1481,9 +1289,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1493,9 +1299,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1511,9 +1315,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 }, { "languages": { @@ -1529,9 +1331,7 @@ } ] }, - "stargazers": { - "totalCount": 0 - } + "stargazerCount": 0 } ] } diff --git a/src/Services/__tests__/githubApiService.test.ts b/src/Services/__tests__/githubApiService.test.ts index b9a697e..6ed8c5b 100644 --- a/src/Services/__tests__/githubApiService.test.ts +++ b/src/Services/__tests__/githubApiService.test.ts @@ -82,7 +82,7 @@ Deno.test("Should get data in first try", async () => { Deno.test("Should throw NOT FOUND", async () => { const provider = new GithubApiService(); - let error = null; + let error: unknown = null; try { error = await provider.requestUserInfo("test"); @@ -90,12 +90,12 @@ Deno.test("Should throw NOT FOUND", async () => { error = e; } - assertEquals(error.code, 404); + assertEquals((error as ServiceError).code, 404); assertEquals(error instanceof ServiceError, true); }); Deno.test("Should throw NOT FOUND even if request the user only", async () => { const provider = new GithubApiService(); - let error = null; + let error: unknown = null; try { error = await provider.requestUserRepository("test"); @@ -103,7 +103,7 @@ Deno.test("Should throw NOT FOUND even if request the user only", async () => { error = e; } - assertEquals(error.code, 404); + assertEquals((error as ServiceError).code, 404); assertEquals(error instanceof ServiceError, true); }); @@ -112,7 +112,7 @@ Deno.test("Should throw NOT FOUND even if request the user only", async () => { // https://docs.deno.com/runtime/manual/basics/testing/assertions#throws Deno.test("Should throw RATE LIMIT", async () => { const provider = new GithubApiService(); - let error = null; + let error: unknown = null; try { error = await provider.requestUserRepository("test"); @@ -120,13 +120,13 @@ Deno.test("Should throw RATE LIMIT", async () => { error = e; } - assertEquals(error.code, 419); + assertEquals((error as ServiceError).code, 419); assertEquals(error instanceof ServiceError, true); }); Deno.test("Should throw RATE LIMIT Exceed", async () => { const provider = new GithubApiService(); - let error = null; + let error: unknown = null; try { error = await provider.requestUserRepository("test"); @@ -134,6 +134,6 @@ Deno.test("Should throw RATE LIMIT Exceed", async () => { error = e; } - assertEquals(error.code, 419); + assertEquals((error as ServiceError).code, 419); assertEquals(error instanceof ServiceError, true); }); diff --git a/src/Services/__tests__/request.test.ts b/src/Services/__tests__/request.test.ts new file mode 100644 index 0000000..1a1c5f7 --- /dev/null +++ b/src/Services/__tests__/request.test.ts @@ -0,0 +1,27 @@ +import { assertEquals, assertRejects, soxa, stub } from "../../../deps.ts"; +import { EServiceKindError, ServiceError } from "../../Types/index.ts"; +import { requestGithubData } from "../request.ts"; + +Deno.test("requestGithubData rejects partial GraphQL responses", async () => { + const post = stub(soxa, "post", () => { + return Promise.resolve({ + data: { + data: { user: { login: "test" } }, + errors: [{ message: "Field access failed", type: "FORBIDDEN" }], + }, + }); + }); + + try { + const error = await assertRejects( + () => requestGithubData("query { viewer { login } }", {}), + ServiceError, + "Field access failed", + ) as ServiceError; + + assertEquals(error.cause, EServiceKindError.UPSTREAM); + assertEquals(error.code, 502); + } finally { + post.restore(); + } +}); diff --git a/src/Services/request.ts b/src/Services/request.ts index d79df16..ccc1a9f 100644 --- a/src/Services/request.ts +++ b/src/Services/request.ts @@ -2,8 +2,6 @@ import { soxa } from "../../deps.ts"; import { EServiceKindError, GithubError, - GithubErrorResponse, - GithubExceedError, QueryDefaultResponse, ServiceError, } from "../Types/index.ts"; @@ -21,6 +19,20 @@ export async function requestGithubData( }) as QueryDefaultResponse<{ user: T }>; const responseData = response.data; + if (responseData?.errors?.length) { + console.error( + "GitHub GraphQL errors:", + JSON.stringify(responseData.errors, null, 2), + ); + + throw new ServiceError( + responseData.errors + .map((error) => error.message) + .join("; "), + getGraphQLErrorKind(responseData.errors), + ); + } + if (responseData?.data?.user) { return responseData.data.user; } @@ -28,6 +40,22 @@ export async function requestGithubData( throw handleError(responseData); } +function getGraphQLErrorKind(errors: GithubError[]): EServiceKindError { + const errorTypes = errors.map((error) => error.type); + + if ( + errorTypes.some((type) => type?.includes(EServiceKindError.RATE_LIMIT)) + ) { + return EServiceKindError.RATE_LIMIT; + } + + if (errorTypes.every((type) => type === EServiceKindError.NOT_FOUND)) { + return EServiceKindError.NOT_FOUND; + } + + return EServiceKindError.UPSTREAM; +} + function handleError( responseData: { data?: unknown; diff --git a/src/Types/EServiceKindError.ts b/src/Types/EServiceKindError.ts index 172ed05..e6e2bd1 100644 --- a/src/Types/EServiceKindError.ts +++ b/src/Types/EServiceKindError.ts @@ -1,4 +1,5 @@ export const enum EServiceKindError { RATE_LIMIT = "RATE_LIMITED", NOT_FOUND = "NOT_FOUND", + UPSTREAM = "UPSTREAM", } diff --git a/src/Types/ServiceError.ts b/src/Types/ServiceError.ts index cd0ec7a..c1d0733 100644 --- a/src/Types/ServiceError.ts +++ b/src/Types/ServiceError.ts @@ -14,6 +14,8 @@ export class ServiceError extends Error { return 419; case EServiceKindError.NOT_FOUND: return 404; + case EServiceKindError.UPSTREAM: + return 502; default: return 400; } diff --git a/src/__tests__/user_info.test.ts b/src/__tests__/user_info.test.ts new file mode 100644 index 0000000..ae32d70 --- /dev/null +++ b/src/__tests__/user_info.test.ts @@ -0,0 +1,41 @@ +import { assertEquals } from "../../deps.ts"; +import { UserInfo } from "../user_info.ts"; + +Deno.test("UserInfo calculates total stargazers", () => { + const userInfo = new UserInfo( + { + createdAt: "2025-01-01T00:00:00Z", + contributionsCollection: { + restrictedContributionsCount: 0, + totalCommitContributions: 0, + totalPullRequestReviewContributions: 0, + }, + organizations: { totalCount: 0 }, + followers: { totalCount: 0 }, + }, + { + openIssues: { totalCount: 0 }, + closedIssues: { totalCount: 0 }, + }, + { pullRequests: { totalCount: 0 } }, + { + repositories: { + totalCount: 2, + nodes: [ + { + languages: { nodes: [] }, + stargazerCount: 3, + createdAt: "2025-01-01T00:00:00Z", + }, + { + languages: { nodes: [] }, + stargazerCount: 5, + createdAt: "2025-01-02T00:00:00Z", + }, + ], + }, + }, + ); + + assertEquals(userInfo.totalStargazers, 8); +}); diff --git a/src/error_page.ts b/src/error_page.ts index 7b1acb9..71e5522 100644 --- a/src/error_page.ts +++ b/src/error_page.ts @@ -128,3 +128,8 @@ export class Error404 extends BaseError { readonly status = 404; readonly message = "Not Found"; } + +export class Error502 extends BaseError { + readonly status = 502; + readonly message = "Bad Gateway"; +} diff --git a/src/pages/Error.ts b/src/pages/Error.ts index 9170345..0fd0513 100644 --- a/src/pages/Error.ts +++ b/src/pages/Error.ts @@ -1,12 +1,12 @@ import { EServiceKindError, ServiceError } from "../Types/index.ts"; -import { Error400, Error404, Error419 } from "../error_page.ts"; +import { Error400, Error404, Error419, Error502 } from "../error_page.ts"; interface ErrorPageProps { error: ServiceError; } export function ErrorPage({ error }: ErrorPageProps) { - let cause: Error400 | Error404 | Error419 = new Error400(); + let cause: Error400 | Error404 | Error419 | Error502 = new Error400(); if (error.cause === EServiceKindError.RATE_LIMIT) { cause = new Error419(); @@ -18,5 +18,9 @@ export function ErrorPage({ error }: ErrorPageProps) { ); } + if (error.cause === EServiceKindError.UPSTREAM) { + cause = new Error502("GitHub returned an unexpected response."); + } + return cause; } diff --git a/src/user_info.ts b/src/user_info.ts index c5b986e..1f3426d 100644 --- a/src/user_info.ts +++ b/src/user_info.ts @@ -1,8 +1,7 @@ type Language = { name: string }; -type Stargazers = { totalCount: number }; type Repository = { languages: { nodes: Language[] }; - stargazers: Stargazers; + stargazerCount: number; createdAt: string; }; export type GitHubUserRepository = { @@ -78,7 +77,7 @@ export class UserInfo { userActivity.contributionsCollection.totalCommitContributions; const totalStargazers = userRepository.repositories.nodes.reduce( (prev: number, node: Repository) => { - return prev + node.stargazers.totalCount; + return prev + node.stargazerCount; }, 0, );