my quick tests for implementing stale-if-error

Rate limit error caching to alleviate PATs.

.github/workflows/deploy-prep.py

@@ -1,10 +0,0 @@
-import os
-
-file = open('./vercel.json', 'r')
-str = file.read()
-file = open('./vercel.json', 'w')
-
-str = str.replace('"maxDuration": 10', '"maxDuration": 30')
-
-file.write(str)
-file.close()

.github/workflows/deploy-prep.yml

@@ -1,20 +0,0 @@
-name: Deployment Prep
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-
-jobs:
-  config:
-    if: github.repository == 'anuraghazra/github-readme-stats'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Deployment Prep
-        run: python ./.github/workflows/deploy-prep.py
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          branch: vercel
-          create_branch: true
-          push_options: "--force"

.github/workflows/e2e-test.yml

@@ -5,7 +5,6 @@ on:
 jobs:
   e2eTests:
     if:
-      github.repository == 'anuraghazra/github-readme-stats' &&
       github.event_name == 'deployment_status' &&
       github.event.deployment_status.state == 'success'
     name: Perform 2e2 tests

.github/workflows/empty-issues-closer.yaml

@@ -8,7 +8,6 @@ on:
 
 jobs:
   closeEmptyIssuesAndTemplates:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     name: Close empty issues
     runs-on: ubuntu-latest
     steps:

.github/workflows/label-pr.yml

@@ -4,7 +4,6 @@ on:
 
 jobs:
   triage:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/labeler@v4

.github/workflows/stale-theme-pr-closer.yaml

@@ -5,7 +5,6 @@ on:
 
 jobs:
   closeOldThemePrs:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     name: Close stale 'invalid' theme PRs
     runs-on: ubuntu-latest
     strategy:

.github/workflows/top-issues-dashboard.yml

@@ -5,7 +5,6 @@ on:
 
 jobs:
   showAndLabelTopIssues:
-    if: github.repository == 'anuraghazra/github-readme-stats'
     name: Update top issues Dashboard.
     runs-on: ubuntu-latest
     steps:

.github/workflows/update-langs.yaml

