plugin: version 4.3.0

Author: CondensedTea

plugin/chrome_manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "Offi",
   "description": "tf2 competitive QoL extension",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "content_scripts": [
     {
       "run_at": "document_end",

plugin/firefox_manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Offi",
   "description": "tf2 competitive QoL extension",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "content_scripts": [
     {
       "run_at": "document_end",

plugin/package.json

@@ -1,10 +1,10 @@
 {
   "name": "offi",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "scripts": {
-    "build_ff": "cp firefox_manifest.json manifest.json && parcel build manifest.json --dist-dir build/firefox --no-optimize && rm manifest.json",
-    "build_c": "cp chrome_manifest.json manifest.json && parcel build manifest.json --dist-dir build/chrome --no-optimize && rm manifest.json",
-    "lint": "eslint src/*.ts"
+    "build_ff": "cp firefox_manifest.json manifest.json && parcel build manifest.json --dist-dir build/firefox --no-optimize --no-content-hash && rm manifest.json",
+    "build_c": "cp chrome_manifest.json manifest.json && parcel build manifest.json --dist-dir build/chrome --no-optimize --no-scope-hoist --no-content-hash && rm manifest.json",
+    "lint": "eslint src/*.ts src/api/*.ts"
   },
   "dependencies": {
     "@parcel/config-webextension": "2.13.2",
@@ -15,6 +15,8 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.15.0",
+    "@parcel/optimizer-data-url": "2.13.2",
+    "@parcel/transformer-inline-string": "2.13.2",
     "@parcel/transformer-typescript-tsc": "2.13.2",
     "@types/node": "^22.9.3",
     "@types/webextension-polyfill": "^0.12.1",

plugin/src/api/api.ts

@@ -0,0 +1,8 @@
+const VERSION =
+  (process.env.OFFI_PLATFORM || "unknown") + "/" + (process.env.OFFI_VERSION || "dev");
+
+export const requestHeaders = {
+    "X-Offi-Version": VERSION,
+    "Content-Type": "application/json",
+}
+

plugin/src/api/error.ts

@@ -0,0 +1,23 @@
+export class APIError extends Error {
+    public status: number
+    public traceparent: string | null
+
+    constructor(message: string, status: number, traceparent: string | null) {
+        super(message);
+
+        this.status = status
+        this.traceparent = traceparent
+    }
+
+    toString(): string {
+        return `[${this.status}] API error: ${this.message}\nTrace: ${this.traceparent})`
+    }
+
+    static async fromResponse(r: Response): Promise<APIError> {
+        return new APIError(await r.text(), r.status, r.headers.get("traceparent"));
+    }
+}
+
+export const NoRecruitmentInfo = new Error("this team doesn't have recruitment post");
+export const MatchNotFound = new Error("match not found or was not played yet");
+export const NoLogsError = new Error("api didn't found logs for this match");

plugin/src/api/get_logs.ts

@@ -1,25 +1,20 @@
 import { Log, LogResponse } from "./types";
-
-export const NoLogsError = new Error("api didnt found logs for this match");
+import {APIError, NoLogsError} from "./error";
+import {requestHeaders} from "./api";
 
 export async function getLogs(apiBaseUrl: string, matchId: number): Promise<Log[]> {
   const getMatchURL = new URL(apiBaseUrl + `/match/${matchId}`);
 
-  const res = await fetch(getMatchURL);
-  if (!res.ok) {
-    throw new Error("offi api returned error: " + res.statusText);
-  }
-
-  const { logs } = (await res.json()) as LogResponse;
-  if (logs === null) {
+  const res = await fetch(getMatchURL, {
+    headers: requestHeaders,
+  });
+  if (res.status === 404 || res.status === 425) {
     throw NoLogsError;
+  } else if (res.status !== 200) {
+    throw await APIError.fromResponse(res);
   }
 
-  const parsedLogs: Log[] = [];
-
-  for (const rawLog of logs) {
-    parsedLogs.push(new Log(rawLog));
-  }
+  const { logs } = (await res.json()) as LogResponse;
 
-  return parsedLogs;
+  return logs.map((log => new Log(log)));
 }

plugin/src/api/get_match.ts

@@ -1,15 +1,19 @@
-import {Match, MatchResponse} from "./types";
+import { MatchResponse } from "./types";
+import { MatchNotFound, APIError } from "./error";
+import { requestHeaders } from "./api";
 
-export async function getMatch(apiBaseUrl: string, logId: number): Promise<Match> {
+export async function getMatch(apiBaseUrl: string, logId: number): Promise<MatchResponse> {
   const logURL = new URL(apiBaseUrl + `/log/${logId}`);
 
-  const res = await fetch(logURL);
-
-  if (!res.ok) {
-    throw new Error("api returned error: " + res.statusText);
+  const res = await fetch(logURL, {
+    headers: requestHeaders,
+  });
+  if (res.status === 404) {
+    throw MatchNotFound
+  }
+  if (res.status !== 200) {
+    throw await APIError.fromResponse(res);
   }
 
-  const apiResponse = await res.json() as MatchResponse;
-
-  return apiResponse.match;
+  return await res.json() as MatchResponse;
 }

plugin/src/api/get_players.ts

@@ -1,6 +1,8 @@
 import { Player, PlayersResponse } from "./types";
+import { APIError } from "./error";
+import {requestHeaders} from "./api";
 
-export async function getPlayers(apiBaseUrl: string, ids: string[], withRecruitmentStatus: boolean): Promise<Player[]> {
+export async function getPlayers(apiBaseUrl: string, ids: string[], withRecruitmentStatus: boolean = false): Promise<Player[]> {
   const playersURL = new URL(apiBaseUrl + "/players");
 
   const idsString = ids.join(",");
@@ -9,9 +11,11 @@ export async function getPlayers(apiBaseUrl: string, ids: string[], withRecruitm
 
   if (withRecruitmentStatus) playersURL.searchParams.append("with_recruitment_status", "true");
 
-  const res = await fetch(playersURL.toString());
-  if (!res.ok) {
-    throw new Error("offi api returned error: " + res.statusText);
+  const res = await fetch(playersURL.toString(), {
+    headers: requestHeaders,
+  });
+  if (res.status !== 200) {
+    throw await APIError.fromResponse(res);
   }
 
   const response = await res.json() as PlayersResponse;

plugin/src/api/get_team.ts

@@ -1,19 +1,20 @@
-import {Team, TeamResponse} from "./types";
-
-export const NoRecruitmentInfo = new Error("this team doesn't have recruitment post");
+import { Team, TeamResponse } from "./types";
+import { NoRecruitmentInfo, APIError } from "./error";
+import {requestHeaders} from "./api";
 
 export async function getTeam(apiBaseUrl: string, teamId: string): Promise<Team> {
   const getTeamURL = new URL(apiBaseUrl + `/team/${teamId}`);
 
-  const res = await fetch(getTeamURL);
-  if (!res.ok) {
-    throw new Error("offi api returned error: " + res.statusText);
+  const res = await fetch(getTeamURL, {
+    headers: requestHeaders,
+  });
+  if (res.status === 404) {
+    throw NoRecruitmentInfo;
+  } else if (res.status !== 200) {
+    throw await APIError.fromResponse(res);
   }
 
   const response = (await res.json()) as TeamResponse;
-  if (response.team === null || !response.team.recruitment) {
-    throw NoRecruitmentInfo;
-  }
 
   return response.team;
 }

plugin/src/api/types.ts

@@ -26,21 +26,21 @@ export type Team = {
   recruitment: Recruitment;
 }
 
-
-
 export class Log {
   id: number;
   title: string;
   map: string;
   played_at: Date;
   is_secondary: boolean;
+  demo_id?: number;
 
   constructor(data: Log) {
     this.id = data.id;
     this.title = data.title;
     this.map = data.map;
     this.played_at = new Date(data.played_at);
     this.is_secondary = data.is_secondary;
+    this.demo_id = data.demo_id;
   }
 }
 
@@ -51,8 +51,13 @@ export type Match = {
   tier: string;
 }
 
+export type LogMeta = {
+  demo_id?: number
+}
+
 export type MatchResponse = {
   match: Match;
+  log: LogMeta;
 }
 
 export type LogResponse = {