Merge branch 'master' into fix/commandline-hotkey-custom-modals

Author: Leonabcd123

backend/scripts/openapi.ts

@@ -1,5 +1,5 @@
 import { generateOpenApi } from "@ts-rest/open-api";
-import { contract } from "@monkeytype/contracts/index";
+import { COMPATIBILITY_CHECK, contract } from "@monkeytype/contracts/index";
 import { writeFileSync, mkdirSync } from "fs";
 import { EndpointMetadata, PermissionId } from "@monkeytype/contracts/util/api";
 import type { OpenAPIObject, OperationObject } from "openapi3-ts";
@@ -24,7 +24,7 @@ export function getOpenApi(): OpenAPIObject {
         title: "Monkeytype API",
         description:
           "Documentation for the endpoints provided by the Monkeytype API server.\n\nNote that authentication is performed with the Authorization HTTP header in the format `Authorization: ApeKey YOUR_APE_KEY`\n\nThere is a rate limit of `30 requests per minute` across all endpoints with some endpoints being more strict. Rate limit rates are shared across all ape keys.",
-        version: "2.0.0",
+        version: `2.${COMPATIBILITY_CHECK}.0`,
         termsOfService: "https://monkeytype.com/terms-of-service",
         contact: {
           name: "Support",

backend/src/api/controllers/result.ts

@@ -43,7 +43,6 @@ import {
   GetResultsResponse,
   UpdateResultTagsRequest,
   UpdateResultTagsResponse,
-  ReportCompletedEventMismatchRequest,
 } from "@monkeytype/contracts/results";
 import {
   CompletedEvent,
@@ -185,48 +184,6 @@ export async function updateTags(
   });
 }
 
-export async function reportCompletedEventMismatch(
-  req: MonkeyRequest<undefined, ReportCompletedEventMismatchRequest>,
-): Promise<MonkeyResponse> {
-  const { uid } = req.ctx.decodedToken;
-  const {
-    notMatching,
-    mismatchedKeys,
-    groupKey,
-    language,
-    mode,
-    mode2,
-    difficulty,
-    duration,
-    funboxes,
-    version,
-    eventLog,
-  } = req.body;
-  // Logger.warning(
-  //   `Completed event mismatch for uid ${uid}: ${notMatching.join(", ")}`,
-  // );
-  // Logger.warning(`Old CE: ${JSON.stringify(ce)}`);
-  // Logger.warning(`New CE: ${JSON.stringify(ce2)}`);
-  void addLog(
-    "completed_event_mismatch",
-    {
-      notMatching,
-      mismatchedKeys,
-      groupKey,
-      language,
-      mode,
-      mode2,
-      difficulty,
-      duration,
-      funboxes,
-      version,
-      eventLog,
-    },
-    uid,
-  );
-  return new MonkeyResponse("Mismatch reported", null);
-}
-
 export async function addResult(
   req: MonkeyRequest<undefined, AddResultRequest>,
 ): Promise<AddResultResponse> {

backend/src/api/routes/results.ts

@@ -17,10 +17,6 @@ export default s.router(resultsContract, {
   updateTags: {
     handler: async (r) => callController(ResultController.updateTags)(r),
   },
-  reportCompletedEventMismatch: {
-    handler: async (r) =>
-      callController(ResultController.reportCompletedEventMismatch)(r),
-  },
   deleteAll: {
     handler: async (r) => callController(ResultController.deleteAll)(r),
   },

backend/src/middlewares/rate-limit.ts

@@ -2,6 +2,7 @@ import MonkeyError from "../utils/error";
 import type { Response, NextFunction, Request } from "express";
 import { RateLimiterMemory } from "rate-limiter-flexible";
 import {
+  ipKeyGenerator,
   rateLimit,
   RateLimitRequestHandler,
   type Options,
@@ -40,12 +41,13 @@ export const customHandler = (
 };
 
 const getKey = (req: Request, _res: Response): string => {
-  return (
+  const ip =
     (req.headers["cf-connecting-ip"] as string) ||
     (req.headers["x-forwarded-for"] as string) ||
     (req.ip as string) ||
-    "255.255.255.255"
-  );
+    "255.255.255.255";
+  const key = ipKeyGenerator(ip);
+  return key;
 };
 
 const getKeyWithUid = (

frontend/__tests__/input/helpers/validation.spec.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect, vi, beforeEach, afterAll } from "vitest";
 import {
   isCharCorrect,
+  isWordCorrect,
   shouldInsertSpaceCharacter,
 } from "../../../src/ts/input/helpers/validation";
 import { __testing } from "../../../src/ts/config/testing";
@@ -75,6 +76,29 @@ describe("isCharCorrect", () => {
   });
 
   describe("Space Handling", () => {
+    it.each([
+      ["returns false in the middle of a word", " ", "wor", "word", false],
+      ["returns false at the start of a word", " ", "", "word", false],
+      [
+        "returns false when longer than a word",
+        " ",
+        "wordwordword",
+        "word",
+        false,
+      ],
+    ])("%s", (_desc, char, input, word, expected) => {
+      expect(
+        isCharCorrect({
+          data: char,
+          inputValue: input,
+          targetWord: word,
+          correctShiftUsed: true,
+        }),
+      ).toBe(expected);
+    });
+  });
+
+  describe("Space Handling at the end of a word", () => {
     it.each([
       ["returns true at the end of a correct word", " ", "word", "word", true],
       [
@@ -84,18 +108,23 @@ describe("isCharCorrect", () => {
         "word",
         false,
       ],
-      ["returns false in the middle of a word", " ", "wor", "word", false],
-      ["returns false at the start of a word", " ", "", "word", false],
       [
-        "returns false when longer than a word",
-        " ",
-        "wordwordword",
+        "returns true when committing a word with a newline",
+        "\n",
         "word",
+        "word\n",
+        true,
+      ],
+      [
+        "returns false when committing an incorrect word with a newline",
+        "\n",
+        "xord",
+        "word\n",
         false,
       ],
     ])("%s", (_desc, char, input, word, expected) => {
       expect(
-        isCharCorrect({
+        isWordCorrect({
           data: char,
           inputValue: input,
           targetWord: word,
@@ -124,17 +153,6 @@ describe("isCharCorrect", () => {
       },
     );
   });
-
-  it("throws error if data is undefined", () => {
-    expect(() =>
-      isCharCorrect({
-        data: undefined as any,
-        inputValue: "val",
-        targetWord: "word",
-        correctShiftUsed: true,
-      }),
-    ).toThrow();
-  });
 });
 
 describe("shouldInsertSpaceCharacter", () => {

frontend/__tests__/test/events/data.spec.ts

@@ -57,7 +57,7 @@ function timerData(
   if (event === "step") {
     return { event, timer, drift: 0 };
   }
-  return { event, timer };
+  return { event, timer, date: 0 };
 }
 
 describe("data.ts", () => {
@@ -285,18 +285,8 @@ describe("data.ts", () => {
       logTestEvent("input", 1010, inputData({ wordIndex: 0, charIndex: 0 }));
       logTestEvent("input", 1100, inputData({ wordIndex: 0, charIndex: 1 }));
 
-      const perWord = getEventsPerWord(getAllTestEvents(), undefined, 50);
-      expect(perWord.get(0)).toHaveLength(1);
-    });
-
-    it("respects startMs", () => {
-      logTestEvent("input", 1010, inputData({ wordIndex: 0, charIndex: 0 }));
-      logTestEvent("input", 1100, inputData({ wordIndex: 0, charIndex: 1 }));
-
       const perWord = getEventsPerWord(getAllTestEvents(), 50);
       expect(perWord.get(0)).toHaveLength(1);
-      const first = perWord.get(0)?.[0];
-      expect(first?.type === "input" && first.data.charIndex).toBe(1);
     });
   });