@@ -1,44 +0,0 @@
-name: Update supported languages
-on:
-  schedule:
-    - cron: "0 0 */30 * *"
-
-jobs:
-  updateLanguages:
-    if: github.repository == 'anuraghazra/github-readme-stats'
-    name: Update supported languages
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-        env:
-          CI: true
-
-      - name: Run update-languages-json.js script
-        run: npm run generate-langs-json
-
-      - name: Create Pull Request if upstream language file is changed
-        uses: peter-evans/create-pull-request@v4
-        with:
-          commit-message: "refactor: update languages JSON"
-          branch: "update_langs/patch"
-          delete-branch: true
-          title: Update languages JSON
-          body:
-            "The
-            [update-langs](https://github.com/anuraghazra/github-readme-stats/actions/workflows/update-langs.yaml)
-            action found new/updated languages in the [upstream languages JSON
-            file](https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml)."
-          labels: "ci, lang-card"

api/index.js

@@ -7,6 +7,7 @@ import {
   parseBoolean,
   renderError,
 } from "../src/common/utils.js";
+import { HttpException } from "../src/common/exceptions.js";
 import { fetchStats } from "../src/fetchers/stats-fetcher.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
@@ -56,7 +57,7 @@ export default async (req, res) => {
     );
 
     const cacheSeconds = clampValue(
-      parseInt(cache_seconds || CONSTANTS.FOUR_HOURS, 10),
+      parseInt(cache_seconds || CONSTANTS.CARD_CACHE_SECONDS, 10),
       CONSTANTS.FOUR_HOURS,
       CONSTANTS.ONE_DAY,
     );
@@ -65,7 +66,8 @@ export default async (req, res) => {
       "Cache-Control",
       `max-age=${
         cacheSeconds / 2
-      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
+      }, s-maxage=${cacheSeconds}, stale-while-revalidate=${CONSTANTS.ONE_DAY}, 
+      stale-if-error=${CONSTANTS.ONE_HOUR}`,
     );
 
     return res.send(
@@ -93,7 +95,27 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    // Throw error if REST and GraphQL API calls fail. This way we can return a cached
+    if (err instanceof HttpException) {
+      // throw err;
+      // throw new Error(err.message);
+      // return res.status(404).;
+      // return {statusCode: 404, body: err.message}
+      return res
+        .status(500)
+        .send(
+          renderError(err.errors[0].message, err.errors[0].secondaryMessage),
+        );
+    }
+
+    // Cache the error response less frequently.
+    res.setHeader(
+      "Cache-Control",
+      `max-age=${CONSTANTS.ERROR_CACHE_SECONDS / 2}, s-maxage=${
+        CONSTANTS.ERROR_CACHE_SECONDS
+      }, stale-while-revalidate=${CONSTANTS.ONE_DAY}
+      stale-if-error=${CONSTANTS.ONE_HOUR}`,
+    );
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

api/pin.js

@@ -40,7 +40,7 @@ export default async (req, res) => {
     const repoData = await fetchRepo(username, repo);
 
     let cacheSeconds = clampValue(
-      parseInt(cache_seconds || CONSTANTS.FOUR_HOURS, 10),
+      parseInt(cache_seconds || CONSTANTS.CARD_CACHE_SECONDS, 10),
       CONSTANTS.FOUR_HOURS,
       CONSTANTS.ONE_DAY,
     );
@@ -80,7 +80,12 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    res.setHeader(
+      "Cache-Control",
+      `max-age=${CONSTANTS.ERROR_CACHE_SECONDS / 2}, s-maxage=${
+        CONSTANTS.ERROR_CACHE_SECONDS
+      }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
+    ); // Cache the error response less frequently.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

api/status/pat-info.js

@@ -1,139 +0,0 @@
-/**
- * @file Contains a simple cloud function that can be used to check which PATs are no
- * longer working. It returns a list of valid PATs, expired PATs and PATs with errors.
- *
- * @description This function is currently rate limited to 1 request per 10 minutes.
- */
-
-import { logger, request, dateDiff } from "../../src/common/utils.js";
-export const RATE_LIMIT_SECONDS = 60 * 5; // 1 request per 10 minutes
-
-/**
- * Simple uptime check fetcher for the PATs.
- *
- * @param {import('axios').AxiosRequestHeaders} variables
- * @param {string} token
- */
-const uptimeFetcher = (variables, token) => {
-  return request(
-    {
-      query: `
-        query {
-          rateLimit {
-            remaining
-            resetAt
-          },
-        }`,
-      variables,
-    },
-    {
-      Authorization: `bearer ${token}`,
-    },
-  );
-};
-
-const getAllPATs = () => {
-  return Object.keys(process.env).filter((key) => /PAT_\d*$/.exec(key));
-};
-
-/**
- * Check whether any of the PATs is expired.
- */
-const getPATInfo = async (fetcher, variables) => {
-  const details = {};
-  const PATs = getAllPATs();
-
-  for (const pat of PATs) {
-    try {
-      const response = await fetcher(variables, process.env[pat]);
-      const errors = response.data.errors;
-      const hasErrors = Boolean(errors);
-      const errorType = errors?.[0]?.type;
-      const isRateLimited =
-        (hasErrors && errorType === "RATE_LIMITED") ||
-        response.data.data?.rateLimit?.remaining === 0;
-
-      // Store PATs with errors.
-      if (hasErrors && errorType !== "RATE_LIMITED") {
-        details[pat] = {
-          status: "error",
-          error: {
-            type: errors[0].type,
-            message: errors[0].message,
-          },
-        };
-        continue;
-      } else if (isRateLimited) {
-        const date1 = new Date();
-        const date2 = new Date(response.data?.data?.rateLimit?.resetAt);
-        details[pat] = {
-          status: "exhausted",
-          remaining: 0,
-          resetIn: dateDiff(date2, date1) + " minutes",
-        };
-      } else {
-        details[pat] = {
-          status: "valid",
-          remaining: response.data.data.rateLimit.remaining,
-        };
-      }
-    } catch (err) {
-      // Store the PAT if it is expired.
-      const errorMessage = err.response?.data?.message?.toLowerCase();
-      if (errorMessage === "bad credentials") {
-        details[pat] = {
-          status: "expired",
-        };
-      } else if (errorMessage === "sorry. your account was suspended.") {
-        details[pat] = {
-          status: "suspended",
-        };
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  const filterPATsByStatus = (status) => {
-    return Object.keys(details).filter((pat) => details[pat].status === status);
-  };
-
-  const sortedDetails = Object.keys(details)
-    .sort()
-    .reduce((obj, key) => {
-      obj[key] = details[key];
-      return obj;
-    }, {});
-
-  return {
-    validPATs: filterPATsByStatus("valid"),
-    expiredPATs: filterPATsByStatus("expired"),
-    exhaustedPATs: filterPATsByStatus("exhausted"),
-    suspendedPATs: filterPATsByStatus("suspended"),
-    errorPATs: filterPATsByStatus("error"),
-    details: sortedDetails,
-  };
-};
-
-/**
- * Cloud function that returns information about the used PATs.
- */
-export default async (_, res) => {
-  res.setHeader("Content-Type", "application/json");
-  try {
-    // Add header to prevent abuse.
-    const PATsInfo = await getPATInfo(uptimeFetcher, {});
-    if (PATsInfo) {
-      res.setHeader(
-        "Cache-Control",
-        `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`,
-      );
-    }
-    res.send(JSON.stringify(PATsInfo, null, 2));
-  } catch (err) {
-    // Throw error if something went wrong.
-    logger.error(err);
-    res.setHeader("Cache-Control", "no-store");
-    res.send("Something went wrong: " + err.message);
-  }
-};

api/status/up.js

@@ -1,103 +0,0 @@
-/**
- * @file Contains a simple cloud function that can be used to check if the PATs are still
- * functional.
- *
- * @description This function is currently rate limited to 1 request per 10 minutes.
- */
-
-import retryer from "../../src/common/retryer.js";
-import { logger, request } from "../../src/common/utils.js";
-
-export const RATE_LIMIT_SECONDS = 60 * 10; // 1 request per 10 minutes
-
-/**
- * Simple uptime check fetcher for the PATs.
- *
- * @param {import('axios').AxiosRequestHeaders} variables
- * @param {string} token
- */
-const uptimeFetcher = (variables, token) => {
-  return request(
-    {
-      query: `
-        query {
-          rateLimit {
-              remaining
-          }
-        }
-        `,
-      variables,
-    },
-    {
-      Authorization: `bearer ${token}`,
-    },
-  );
-};
-
-/**
- * Creates Json response that can be used for shields.io dynamic card generation.
- *
- * @param {*} up Whether the PATs are up or not.
- * @returns Dynamic shields.io JSON response object.
- *
- * @see https://shields.io/endpoint.
- */
-const shieldsUptimeBadge = (up) => {
-  const schemaVersion = 1;
-  const isError = true;
-  const label = "Public Instance";
-  const message = up ? "up" : "down";
-  const color = up ? "brightgreen" : "red";
-  return {
-    schemaVersion,
-    label,
-    message,
-    color,
-    isError,
-  };
-};
-
-/**
- * Cloud function that returns whether the PATs are still functional.
- */
-export default async (req, res) => {
-  let { type } = req.query;
-  type = type ? type.toLowerCase() : "boolean";
-
-  res.setHeader("Content-Type", "application/json");
-
-  try {
-    let PATsValid = true;
-    try {
-      await retryer(uptimeFetcher, {});
-    } catch (err) {
-      PATsValid = false;
-    }
-
-    if (PATsValid) {
-      res.setHeader(
-        "Cache-Control",
-        `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`,
-      );
-    } else {
-      res.setHeader("Cache-Control", "no-store");
-    }
-
-    switch (type) {
-      case "shields":
-        res.send(shieldsUptimeBadge(PATsValid));
-        break;
-      case "json":
-        res.send({ up: PATsValid });
-        break;
-      default:
-        res.send(PATsValid);
-        break;
-    }
-  } catch (err) {
-    // Return fail boolean if something went wrong.
-    logger.error(err);
-    res.setHeader("Cache-Control", "no-store");
-    res.send("Something went wrong: " + err.message);
-  }
-};

api/top-langs.js

@@ -30,7 +30,6 @@ export default async (req, res) => {
     border_radius,
     border_color,
     disable_animations,
-    hide_progress,
   } = req.query;
   res.setHeader("Content-Type", "image/svg+xml");
 
@@ -49,7 +48,7 @@ export default async (req, res) => {
     );
 
     const cacheSeconds = clampValue(
-      parseInt(cache_seconds || CONSTANTS.FOUR_HOURS, 10),
+      parseInt(cache_seconds || CONSTANTS.CARD_CACHE_SECONDS, 10),
       CONSTANTS.FOUR_HOURS,
       CONSTANTS.ONE_DAY,
     );
@@ -78,11 +77,15 @@ export default async (req, res) => {
         border_color,
         locale: locale ? locale.toLowerCase() : null,
         disable_animations: parseBoolean(disable_animations),
-        hide_progress: parseBoolean(hide_progress),
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    res.setHeader(
+      "Cache-Control",
+      `max-age=${CONSTANTS.ERROR_CACHE_SECONDS / 2}, s-maxage=${
+        CONSTANTS.ERROR_CACHE_SECONDS
+      }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
+    ); // Cache the error response less frequently.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

api/wakatime.js

@@ -43,15 +43,11 @@ export default async (req, res) => {
     const stats = await fetchWakatimeStats({ username, api_domain, range });
 
     let cacheSeconds = clampValue(
-      parseInt(cache_seconds || CONSTANTS.FOUR_HOURS, 10),
+      parseInt(cache_seconds || CONSTANTS.CARD_CACHE_SECONDS, 10),
       CONSTANTS.FOUR_HOURS,
       CONSTANTS.ONE_DAY,
     );
 
-    if (!cache_seconds) {
-      cacheSeconds = CONSTANTS.FOUR_HOURS;
-    }
-
     res.setHeader(
       "Cache-Control",
       `max-age=${
@@ -80,7 +76,12 @@ export default async (req, res) => {
       }),
     );
   } catch (err) {
-    res.setHeader("Cache-Control", `no-cache, no-store, must-revalidate`); // Don't cache error responses.
+    res.setHeader(
+      "Cache-Control",
+      `max-age=${CONSTANTS.ERROR_CACHE_SECONDS / 2}, s-maxage=${
+        CONSTANTS.ERROR_CACHE_SECONDS
+      }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
+    ); // Cache the error response less frequently.
     return res.send(renderError(err.message, err.secondaryMessage));
   }
 };

package-lock.json

@@ -22,7 +22,7 @@
         "@testing-library/dom": "^8.17.1",
         "@testing-library/jest-dom": "^5.16.5",
         "@uppercod/css-to-object": "^1.1.1",
-        "axios-mock-adapter": "^1.21.2",
+        "axios-mock-adapter": "^1.18.1",
         "color-contrast-checker": "^2.1.0",
         "hjson": "^3.2.2",
         "husky": "^8.0.0",

package.json

@@ -39,7 +39,7 @@
     "@testing-library/dom": "^8.17.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@uppercod/css-to-object": "^1.1.1",
-    "axios-mock-adapter": "^1.21.2",
+    "axios-mock-adapter": "^1.18.1",
     "color-contrast-checker": "^2.1.0",
     "hjson": "^3.2.2",
     "husky": "^8.0.0",

readme.md

@@ -305,7 +305,6 @@ You can provide multiple comma-separated values in the bg_color option to render
 -   `exclude_repo` - Exclude specified repositories _(Comma-separated values)_. Default: `[] (blank array)`.
 -   `custom_title` - Sets a custom title for the card _(string)_. Default `Most Used Languages`.
 -   `disable_animations` - Disables all animations in the card _(boolean)_. Default: `false`.
--   `hide_progress` - It uses the compact layout option, hides percentages, and removes the bars. Default: `false`.
 
 > **Warning**
 > Language names should be URI-escaped, as specified in [Percent Encoding](https://en.wikipedia.org/wiki/Percent-encoding)
@@ -399,14 +398,6 @@ You can use the `&layout=compact` option to change the card design.
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&layout=compact)](https://github.com/anuraghazra/github-readme-stats)
 ```
 
-### Hide Progress Bars
-
-You can use the `&hide_progress=true` option to hide the percentages and the progress bars (layout will be automatically set to `compact`).
-
-```md
-[![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&hide_progress=true)](https://github.com/anuraghazra/github-readme-stats)
-```
-
 ### Demo
 
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra)](https://github.com/anuraghazra/github-readme-stats)
@@ -415,10 +406,6 @@ You can use the `&hide_progress=true` option to hide the percentages and the pro
 
 [![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&layout=compact)](https://github.com/anuraghazra/github-readme-stats)
 
-- Hidden progress bars
-
-[![Top Langs](https://github-readme-stats.vercel.app/api/top-langs/?username=anuraghazra&hide_progress=true)](https://github.com/anuraghazra/github-readme-stats)
-
 # Wakatime Week Stats
 
 Change the `?username=` value to your [Wakatime](https://wakatime.com) username.

src/cards/stats-card.js

@@ -12,11 +12,6 @@ import {
 import { getStyles } from "../getStyles.js";
 import { statCardLocales } from "../translations.js";
 
-const CARD_MIN_WIDTH = 287;
-const CARD_DEFAULT_WIDTH = 287;
-const RANK_CARD_MIN_WIDTH = 420;
-const RANK_CARD_DEFAULT_WIDTH = 450;
-
 /**
  * Create a stats card text item.
  *
@@ -223,17 +218,11 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     When hide_rank=false, the minimum card_width is 340 px + the icon width (if show_icons=true).
     Numbers are picked by looking at existing dimensions on production.
   */
-  const iconWidth = show_icons ? 16 + /* padding */ 1 : 0;
-  const minCardWidth =
-    (hide_rank
-      ? clampValue(
-          50 /* padding */ + calculateTextWidth() * 2,
-          CARD_MIN_WIDTH,
-          Infinity,
-        )
-      : RANK_CARD_MIN_WIDTH) + iconWidth;
-  const defaultCardWidth =
-    (hide_rank ? CARD_DEFAULT_WIDTH : RANK_CARD_DEFAULT_WIDTH) + iconWidth;
+  const iconWidth = show_icons ? 16 : 0;
+  const minCardWidth = hide_rank
+    ? clampValue(50 /* padding */ + calculateTextWidth() * 2, 270, Infinity)
+    : 340 + iconWidth;
+  const defaultCardWidth = hide_rank ? 270 : 495;
   let width = isNaN(card_width) ? defaultCardWidth : card_width;
   if (width < minCardWidth) {
     width = minCardWidth;
@@ -262,21 +251,18 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
 
   /**
    * Calculates the right rank circle translation values such that the rank circle
-   * keeps respecting the following padding:
+   * keeps respecting the padding.
    *
-   * width > RANK_CARD_DEFAULT_WIDTH: The default right padding of 70 px will be used.
-   * width < RANK_CARD_DEFAULT_WIDTH: The left and right padding will be enlarged
-   *   equally from a certain minimum at RANK_CARD_MIN_WIDTH.
+   * width > 450: The default left padding of 50 px will be used.
+   * width < 450: The left and right padding will shrink equally.
    *
    * @returns {number} - Rank circle translation value.
    */
   const calculateRankXTranslation = () => {
-    const minXTranslation = RANK_CARD_MIN_WIDTH + iconWidth - 70;
-    if (width > RANK_CARD_DEFAULT_WIDTH) {
-      const xMaxExpansion = minXTranslation + (450 - minCardWidth) / 2;
-      return xMaxExpansion + width - RANK_CARD_DEFAULT_WIDTH;
+    if (width < 450) {
+      return width - 95 + (45 * (450 - 340)) / 110;
     } else {
-      return minXTranslation + (width - minCardWidth) / 2;
+      return width - 95;
     }
   };
 

src/cards/top-languages-card.js

@@ -76,11 +76,10 @@ const createProgressTextNode = ({ width, color, name, progress, index }) => {
  * @param {object} props Function properties.
  * @param {Lang} props.lang Programming language object.
  * @param {number} props.totalSize Total size of all languages.
- * @param {boolean} props.hideProgress Whether to hide percentage.
  * @param {number} props.index Index of the programming language.
  * @returns {string} Compact layout programming language SVG node.
  */
-const createCompactLangNode = ({ lang, totalSize, hideProgress, index }) => {
+const createCompactLangNode = ({ lang, totalSize, index }) => {
   const percentage = ((lang.size / totalSize) * 100).toFixed(2);
   const staggerDelay = (index + 3) * 150;
   const color = lang.color || "#858585";
@@ -89,7 +88,7 @@ const createCompactLangNode = ({ lang, totalSize, hideProgress, index }) => {
     <g class="stagger" style="animation-delay: ${staggerDelay}ms">
       <circle cx="5" cy="6" r="5" fill="${color}" />
       <text data-testid="lang-name" x="15" y="10" class='lang-name'>
-        ${lang.name} ${hideProgress ? "" : percentage + "%"}
+        ${lang.name} ${percentage}%
       </text>
     </g>
   `;
@@ -101,10 +100,9 @@ const createCompactLangNode = ({ lang, totalSize, hideProgress, index }) => {
  * @param {object[]} props Function properties.
  * @param {Lang[]} props.langs Array of programming languages.
  * @param {number} props.totalSize Total size of all languages.
- * @param {boolean} props.hideProgress Whether to hide percentage.
  * @returns {string} Programming languages SVG node.
  */
-const createLanguageTextNode = ({ langs, totalSize, hideProgress }) => {
+const createLanguageTextNode = ({ langs, totalSize }) => {
   const longestLang = getLongestLang(langs);
   const chunked = chunkArray(langs, langs.length / 2);
   const layouts = chunked.map((array) => {
@@ -113,7 +111,6 @@ const createLanguageTextNode = ({ langs, totalSize, hideProgress }) => {
       createCompactLangNode({
         lang,
         totalSize,
-        hideProgress,
         index,
       }),
     );
@@ -163,10 +160,9 @@ const renderNormalLayout = (langs, width, totalLanguageSize) => {
  * @param {Lang[]} langs Array of programming languages.
  * @param {number} width Card width.
  * @param {number} totalLanguageSize Total size of all languages.
- * @param {boolean} hideProgress Whether to hide progress bar.
  * @returns {string} Compact layout card SVG object.
  */
-const renderCompactLayout = (langs, width, totalLanguageSize, hideProgress) => {
+const renderCompactLayout = (langs, width, totalLanguageSize) => {
   const paddingRight = 50;
   const offsetWidth = width - paddingRight;
   // progressOffset holds the previous language's width and used to offset the next language
@@ -197,21 +193,15 @@ const renderCompactLayout = (langs, width, totalLanguageSize, hideProgress) => {
     .join("");
 
   return `
-  ${
-    !hideProgress
-      ? `
-  <mask id="rect-mask">
+    <mask id="rect-mask">
       <rect x="0" y="0" width="${offsetWidth}" height="8" fill="white" rx="5"/>
     </mask>
     ${compactProgressBar}
-  `
-      : ""
-  }
-    <g transform="translate(0, ${hideProgress ? "0" : "25"})">
+
+    <g transform="translate(0, 25)">
       ${createLanguageTextNode({
         langs,
         totalSize: totalLanguageSize,
-        hideProgress: hideProgress,
       })}
     </g>
   `;
@@ -286,7 +276,6 @@ const renderTopLanguages = (topLangs, options = {}) => {
     text_color,
     bg_color,
     hide,
-    hide_progress,
     theme,
     layout,
     custom_title,
@@ -316,17 +305,11 @@ const renderTopLanguages = (topLangs, options = {}) => {
   let height = calculateNormalLayoutHeight(langs.length);
 
   let finalLayout = "";
-  if (layout === "compact" || hide_progress == true) {
+  if (layout === "compact") {
     width = width + 50; // padding
-    height =
-      calculateCompactLayoutHeight(langs.length) + (hide_progress ? -25 : 0);
+    height = calculateCompactLayoutHeight(langs.length);
 
-    finalLayout = renderCompactLayout(
-      langs,
-      width,
-      totalLanguageSize,
-      hide_progress,
-    );
+    finalLayout = renderCompactLayout(langs, width, totalLanguageSize);
   } else {
     finalLayout = renderNormalLayout(langs, width, totalLanguageSize);
   }

src/cards/types.d.ts

@@ -38,7 +38,6 @@ export type TopLangOptions = CommonOptions & {
   custom_title: string;
   langs_count: number;
   disable_animations: boolean;
-  hide_progress: boolean;
 };
 
 type WakaTimeOptions = CommonOptions & {

src/common/exceptions.js

@@ -0,0 +1,82 @@
+/**
+ * @file GRS Exception/Errors.
+ */
+
+const SECONDARY_ERROR_MESSAGES = {
+  MAX_RETRY:
+    "Please add an env variable called PAT_1 with your github token in vercel",
+  USER_NOT_FOUND: "Make sure the provided username is not an organization",
+  GRAPHQL_ERROR: "Please try again later",
+};
+
+/**
+ * Custom error class to handle custom GRS errors.
+ *
+ * @extends Error
+ */
+class CustomError extends Error {
+  /**
+   * @param {string} message Error message.
+   * @param {string} type Error type.
+   */
+  constructor(message, type) {
+    super(message);
+    this.type = type;
+    this.secondaryMessage = SECONDARY_ERROR_MESSAGES[type] || type;
+  }
+
+  static MAX_RETRY = "MAX_RETRY";
+  static USER_NOT_FOUND = "USER_NOT_FOUND";
+  static GRAPHQL_ERROR = "GRAPHQL_ERROR";
+}
+
+/**
+ * Missing query parameter class.
+ *
+ * @extends Error
+ */
+class MissingParamError extends Error {
+  /**
+   * @param {string[]} missedParams
+   * @param {string?=} secondaryMessage
+   */
+  constructor(missedParams, secondaryMessage) {
+    const msg = `Missing params ${missedParams
+      .map((p) => `"${p}"`)
+      .join(", ")} make sure you pass the parameters in URL`;
+    super(msg);
+    this.missedParams = missedParams;
+    this.secondaryMessage = secondaryMessage;
+  }
+}
+
+/**
+ * HttpException class.
+ *
+ * @extends Error
+ */
+class HttpException extends Error {
+  /**
+   * Create a HttpException.
+   *
+   * @param {number} statusCode - The status code.
+   * @param {string} message - The error message.
+   * @param {string[]} errors - The errors.
+   */
+  constructor(
+    statusCode,
+    message = "Exception occurred during the processing of HTTP requests.",
+    errors = [],
+  ) {
+    super(message);
+    this.statusCode = statusCode;
+    this.errors = errors;
+  }
+}
+
+export {
+  SECONDARY_ERROR_MESSAGES,
+  CustomError,
+  MissingParamError,
+  HttpException,
+};

src/common/index.js

@@ -21,10 +21,9 @@ export {
   wrapTextMultiline,
   logger,
   CONSTANTS,
-  CustomError,
-  MissingParamError,
   measureText,
   lowercaseTrim,
   chunkArray,
   parseEmojis,
 } from "./utils.js";
+export { CustomError, MissingParamError, HttpException } from "./exceptions.js";

src/common/languageColors.json

@@ -102,7 +102,6 @@
     "Csound Score": "#1a1a1a",
     "Cuda": "#3A4E3A",
     "Curry": "#531242",
-    "Cypher": "#34c0eb",
     "Cython": "#fedf5b",
     "D": "#ba595e",
     "DM": "#447265",
@@ -125,7 +124,6 @@
     "Earthly": "#2af0ff",
     "Easybuild": "#069406",
     "Ecere Projects": "#913960",
-    "Ecmarkup": "#eb8131",
     "EditorConfig": "#fff1f2",
     "Eiffel": "#4d6977",
     "Elixir": "#6e4a7e",
@@ -217,7 +215,6 @@
     "Idris": "#b30000",
     "Ignore List": "#000000",
     "ImageJ Macro": "#99AAFF",
-    "Imba": "#16cec6",
     "Inno Setup": "#264b99",
     "Io": "#a9188d",
     "Ioke": "#078193",
@@ -289,7 +286,6 @@
     "Mathematica": "#dd1100",
     "Max": "#c4a79c",
     "Mercury": "#ff2b2b",
-    "Mermaid": "#ff3670",
     "Meson": "#007800",
     "Metal": "#8f14e9",
     "MiniYAML": "#ff1111",
@@ -322,10 +318,6 @@
     "Nu": "#c9df40",
     "NumPy": "#9C8AF9",
     "Nunjucks": "#3d8137",
-    "OASv2-json": "#85ea2d",
-    "OASv2-yaml": "#85ea2d",
-    "OASv3-json": "#85ea2d",
-    "OASv3-yaml": "#85ea2d",
     "OCaml": "#3be133",
     "ObjectScript": "#424893",
     "Objective-C": "#438eff",
@@ -335,18 +327,14 @@
     "Omgrofl": "#cabbff",
     "Opal": "#f7ede0",
     "Open Policy Agent": "#7d9199",
-    "OpenAPI Specification v2": "#85ea2d",
-    "OpenAPI Specification v3": "#85ea2d",
     "OpenCL": "#ed2e2d",
     "OpenEdge ABL": "#5ce600",
     "OpenQASM": "#AA70FF",
     "OpenSCAD": "#e5cd45",
-    "Option List": "#476732",
     "Org": "#77aa99",
     "Oxygene": "#cdd0e3",
     "Oz": "#fab738",
     "P4": "#7055b5",
-    "PDDL": "#0d00ff",
     "PEG.js": "#234d6b",
     "PHP": "#4F5D95",
     "PLSQL": "#dad8d8",
@@ -363,7 +351,6 @@
     "PigLatin": "#fcd7de",
     "Pike": "#005390",
     "PogoScript": "#d80074",
-    "Polar": "#ae81ff",
     "Portugol": "#f8bd00",
     "PostCSS": "#dc3a0c",
     "PostScript": "#da291c",
@@ -427,7 +414,6 @@
     "Sass": "#a53b70",
     "Scala": "#c22d40",
     "Scaml": "#bd181a",
-    "Scenic": "#fdc700",
     "Scheme": "#1e4aec",
     "Scilab": "#ca0f21",
     "Self": "#0579aa",
@@ -435,7 +421,6 @@
     "Shell": "#89e051",
     "ShellCheck Config": "#cecfcb",
     "Shen": "#120F14",
-    "Simple File Verification": "#C9BFED",
     "Singularity": "#64E6AD",
     "Slash": "#007eff",
     "Slice": "#003fa2",
@@ -443,7 +428,6 @@
     "SmPL": "#c94949",
     "Smalltalk": "#596706",
     "Smarty": "#f0c040",
-    "Smithy": "#c44536",
     "Solidity": "#AA6746",
     "SourcePawn": "#f69e1d",
     "Squirrel": "#800000",
@@ -494,7 +478,6 @@
     "Vim Script": "#199f4b",
     "Vim Snippet": "#199f4b",
     "Visual Basic .NET": "#945db7",
-    "Visual Basic 6.0": "#2c6353",
     "Volt": "#1F1F1F",
     "Vue": "#41b883",
     "Vyper": "#2980b9",
@@ -531,7 +514,6 @@
     "fish": "#4aae47",
     "hoon": "#00b171",
     "jq": "#c7254e",
-    "just": "#384d54",
     "kvlang": "#1da6e0",
     "mIRC Script": "#3d57c3",
     "mcfunction": "#E22837",

src/common/retryer.js

@@ -1,4 +1,8 @@
-import { CustomError, logger } from "./utils.js";
+import { logger } from "./utils.js";
+import {
+  CustomError,
+  HttpException,
+} from "./exceptions.js";
 
 // Script variables.
 const PATs = Object.keys(process.env).filter((key) =>
@@ -16,8 +20,13 @@ const RETRIES = PATs ? PATs : 7;
  * @returns Promise<retryer>
  */
 const retryer = async (fetcher, variables, retries = 0) => {
-  if (retries > RETRIES) {
-    throw new CustomError("Maximum retries exceeded", CustomError.MAX_RETRY);
+  // if (retries > RETRIES) {
+  if (true) { // FIXME: Test out error
+    throw new HttpException(
+      statusCode=500,
+      message=`Max GraphQL retries exceeded. Please add an env variable called PAT_1 with your github token in vercel.`,
+      errors=[new CustomError("Maximum retries exceeded", CustomError.MAX_RETRY)]
+    );
   }
   try {
     // try to fetch with the first token since RETRIES is 0 index i'm adding +1
@@ -60,5 +69,5 @@ const retryer = async (fetcher, variables, retries = 0) => {
   }
 };
 
-export { retryer };
+export { retryer, RETRIES };
 export default retryer;

src/common/utils.js

@@ -22,8 +22,7 @@ const renderError = (message, secondaryMessage = "") => {
     .small { font: 600 12px 'Segoe UI', Ubuntu, Sans-Serif; fill: #252525 }
     .gray { fill: #858585 }
     </style>
-    <rect x="0.5" y="0.5" width="${
-      ERROR_CARD_LENGTH - 1
+    <rect x="0.5" y="0.5" width="${ERROR_CARD_LENGTH - 1
     }" height="99%" rx="4.5" fill="#FFFEFE" stroke="#E4E2E2"/>
     <text x="25" y="45" class="text">Something went wrong! file an issue at https://tiny.one/readme-stats</text>
     <text data-testid="message" x="25" y="55" class="text small">
@@ -288,62 +287,28 @@ const wrapTextMultiline = (text, width = 59, maxLines = 3) => {
   return multiLineText;
 };
 
-const noop = () => {};
+const noop = () => { };
 // return console instance based on the environment
 const logger =
   process.env.NODE_ENV !== "test" ? console : { log: noop, error: noop };
 
+// Cache settings.
+const CARD_CACHE_SECONDS = 14400;
+const ERROR_CACHE_SECONDS = 600;
+
 const CONSTANTS = {
+  ONE_MINUTE: 60,
+  FIVE_MINUTES: 300,
+  TEN_MINUTES: 600,
+  FIFTEEN_MINUTES: 900,
   THIRTY_MINUTES: 1800,
   TWO_HOURS: 7200,
   FOUR_HOURS: 14400,
   ONE_DAY: 86400,
+  CARD_CACHE_SECONDS: CARD_CACHE_SECONDS,
+  ERROR_CACHE_SECONDS: ERROR_CACHE_SECONDS,
 };
 
-const SECONDARY_ERROR_MESSAGES = {
-  MAX_RETRY:
-    "Please add an env variable called PAT_1 with your github token in vercel",
-  USER_NOT_FOUND: "Make sure the provided username is not an organization",
-  GRAPHQL_ERROR: "Please try again later",
-};
-
-/**
- * Custom error class to handle custom GRS errors.
- */
-class CustomError extends Error {
-  /**
-   * @param {string} message Error message.
-   * @param {string} type Error type.
-   */
-  constructor(message, type) {
-    super(message);
-    this.type = type;
-    this.secondaryMessage = SECONDARY_ERROR_MESSAGES[type] || type;
-  }
-
-  static MAX_RETRY = "MAX_RETRY";
-  static USER_NOT_FOUND = "USER_NOT_FOUND";
-  static GRAPHQL_ERROR = "GRAPHQL_ERROR";
-}
-
-/**
- * Missing query parameter class.
- */
-class MissingParamError extends Error {
-  /**
-   * @param {string[]} missedParams
-   * @param {string?=} secondaryMessage
-   */
-  constructor(missedParams, secondaryMessage) {
-    const msg = `Missing params ${missedParams
-      .map((p) => `"${p}"`)
-      .join(", ")} make sure you pass the parameters in URL`;
-    super(msg);
-    this.missedParams = missedParams;
-    this.secondaryMessage = secondaryMessage;
-  }
-}
-
 /**
  * Retrieve text length.
  *
@@ -424,19 +389,6 @@ const parseEmojis = (str) => {
   });
 };
 
-/**
- * Get diff in minutes
- * @param {Date} d1
- * @param {Date} d2
- * @returns {number}
- */
-const dateDiff = (d1, d2) => {
-  const date1 = new Date(d1);
-  const date2 = new Date(d2);
-  const diff = date1.getTime() - date2.getTime();
-  return Math.round(diff / (1000 * 60));
-};
-
 export {
   ERROR_CARD_LENGTH,
   renderError,
@@ -454,11 +406,8 @@ export {
   wrapTextMultiline,
   logger,
   CONSTANTS,
-  CustomError,
-  MissingParamError,
   measureText,
   lowercaseTrim,
   chunkArray,
   parseEmojis,
-  dateDiff,
 };

src/fetchers/repo-fetcher.js

@@ -1,6 +1,7 @@
 // @ts-check
 import { retryer } from "../common/retryer.js";
-import { MissingParamError, request } from "../common/utils.js";
+import { request } from "../common/utils.js";
+import { MissingParamError } from "../common/exceptions.js";
 
 /**
  * Repo data fetcher.

src/fetchers/stats-fetcher.js

@@ -5,12 +5,11 @@ import githubUsernameRegex from "github-username-regex";
 import { calculateRank } from "../calculateRank.js";
 import { retryer } from "../common/retryer.js";
 import {
-  CustomError,
   logger,
-  MissingParamError,
   request,
   wrapTextMultiline,
 } from "../common/utils.js";
+import { CustomError, MissingParamError } from "../common/exceptions.js";
 
 dotenv.config();
 

src/fetchers/top-languages-fetcher.js

@@ -1,12 +1,11 @@
 // @ts-check
 import { retryer } from "../common/retryer.js";
 import {
-  CustomError,
   logger,
-  MissingParamError,
   request,
   wrapTextMultiline,
 } from "../common/utils.js";
+import { CustomError, MissingParamError } from "../common/exceptions.js";
 
 /**
  * Top languages fetcher object.

src/fetchers/wakatime-fetcher.js

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { MissingParamError } from "../common/utils.js";
+import { MissingParamError } from "../common/exceptions.js";
 
 /**
  * WakaTime data fetcher.

tests/api.test.js

@@ -171,13 +171,18 @@ describe("Test /api/", () => {
     ]);
   });
 
-  it("should not store cache when error", async () => {
+  it("should set shorter cache when error", async () => {
     const { req, res } = faker({}, error);
     await api(req, res);
 
     expect(res.setHeader.mock.calls).toEqual([
       ["Content-Type", "image/svg+xml"],
-      ["Cache-Control", `no-cache, no-store, must-revalidate`],
+      [
+        "Cache-Control",
+        `max-age=${CONSTANTS.ERROR_CACHE_SECONDS / 2}, s-maxage=${
+          CONSTANTS.ERROR_CACHE_SECONDS
+        }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`,
+      ],
     ]);
   });
 

tests/pat-info.test.js

@@ -1,244 +0,0 @@
-/**
- * @file Tests for the status/pat-info cloud function.
- */
-import dotenv from "dotenv";
-dotenv.config();
-
-import { jest } from "@jest/globals";
-import axios from "axios";
-import MockAdapter from "axios-mock-adapter";
-import patInfo, { RATE_LIMIT_SECONDS } from "../api/status/pat-info.js";
-
-const mock = new MockAdapter(axios);
-
-const successData = {
-  data: {
-    rateLimit: {
-      remaining: 4986,
-    },
-  },
-};
-
-const faker = (query) => {
-  const req = {
-    query: { ...query },
-  };
-  const res = {
-    setHeader: jest.fn(),
-    send: jest.fn(),
-  };
-
-  return { req, res };
-};
-
-const rate_limit_error = {
-  errors: [
-    {
-      type: "RATE_LIMITED",
-      message: "API rate limit exceeded for user ID.",
-    },
-  ],
-  data: {
-    rateLimit: {
-      resetAt: Date.now(),
-    },
-  },
-};
-
-const other_error = {
-  errors: [
-    {
-      type: "SOME_ERROR",
-      message: "This is a error",
-    },
-  ],
-};
-
-const bad_credentials_error = {
-  message: "Bad credentials",
-};
-
-afterEach(() => {
-  mock.reset();
-});
-
-describe("Test /api/status/pat-info", () => {
-  beforeAll(() => {
-    // reset patenv first so that dotenv doesn't populate them with local envs
-    process.env = {};
-    process.env.PAT_1 = "testPAT1";
-    process.env.PAT_2 = "testPAT2";
-    process.env.PAT_3 = "testPAT3";
-    process.env.PAT_4 = "testPAT4";
-  });
-
-  it("should return only 'validPATs' if all PATs are valid", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, rate_limit_error)
-      .onPost("https://api.github.com/graphql")
-      .reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(
-      JSON.stringify(
-        {
-          validPATs: ["PAT_2", "PAT_3", "PAT_4"],
-          expiredPATs: [],
-          exhaustedPATs: ["PAT_1"],
-          suspendedPATs: [],
-          errorPATs: [],
-          details: {
-            PAT_1: {
-              status: "exhausted",
-              remaining: 0,
-              resetIn: "0 minutes",
-            },
-            PAT_2: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_3: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_4: {
-              status: "valid",
-              remaining: 4986,
-            },
-          },
-        },
-        null,
-        2,
-      ),
-    );
-  });
-
-  it("should return `errorPATs` if a PAT causes an error to be thrown", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, other_error)
-      .onPost("https://api.github.com/graphql")
-      .reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(
-      JSON.stringify(
-        {
-          validPATs: ["PAT_2", "PAT_3", "PAT_4"],
-          expiredPATs: [],
-          exhaustedPATs: [],
-          suspendedPATs: [],
-          errorPATs: ["PAT_1"],
-          details: {
-            PAT_1: {
-              status: "error",
-              error: {
-                type: "SOME_ERROR",
-                message: "This is a error",
-              },
-            },
-            PAT_2: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_3: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_4: {
-              status: "valid",
-              remaining: 4986,
-            },
-          },
-        },
-        null,
-        2,
-      ),
-    );
-  });
-
-  it("should return `expiredPaths` if a PAT returns a 'Bad credentials' error", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(404, bad_credentials_error)
-      .onPost("https://api.github.com/graphql")
-      .reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(
-      JSON.stringify(
-        {
-          validPATs: ["PAT_2", "PAT_3", "PAT_4"],
-          expiredPATs: ["PAT_1"],
-          exhaustedPATs: [],
-          suspendedPATs: [],
-          errorPATs: [],
-          details: {
-            PAT_1: {
-              status: "expired",
-            },
-            PAT_2: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_3: {
-              status: "valid",
-              remaining: 4986,
-            },
-            PAT_4: {
-              status: "valid",
-              remaining: 4986,
-            },
-          },
-        },
-        null,
-        2,
-      ),
-    );
-  });
-
-  it("should throw an error if something goes wrong", async () => {
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith("Something went wrong: Network Error");
-  });
-
-  it("should have proper cache when no error is thrown", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, successData);
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`],
-    ]);
-  });
-
-  it("should have proper cache when error is thrown", async () => {
-    mock.reset();
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await patInfo(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", "no-store"],
-    ]);
-  });
-});

tests/renderStatsCard.test.js

@@ -78,17 +78,16 @@ describe("Test renderStatsCard", () => {
 
   it("should render with custom width set", () => {
     document.body.innerHTML = renderStatsCard(stats);
-    expect(document.querySelector("svg")).toHaveAttribute("width", "450");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "495");
 
-    document.body.innerHTML = renderStatsCard(stats, { card_width: 500 });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "500");
+    document.body.innerHTML = renderStatsCard(stats, { card_width: 400 });
+    expect(document.querySelector("svg")).toHaveAttribute("width", "400");
   });
 
   it("should render with custom width set and limit minimum width", () => {
     document.body.innerHTML = renderStatsCard(stats, { card_width: 1 });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "420");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "340");
 
-    // Test default minimum card width without rank circle.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: true,
@@ -98,7 +97,6 @@ describe("Test renderStatsCard", () => {
       "305.81250000000006",
     );
 
-    // Test minimum card width with rank and icons.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: true,
@@ -106,24 +104,22 @@ describe("Test renderStatsCard", () => {
     });
     expect(document.querySelector("svg")).toHaveAttribute(
       "width",
-      "322.81250000000006",
+      "305.81250000000006",
     );
 
-    // Test minimum card width with icons but without rank.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: false,
       show_icons: true,
     });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "437");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "356");
 
-    // Test minimum card width without icons or rank.
     document.body.innerHTML = renderStatsCard(stats, {
       card_width: 1,
       hide_rank: false,
       show_icons: false,
     });
-    expect(document.querySelector("svg")).toHaveAttribute("width", "420");
+    expect(document.querySelector("svg")).toHaveAttribute("width", "340");
   });
 
   it("should render default colors properly", () => {
@@ -316,7 +312,7 @@ describe("Test renderStatsCard", () => {
 
     expect(
       document.body.getElementsByTagName("svg")[0].getAttribute("width"),
-    ).toBe("287");
+    ).toBe("270");
   });
 
   it("should render translations", () => {

tests/retryer.test.js

@@ -1,6 +1,6 @@
 import { jest } from "@jest/globals";
 import "@testing-library/jest-dom";
-import { retryer } from "../src/common/retryer.js";
+import { retryer, RETRIES } from "../src/common/retryer.js";
 import { logger } from "../src/common/utils.js";
 
 const fetcher = jest.fn((variables, token) => {
@@ -45,7 +45,7 @@ describe("Test Retryer", () => {
     try {
       res = await retryer(fetcherFail, {});
     } catch (err) {
-      expect(fetcherFail).toBeCalledTimes(8);
+      expect(fetcherFail).toBeCalledTimes(RETRIES + 1);
       expect(err.message).toBe("Maximum retries exceeded");
     }
   });

tests/status.up.test.js

@@ -1,194 +0,0 @@
-/**
- * @file Tests for the status/up cloud function.
- */
-import { jest } from "@jest/globals";
-import axios from "axios";
-import MockAdapter from "axios-mock-adapter";
-import up, { RATE_LIMIT_SECONDS } from "../api/status/up.js";
-
-const mock = new MockAdapter(axios);
-
-const successData = {
-  rateLimit: {
-    remaining: 4986,
-  },
-};
-
-const faker = (query) => {
-  const req = {
-    query: { ...query },
-  };
-  const res = {
-    setHeader: jest.fn(),
-    send: jest.fn(),
-  };
-
-  return { req, res };
-};
-
-const rate_limit_error = {
-  errors: [
-    {
-      type: "RATE_LIMITED",
-    },
-  ],
-};
-
-const bad_credentials_error = {
-  message: "Bad credentials",
-};
-
-const shields_up = {
-  schemaVersion: 1,
-  label: "Public Instance",
-  isError: true,
-  message: "up",
-  color: "brightgreen",
-};
-const shields_down = {
-  schemaVersion: 1,
-  label: "Public Instance",
-  isError: true,
-  message: "down",
-  color: "red",
-};
-
-afterEach(() => {
-  mock.reset();
-});
-
-describe("Test /api/status/up", () => {
-  it("should return `true` if request was successful", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(true);
-  });
-
-  it("should return `false` if all PATs are rate limited", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, rate_limit_error);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(false);
-  });
-
-  it("should return JSON `true` if request was successful and type='json'", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({ type: "json" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith({ up: true });
-  });
-
-  it("should return JSON `false` if all PATs are rate limited and type='json'", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, rate_limit_error);
-
-    const { req, res } = faker({ type: "json" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith({ up: false });
-  });
-
-  it("should return UP shields.io config if request was successful and type='shields'", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({ type: "shields" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(shields_up);
-  });
-
-  it("should return DOWN shields.io config if all PATs are rate limited and type='shields'", async () => {
-    mock.onPost("https://api.github.com/graphql").reply(200, rate_limit_error);
-
-    const { req, res } = faker({ type: "shields" }, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(shields_down);
-  });
-
-  it("should return `true` if the first PAT is rate limited but the second PATs works", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, rate_limit_error)
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(true);
-  });
-
-  it("should return `true` if the first PAT has 'Bad credentials' but the second PAT works", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(404, bad_credentials_error)
-      .onPost("https://api.github.com/graphql")
-      .replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(true);
-  });
-
-  it("should return `false` if all pats have 'Bad credentials'", async () => {
-    mock
-      .onPost("https://api.github.com/graphql")
-      .reply(404, bad_credentials_error);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(false);
-  });
-
-  it("should throw an error if the request fails", async () => {
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader).toBeCalledWith("Content-Type", "application/json");
-    expect(res.send).toBeCalledWith(false);
-  });
-
-  it("should have proper cache when no error is thrown", async () => {
-    mock.onPost("https://api.github.com/graphql").replyOnce(200, successData);
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", `max-age=0, s-maxage=${RATE_LIMIT_SECONDS}`],
-    ]);
-  });
-
-  it("should have proper cache when error is thrown", async () => {
-    mock.onPost("https://api.github.com/graphql").networkError();
-
-    const { req, res } = faker({}, {});
-    await up(req, res);
-
-    expect(res.setHeader.mock.calls).toEqual([
-      ["Content-Type", "application/json"],
-      ["Cache-Control", "no-store"],
-    ]);
-  });
-});

themes/index.js

@@ -374,19 +374,6 @@ export const themes = {
     border_color: "170F0C",
     bg_color: "170F0C",
   },
-  one_dark_pro: {
-    title_color: "61AFEF",
-    text_color: "E5C06E",
-    icon_color: "C678DD",
-    border_color: "3B4048",
-    bg_color: "23272E",
-  rose: {
-    title_color: "8d192b",
-    text_color: "862931",
-    icon_color: "B71F36",
-    border_color: "e9d8d4",
-    bg_color: "e9d8d4",
-  },
 };
 
 export default themes;

vercel.json

@@ -2,7 +2,7 @@
   "functions": {
     "api/*.js": {
       "memory": 128,
-      "maxDuration": 10
+      "maxDuration": 30
     }
   },
   "redirects": [