refactor(remote_judger): waitForSubmission

remote_judger/src/interface.ts

@@ -20,10 +20,10 @@ export interface IBasicProvider {
     end: NextFunction
   ): Promise<string | void>;
   waitForSubmission(
-    problem_id: string,
     id: string,
     next: NextFunction,
-    end: NextFunction
+    end: NextFunction,
+    problem_id?: string
   ): Promise<void>;
 }
 

remote_judger/src/providers/atcoder.ts

@@ -8,7 +8,7 @@ import Logger from '../utils/logger';
 proxy(superagent);
 const logger = new Logger('remote/atcoder');
 
-const langs_map = {
+const LANGS_MAP = {
   C: {
     name: 'C (GCC 9.2.1)',
     id: 4001,
@@ -182,7 +182,7 @@ export default class AtcoderProvider implements IBasicProvider {
     next,
     end
   ) {
-    const programType = langs_map[lang] || langs_map['C++'];
+    const programType = LANGS_MAP[lang] || LANGS_MAP['C++'];
     const comment = programType.comment;
 
     if (comment) {
@@ -244,31 +244,24 @@ export default class AtcoderProvider implements IBasicProvider {
       .getAttribute('data-id');
   }
 
-  async waitForSubmission(problem_id: string, id: string, next, end) {
+  async waitForSubmission(id: string, next, end, problem_id: string) {
-    let i = 0;
+    let count = 0;
+    let fail = 0;
 
     const [contestId] = parseProblemId(problem_id);
     const status_url = `/contests/${contestId}/submissions/me/status/json?reload=true&sids[]=${id}`;
 
-    while (true) {
+    while (count < 180 && fail < 10) {
-      if (++i > 180) {
+      count++;
-        return await end({
-          id,
-          error: true,
-          status: 'Judgment Failed',
-          message: 'Failed to fetch submission details.',
-        });
-      }
-
       await sleep(1000);
-      const { body, error, header } = await this.get(status_url).retry(3);
+
+      try {
+        const { body, header } = await this.get(status_url).retry(3);
 
         if (header['set-cookie']) {
           this.cookie = header['set-cookie'];
         }
 
-      if (error) continue;
-
         const result = body.Result[id];
         const {
           window: { document },
@@ -290,7 +283,8 @@ export default class AtcoderProvider implements IBasicProvider {
 
         if (
           statusElem.title === 'Judging' ||
-        (statusTd.colSpan == 3 && statusTd.className.includes('waiting-judge'))
+          (statusTd.colSpan == 3 &&
+            statusTd.className.includes('waiting-judge'))
         ) {
           await next({ test_id: /(\d+)/.exec(statusElem.innerHTML)[1] || 0 });
 
@@ -328,6 +322,18 @@ export default class AtcoderProvider implements IBasicProvider {
           time,
           memory,
         });
+      } catch (e) {
+        logger.error(e);
+
+        fail++;
       }
     }
+
+    return await end({
+      id,
+      error: true,
+      status: 'Judgment Failed',
+      message: 'Failed to fetch submission details.',
+    });
+  }
 }

remote_judger/src/providers/codeforces.ts

@@ -344,27 +344,22 @@ export default class CodeforcesProvider implements IBasicProvider {
       .getAttribute('data-submission-id');
   }
 
-  async waitForSubmission(problem_id: string, id: string, next, end) {
+  async waitForSubmission(id: string, next, end) {
-    let i = 0;
+    let count = 0;
-
+    let fail = 0;
-    while (true) {
-      if (++i > 180) {
-        return await end({
-          id,
-          error: true,
-          status: 'Judgment Failed',
-          message: 'Failed to fetch submission details.',
-        });
-      }
 
+    while (count < 180 && fail < 10) {
+      count++;
       await sleep(1000);
-      const { body, error } = await this.post('/data/submitSource')
+
+      try {
+        const { body } = await this.post('/data/submitSource')
           .send({
             csrf_token: this.csrf,
             submissionId: id,
           })
           .retry(3);
-      if (error) continue;
+
         if (body.compilationError === 'true') {
           return await end({
             id,
@@ -373,6 +368,7 @@ export default class CodeforcesProvider implements IBasicProvider {
             message: crlf(body['checkerStdoutAndStderr#1'], LF),
           });
         }
+
         const time = mathSum(
           Object.keys(body)
             .filter(k => k.startsWith('timeConsumed#'))
@@ -385,6 +381,7 @@ export default class CodeforcesProvider implements IBasicProvider {
               .map(k => +body[k])
           ) / 1024;
         await next({ test_id: body.testCount });
+
         if (body.waiting === 'true') continue;
 
         const testCount = +body.testCount;
@@ -442,6 +439,18 @@ export default class CodeforcesProvider implements IBasicProvider {
           memory,
           details,
         });
+      } catch (e) {
+        logger.error(e);
+
+        fail++;
       }
     }
+
+    return await end({
+      id,
+      error: true,
+      status: 'Judgment Failed',
+      message: 'Failed to fetch submission details.',
+    });
+  }
 }

remote_judger/src/providers/loj.ts

@@ -285,7 +285,7 @@ export default class LibreojProvider implements IBasicProvider {
     return user_id === submission_user_id;
   }
 
-  async waitForSubmission(problem_id: string, id: string, next, end) {
+  async waitForSubmission(id: string, next, end, problem_id: string) {
     if (!(await this.ensureLogin())) {
       await end({
         error: true,
@@ -296,25 +296,18 @@ export default class LibreojProvider implements IBasicProvider {
       return null;
     }
 
-    let i = 0;
+    let count = 0;
-
+    let fail = 0;
-    while (true) {
-      if (++i > 180) {
-        return await end({
-          id,
-          error: true,
-          status: 'Judgment Failed',
-          message: 'Failed to fetch submission details.',
-        });
-      }
 
+    while (count < 180 && fail < 10) {
+      count++;
       await sleep(1000);
-      const { body, error } = await this.post('/submission/getSubmissionDetail')
+
+      try {
+        const { body } = await this.post('/submission/getSubmissionDetail')
           .send({ submissionId: String(id), locale: 'zh_CN' })
           .retry(3);
 
-      if (error) continue;
-
         if (body.meta.problem.displayId != problem_id) {
           return await end({
             id,
@@ -377,7 +370,8 @@ export default class LibreojProvider implements IBasicProvider {
               body.progress.testcaseResult[testcase.testcaseHash].status !==
               'Accepted'
             ) {
-            result = body.progress.testcaseResult[testcase.testcaseHash].status;
+              result =
+                body.progress.testcaseResult[testcase.testcaseHash].status;
 
               break;
             }
@@ -407,9 +401,9 @@ export default class LibreojProvider implements IBasicProvider {
 
           test_info += `<test num="${
             index + 1
-        }" info="${status}" time="${Math.round(testcase.time || 0)}" memory="${
+          }" info="${status}" time="${Math.round(
-          testcase.memory
+            testcase.time || 0
-        }">`;
+          )}" memory="${testcase.memory}">`;
 
           if (testcase.input) {
             if (typeof testcase.input === 'string') {
@@ -495,7 +489,9 @@ export default class LibreojProvider implements IBasicProvider {
           details += `<tests>${body.progress.subtasks
             .map(
               (subtask, index) =>
-              `<subtask num="${index + 1}" info="${getSubtaskStatusDisplayText(
+                `<subtask num="${
+                  index + 1
+                }" info="${getSubtaskStatusDisplayText(
                   subtask.testcases
                 )}">${subtask.testcases
                   .map((item, index) =>
@@ -516,6 +512,18 @@ export default class LibreojProvider implements IBasicProvider {
           memory: body.meta.memoryUsed,
           details: `<div>${details}</div>`,
         });
+      } catch (e) {
+        logger.error(e);
+
+        fail++;
       }
     }
+
+    return await end({
+      id,
+      error: true,
+      status: 'Judgment Failed',
+      message: 'Failed to fetch submission details.',
+    });
+  }
 }

remote_judger/src/providers/luogu.ts

@@ -250,11 +250,11 @@ export default class LuoguProvider implements IBasicProvider {
     return result.body.rid;
   }
 
-  async waitForSubmission(problem_id: string, id: string, next, end) {
+  async waitForSubmission(id: string, next, end) {
     let fail = 0;
     let count = 0;
 
-    while (count < 180 && fail < 5) {
+    while (count < 180 && fail < 10) {
       await sleep(1000);
       count++;
 

remote_judger/src/providers/uoj.ts

@@ -9,7 +9,7 @@ import sleep from '../utils/sleep';
 proxy(superagent);
 const logger = new Logger('remote/uoj');
 
-const langs_map = {
+const LANGS_MAP = {
   C: {
     name: 'C',
     id: 'C',
@@ -175,7 +175,7 @@ export default class UOJProvider implements IBasicProvider {
     next,
     end
   ) {
-    const programType = langs_map[lang] || langs_map['C++'];
+    const programType = LANGS_MAP[lang] || LANGS_MAP['C++'];
     const comment = programType.comment;
 
     if (comment) {
@@ -206,20 +206,15 @@ export default class UOJProvider implements IBasicProvider {
       .innerHTML.split('#')[1];
   }
 
-  async waitForSubmission(problem_id: string, id: string, next, end) {
+  async waitForSubmission(id: string, next, end) {
-    let i = 0;
+    let count = 0;
-
+    let fail = 0;
-    while (true) {
-      if (++i > 180) {
-        return await end({
-          id,
-          error: true,
-          status: 'Judgment Failed',
-          message: 'Failed to fetch submission details.',
-        });
-      }
 
+    while (count < 180 && fail < 10) {
+      count++;
       await sleep(1000);
+
+      try {
         const { text } = await this.get(`/submission/${id}`);
         const {
           window: { document },
@@ -265,6 +260,18 @@ export default class UOJProvider implements IBasicProvider {
           time,
           memory,
         });
+      } catch (e) {
+        logger.error(e);
+
+        fail++;
       }
     }
+
+    return await end({
+      id,
+      error: true,
+      status: 'Judgment Failed',
+      message: 'Failed to fetch submission details.',
+    });
+  }
 }

remote_judger/src/vjudge.ts

@@ -35,7 +35,7 @@ class AccountService {
 
       if (!rid) return;
 
-      await this.api.waitForSubmission(problem_id, rid, next, end);
+      await this.api.waitForSubmission(rid, next, end, problem_id);
     } catch (e) {
       logger.error(e);
 
@@ -178,7 +178,7 @@ class VJudge {
 
         if (!rid) return;
 
-        await provider.waitForSubmission(problem_id, rid, next, end);
+        await provider.waitForSubmission(rid, next, end, problem_id);
       } catch (e) {
         logger.error(e);
 
@@ -204,10 +204,10 @@ class VJudge {
 
         if (await provider.ensureIsOwnSubmission(config.remote_submission_id)) {
           await provider.waitForSubmission(
-            problem_id,
             config.remote_submission_id,
             next,
-            end
+            end,
+            problem_id
           );
         } else {
           return await end({