Added priority lock

Ob91190 · Jul 29, 2020 · 964eb53 · 964eb53
1 parent e556ce8
commit 964eb53
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/dist/server/sockets.js b/dist/server/sockets.js
@@ -332,15 +332,23 @@ function default_1(server, app) {
     radar.startRadar(app, io);
     app.post('/', function (req, res) {
         runtimeConfig.last = req.body;
+        if (intervalId) {
+            clearInterval(intervalId);
+            intervalId = null;
+            io.emit('enableTest', true);
+        }
         io.emit('update', req.body);
         exports.GSI.digest(req.body);
         radar.digestRadar(req.body);
         res.sendStatus(200);
     });
     app.post('/api/test', function (_req, res) {
+        var _a, _b;
         res.sendStatus(200);
         if (intervalId)
             return;
+        if (((_b = (_a = runtimeConfig.last) === null || _a === void 0 ? void 0 : _a.provider) === null || _b === void 0 ? void 0 : _b.timestamp) && (new Date()).getTime() - runtimeConfig.last.provider.timestamp * 1000 <= 5000)
+            return;
         io.emit('enableTest', false);
         var i = 0;
         intervalId = setInterval(function () {

diff --git a/server/sockets.ts b/server/sockets.ts
@@ -241,6 +241,13 @@ export default function (server: http.Server, app: express.Router) {
 
     app.post('/', (req, res) => {
         runtimeConfig.last = req.body;
+
+        if(intervalId){
+            clearInterval(intervalId);
+            intervalId = null;
+            io.emit('enableTest', true);
+        }
+
         io.emit('update', req.body);
         GSI.digest(req.body);
         radar.digestRadar(req.body);
@@ -249,8 +256,12 @@ export default function (server: http.Server, app: express.Router) {
 
     app.post('/api/test', (_req, res) => {
         res.sendStatus(200);
+
         if(intervalId) return;
+        if(runtimeConfig.last?.provider?.timestamp && (new Date()).getTime() - runtimeConfig.last.provider.timestamp*1000 <= 5000) return;
+
         io.emit('enableTest', false);
+
         let i = 0;
         intervalId = setInterval(() => {
             if(!testData[i]) {