rhythia-api 139.0.0 → 142.0.0

package/api/createBeatmap.ts

@@ -18,6 +18,7 @@ export const Schema = {
   input: z.strictObject({
     url: z.string(),
     session: z.string(),
+    updateFlag: z.boolean().optional(),
   }),
   output: z.strictObject({
     hash: z.string().optional(),
@@ -36,6 +37,8 @@ export async function POST(request: Request): Promise<NextResponse> {
 
 export async function handler({
   url,
+  session,
+  updateFlag,
 }: (typeof Schema)["input"]["_type"]): Promise<
   NextResponse<(typeof Schema)["output"]["_type"]>
 > {
@@ -49,6 +52,17 @@ export async function handler({
   const parsedData = parser.parse();
   const digested = parsedData.strings.mapID;
 
+  const user = (await supabase.auth.getUser(session)).data.user!;
+  let { data: userData, error: userError } = await supabase
+    .from("profiles")
+    .select("*")
+    .eq("uid", user.id)
+    .single();
+
+  if (!userData) {
+    return NextResponse.json({ error: "Bad user" });
+  }
+
   let { data: beatmapPage, error: errorlast } = await supabase
     .from("beatmapPages")
     .select(`*`)
@@ -56,7 +70,11 @@ export async function handler({
     .single();
 
   if (beatmapPage) {
-    return NextResponse.json({ error: "Already Exists" });
+    if (!updateFlag) {
+      return NextResponse.json({ error: "Already Exists" });
+    } else if (beatmapPage.owner !== userData.id) {
+      return NextResponse.json({ error: "Already Exists" });
+    }
   }
 
   const imgkey = `beatmap-img-${Date.now()}-${digested}`;

package/api/deleteBeatmapPage.ts

@@ -46,7 +46,7 @@ export async function handler({
   let { data: beatmapData, error: bmPageError } = await supabase
     .from("beatmaps")
     .select("*")
-    .eq("beatmapHash", pageData.id)
+    .eq("beatmapHash", pageData.latestBeatmapHash || "-1-1-1-1")
     .single();
 
   if (!userData) return NextResponse.json({ error: "No user." });

package/api/getBadgedUsers.ts

@@ -40,8 +40,7 @@ export async function handler(
 export async function getLeaderboard(badge: string) {
   let { data: queryData, error } = await supabase
     .from("profiles")
-    .select("flag,id,username,badges")
-    .neq("ban", "excluded");
+    .select("flag,id,username,badges");
 
   const users = queryData?.filter((e) =>
     ((e.badges || []) as string[]).includes(badge)

package/api/submitScore.ts

@@ -11,14 +11,10 @@ export const Schema = {
       relayHwid: z.string(),
       songId: z.string(),
       misses: z.number(),
-      squareHits: z.number(),
+      hits: z.number(),
       mapHash: z.string(),
-      mapTitle: z.string(),
-      mapDifficulty: z.number(),
       mapNoteCount: z.number(),
-      mapLength: z.number(),
-      passed: z.boolean(),
-      sspp: z.number(),
+      speed: z.number(),
     }),
   }),
   output: z.object({
@@ -26,6 +22,19 @@ export const Schema = {
   }),
 };
 
+function easeInExpoDeq(x: number) {
+  return x === 0 ? 0 : Math.pow(2, 50 * x - 50);
+}
+
+export function calculatePerformancePoints(
+  starRating: number,
+  accuracy: number
+) {
+  return Math.round(
+    Math.pow((starRating * easeInExpoDeq(accuracy) * 100) / 2, 2) / 1000
+  );
+}
+
 export async function POST(request: Request): Promise<NextResponse> {
   return protectedApi({
     request,
@@ -79,8 +88,6 @@ export async function handler({
     );
   }
 
-  let newPlaycount = 1;
-
   if (!beatmaps) {
     return NextResponse.json(
       {
@@ -90,14 +97,6 @@ export async function handler({
     );
   }
 
-  if (beatmaps.noteCount !== data.mapNoteCount) {
-    return NextResponse.json(
-      {
-        error: "Wrong map",
-      },
-      { status: 500 }
-    );
-  }
   if (beatmaps.noteCount !== data.mapNoteCount) {
     return NextResponse.json(
       {
@@ -107,18 +106,22 @@ export async function handler({
     );
   }
 
-  newPlaycount = (beatmaps.playcount || 1) + 1;
   await supabase.from("beatmaps").upsert({
     beatmapHash: data.mapHash,
-    title: data.mapTitle,
-    playcount: newPlaycount,
-    difficulty: data.mapDifficulty,
-    noteCount: data.mapNoteCount,
-    length: data.mapLength,
+    playcount: (beatmaps.playcount || 1) + 1,
   });
 
+  const passed =
+    data.misses == 0 && data.misses + data.hits == beatmaps.noteCount;
+  const accurracy = data.hits / beatmaps.noteCount;
+  let awarded_sp = 0;
+
+  if (beatmaps.starRating) {
+    awarded_sp = calculatePerformancePoints(beatmaps.starRating, accurracy);
+  }
+
   if (beatmapPages.status == "UNRANKED") {
-    data.sspp = 0;
+    awarded_sp = 0;
   }
 
   console.log("p1");
@@ -127,9 +130,9 @@ export async function handler({
     replayHwid: data.relayHwid,
     songId: data.songId,
     userId: userData.id,
-    passed: data.passed,
+    passed,
     misses: data.misses,
-    awarded_sp: Math.round(data.sspp * 100) / 100,
+    awarded_sp: Math.round(awarded_sp * 100) / 100,
   });
   console.log("p2");
 
@@ -172,11 +175,9 @@ export async function handler({
     id: userData.id,
     play_count: (userData.play_count || 0) + 1,
     skill_points: Math.round(totalSp * 100) / 100,
-    squares_hit: (userData.squares_hit || 0) + data.squareHits,
+    squares_hit: (userData.squares_hit || 0) + data.hits,
   });
   console.log("p3");
 
-  // await Promise.all([p1, p2, p3]);
-
   return NextResponse.json({});
 }

package/api/updateBeatmapPage.ts

@@ -73,6 +73,7 @@ export async function handler({
       owner: userData.id,
       description,
       tags,
+      nominations: [],
     })
     .select("*")
     .single();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "139.0.0",
+  "version": "142.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",

package/scripts/ci-deploy.ts

@@ -1,76 +0,0 @@
-import fs from "fs";
-import * as git from "isomorphic-git";
-import http from "isomorphic-git/http/node";
-import path from "path";
-
-// Set up the repository URL
-const repoUrl = `https://${process.env.GIT_KEY}@github.com/cunev/rhythia-api.git`;
-
-const sourceBranch = process.env.SOURCE_BRANCH!;
-const targetBranch = process.env.TARGET_BRANCH!;
-
-async function cloneBranch() {
-  const dir = path.join("/tmp", "repo");
-
-  try {
-    // Ensure the directory is clean before cloning
-    if (fs.existsSync(dir)) {
-      fs.rmdirSync(dir, { recursive: true });
-      console.log(`Deleted existing directory: ${dir}`);
-    }
-
-    // Clone the repository into a temporary directory
-    await git.clone({
-      fs,
-      http,
-      dir,
-      url: repoUrl,
-      ref: sourceBranch,
-      singleBranch: true,
-      depth: 1,
-    });
-    console.log(`Cloned ${sourceBranch} branch from remote repository.`);
-
-    // Check out the source branch
-    await git.checkout({ fs, dir, ref: sourceBranch });
-    console.log(`Checked out to branch: ${sourceBranch}`);
-
-    // Pull the latest changes from the source branch
-    await git.pull({
-      fs,
-      http,
-      dir,
-      ref: sourceBranch,
-      singleBranch: true,
-      author: {
-        name: process.env.GIT_USER,
-        email: "you@example.com", // Replace with the actual email
-      },
-    });
-    console.log(`Pulled latest changes from branch: ${sourceBranch}`);
-
-    // Create and checkout the target branch from the source branch
-    await git.branch({ fs, dir, ref: targetBranch });
-    await git.checkout({ fs, dir, ref: targetBranch });
-    console.log(`Created and checked out to branch: ${targetBranch}`);
-
-    // Push the new branch to the remote repository
-    await git.push({
-      fs,
-      http,
-      dir,
-      remote: "origin",
-      ref: targetBranch,
-      force: true,
-      onAuth: () => ({
-        username: process.env.GIT_KEY, // GitHub token or password
-        password: "",
-      }),
-    });
-    console.log(`Pushed new branch to remote: ${targetBranch}`);
-  } catch (error) {
-    console.error("Error performing Git operations:", error.message);
-  }
-}
-
-cloneBranch();

package/scripts/test.ts

@@ -1,96 +0,0 @@
-import { createClient } from "@supabase/supabase-js";
-import { Database } from "../types/database";
-import { SSPMParser } from "../utils/star-calc/sspmParser";
-import { rateMap, rateMapOld } from "../utils/star-calc";
-import { V1SSPMParser } from "../utils/star-calc/sspmv1Parser";
-
-export const supabase = createClient<Database>(
-  `https://pfkajngbllcbdzoylrvp.supabase.co`,
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBma2FqbmdibGxjYmR6b3lscnZwIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcxODU3NjA3MCwiZXhwIjoyMDM0MTUyMDcwfQ.XKUlQWvzmcYyirM-Zi4nwhiEKcpx1xLS97QUyuR3MoY",
-  {
-    auth: {
-      autoRefreshToken: false,
-      persistSession: false,
-    },
-  }
-);
-
-async function main() {
-  let qry = supabase
-    .from("beatmapPages")
-    .select(
-      `
-        owner,
-        created_at,
-        id,
-        status,
-        beatmaps!inner(
-          playcount,
-          ranked,
-          beatmapFile,
-          image,
-          starRating,
-          difficulty,
-          title
-        ),
-        profiles!inner(
-          username
-        )`
-    )
-    .order("created_at", { ascending: false });
-
-  qry = qry.ilike("beatmaps.title", "%Ca%");
-  qry = qry.ilike("profiles.username", "%Ca%");
-
-  const data = await qry;
-  console.log(data);
-  // console.log(data.data[]);
-  // const req = await fetch(`https://cdn.rhythia.net/index.json`);
-  // const json = Object.values(await req.json()) as any[];
-  // console.log(json[0]);
-
-  // let count = 0;
-  // for (const map of json) {
-  //   const request = await fetch(map.download);
-  //   const bytes = await request.arrayBuffer();
-  //   const parser = new SSPMParser(Buffer.from(bytes));
-  //   let rate = 0;
-  //   try {
-  //     const data = parser.parse();
-  //     rate = rateMap(data);
-  //   } catch (error) {
-  //     const parserOld = new V1SSPMParser(Buffer.from(bytes));
-  //     const data = parserOld.parse();
-
-  //     rate = rateMapOld(data);
-  //   }
-  //   await supabase.from("beatmaps").upsert({
-  //     beatmapHash: map.id,
-  //     starRating: rate,
-  //   });
-  //   count++;
-  //   console.log(count, json.length, map.id, rate);
-  // }
-  // for (const map of json) {
-  //   const reqMap = await fetch(map.link);
-  //   const buff = await reqMap.arrayBuffer();
-  //   writeFileSync("./toSubmit/" + map.id + ".sspm", Buffer.from(buff));
-  // }
-
-  // const { data: mapData, error } = await supabase
-  //   .from("beatmapPages")
-  //   .select("id,nominations,owner,status")
-  //   .eq("owner", 10)
-  //   .eq("status", "RANKED");
-
-  // if (!mapData) {
-  //   throw "lolz";
-  // }
-
-  // for (const element of mapData) {
-
-  //   console.log(data.error);
-  // }
-}
-
-main();

package/scripts/update.ts

@@ -1,49 +0,0 @@
-import { $ } from "bun";
-import { readdirSync, readFileSync, writeFileSync } from "fs";
-import { lowerFirst, upperFirst } from "lodash";
-import path from "path";
-const packageJson = JSON.parse(readFileSync("./package.json", "utf-8"));
-
-const versions = packageJson.version.split(".");
-versions[0] = Number(versions[0]) + 1;
-
-packageJson.version = versions.join(".");
-
-writeFileSync("./package.json", JSON.stringify(packageJson, null, 2));
-
-const apis = readdirSync("./api");
-
-const exports: string[] = [];
-exports.push(`import { handleApi } from "./handleApi"`);
-
-for (const api of apis) {
-  if (
-    !readFileSync(path.join("./api", api), "utf-8").includes(
-      "export const Schema"
-    )
-  ) {
-    continue;
-  }
-  exports.push(`\n// ./api/${api} API`);
-
-  const apiName = path.parse(api).name;
-  exports.push(
-    `import { Schema as ${upperFirst(apiName)} } from "./api/${apiName}"`
-  );
-  exports.push(
-    `export { Schema as Schema${upperFirst(apiName)} } from "./api/${apiName}"`
-  );
-
-  exports.push(
-    `export const ${lowerFirst(
-      apiName
-    )} = handleApi({url:"/api/${apiName}",...${upperFirst(apiName)}})`
-  );
-}
-exports.push(`export { handleApi } from "./handleApi"`);
-
-writeFileSync("./index.ts", exports.join("\n"));
-
-// const conf = readFileSync("./.cred", "utf-8");
-// await $`npm logout`.nothrow();
-await $`yarn publish`;