orosmatthew/bw-hspc-contest-env
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[extension] Format

Browse Source
This commit is contained in:
orosmatthew 2024-03-05 19:31:11 -05:00
parent 4a3ff56e7a
commit fde6b0019b
17 changed files with 458 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extension/bwcontest/package.json
View File

@ -9,7 +9,9 @@
"categories": [
"Other"
],
"activationEvents": ["onStartupFinished"],
"activationEvents": [
"onStartupFinished"
],
"main": "./out/main.js",
"contributes": {
"configuration": {

119
extension/bwcontest/src/SidebarProvider.ts
View File

@ -4,15 +4,25 @@ import { cloneAndOpenRepo } from './extension';
import { BWPanel } from './problemPanel';
import urlJoin from 'url-join';
import outputPanelLog from './outputPanelLog';
import { ContestStateForExtension, ProblemNameForExtension, SubmissionForExtension, SubmissionStateForExtension } from './contestMonitor/contestMonitorSharedTypes';
import {
ContestStateForExtension,
ProblemNameForExtension,
SubmissionForExtension,
SubmissionStateForExtension
} from './contestMonitor/contestMonitorSharedTypes';
import { TeamData } from './sharedTypes';
import { ContestTeamState, getCachedContestTeamState, clearCachedContestTeamState, submissionsListChanged } from './contestMonitor/contestStateSyncManager';
import {
ContestTeamState,
getCachedContestTeamState,
clearCachedContestTeamState,
submissionsListChanged
} from './contestMonitor/contestStateSyncManager';
import { startTeamStatusPolling, stopTeamStatusPolling } from './contestMonitor/pollingService';
export type WebviewMessageType =
{ msg: 'onLogin'; data: TeamData } |
{ msg: 'onLogout' } |
{ msg: 'teamStatusUpdated'; data: SidebarTeamStatus | null };
| { msg: 'onLogin'; data: TeamData }
| { msg: 'onLogout' }
| { msg: 'teamStatusUpdated'; data: SidebarTeamStatus | null };
export type MessageType =
| { msg: 'onTestAndSubmit' }
@ -27,14 +37,14 @@ export type SidebarTeamStatus = {
processingProblems: SidebarProblemWithSubmissions[];
incorrectProblems: SidebarProblemWithSubmissions[];
notStartedProblems: SidebarProblemWithSubmissions[];
}
};
export type SidebarProblemWithSubmissions = {
problem: ProblemNameForExtension;
overallState: SubmissionStateForExtension | null;
submissions: SubmissionForExtension[];
modified: boolean;
}
};
export class SidebarProvider implements vscode.WebviewViewProvider {
private webview: vscode.Webview | null = null;
@ -44,14 +54,17 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
private readonly context: vscode.ExtensionContext,
private readonly webUrl: string
) {
outputPanelLog.info("Constructing SidebarProvider");
outputPanelLog.info('Constructing SidebarProvider');
const currentSubmissionsList = getCachedContestTeamState();
outputPanelLog.info("When SidebarProvider constructed, cached submission list is: " + JSON.stringify(currentSubmissionsList));
outputPanelLog.info(
'When SidebarProvider constructed, cached submission list is: ' +
JSON.stringify(currentSubmissionsList)
);
this.updateTeamStatus(currentSubmissionsList);
submissionsListChanged.add(submissionsChangedEventArgs => {
outputPanelLog.trace("Sidebar submission list updating from submissionsListChanged event");
submissionsListChanged.add((submissionsChangedEventArgs) => {
outputPanelLog.trace('Sidebar submission list updating from submissionsListChanged event');
if (!submissionsChangedEventArgs) {
return;
@ -60,7 +73,8 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
this.updateTeamStatus(
submissionsChangedEventArgs.contestTeamState,
submissionsChangedEventArgs.changedProblemIds
)});
);
});
}
private async handleLogin(
@ -84,7 +98,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
}
if (resData.success !== true) {
outputPanelLog.error('Invalid Login attempt with message: ' + (resData.message ?? "<none>"));
outputPanelLog.error('Invalid Login attempt with message: ' + (resData.message ?? '<none>'));
vscode.window.showErrorMessage('BWContest: Invalid Login');
return;
}
@ -95,7 +109,9 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
});
const data2 = await teamRes.json();
if (!data2.success) {
outputPanelLog.error('Login attempt retrieved token but not team details. Staying logged out.');
outputPanelLog.error(
'Login attempt retrieved token but not team details. Staying logged out.'
);
vscode.window.showErrorMessage('BWContest: Invalid Login');
return;
}
@ -109,21 +125,27 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
webviewPostMessage({ msg: 'onLogin', data: data2.data });
const currentSubmissionsList = getCachedContestTeamState();
outputPanelLog.info("After login, cached submission list is: " + JSON.stringify(currentSubmissionsList));
outputPanelLog.info(
'After login, cached submission list is: ' + JSON.stringify(currentSubmissionsList)
);
this.updateTeamStatus(currentSubmissionsList);
}
private async handleLogout(webviewPostMessage: (m: WebviewMessageType) => void) {
const sessionToken = this.context.globalState.get<string>('token');
if (sessionToken === undefined) {
outputPanelLog.error("Team requested logout, but no token was stored locally. Switching to logged out state.");
outputPanelLog.error(
'Team requested logout, but no token was stored locally. Switching to logged out state.'
);
this.clearLocalTeamDataAndFinishLogout(webviewPostMessage);
return;
}
const teamData = this.context.globalState.get<TeamData>('teamData');
if (teamData === undefined) {
outputPanelLog.error("Team requested logout with a locally stored token but no teamData. Switching to logged out state.");
outputPanelLog.error(
'Team requested logout with a locally stored token but no teamData. Switching to logged out state.'
);
this.clearLocalTeamDataAndFinishLogout(webviewPostMessage);
return;
}
@ -138,16 +160,21 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
});
if (res.status !== 200) {
outputPanelLog.error(`Team requested logout, failed with status code ${res.status}. Not modifying local state.`);
outputPanelLog.error(
`Team requested logout, failed with status code ${res.status}. Not modifying local state.`
);
vscode.window.showErrorMessage(`BWContest: Logout failed with code ${res.status}`);
return;
};
}
const data2 = await res.json();
const responseMessage = data2.message ? `Message: ${data2.message}` : '';
if (data2.success !== true) {
outputPanelLog.error(`Team requested logout, failed with normal status code. Not modifying local state. ` + responseMessage);
outputPanelLog.error(
`Team requested logout, failed with normal status code. Not modifying local state. ` +
responseMessage
);
vscode.window.showErrorMessage(`BWContest: Logout failed.`);
return;
}
@ -166,44 +193,51 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
this.context.globalState.update('teamData', undefined);
}
public updateTeamStatus(contestTeamState : ContestTeamState | null, changedProblemIds = new Set<number>) {
public updateTeamStatus(
contestTeamState: ContestTeamState | null,
changedProblemIds = new Set<number>()
) {
if (contestTeamState == null) {
outputPanelLog.trace("Not updating sidebar submission list because provided state is null");
outputPanelLog.trace('Not updating sidebar submission list because provided state is null');
return;
}
if (this.webview == null) {
outputPanelLog.trace("Not updating sidebar submission list because webview is null");
outputPanelLog.trace('Not updating sidebar submission list because webview is null');
return;
}
const contestState = contestTeamState.contestState;
const problemsWithSubmissions = contestState.problems.map<SidebarProblemWithSubmissions>(p => ({
const problemsWithSubmissions = contestState.problems.map<SidebarProblemWithSubmissions>(
(p) => ({
problem: p,
overallState: calculateOverallState(contestTeamState.submissionsList.get(p.id) ?? []),
submissions: contestTeamState.submissionsList.get(p.id) ?? [],
modified: changedProblemIds.has(p.id)
}));
})
);
const teamStatus: SidebarTeamStatus = {
contestState,
correctProblems: problemsWithSubmissions.filter(p => p.overallState === 'Correct'),
processingProblems: problemsWithSubmissions.filter(p => p.overallState === 'Processing'),
incorrectProblems: problemsWithSubmissions.filter(p => p.overallState === 'Incorrect'),
notStartedProblems: problemsWithSubmissions.filter(p => p.overallState === null),
}
correctProblems: problemsWithSubmissions.filter((p) => p.overallState === 'Correct'),
processingProblems: problemsWithSubmissions.filter((p) => p.overallState === 'Processing'),
incorrectProblems: problemsWithSubmissions.filter((p) => p.overallState === 'Incorrect'),
notStartedProblems: problemsWithSubmissions.filter((p) => p.overallState === null)
};
const message: WebviewMessageType = {
msg: 'teamStatusUpdated',
data: teamStatus
};
outputPanelLog.trace("Posting teamStatusUpdated to webview with message: " + JSON.stringify(message));
outputPanelLog.trace(
'Posting teamStatusUpdated to webview with message: ' + JSON.stringify(message)
);
this.webview.postMessage(message);
}
public resolveWebviewView(webviewView: vscode.WebviewView) {
outputPanelLog.trace("SidebarProvider resolveWebviewView");
outputPanelLog.trace('SidebarProvider resolveWebviewView');
const webview = webviewView.webview;
this.webview = webview;
webview.options = {
@ -225,7 +259,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
break;
}
case 'onUIMount': {
outputPanelLog.trace("SidebarProvider onUIMount");
outputPanelLog.trace('SidebarProvider onUIMount');
const token = this.context.globalState.get<string>('token');
const teamData = this.context.globalState.get<TeamData>('teamData');
if (token !== undefined && teamData !== undefined) {
@ -235,7 +269,9 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
});
const currentSubmissionsList = getCachedContestTeamState();
outputPanelLog.trace("onUIMount, currentSubmissionsList is " + JSON.stringify(currentSubmissionsList));
outputPanelLog.trace(
'onUIMount, currentSubmissionsList is ' + JSON.stringify(currentSubmissionsList)
);
this.updateTeamStatus(currentSubmissionsList);
}
break;
@ -297,17 +333,16 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
</html>`;
}
}
function calculateOverallState(submissions: SubmissionForExtension[]): SubmissionStateForExtension | null {
if (submissions.find(s => s.state === 'Correct')) {
function calculateOverallState(
submissions: SubmissionForExtension[]
): SubmissionStateForExtension | null {
if (submissions.find((s) => s.state === 'Correct')) {
return 'Correct';
}
else if (submissions.find(s => s.state === 'Processing')) {
} else if (submissions.find((s) => s.state === 'Processing')) {
return 'Processing';
}
else if (submissions.find(s => s.state === 'Incorrect')) {
} else if (submissions.find((s) => s.state === 'Incorrect')) {
return 'Incorrect';
}
else {
} else {
return null;
}
}

40
extension/bwcontest/src/contestMonitor/contestMonitorSharedTypes.ts
View File

@ -1,29 +1,29 @@
export type FullStateForExtension = {
contestState: ContestStateForExtension,
submissions: SubmissionForExtension[]
}
contestState: ContestStateForExtension;
submissions: SubmissionForExtension[];
};
export type ProblemNameForExtension = {
id: number,
friendlyName: string,
}
id: number;
friendlyName: string;
};
export type ContestStateForExtension = {
startTime: Date | null,
endTime: Date | null,
problems: ProblemNameForExtension[],
isActive: boolean,
isScoreboardFrozen: boolean,
}
startTime: Date | null;
endTime: Date | null;
problems: ProblemNameForExtension[];
isActive: boolean;
isScoreboardFrozen: boolean;
};
export type SubmissionStateForExtension = 'Processing' | 'Correct' | 'Incorrect';
export type SubmissionForExtension = {
id: number,
contestId: number,
teamId: number,
problemId: number,
createdAt: Date,
state: SubmissionStateForExtension
message: string | null
}
id: number;
contestId: number;
teamId: number;
problemId: number;
createdAt: Date;
state: SubmissionStateForExtension;
message: string | null;
};

127
extension/bwcontest/src/contestMonitor/contestStateSyncManager.ts
View File

@ -2,18 +2,23 @@ import * as vscode from 'vscode';
import urlJoin from 'url-join';
import outputPanelLog from '../outputPanelLog';
import { extensionSettings } from '../extension';
import { ContestStateForExtension, ProblemNameForExtension, FullStateForExtension, SubmissionForExtension } from './contestMonitorSharedTypes';
import {
ContestStateForExtension,
ProblemNameForExtension,
FullStateForExtension,
SubmissionForExtension
} from './contestMonitorSharedTypes';
import { LiteEvent } from '../utilities/LiteEvent';
export type ContestTeamState = {
contestState: ContestStateForExtension,
submissionsList: Map<number, SubmissionForExtension[]>
}
contestState: ContestStateForExtension;
submissionsList: Map<number, SubmissionForExtension[]>;
};
export type SubmissionListStateChangedEventArgs = {
contestTeamState: ContestTeamState,
changedProblemIds: Set<number>
}
contestTeamState: ContestTeamState;
changedProblemIds: Set<number>;
};
let latestContestTeamState: ContestTeamState | null = null;
@ -39,65 +44,91 @@ export async function pollContestStatus(context: vscode.ExtensionContext) {
return;
}
const contestStateResponse = await fetch(urlJoin(extensionSettings().webUrl, `api/team/${sessionToken}/contestState`), {
const contestStateResponse = await fetch(
urlJoin(extensionSettings().webUrl, `api/team/${sessionToken}/contestState`),
{
method: 'GET'
});
}
);
if (contestStateResponse.status != 200) {
outputPanelLog.trace(` Ending poll #${pollNum}: Status check API returned http status ${contestStateResponse.status}`);
outputPanelLog.trace(
` Ending poll #${pollNum}: Status check API returned http status ${contestStateResponse.status}`
);
return;
}
const data = await contestStateResponse.json();
if (!data.success) {
outputPanelLog.trace(` Ending poll #${pollNum}: Status check returned OK but was not successful`);
outputPanelLog.trace(
` Ending poll #${pollNum}: Status check returned OK but was not successful`
);
return;
}
const fullState: FullStateForExtension = data.data;
outputPanelLog.trace(` Poll #${pollNum} succeeded. Submission count: ${fullState.submissions.length}. Diffing...`);
outputPanelLog.trace(
` Poll #${pollNum} succeeded. Submission count: ${fullState.submissions.length}. Diffing...`
);
diffAndUpdateContestState(fullState);
}
function diffAndUpdateContestState(fullState: FullStateForExtension) {
const contestState = fullState.contestState;
const currentSubmissionsList = createProblemSubmissionsLookup(contestState.problems, fullState.submissions);
const currentSubmissionsList = createProblemSubmissionsLookup(
contestState.problems,
fullState.submissions
);
const changedProblemIds = new Set<number>();
let anythingChanged = false;
if (latestContestTeamState == null) {
outputPanelLog.trace(` No previously cached data to diff`);
anythingChanged = true;
}
else {
} else {
for (const problem of contestState.problems) {
const problemId = problem.id;
const currentSubmissionsForProblem = currentSubmissionsList.get(problemId) ?? [];
const cachedSubmissionsForProblem = latestContestTeamState.submissionsList.get(problemId) ?? [];
const cachedSubmissionsForProblem =
latestContestTeamState.submissionsList.get(problemId) ?? [];
const currentSubmissionsAlreadyInCache = currentSubmissionsForProblem!.filter(s => cachedSubmissionsForProblem.find(ss => ss.id == s.id));
const currentSubmissionsNotInCache = currentSubmissionsForProblem!.filter(s => !cachedSubmissionsForProblem.find(ss => ss.id == s.id));
const cachedSubmissionsNotInCurrent = cachedSubmissionsForProblem.filter(s => !currentSubmissionsForProblem!.find(ss => ss.id == s.id));
const currentSubmissionsAlreadyInCache = currentSubmissionsForProblem!.filter((s) =>
cachedSubmissionsForProblem.find((ss) => ss.id == s.id)
);
const currentSubmissionsNotInCache = currentSubmissionsForProblem!.filter(
(s) => !cachedSubmissionsForProblem.find((ss) => ss.id == s.id)
);
const cachedSubmissionsNotInCurrent = cachedSubmissionsForProblem.filter(
(s) => !currentSubmissionsForProblem!.find((ss) => ss.id == s.id)
);
for (const currentSubmission of currentSubmissionsAlreadyInCache) {
const previousSubmission = cachedSubmissionsForProblem.find(s => s.id == currentSubmission.id)!;
const previousSubmission = cachedSubmissionsForProblem.find(
(s) => s.id == currentSubmission.id
)!;
if (currentSubmission.state != previousSubmission.state) {
anythingChanged = true;
changedProblemIds.add(problem.id);
outputPanelLog.trace(` Submission state for #${currentSubmission.id} changed from ${previousSubmission.state} (message '${previousSubmission.message}') to ${currentSubmission.state} (message '${currentSubmission.message}')`);
outputPanelLog.trace(
` Submission state for #${currentSubmission.id} changed from ${previousSubmission.state} (message '${previousSubmission.message}') to ${currentSubmission.state} (message '${currentSubmission.message}')`
);
alertForNewState(problem, currentSubmission);
} else if (currentSubmission.message != previousSubmission.message) {
anythingChanged = true;
changedProblemIds.add(problem.id);
outputPanelLog.trace(` Submission message changed (with same state) for #${currentSubmission.id} from ${previousSubmission.message} to ${currentSubmission.message}`);
outputPanelLog.trace(
` Submission message changed (with same state) for #${currentSubmission.id} from ${previousSubmission.message} to ${currentSubmission.message}`
);
}
}
for (const currentSubmission of currentSubmissionsNotInCache) {
anythingChanged = true;
changedProblemIds.add(problem.id);
outputPanelLog.trace(` Newly acknowledge submission #${currentSubmission.id} with state ${currentSubmission.state} and message ${currentSubmission.message}`);
outputPanelLog.trace(
` Newly acknowledge submission #${currentSubmission.id} with state ${currentSubmission.state} and message ${currentSubmission.message}`
);
alertForNewState(problem, currentSubmission);
}
@ -108,7 +139,9 @@ function diffAndUpdateContestState(fullState: FullStateForExtension) {
}
}
outputPanelLog.trace(anythingChanged ? " Diff has changes, triggering events" : " No changes found");
outputPanelLog.trace(
anythingChanged ? ' Diff has changes, triggering events' : ' No changes found'
);
if (anythingChanged) {
latestContestTeamState = { contestState, submissionsList: currentSubmissionsList };
@ -119,45 +152,65 @@ function diffAndUpdateContestState(fullState: FullStateForExtension) {
}
}
function createProblemSubmissionsLookup(problems: ProblemNameForExtension[], submissions: SubmissionForExtension[]): Map<number, SubmissionForExtension[]> {
function createProblemSubmissionsLookup(
problems: ProblemNameForExtension[],
submissions: SubmissionForExtension[]
): Map<number, SubmissionForExtension[]> {
const orderedSubmissionsByProblemId = new Map<number, SubmissionForExtension[]>();
for (const problem of problems) {
orderedSubmissionsByProblemId.set(problem.id, []);
}
for (const submission of submissions.sort(s => s.id)) {
for (const submission of submissions.sort((s) => s.id)) {
orderedSubmissionsByProblemId.get(submission.problemId)!.push(submission);
}
return orderedSubmissionsByProblemId;
}
function alertForNewState(problem: ProblemNameForExtension, currentSubmission: SubmissionForExtension) {
function alertForNewState(
problem: ProblemNameForExtension,
currentSubmission: SubmissionForExtension
) {
// Only alert on state changes team cares about
if (currentSubmission.state === 'Correct') {
vscode.window.showInformationMessage(`BWContest Judge: CORRECT Submission '${problem.friendlyName}'`);
vscode.window.showInformationMessage(
`BWContest Judge: CORRECT Submission '${problem.friendlyName}'`
);
} else if (currentSubmission.state === 'Incorrect') {
const messageDisplayText = currentSubmission.message ? `Message: ${currentSubmission.message}` : '';
vscode.window.showInformationMessage(`BWContest Judge: INCORRECT Submission '${problem.friendlyName}' ${messageDisplayText}`);
const messageDisplayText = currentSubmission.message
? `Message: ${currentSubmission.message}`
: '';
vscode.window.showInformationMessage(
`BWContest Judge: INCORRECT Submission '${problem.friendlyName}' ${messageDisplayText}`
);
}
}
export function recordInitialSubmission(submission: SubmissionForExtension): void {
outputPanelLog.trace("Server received new submission, #" + submission.id);
outputPanelLog.trace('Server received new submission, #' + submission.id);
if (!latestContestTeamState) {
outputPanelLog.trace(" No locally cached submission list state, the normal polling cycle will update the list");
outputPanelLog.trace(
' No locally cached submission list state, the normal polling cycle will update the list'
);
return;
}
const existingSubmissionListForProblem = latestContestTeamState.submissionsList.get(submission.problemId);
const existingSubmissionListForProblem = latestContestTeamState.submissionsList.get(
submission.problemId
);
if (existingSubmissionListForProblem === undefined) {
outputPanelLog.trace(` The cached submission list does not know about problemId #${submission.problemId}. Next polling cycle should fix consistency.`);
outputPanelLog.trace(
` The cached submission list does not know about problemId #${submission.problemId}. Next polling cycle should fix consistency.`
);
return;
}
if (existingSubmissionListForProblem.find(s => s.id == submission.id)) {
outputPanelLog.trace(` The cached submission list already knows about submissionId #${submission.id}`);
if (existingSubmissionListForProblem.find((s) => s.id == submission.id)) {
outputPanelLog.trace(
` The cached submission list already knows about submissionId #${submission.id}`
);
return;
}
@ -165,6 +218,6 @@ export function recordInitialSubmission(submission: SubmissionForExtension): voi
existingSubmissionListForProblem.push(submission);
onSubmissionsListChanged.trigger({
contestTeamState: latestContestTeamState,
changedProblemIds: new Set<number>([submission.problemId]),
changedProblemIds: new Set<number>([submission.problemId])
});
}

24
extension/bwcontest/src/contestMonitor/pollingService.ts
View File

@ -25,9 +25,8 @@ export async function startTeamStatusPolling() {
if (currentlyPolling) {
outputPanelLog.trace("Tried to start team status polling, but it's already running.");
return;
}
else if (!extensionContext.globalState.get('token')) {
outputPanelLog.info("Tried to start team status polling, but team is not logged in.");
} else if (!extensionContext.globalState.get('token')) {
outputPanelLog.info('Tried to start team status polling, but team is not logged in.');
return;
}
@ -38,14 +37,15 @@ export async function startTeamStatusPolling() {
async function startPollingWorker(cancellationToken: SimpleCancellationToken) {
const pollingLoopNum = ++debugPollingLoopNum;
outputPanelLog.trace(`Starting polling loop #${pollingLoopNum}, checking contest/team status every ${pollingIntervalSeconds} seconds`);
outputPanelLog.trace(
`Starting polling loop #${pollingLoopNum}, checking contest/team status every ${pollingIntervalSeconds} seconds`
);
while (!cancellationToken.isCancelled) {
try {
await pollContestStatus(extensionContext);
}
catch (error) {
outputPanelLog.error("Polling contest status failed: " + (error ?? "<unknown error>"));
} catch (error) {
outputPanelLog.error('Polling contest status failed: ' + (error ?? '<unknown error>'));
}
await sleep(pollingIntervalSeconds * 1000);
@ -55,12 +55,16 @@ async function startPollingWorker(cancellationToken: SimpleCancellationToken) {
}
export function stopTeamStatusPolling() {
outputPanelLog.trace("Stopping team status polling");
outputPanelLog.trace('Stopping team status polling');
currentPollingCancellationToken?.cancel();
currentlyPolling = false;
}
export function useFastPolling(enabled: boolean): void {
pollingIntervalSeconds = enabled ? developerFastPollingIntervalSeconds : defaultPollingIntervalSeconds;
outputPanelLog.info(`Changed polling interval to ${pollingIntervalSeconds} seconds. Takes effect after current delay.`);
pollingIntervalSeconds = enabled
? developerFastPollingIntervalSeconds
: defaultPollingIntervalSeconds;
outputPanelLog.info(
`Changed polling interval to ${pollingIntervalSeconds} seconds. Takes effect after current delay.`
);
}

22
extension/bwcontest/src/extension.ts
View File

@ -6,7 +6,11 @@ import git from 'isomorphic-git';
import path = require('path');
import http from 'isomorphic-git/http/node';
import outputPanelLog from './outputPanelLog';
import { startTeamStatusPollingOnActivation, stopTeamStatusPolling, useFastPolling } from './contestMonitor/pollingService';
import {
startTeamStatusPollingOnActivation,
stopTeamStatusPolling,
useFastPolling
} from './contestMonitor/pollingService';
export interface BWContestSettings {
repoBaseUrl: string;
@ -83,13 +87,14 @@ export async function cloneAndOpenRepo(contestId: number, teamId: number) {
outputPanelLog.info(`Running 'git clone' to directory: ${dir}`);
try {
await git.clone({ fs, http, dir, url: repoUrl });
}
catch (error) {
outputPanelLog.error("Failed to 'git clone'. The git server might be incorrectly configured. Error: " + error);
} catch (error) {
outputPanelLog.error(
"Failed to 'git clone'. The git server might be incorrectly configured. Error: " + error
);
throw error;
}
outputPanelLog.info("Closing workspaces...");
outputPanelLog.info('Closing workspaces...');
closeAllWorkspaces();
const addedFolder = vscode.workspace.updateWorkspaceFolders(
@ -107,7 +112,7 @@ export async function cloneAndOpenRepo(contestId: number, teamId: number) {
}
export function activate(context: vscode.ExtensionContext) {
outputPanelLog.info("BWContest Extension Activated");
outputPanelLog.info('BWContest Extension Activated');
const sidebarProvider = new SidebarProvider(
context.extensionUri,
@ -122,7 +127,7 @@ export function activate(context: vscode.ExtensionContext) {
vscode.window.registerWebviewViewProvider('bwcontest-sidebar', sidebarProvider),
vscode.commands.registerCommand('bwcontest.toggleFastPolling', () => {
if (!extensionSettings().debugFastPolling) {
outputPanelLog.trace("Tried to toggle fast polling, but not allowed.");
outputPanelLog.trace('Tried to toggle fast polling, but not allowed.');
return;
}
@ -135,7 +140,6 @@ export function activate(context: vscode.ExtensionContext) {
}
export function deactivate() {
outputPanelLog.info("BWContest Extension Deactivated");
outputPanelLog.info('BWContest Extension Deactivated');
stopTeamStatusPolling();
}

2
extension/bwcontest/src/outputPanelLog.ts
View File

@ -1,4 +1,4 @@
import { window } from "vscode";
import { window } from 'vscode';
/** Logs to the Output panel of a team's VS Code instance. Useful for diagnosing issues.
*

33
extension/bwcontest/src/problemPanel.ts
View File

@ -56,7 +56,7 @@ export class BWPanel {
}
public static show(context: vscode.ExtensionContext, webUrl: string) {
outputPanelLog.info("Showing BWPanel");
outputPanelLog.info('Showing BWPanel');
const column = vscode.window.activeTextEditor
? vscode.window.activeTextEditor.viewColumn
: undefined;
@ -129,15 +129,21 @@ export class BWPanel {
}
try {
const submissionResult = await submitProblem(sessionToken, teamData.contestId, teamData.teamId, problemId);
const submissionResult = await submitProblem(
sessionToken,
teamData.contestId,
teamData.teamId,
problemId
);
if (submissionResult.success === true) {
recordInitialSubmission(submissionResult.submission);
vscode.window.showInformationMessage(`Submitted '${problem.name}'!`);
} else {
vscode.window.showErrorMessage(`Error submitting '${problem.name}': ${submissionResult.message}`);
vscode.window.showErrorMessage(
`Error submitting '${problem.name}': ${submissionResult.message}`
);
}
}
catch (error) {
} catch (error) {
vscode.window.showErrorMessage(`Web error submitting '${problem.name}'`);
outputPanelLog.error(`Web error submitting '${problem.name}': ${error}`);
}
@ -195,7 +201,7 @@ export class BWPanel {
res.runResult.then(() => {
this.runningProgram = undefined;
this.webviewPostMessage({ msg: 'onRunningDone' });
})
});
} else {
this.runningProgram = undefined;
this.webviewPostMessage({
@ -218,13 +224,13 @@ export class BWPanel {
outputBuffer.push(data);
this.webviewPostMessage({ msg: 'onRunningOutput', data: outputBuffer.join('') });
}
})
});
if (res.success === true) {
killFunc = res.killFunc;
res.runResult.then(() => {
this.runningProgram = undefined;
this.webviewPostMessage({ msg: 'onRunningDone' });
})
});
} else {
this.runningProgram = undefined;
this.webviewPostMessage({
@ -238,18 +244,23 @@ export class BWPanel {
input,
cppPlatform: process.platform === 'win32' ? 'VisualStudio' : 'GCC',
problemName: problem.pascalName,
srcDir: join(repoDir, 'BWContest', teamData.contestId.toString(), teamData.teamId.toString()),
srcDir: join(
repoDir,
'BWContest',
teamData.contestId.toString(),
teamData.teamId.toString()
),
outputCallback: (data) => {
outputBuffer.push(data);
this.webviewPostMessage({ msg: 'onRunningOutput', data: outputBuffer.join('') });
}
})
});
if (res.success === true) {
killFunc = res.killFunc;
res.runResult.then(() => {
this.runningProgram = undefined;
this.webviewPostMessage({ msg: 'onRunningDone' });
})
});
} else {
this.runningProgram = undefined;
this.webviewPostMessage({

8
extension/bwcontest/src/run/cpp.ts
View File

@ -1,6 +1,12 @@
import { join } from 'path';
import { exec, spawn } from 'child_process';
import { timeoutSeconds, type IRunner, type IRunnerParams, type IRunnerReturn, type RunResult } from './types';
import {
timeoutSeconds,
type IRunner,
type IRunnerParams,
type IRunnerReturn,
type RunResult
} from './types';
import kill = require('tree-kill');
import * as os from 'os';
import * as fs from 'fs-extra';

8
extension/bwcontest/src/run/java.ts
View File

@ -1,7 +1,13 @@
import { join } from 'path';
import { exec, spawn } from 'child_process';
import * as util from 'util';
import { timeoutSeconds, type IRunner, type IRunnerParams, type IRunnerReturn, type RunResult } from './types';
import {
timeoutSeconds,
type IRunner,
type IRunnerParams,
type IRunnerReturn,
type RunResult
} from './types';
import kill = require('tree-kill');
const execPromise = util.promisify(exec);

9
extension/bwcontest/src/submit.ts
View File

@ -12,7 +12,9 @@ export async function submitProblem(
contestId: number,
teamId: number,
problemId: number
): Promise<{ success: true; submission: SubmissionForExtension } | { success: false; message: string }> {
): Promise<
{ success: true; submission: SubmissionForExtension } | { success: false; message: string }
> {
outputPanelLog.info(`Submitting problem id #{${problemId}}...`);
let hash: string;
@ -30,9 +32,8 @@ export async function submitProblem(
author: { name: `Team ${teamId}` },
message: `Submit problem ${problemId}`
});
}
catch (error) {
outputPanelLog.error("Fail to make commit for submission: " + JSON.stringify(error));
} catch (error) {
outputPanelLog.error('Fail to make commit for submission: ' + JSON.stringify(error));
throw error;
}

8
extension/bwcontest/src/utilities/LiteEvent.ts
View File

@ -1,6 +1,6 @@
// Modified from JasonKleban @ https://gist.github.com/JasonKleban/50cee44960c225ac1993c922563aa540
export { ILiteEvent, LiteEvent }
export { ILiteEvent, LiteEvent };
interface ILiteEvent<T> {
add(handler: { (data?: T): void }): void;
@ -8,7 +8,7 @@ interface ILiteEvent<T> {
}
class LiteEvent<T> implements ILiteEvent<T> {
protected handlers: { (data?: T): void; }[] = [];
protected handlers: { (data?: T): void }[] = [];
public add(handler: { (data?: T): void }): void {
this.handlers.push(handler);
@ -16,12 +16,12 @@ class LiteEvent<T> implements ILiteEvent<T> {
public remove(handler: { (data?: T): void }): boolean {
const countBefore = this.handlers.length;
this.handlers = this.handlers.filter(h => h !== handler);
this.handlers = this.handlers.filter((h) => h !== handler);
return countBefore != this.handlers.length;
}
public trigger(data?: T) {
this.handlers.slice(0).forEach(h => h(data));
this.handlers.slice(0).forEach((h) => h(data));
}
public expose(): ILiteEvent<T> {

4
extension/bwcontest/src/utilities/SimpleCancellationToken.ts
View File

@ -1,6 +1,8 @@
export class SimpleCancellationToken {
private _isCancelled: boolean = false;
get isCancelled() { return this._isCancelled; }
get isCancelled() {
return this._isCancelled;
}
cancel(): void {
this._isCancelled = true;

2
extension/bwcontest/src/utilities/sleep.ts
View File

@ -1,3 +1,3 @@
export function sleep(ms: number): Promise<void> {
return new Promise(resolve => setTimeout(resolve, ms));
return new Promise((resolve) => setTimeout(resolve, ms));
}

42
extension/bwcontest/webviews/components/Sidebar.svelte
View File

@ -2,7 +2,11 @@
import { onMount } from 'svelte';
import SidebarProblemStatus from './SidebarProblemStatus.svelte';
import type { TeamData } from '../../src/sharedTypes';
import type { WebviewMessageType, MessageType, SidebarTeamStatus } from '../../src/SidebarProvider';
import type {
WebviewMessageType,
MessageType,
SidebarTeamStatus
} from '../../src/SidebarProvider';
let teamname: string;
let password: string;
@ -122,7 +126,10 @@
</div>
{#if teamStatus.processingProblems.length > 0}
{#each teamStatus.processingProblems as inProgressProblem (JSON.stringify(inProgressProblem))}
<SidebarProblemStatus problem={inProgressProblem} contestState={teamStatus.contestState} />
<SidebarProblemStatus
problem={inProgressProblem}
contestState={teamStatus.contestState}
/>
{/each}
{:else}
<div class="problemSectionExplanation">No pending submissions</div>
@ -131,11 +138,16 @@
<div class="problemResultsSection">
<div>
<span class="problemResultsSectionHeader correct">Correct </span>
<span class="problemResultsSectionCount">{teamStatus.correctProblems.length} of {totalProblems}</span>
<span class="problemResultsSectionCount"
>{teamStatus.correctProblems.length} of {totalProblems}</span
>
</div>
{#if teamStatus.correctProblems.length > 0}
{#each teamStatus.correctProblems as correctProblem (JSON.stringify(correctProblem))}
<SidebarProblemStatus problem={correctProblem} contestState={teamStatus.contestState} />
<SidebarProblemStatus
problem={correctProblem}
contestState={teamStatus.contestState}
/>
{/each}
{:else}
<div class="problemSectionExplanation">Solved problems appear here</div>
@ -144,26 +156,34 @@
<div class="problemResultsSection">
<div>
<span class="problemResultsSectionHeader incorrect">Incorrect </span>
<span class="problemResultsSectionCount">{teamStatus.incorrectProblems.length} of {totalProblems}</span>
<span class="problemResultsSectionCount"
>{teamStatus.incorrectProblems.length} of {totalProblems}</span
>
</div>
{#if teamStatus.incorrectProblems.length > 0}
{#each teamStatus.incorrectProblems as incorrectProblem (JSON.stringify(incorrectProblem))}
<SidebarProblemStatus problem={incorrectProblem} contestState={teamStatus.contestState} />
<SidebarProblemStatus
problem={incorrectProblem}
contestState={teamStatus.contestState}
/>
{/each}
{:else}
<div class="problemSectionExplanation">
Attempted problems appear here until solved
</div>
<div class="problemSectionExplanation">Attempted problems appear here until solved</div>
{/if}
</div>
{#if teamStatus.notStartedProblems.length > 0}
<div class="problemResultsSection">
<div>
<span class="problemResultsSectionHeader notAttempted">Not Attempted </span>
<span class="problemResultsSectionCount">{teamStatus.notStartedProblems.length} of {totalProblems}</span>
<span class="problemResultsSectionCount"
>{teamStatus.notStartedProblems.length} of {totalProblems}</span
>
</div>
{#each teamStatus.notStartedProblems as notStartedProblem (JSON.stringify(notStartedProblem))}
<SidebarProblemStatus problem={notStartedProblem} contestState={teamStatus.contestState} />
<SidebarProblemStatus
problem={notStartedProblem}
contestState={teamStatus.contestState}
/>
{/each}
</div>
{/if}

70
extension/bwcontest/webviews/components/SidebarProblemStatus.svelte
View File

@ -1,32 +1,48 @@
<script lang="ts" context="module">
export const watSubmissionsImageUrl =
new URL('../../media/SubmissionIcons/TeamPanel/none.png', import.meta.url).href;
export const watSubmissionsImageUrl = new URL(
'../../media/SubmissionIcons/TeamPanel/none.png',
import.meta.url
).href;
export const correctSubmissionImageUrl =
new URL('../../media/SubmissionIcons/TeamPanel/correct.png', import.meta.url).href;
export const correctSubmissionImageUrl = new URL(
'../../media/SubmissionIcons/TeamPanel/correct.png',
import.meta.url
).href;
export const incorrectSubmissionImageUrl =
new URL('../../media/SubmissionIcons/TeamPanel/incorrect.png', import.meta.url).href;
export const incorrectSubmissionImageUrl = new URL(
'../../media/SubmissionIcons/TeamPanel/incorrect.png',
import.meta.url
).href;
export const pendingSubmissionImageUrl =
new URL('../../media/SubmissionIcons/TeamPanel/unknown.png', import.meta.url).href;
export const pendingSubmissionImageUrl = new URL(
'../../media/SubmissionIcons/TeamPanel/unknown.png',
import.meta.url
).href;
export const noSubmissionsImageUrl =
new URL('../../media/SubmissionIcons/TeamPanel/none.png', import.meta.url).href;
export const noSubmissionsImageUrl = new URL(
'../../media/SubmissionIcons/TeamPanel/none.png',
import.meta.url
).href;
</script>
<script lang="ts">
import type { SidebarProblemWithSubmissions } from '../../src/SidebarProvider';
import type { ContestStateForExtension, SubmissionForExtension, SubmissionStateForExtension } from '../../src/contestMonitor/contestMonitorSharedTypes';
import type {
ContestStateForExtension,
SubmissionForExtension,
SubmissionStateForExtension
} from '../../src/contestMonitor/contestMonitorSharedTypes';
export let contestState: ContestStateForExtension;
export let problem: SidebarProblemWithSubmissions;
const sortedSubmissions = problem.submissions
? problem.submissions.sort((s1, s2) => Date.parse(s1.createdAt.toString()) - Date.parse(s2.createdAt.toString()))
? problem.submissions.sort(
(s1, s2) => Date.parse(s1.createdAt.toString()) - Date.parse(s2.createdAt.toString())
)
: [];
const highlightClasses = `${(problem.modified ? "highlight" : "")} ${problem.overallState?.toLowerCase()}`;
const highlightClasses = `${problem.modified ? 'highlight' : ''} ${problem.overallState?.toLowerCase()}`;
function getStatusImageUrl(overallState: SubmissionStateForExtension | null): string {
switch (overallState) {
@ -62,8 +78,8 @@
}
</script>
<div class={"problemStatusDiv " + highlightClasses}>
<div class={"problemHeaderDiv"}>
<div class={'problemStatusDiv ' + highlightClasses}>
<div class={'problemHeaderDiv'}>
<img
class="overallStatusImage"
src={getStatusImageUrl(problem.overallState)}
@ -76,28 +92,38 @@
<span class="problemHeaderName">{problem.problem.friendlyName}</span>
<span class="problemHeaderSubmitCount">
{problem.submissions.length}
{pluralize(problem.submissions.length, 'attempt', 'attempts')}</span>
{pluralize(problem.submissions.length, 'attempt', 'attempts')}</span
>
{#if problem.submissions.filter((s) => s.state === 'Processing').length > 0}
<span>({problem.submissions.filter((s) => s.state === 'Processing').length} pending...)</span>
<span
>({problem.submissions.filter((s) => s.state === 'Processing').length} pending...)</span
>
{/if}
{#if problem.overallState === "Correct"}
<span class="individualSubmissionAttemptTime"> @ {getContestOffsetDisplay(problem.submissions.filter(s => s.state === "Correct")[0])}</span>
{#if problem.overallState === 'Correct'}
<span class="individualSubmissionAttemptTime">
@ {getContestOffsetDisplay(
problem.submissions.filter((s) => s.state === 'Correct')[0]
)}</span
>
{/if}
{/if}
</div>
</div>
{#if problem.overallState !== "Correct"}
{#if problem.overallState !== 'Correct'}
{#each sortedSubmissions as submission, i}
<div class="individualSubmissionDiv">
<span class="individualSubmissionAttemptNumber">Submit #{i + 1}: </span>
<img
class="individualSubmissionStatusImage"
src={getStatusImageUrl(submission.state)}
alt={submission.state}/>
alt={submission.state}
/>
<span class="individualSubmissionResult {submission.state.toLowerCase()}">
{submission.state}
</span>
<span class="individualSubmissionAttemptTime"> @ {getContestOffsetDisplay(submission)}</span>
<span class="individualSubmissionAttemptTime">
@ {getContestOffsetDisplay(submission)}</span
>
</div>
{#if submission.message}
<div class="individualSubmissionMessageWrapper">