core: fix limit_rate

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.23.19",
+    "version": "2.23.20",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/model/opcount.ts

@@ -10,18 +10,22 @@ export async function inc(op: string, ident: string, periodSecs: number, maxOper
     const expireAt = new Date(beginAt.getTime() + periodSecs * 1000);
     try {
         await coll.findOneAndUpdate({
+            op,
             ident,
             beginAt,
             expireAt,
-            op: { $lt: maxOperations },
-        }, { $inc: { op: 1 } }, { upsert: true });
+            opcount: { $lt: maxOperations },
+        }, { $inc: { opcount: 1 } }, { upsert: true });
     } catch (e) {
         throw new OpcountExceededError(op, periodSecs, maxOperations);
     }
 }
 
 function ensureIndexes() {
-    return coll.createIndex('expireAt', { expireAfterSeconds: 0 });
+    return Promise.all([
+        coll.createIndex('expireAt', { expireAfterSeconds: 0 }),
+        coll.createIndex({ op: 1, ident: 1 }, { unique: true }),
+    ]);
 }
 
 bus.once('app/started', ensureIndexes);

packages/hydrooj/src/service/server.ts

@@ -296,7 +296,6 @@ export class HandlerCommon {
 
     async limitRate(op: string, periodSecs: number, maxOperations: number) {
         if (this.user && this.user.hasPriv(PRIV.PRIV_UNLIMITED_ACCESS)) return;
-        logger.info(op, periodSecs, maxOperations, this.request.ip);
         await opcount.inc(op, this.request.ip, periodSecs, maxOperations);
     }
 
@@ -484,7 +483,7 @@ export class Handler extends HandlerCommon {
     }
 
     async init({ domainId }) {
-        if (!argv.benchmark) await this.limitRate('global', 10, 88);
+        if (!argv.benchmark) await this.limitRate('global', 10, 1);
         const [absoluteDomain, inferDomain] = await Promise.all([
             domain.get(domainId),
             domain.getByHost(this.request.host),