added swdc headers and removed ping calls

swdotcom · Jun 7, 2020 · 575ceb7 · 575ceb7
1 parent 0e8e106
commit 575ceb7
Show file tree

Hide file tree

Showing 16 changed files with 195 additions and 148 deletions.
diff --git a/Software.py b/Software.py
@@ -348,7 +348,11 @@ def initializeUser():
     serverAvailable = serverIsAvailable()
     fileExists = softwareSessionFileExists()
     jwt = getItem("jwt")
-    log("JWT VAL: %s" % jwt)
+
+    # print("INITALIZING CODE TIME")
+    # print("JWT: %s" % jwt)
+    # print("file exists: %s" % fileExists)
+
     if (fileExists is False or jwt is None):
         if (serverAvailable is False):
             if (retry_counter == 0):
@@ -357,7 +361,7 @@ def initializeUser():
                 check_online_interval_sec, initializeUser)
             initializeUserTimer.start()
         else:
-            result = createAnonymousUser(serverAvailable)
+            result = createAnonymousUser()
             if (result is None):
                 if (retry_counter == 0):
                     showOfflinePrompt()
@@ -371,8 +375,9 @@ def initializeUser():
 
 
 def initializePlugin(initializedAnonUser, serverAvailable):
-    PACKAGE_NAME = __name__.split('.')[0]
-    log('Code Time: Loaded v%s of package name: %s' % (VERSION, PACKAGE_NAME))
+    name = getPluginName()
+    version = getVersion()
+    log('Code Time: Loaded v%s of package name: %s' % (version, name))
     showStatus("Code Time")
 
     setItem("sublime_lastUpdateTime", None)
@@ -382,7 +387,7 @@ def initializePlugin(initializedAnonUser, serverAvailable):
 
     # fire off timer tasks (seconds, task)
 
-    setOnlineStatusTimer = Timer(2, setOnlineStatus)
+    setOnlineStatusTimer = Timer(5, setOnlineStatus)
     setOnlineStatusTimer.start()
 
     oneMin = 60
@@ -463,7 +468,7 @@ def setOnlineStatus():
         # log("Code Time: Offline")
 
     # run the check in another 1 minute
-    timer = Timer(60 * 1, setOnlineStatus)
+    timer = Timer(60 * 10, setOnlineStatus)
     timer.start()
 
 

diff --git a/lib/CommonUtil.py b/lib/CommonUtil.py
@@ -0,0 +1,107 @@
+import time as timeModule
+import platform
+import json
+import os
+
+from .Constants import *
+from datetime import *
+
+def getUtcOffset():
+    timestamp = timeModule.time()
+    time_local = datetime.fromtimestamp(timestamp)
+    time_utc = datetime.utcfromtimestamp(timestamp)
+    offset_in_sec = round((time_local - time_utc).total_seconds())
+    return offset_in_sec
+
+def getNowTimes():
+    nowInSec = round(timeModule.time())
+    offsetInSec = getUtcOffset()
+    localNowInSec = round(nowInSec + offsetInSec)
+    day = datetime.now().date().isoformat()
+    return {
+        'nowInSec': nowInSec,
+        'localNowInSec': localNowInSec,
+        'offsetInSec': offsetInSec,
+        'day': day
+    }
+
+def getIsNewDay():
+    day = getNowTimes()['day']
+    currentDay = getItem('currentDay')
+    if (currentDay != day):
+        return True
+    else: 
+        return False
+
+def getOs():
+    system = platform.system()
+    return system
+
+def getTimezone():
+    myTimezone = None 
+    try:
+        myTimezone = datetime.now(timezone.utc).astimezone().tzname()
+    except Exception:
+        pass
+    return myTimezone
+
+def getPluginId():
+	return PLUGIN_ID
+
+def getVersion():
+    packageJson = os.path.join(os.path.dirname(__file__), '..', 'package.json')
+    version = "2.2.1"
+    try:
+        with open(packageJson) as jsonData:
+            loadedJsonData = json.load(jsonData)
+            version = loadedJsonData.get("version", "2.2.1")
+    except Exception as ex:
+        print("Error reading package info: %s" % ex)
+
+    return version
+
+def getPluginName():
+	pluginName = __name__.split('.')[0]
+	return pluginName
+
+# fetch a value from the .software/session.json file
+def getItem(key):
+    jsonObj = getSoftwareSessionAsJson()
+
+    # return a default of None if key isn't found
+    val = jsonObj.get(key, None)
+
+    return val
+
+# get an item from the session json file
+def setItem(key, value):
+    jsonObj = getSoftwareSessionAsJson()
+    jsonObj[key] = value
+
+    content = json.dumps(jsonObj)
+
+    sessionFile = getSoftwareSessionFile()
+    with open(sessionFile, 'w') as f:
+        f.write(content)
+
+def getSoftwareSessionAsJson():
+    try:
+        with open(getSoftwareSessionFile()) as sessionFile:
+            loadedSessionFile = json.load(sessionFile)
+            return loadedSessionFile
+    except Exception:
+        return {}
+
+def getSoftwareSessionFile():
+    file = getSoftwareDir(True)
+    return os.path.join(file, 'session.json')
+
+def getSoftwareDir(autoCreate):
+    softwareDataDir = os.path.expanduser('~')
+    softwareDataDir = os.path.join(softwareDataDir, '.software')
+    if (autoCreate is True):
+        os.makedirs(softwareDataDir, exist_ok=True)
+    return softwareDataDir
+
+
+
diff --git a/lib/KpmManager.py b/lib/KpmManager.py
@@ -6,6 +6,7 @@
 from .SoftwareUtil import *
 from .TimeSummaryData import *
 from .Constants import *
