migrate around me to the backend

projects/common/src/response/around-player-response.ts

@@ -0,0 +1,8 @@
+import ScoreSaberPlayerToken from "../types/token/scoresaber/score-saber-player-token";
+
+export type AroundPlayerResponse = {
+  /**
+   * The players around the player.
+   */
+  players: ScoreSaberPlayerToken[];
+};

projects/common/src/types/around-player.ts

@@ -0,0 +1 @@
+export type AroundPlayer = "global" | "country";

projects/common/src/utils/player-utils.ts

@@ -1,6 +1,8 @@
 import { PlayerHistory } from "../player/player-history";
 import { kyFetch } from "./utils";
 import { Config } from "../config";
+import { AroundPlayer } from "../types/around-player";
+import { AroundPlayerResponse } from "../response/around-player-response";
 
 /**
  * Sorts the player history based on date,
@@ -22,3 +24,13 @@ export function sortPlayerHistory(history: Map<string, PlayerHistory>) {
 export async function trackPlayer(id: string) {
   await kyFetch(`${Config.apiUrl}/player/history/${id}?createIfMissing=true`);
 }
+
+/**
+ * Gets the players around a player.
+ *
+ * @param id the player to get around
+ * @param type the type to get
+ */
+export async function getPlayersAroundPlayer(id: string, type: AroundPlayer) {
+  return await kyFetch<AroundPlayerResponse>(`${Config.apiUrl}/player/around/${id}/${type}`);
+}

projects/common/src/utils/utils.ts

@@ -28,10 +28,10 @@ export function delay(ms: number) {
  *
  * @param rank the rank
  * @param itemsPerPage the items per page
- * @returns the page
+ * @returns the page number
  */
 export function getPageFromRank(rank: number, itemsPerPage: number) {
-  return Math.floor(rank / itemsPerPage) + 1;
+  return Math.floor((rank - 1) / itemsPerPage) + 1;
 }
 
 /**

projects/common/src/websocket/scoresaber-websocket.ts

@@ -21,7 +21,7 @@ type ScoresaberSocket = {
    *
    * @param error the error that caused the connection to close
    */
-  onDisconnect?: (error?: WebSocket.ErrorEvent) => void;
+  onDisconnect?: (error?: WebSocket.ErrorEvent | WebSocket.CloseEvent) => void;
 };
 
 /**
@@ -46,10 +46,10 @@ export function connectScoreSaberWebSocket({ onMessage, onScore, onDisconnect }:
       onDisconnect && onDisconnect(error);
     };
 
-    websocket.onclose = () => {
+    websocket.onclose = event => {
       console.log("Lost connection to the ScoreSaber WebSocket. Attempting to reconnect...");
 
-      onDisconnect && onDisconnect();
+      onDisconnect && onDisconnect(event);
       setTimeout(connectWs, 5000); // Reconnect after 5 seconds
     };