GitHub etag still counts against api quota when not authenticated, rate limit checking for updates client side

Author: alanhamlett

scripts/install_cli.py

@@ -10,6 +10,7 @@
 import ssl
 import subprocess
 import sys
+import time
 import traceback
 from subprocess import PIPE
 from zipfile import ZipFile
@@ -36,7 +37,7 @@ def getOsName():
 
 
 GITHUB_RELEASES_STABLE_URL = 'https://api.github.com/repos/wakatime/wakatime-cli/releases/latest'
-GITHUB_DOWNLOAD_PREFIX = 'https://github.com/wakatime/wakatime-cli/releases/download'
+GITHUB_DOWNLOAD_URL = 'https://github.com/wakatime/wakatime-cli/releases/latest/download'
 PLUGIN = 'vim'
 
 is_py2 = (sys.version_info[0] == 2)
@@ -298,8 +299,27 @@ def isCliLatest():
         return True
 
     log('Current wakatime-cli version is %s' % localVer)
-    log('Checking for updates to wakatime-cli...')
 
+    configs, last_accessed = None, None
+    try:
+        configs = parseConfigFile(getConfigFile(True))
+        if configs and configs.has_option('internal', 'cli_version_last_accessed'):
+            last_accessed = configs.get('internal', 'cli_version_last_accessed')
+    except:
+        log(traceback.format_exc())
+
+    if last_accessed:
+        try:
+            last_accessed = int(float(last_accessed))
+        except:
+            last_accessed = None
+        now = round(time.time())
+        four_hours = 4 * 3600
+        if last_accessed and last_accessed + four_hours > now:
+            log('Skip checking for wakatime-cli updates because recently checked {0} seconds ago.'.format(now - last_accessed))
+            return True
+
+    log('Checking for updates to wakatime-cli...')
     remoteVer = getLatestCliVersion()
 
     if not remoteVer:
@@ -313,50 +333,31 @@ def isCliLatest():
     return False
 
 
-LATEST_CLI_VERSION = None
-
-
 def getLatestCliVersion():
-    global LATEST_CLI_VERSION
-
-    if LATEST_CLI_VERSION:
-        return LATEST_CLI_VERSION
-
-    configs, last_modified, last_version = None, None, None
-    try:
-        configs = parseConfigFile(getConfigFile(True))
-        if configs:
-            if configs.has_option('internal', 'cli_version'):
-                last_version = configs.get('internal', 'cli_version')
-            if last_version and configs.has_option('internal', 'cli_version_last_modified'):
-                last_modified = configs.get('internal', 'cli_version_last_modified')
-    except:
-        log(traceback.format_exc())
-
     try:
-        headers, contents, code = request(GITHUB_RELEASES_STABLE_URL, last_modified=last_modified)
+        headers, contents, code = request(GITHUB_RELEASES_STABLE_URL)
 
         log('GitHub API Response {0}'.format(code))
 
-        if code == 304:
-            LATEST_CLI_VERSION = last_version
-            return last_version
-
         data = json.loads(contents.decode('utf-8'))
 
         ver = data['tag_name']
         log('Latest wakatime-cli version from GitHub: {0}'.format(ver))
 
+        try:
+            configs = parseConfigFile(getConfigFile(True))
+        except:
+            log(traceback.format_exc())
         if configs:
             last_modified = headers.get('Last-Modified')
             if not configs.has_section('internal'):
                 configs.add_section('internal')
             configs.set('internal', 'cli_version', str(u(ver)))
             configs.set('internal', 'cli_version_last_modified', str(u(last_modified)))
+            configs.set('internal', 'cli_version_last_accessed', str(round(time.time())))
             with open(getConfigFile(True), 'w', encoding='utf-8') as fh:
                 configs.write(fh)
 
-        LATEST_CLI_VERSION = ver
         return ver
     except:
         log(traceback.format_exc())
@@ -404,11 +405,8 @@ def cliDownloadUrl():
     if check not in validCombinations:
         reportMissingPlatformSupport(osname, arch)
 
-    version = getLatestCliVersion()
-
-    return '{prefix}/{version}/wakatime-cli-{osname}-{arch}.zip'.format(
-        prefix=GITHUB_DOWNLOAD_PREFIX,
-        version=version,
+    return '{prefix}/wakatime-cli-{osname}-{arch}.zip'.format(
+        prefix=GITHUB_DOWNLOAD_URL,
         osname=osname,
         arch=arch,
     )
@@ -423,17 +421,14 @@ def reportMissingPlatformSupport(osname, arch):
     request(url)
 
 
-def request(url, last_modified=None):
+def request(url):
     req = Request(url)
     req.add_header('User-Agent', 'github.com/wakatime/{plugin}-wakatime'.format(plugin=PLUGIN))
 
     proxy = CONFIGS.get('settings', 'proxy') if CONFIGS.has_option('settings', 'proxy') else None
     if proxy:
         req.set_proxy(proxy, 'https')
 
-    if last_modified:
-        req.add_header('If-Modified-Since', last_modified)
-
     try:
         resp = urlopen(req)
         try: