fix domjudge fetch

hydro-dev · Jun 14, 2024 · db89242 · db89242
1 parent 936baf3
commit db89242
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/server/config.ts b/packages/server/config.ts
@@ -68,7 +68,7 @@ const serverSchema = Schema.intersect([
                 Schema.const('domjudge'),
                 Schema.const('hydro'),
             ] as const).required(),
-            server: Schema.string().role('url').required(),
+            server: Schema.transform(String, (i) => (i.endsWith('/') ? i : `${i}/`)).role('url').required(),
             contestId: Schema.string(),
             token: Schema.string(),
             username: Schema.string(),

diff --git a/packages/server/service/fetcher.ts b/packages/server/service/fetcher.ts
@@ -64,14 +64,14 @@ class DOMjudgeFetcher extends BasicFetcher {
     async contestInfo() {
         let contest;
         if (!config.contestId) {
-            const { body } = await fetch('/api/v4/contests?onlyActive=true');
+            const { body } = await fetch('./api/v4/contests?onlyActive=true');
             if (!body || !body.length) {
                 logger.error('Contest not found');
                 return false;
             }
             contest = body[0];
         } else {
-            const { body } = await fetch(`/api/v4/contests/${config.contestId}`);
+            const { body } = await fetch(`./api/v4/contests/${config.contestId}`);
             if (!body || !body.id) {
                 logger.error(`Contest ${config.contestId} not found`);
                 return false;
@@ -88,7 +88,7 @@ class DOMjudgeFetcher extends BasicFetcher {
     }
 
     async teamInfo() {
-        const { body } = await fetch(`/api/v4/contests/${this.contest.id}/teams`);
+        const { body } = await fetch(`./api/v4/contests/${this.contest.id}/teams`);
         if (!body || !body.length) return;
         const teams = body;
         for (const team of teams) {
@@ -99,7 +99,7 @@ class DOMjudgeFetcher extends BasicFetcher {
 
     async balloonInfo(all) {
         if (all) logger.info('Sync all balloons...');
-        const { body } = await fetch(`/api/v4/contests/${this.contest.id}/balloons?todo=${all ? 'false' : 'true'}`);
+        const { body } = await fetch(`./api/v4/contests/${this.contest.id}/balloons?todo=${all ? 'false' : 'true'}`);
         if (!body || !body.length) return;
         const balloons = body;
         for (const balloon of balloons) {
@@ -136,7 +136,7 @@ class DOMjudgeFetcher extends BasicFetcher {
     }
 
     async setBalloonDone(bid) {
-        await fetch(`/api/v4/contests/${this.contest.id}/balloons/${bid}/done`, 'post');
+        await fetch(`./api/v4/contests/${this.contest.id}/balloons/${bid}/done`, 'post');
         logger.debug(`Balloon ${bid} set done`);
     }
 }