From 0714aceaaf89f7717431cd52a45858155478306e Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 30 Apr 2019 15:19:10 -0400 Subject: [PATCH] Simplify secret generation introduced in 9e4385243c99 --- platform/chromium/vapi-background.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js index 3f44eac5f..751138ffe 100644 --- a/platform/chromium/vapi-background.js +++ b/platform/chromium/vapi-background.js @@ -1044,6 +1044,7 @@ vAPI.messaging.broadcast = function(message) { vAPI.warSecret = (function() { let lastSecretTime = 0; + let lastSecretPtr = 0; const generateSecret = ( ) => { lastSecretTime = Date.now(); @@ -1073,15 +1074,13 @@ vAPI.warSecret = (function() { ); return ( ) => { - const n = Math.min( - Math.floor((Date.now() - lastSecretTime) / 1000), - secrets.length - ); - for ( let i = 0; i < n; i++ ) { - secrets.pop(); - secrets.unshift(generateSecret()); + const now = Date.now(); + if ( (now - lastSecretTime) >= 1000 ) { + lastSecretPtr = (lastSecretPtr + 1) % secrets.length; + secrets[lastSecretPtr] = generateSecret(); + lastSecretTime = now; } - return `?secret=${secrets[0]}`; + return `?secret=${secrets[lastSecretPtr]}`; }; })();