+from .CommonUtil import *
 
 DEFAULT_DURATION = 60
 
@@ -53,7 +54,7 @@ def __init__(self, project):
         self.keystrokes = 0
         self.project = project
         self.pluginId = PLUGIN_ID
-        self.version = VERSION
+        self.version = getVersion()
         self.timezone = getTimezone()
         self.os = getOs()
         self.cumulative_editor_seconds = 0

diff --git a/lib/SoftwareDashboard.py b/lib/SoftwareDashboard.py
@@ -10,6 +10,7 @@
 from .SoftwareFileChangeInfoSummaryData import *
 from .SoftwarePayload import *
 from .TimeSummaryData import *
+from .CommonUtil import *
 
 DAY_CHECK_TIMER_INTERVAL = 60
 
@@ -50,32 +51,30 @@ def launchCodeTimeMetrics():
 
 
 def fetchCodeTimeMetricsDashboard():
-    serverOnline = serverIsAvailable()
     summaryInfoFile = getSummaryInfoFile()
 
-    if serverOnline:
-        # fetch the backend data
-        islinux = "true"
-        if isWindows() is True or isMac() is True:
-            islinux = "false"
+    # fetch the backend data
+    islinux = "true"
+    if isWindows() is True or isMac() is True:
+        islinux = "false"
 
-        # TODO: find sublime setting for showGitMEtrics and replace true with it
-        showGitMetrics = True 
-        api = '/dashboard?showGit=' + 'true' + '&linux=' + islinux + '&showToday=false'
-        response = requestIt("GET", api, None, getItem("jwt"))
+    # TODO: find sublime setting for showGitMEtrics and replace true with it
+    showGitMetrics = True 
+    api = '/dashboard?showGit=' + 'true' + '&linux=' + islinux + '&showToday=false'
+    response = requestIt("GET", api, None, getItem("jwt"))
 
-        summaryContent = ""
-        try:
-            summaryContent = response.read().decode('utf-8')
-        except Exception as ex:
-            summaryContent = SERVICE_NOT_AVAIL
-            log("Code Time: Unable to read response data: %s" % ex)
+    summaryContent = ""
+    try:
+        summaryContent = response.read().decode('utf-8')
+    except Exception as ex:
+        summaryContent = SERVICE_NOT_AVAIL
+        log("Code Time: Unable to read response data: %s" % ex)
 
-        try:
-            with open(summaryInfoFile, 'w', encoding='utf-8') as f:
-                f.write(summaryContent)
-        except Exception as ex:
-            log("Code Time: Unable to write dashboard summary content: %s" % ex)
+    try:
+        with open(summaryInfoFile, 'w', encoding='utf-8') as f:
+            f.write(summaryContent)
+    except Exception as ex:
+        log("Code Time: Unable to write dashboard summary content: %s" % ex)
 
     # concat summary info with the dashboard file
     dashboardFile = getDashboardFile()

diff --git a/lib/SoftwareHttp.py b/lib/SoftwareHttp.py
@@ -2,6 +2,7 @@
 import json
 import sublime_plugin, sublime
 from .SoftwareSettings import *
+from .CommonUtil import *
 
 USER_AGENT = 'Code Time Sublime Plugin'
 lastMsg = None
@@ -40,6 +41,9 @@ def showStatus(msg):
             msg = "⏱"
         else:
             lastMsg = msg
+
+        if (msg is None):
+            msg = "Code Time"
 
         if (active_window is not None):
             for view in active_window.views():
@@ -70,19 +74,19 @@ def requestIt(method, api, payload, jwt):
 
     # try to update kpm data.
     try:
+        headers = {'Content-Type': 'application/json', 'User-Agent': USER_AGENT}
         connection = None
         # create the connection
         if ('localhost' in api_endpoint):
             connection = http.client.HTTPConnection(api_endpoint)
         else:
+            # httpLog("Creating HTTPS Connection")
             connection = http.client.HTTPSConnection(api_endpoint)
-
-        headers = {'Content-Type': 'application/json', 'User-Agent': USER_AGENT}
 
         if (jwt is not None):
             headers['Authorization'] = jwt
         elif (method is 'POST' and jwt is None):
-            httpLog("Code Time: no auth token available to post kpm data: %s" % payload)
+            # httpLog("Code Time: no auth token available to post kpm data: %s" % payload)
             return None
 
         # make the request
@@ -93,6 +97,14 @@ def requestIt(method, api, payload, jwt):
             pass
             # httpLog("Code Time: Sending [" + method + ": " + api_endpoint + "" + api + ", headers: " + json.dumps(headers) + "] payload: %s" % payload)
 
+        headers['X-SWDC-Plugin-Id'] = getPluginId()
+        headers['X-SWDC-Plugin-Name'] = getPluginName()
+        headers['X-SWDC-Plugin-Version'] = getVersion()
+        headers['X-SWDC-Plugin-OS'] = getOs()
+        headers['X-SWDC-Plugin-TZ'] = getTimezone()
+        headers['X-SWDC-Plugin-Offset'] = int(float(getUtcOffset() / 60))
+
+        # httpLog("HEADERS: %s" % headers)
 
         # send the request
         connection.request(method, api, payload, headers)
@@ -101,6 +113,6 @@ def requestIt(method, api, payload, jwt):
         # httpLog("Code Time: " + api_endpoint + "" + api + " Response (%d)" % response.status)
         return response
     except Exception as ex:
-        print("Code Time: " + api + " Network error: %s" % ex)
+        print("Code Time: Response Error for " + api + ": %s" % ex)
         return None
 
diff --git a/lib/SoftwareMusic.py b/lib/SoftwareMusic.py
@@ -4,6 +4,8 @@
 import time
 from .SoftwareHttp import *
 from .SoftwareUtil import *
+from .CommonUtil import *
+
 
 currentTrackInfo = {}
 

diff --git a/lib/SoftwareOffline.py b/lib/SoftwareOffline.py
@@ -11,6 +11,7 @@
 from .SoftwareFileChangeInfoSummaryData import *
 from .TimeSummaryData import *
 from .Constants import *
+from .CommonUtil import *
 
 # This file is called SessionSummaryDataManager.js in Atom
 

diff --git a/lib/SoftwarePayload.py b/lib/SoftwarePayload.py
@@ -4,6 +4,7 @@
 from .SoftwareOffline import *
 from .SoftwareHttp import *
 from .TimeSummaryData import *
+from .CommonUtil import *
 
 # send the data that has been saved offline
 def sendOfflineData(isNewDay=False):

diff --git a/lib/SoftwareRepo.py b/lib/SoftwareRepo.py
@@ -6,6 +6,7 @@
 from .SoftwareHttp import *
 from .SoftwareUtil import *
 from .SoftwareSettings import *
