workspace: upgrade deps & sort imports

packages/hydrojudge/package.json

@@ -7,16 +7,16 @@
     "repository": "https://github.com/hydro-dev/Hydro.git",
     "dependencies": {
         "@hydrooj/utils": "workspace:*",
-        "axios": "^0.21.1",
+        "axios": "^0.21.4",
         "cac": "^6.7.3",
-        "esbuild": "^0.12.24",
+        "esbuild": "^0.12.26",
         "fs-extra": "^10.0.0",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
-        "mongodb": "^3.6.12",
+        "mongodb": "^3.7.0",
         "p-queue": "^7.1.0",
         "shell-quote": "^1.7.2",
-        "ws": "^8.2.1"
+        "ws": "^8.2.2"
     },
     "preferUnplugged": true,
     "license": "AGPL-3.0-or-later",

packages/hydrojudge/src/cache.ts

@@ -1,8 +1,8 @@
 import path from 'path';
-import fs from 'fs-extra';
 import cac from 'cac';
-import { Logger } from './log';
+import fs from 'fs-extra';
 import { getConfig } from './config';
+import { Logger } from './log';
 
 const argv = cac().parse();
 

packages/hydrojudge/src/cases.ts

@@ -1,12 +1,12 @@
-import fs from 'fs-extra';
 import path from 'path';
+import fs from 'fs-extra';
 import yaml from 'js-yaml';
 import { max, sum } from 'lodash';
 import readYamlCases, { convertIniConfig } from '@hydrooj/utils/lib/cases';
 import { changeErrorType } from '@hydrooj/utils/lib/utils';
-import { FormatError, SystemError } from './error';
-import { parseTimeMS, parseMemoryMB, ensureFile } from './utils';
 import { getConfig } from './config';
+import { FormatError, SystemError } from './error';
+import { ensureFile, parseMemoryMB, parseTimeMS } from './utils';
 
 interface Re0 {
     reg: RegExp,

packages/hydrojudge/src/checkers.ts

@@ -1,8 +1,8 @@
 /* eslint-disable no-template-curly-in-string */
+import { SystemError } from './error';
+import { run } from './sandbox';
 import * as STATUS from './status';
 import { parse } from './testlib';
-import { run } from './sandbox';
-import { SystemError } from './error';
 
 interface CheckResult {
     status: number,

packages/hydrojudge/src/compile.ts

@@ -1,9 +1,9 @@
 import { LangConfig } from '@hydrooj/utils/lib/lang';
-import * as STATUS from './status';
-import { run, del } from './sandbox';
 import { CompileError } from './error';
-import { compilerText } from './utils';
 import { Execute } from './interface';
+import { del, run } from './sandbox';
+import * as STATUS from './status';
+import { compilerText } from './utils';
 
 export = async function compile(
     lang: LangConfig, code: string, target: string, copyIn: any = {}, next?: Function,

packages/hydrojudge/src/config.ts

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-const */
-import cac from 'cac';
 import os from 'os';
 import path from 'path';
+import cac from 'cac';
 import fs from 'fs-extra';
 import yaml from 'js-yaml';
 

packages/hydrojudge/src/daemon.ts

@@ -12,10 +12,10 @@
      `-.__          听取人生经验。  __.-'
           ````- - -.......- - -'''    ~
        ~                   */
-import * as Session from './hosts/index';
-import { sleep, Queue } from './utils';
 import { getConfig } from './config';
+import * as Session from './hosts/index';
 import log from './log';
+import { Queue, sleep } from './utils';
 
 declare global {
     namespace NodeJS {

packages/hydrojudge/src/hosts/hydro.ts

@@ -1,24 +1,24 @@
 /* eslint-disable no-await-in-loop */
 import path from 'path';
 import axios from 'axios';
-import fs from 'fs-extra';
-import WebSocket from 'ws';
-import PQueue from 'p-queue';
 import cac from 'cac';
+import fs from 'fs-extra';
 import { noop } from 'lodash';
 import { ObjectID } from 'mongodb';
+import PQueue from 'p-queue';
+import WebSocket from 'ws';
 import { LangConfig } from '@hydrooj/utils/lib/lang';
-import * as tmpfs from '../tmpfs';
+import readCases from '../cases';
+import { getConfig } from '../config';
+import { CompileError, FormatError, SystemError } from '../error';
+import judge from '../judge';
 import log from '../log';
+import { STATUS_COMPILE_ERROR, STATUS_SYSTEM_ERROR } from '../status';
+import * as sysinfo from '../sysinfo';
+import * as tmpfs from '../tmpfs';
 import {
     compilerText, Lock, md5, Queue,
 } from '../utils';
-import { getConfig } from '../config';
-import { FormatError, CompileError, SystemError } from '../error';
-import { STATUS_COMPILE_ERROR, STATUS_SYSTEM_ERROR } from '../status';
-import readCases from '../cases';
-import judge from '../judge';
-import * as sysinfo from '../sysinfo';
 
 const argv = cac().parse();
 

packages/hydrojudge/src/judge/default.ts

@@ -1,14 +1,14 @@
-import Queue from 'p-queue';
 import path from 'path';
 import fs from 'fs-extra';
-import * as STATUS from '../status';
-import { CompileError, SystemError } from '../error';
-import { parseFilename } from '../utils';
-import { run } from '../sandbox';
-import compile from '../compile';
-import signals from '../signals';
+import Queue from 'p-queue';
 import { check, compileChecker } from '../check';
+import compile from '../compile';
 import { getConfig } from '../config';
+import { CompileError, SystemError } from '../error';
+import { run } from '../sandbox';
+import signals from '../signals';
+import * as STATUS from '../status';
+import { parseFilename } from '../utils';
 
 const Score = {
     sum: (a: number, b: number) => (a + b),

packages/hydrojudge/src/judge/hack.ts

@@ -1,13 +1,13 @@
 // Not implemented
 import path from 'path';
 import fs from 'fs-extra';
-import * as STATUS from '../status';
-import { CompileError } from '../error';
-import { copyInDir, parseFilename } from '../utils';
-import { run } from '../sandbox';
-import compile from '../compile';
-import signals from '../signals';
 import { check, compileChecker } from '../check';
+import compile from '../compile';
+import { CompileError } from '../error';
+import { run } from '../sandbox';
+import signals from '../signals';
+import * as STATUS from '../status';
+import { copyInDir, parseFilename } from '../utils';
 
 export const judge = async (ctx) => {
     if (ctx.config.template) {

packages/hydrojudge/src/judge/index.ts

@@ -1,8 +1,8 @@
 import * as def from './default';
+import * as hack from './hack';
 import * as interactive from './interactive';
 import * as run from './run';
 import * as submit_answer from './submit_answer';
-import * as hack from './hack';
 
 export = {
     default: def, interactive, run, submit_answer, hack, objective: submit_answer,

packages/hydrojudge/src/judge/interactive.ts

@@ -1,12 +1,12 @@
-import Queue from 'p-queue';
 import fs from 'fs-extra';
+import Queue from 'p-queue';
+import compile from '../compile';
+import { getConfig } from '../config';
+import { run } from '../sandbox';
+import signals from '../signals';
 import * as STATUS from '../status';
 import { parse } from '../testlib';
 import { findFileSync, parseFilename } from '../utils';
-import { run } from '../sandbox';
-import compile from '../compile';
-import signals from '../signals';
-import { getConfig } from '../config';
 
 const testlibSrc = findFileSync('@hydrooj/hydrojudge/vendor/testlib/testlib.h');
 const Score = {

packages/hydrojudge/src/judge/run.ts

@@ -1,11 +1,11 @@
-import fs from 'fs-extra';
 import path from 'path';
-import * as STATUS from '../status';
-import { run } from '../sandbox';
+import fs from 'fs-extra';
 import compile from '../compile';
-import signals from '../signals';
-import { compilerText, parseMemoryMB, parseTimeMS } from '../utils';
 import { CompileError } from '../error';
+import { run } from '../sandbox';
+import signals from '../signals';
+import * as STATUS from '../status';
+import { compilerText, parseMemoryMB, parseTimeMS } from '../utils';
 
 export const judge = async (ctx) => {
     ctx.stat.judge = new Date();

packages/hydrojudge/src/log.ts

@@ -1,4 +1,4 @@
-import { inspect, InspectOptions, format } from 'util';
+import { format, inspect, InspectOptions } from 'util';
 import cac from 'cac';
 
 const argv = cac().parse();

packages/hydrojudge/src/sandbox.ts

@@ -1,11 +1,11 @@
 import Axios from 'axios';
-import fs from 'fs-extra';
 import cac from 'cac';
-import * as STATUS from './status';
-import { FormatError, SystemError } from './error';
-import { cmd, parseMemoryMB } from './utils';
+import fs from 'fs-extra';
 import { getConfig } from './config';
+import { FormatError, SystemError } from './error';
 import { Logger } from './log';
+import * as STATUS from './status';
+import { cmd, parseMemoryMB } from './utils';
 
 const argv = cac().parse();
 const logger = new Logger('sandbox');

packages/hydrojudge/src/service.ts

@@ -1,19 +1,20 @@
 // Hydro Integration
 /* eslint-disable no-await-in-loop */
 import 'hydrooj';
+
 import path from 'path';
-import { ObjectID } from 'mongodb';
 import fs from 'fs-extra';
 import { noop } from 'lodash';
+import { ObjectID } from 'mongodb';
 import { Logger } from 'hydrooj/src/logger';
 import * as monitor from 'hydrooj/src/service/monitor';
-import * as sysinfo from './sysinfo';
-import * as tmpfs from './tmpfs';
-import { FormatError, CompileError, SystemError } from './error';
-import { STATUS_COMPILE_ERROR, STATUS_SYSTEM_ERROR } from './status';
-import { compilerText, md5 } from './utils';
 import readCases from './cases';
 import { getConfig } from './config';
+import { CompileError, FormatError, SystemError } from './error';
+import { STATUS_COMPILE_ERROR, STATUS_SYSTEM_ERROR } from './status';
+import * as sysinfo from './sysinfo';
+import * as tmpfs from './tmpfs';
+import { compilerText, md5 } from './utils';
 
 declare module 'hydrooj/src/interface' {
     interface SystemKeys {

packages/hydrojudge/src/sysinfo.ts

@@ -2,9 +2,9 @@ import path from 'path';
 import fs from 'fs-extra';
 import { noop } from 'lodash';
 import { get as _get } from '@hydrooj/utils/lib/sysinfo';
+import { getConfig } from './config';
 import { judge } from './judge/run';
 import * as tmpfs from './tmpfs';
-import { getConfig } from './config';
 
 export { update } from '@hydrooj/utils/lib/sysinfo';
 

packages/hydrojudge/src/tmpfs.ts

@@ -1,6 +1,6 @@
 import child from 'child_process';
-import fs from 'fs-extra';
 import os from 'os';
+import fs from 'fs-extra';
 import log from './log';
 
 const linux = os.platform() === 'linux';

packages/hydrojudge/src/utils.ts

@@ -1,9 +1,9 @@
-import fs from 'fs-extra';
 import crypto from 'crypto';
-import path from 'path';
-import { parse } from 'shell-quote';
-import _ from 'lodash';
 import { EventEmitter } from 'events';
+import path from 'path';
+import fs from 'fs-extra';
+import _ from 'lodash';
+import { parse } from 'shell-quote';
 import { sleep } from '@hydrooj/utils/lib/utils';
 import { FormatError } from './error';