+from .CommonUtil import *
 
 ONE_HOUR_IN_SEC = 60 * 60
 ONE_DAY_SEC = ONE_HOUR_IN_SEC * 24

diff --git a/lib/SoftwareSessionApp.py b/lib/SoftwareSessionApp.py
@@ -5,6 +5,7 @@
 from .SoftwareHttp import *
 from .SoftwareWallClock import *
 from .SoftwareOffline import *
+from .CommonUtil import *
 
 def updateSessionSummaryFromServer(isNewDay=False):
     jwt = getItem('jwt')

diff --git a/lib/SoftwareTree.py b/lib/SoftwareTree.py
@@ -10,6 +10,7 @@
 from .SoftwareRepo import *
 from .SoftwareUserStatus import *
 from .TimeSummaryData import *
+from .CommonUtil import *
 
 icons = {
     "bolt-grey": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAACxLAAAsSwGlPZapAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAKkSURBVHgB7dpPbtNAFAbw742D1GWP4BuQGxBOUBcJKWKXI3CDcgM4Qc0uCKkYxB4fAW7gG5AdLOJ5TEqLSqhjO+/Ns1Dnt6nUWEry2fPnvQmQJEmSJMlDRVBUFC/mTO0liOYYr2Gg/HS1fgVDDorY+Q9HfvmdPNyNi6IoTmFILYCbD55DaIuTYwM8iuIT8CiHgs/VuoYhtQC2GeWQYtQwphbAjLMcQp7oI4ypBeBZPv4zv61hTC0AAj+GTFNV77/CmN4k6Fi0fDHzN0xALwAm0fLliCpMQCWAoljmkPL2K8CO1hOQQyaM/3WDCagE0MoDqDERlQDIyQIgb7/+39IJgKRL4I8aE5lBg6dTSWHN7uT72bPl0Msb8u251p5BZxIksqzgcqbZJZSIA/hdBrNpDQ9itcAVngCdMnikEkrEAaiUweOEOQBqbTNxABpl8Bihb/hWc9MkDkCjDB6hCU3TCygSB6BQBo94L6h3jOWToLNaAbiqrtYllMkDYJs9QNguv0QE8gCILbo4ZaxqUT4HtNkq/GkQj+qyt0/1aGyos/Pll/DOiyHXhg+4ijH2b6kejQ02vHZoYn75HfMAQvtsMbR2aD1WiMz+CXCD735pcUxmHgCTfzLkupgT3132TwC7Re8lYcdn1SQ1DaAons8HjP/G+Z+vYcQ0gBZZ7/in67tfbWDENADn0Df+oy97+6zngMWhF8PE9xTGzAK4OT7LD1xSTnE6ZBbANvMHxj9trJa9fWYBOJ8tul5j8Jv/+mxwCHKdGyD1NtcYJgFcnx10NE5itLnG0Dka69X1279dm+tdiQmZPAGeqLjv/7HaXGOYBNDROS6nmvjuspkE/+3+NFMte/uMAvi7cUqG1V4fmyHwp3FKG+aw5hvv95MkSZIkSe7zC7hNx9RHEqHkAAAAAElFTkSuQmCC",

diff --git a/lib/SoftwareUserStatus.py b/lib/SoftwareUserStatus.py
@@ -7,15 +7,16 @@
 from .SoftwareDashboard import *
 from .SoftwareSettings import *
 from .SoftwarePayload import *
+from .CommonUtil import *
 
 loggedInCacheState = False 
 LOGIN_LABEL = "Log in"
 
-def isLoggedOn(serverAvailable):
+def isLoggedOn():
     jwt = getItem("jwt")
-    if (serverAvailable and jwt is not None):
+    if (jwt is not None):
 
-        user = getUser(serverAvailable)
+        user = getUser()
         if (user is not None and validateEmail(user.get("email", None))):
             setItem("name", user.get("email"))
             setItem("jwt", user.get("plugin_jwt"))
@@ -52,10 +53,8 @@ def getUserStatus():
 
     currentUserStatus = {}
 
-    serverAvailable = serverIsAvailable()
-
     # check if they're logged in or not
-    loggedOn = isLoggedOn(serverAvailable)
+    loggedOn = isLoggedOn()
 
     setValue("logged_on", loggedOn)