Functionality to submit Usage through NodeJS

Author: StanleyGoldman

octorun/src/bin/app-usage.js

@@ -3,19 +3,24 @@ var package = require('../../package.json')
 var endOfLine = require('os').EOL;
 var fs = require('fs');
 var util = require('util');
-var https = require('https');
 
 commander
     .version(package.version)
+    .option('-s, --scheme <scheme>')
     .option('-h, --host <host>')
     .option('-p, --port <port>')
     .parse(process.argv);
 
 var host = commander.host;
 var port = 443;
+var scheme = 'https';
 
 if (commander.port) {
-    port = commander.port;
+    port = parseInt(commander.port);
+}
+
+if (commander.scheme) {
+    scheme = commander.scheme;
 }
 
 var fileContents = null;
@@ -27,9 +32,10 @@ if (commander.args.length == 1) {
     }
 }
 
-if (fileContents && host && util.isNumber(port)) {
+if (fileContents && host) {
+    var https = require(scheme);
     var options = {
-        protocol: "https:",
+        protocol: scheme + ':',
         hostname: host,
         port: port,
         path: '/api/usage/unity',
@@ -40,18 +46,34 @@ if (fileContents && host && util.isNumber(port)) {
     };
 
     var req = https.request(options, function (res) {
+        var success = res.statusCode == 200;
+
         res.on('data', function (d) {
-            process.stdout.write(d);
-            process.stdout.write(endOfLine);
+            if (success) {
+                process.stdout.write("Success");
+                process.stdout.write(endOfLine);
+                process.stdout.write(d);
+            }
+            else {
+                process.stdout.write("Error");
+                process.stdout.write(endOfLine);
+                process.stdout.write(d);
+            }
         });
 
         res.on('end', function (d) {
-            process.exit(res.statusCode == 200 ? 0 : -1);
+            process.exit(success ? 0 : -1);
         });
     });
 
     req.on('error', function (e) {
-        console.log(e);
+        process.stdout.write("Error");
+        process.stdout.write(endOfLine);
+        
+        if (e) {
+            process.stdout.write(e.toString());
+        }
+
         process.exit(-1);
     });
 

script

@@ -30,7 +30,6 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain, IPr
         private readonly IGitHubClient githubClient;
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
-        private readonly NPath octorunScriptPath;
         private readonly ILoginManager loginManager;
 
         public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClient, IProcessManager processManager, ITaskManager taskManager, NPath nodeJsExecutablePath, NPath octorunScriptPath)
@@ -45,7 +44,6 @@ public ApiClient(UriString hostUrl, IKeychain keychain, IGitHubClient githubClie
             this.githubClient = githubClient;
             this.processManager = processManager;
             this.taskManager = taskManager;
-            this.octorunScriptPath = octorunScriptPath;
             loginManager = new LoginManager(keychain, ApplicationInfo.ClientId, ApplicationInfo.ClientSecret,
                 processManager: processManager,
                 taskManager: taskManager,

src/GitHub.Api/Application/ApiClient.cs

@@ -40,7 +40,6 @@ protected void Initialize()
             ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
             Platform.Initialize(ProcessManager, TaskManager);
             GitClient = new GitClient(Environment, ProcessManager, TaskManager.Token);
-            SetupMetrics();
         }
 
         public void Run(bool firstRun)
@@ -156,7 +155,14 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
                 UserSettings.Set(Constants.GuidKey, id);
             }
 
-            UsageTracker = new UsageTracker(UserSettings, usagePath, id, unityVersion);
+            var metricsService = new MetricsService(ProcessManager,
+                TaskManager,
+                Environment.FileSystem,
+                Environment.NodeJsExecutablePath,
+                Environment.OctorunScriptPath,
+                ApplicationConfiguration.ProductHeader);
+
+            UsageTracker = new UsageTracker(metricsService, UserSettings, usagePath, id, unityVersion);
 
             if (firstRun)
             {
@@ -181,6 +187,7 @@ private void InitializeEnvironment(NPath gitExecutablePath, NPath octorunScriptP
             Environment.GitExecutablePath = gitExecutablePath;
             Environment.OctorunScriptPath = octorunScriptPath;
             Environment.User.Initialize(GitClient);
+            SetupMetrics();
 
             if (Environment.IsWindows)
             {

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -13,24 +13,25 @@ namespace GitHub.Unity
     class UsageTracker : IUsageTracker
     {
         private static ILogging Logger { get; } = LogHelper.GetLogger<UsageTracker>();
-        private static IMetricsService metricsService;
 
         private readonly NPath storePath;
         private readonly ISettings userSettings;
+        private readonly IMetricsService metricsService;
         private readonly string guid;
         private readonly string unityVersion;
         private Timer timer;
 
-        public UsageTracker(ISettings userSettings, NPath storePath, string guid, string unityVersion)
+        public UsageTracker(IMetricsService metricsService, ISettings userSettings, NPath storePath, string guid, string unityVersion)
         {
             this.userSettings = userSettings;
+            this.metricsService = metricsService;
             this.guid = guid;
             this.storePath = storePath;
             this.unityVersion = unityVersion;
 
             Logger.Trace("guid:{0}", guid);
             if (Enabled)
-                RunTimer(3*60);
+                RunTimer(3*10);
         }
 
         private UsageStore LoadUsage()
@@ -108,8 +109,6 @@ private void RunTimer(int seconds)
 
         private async Task SendUsage()
         {
-            Logger.Trace("SendUsage");
-
             var usage = LoadUsage();
 
             if (metricsService == null)
@@ -174,12 +173,6 @@ public void IncrementLaunchCount()
             SaveUsage(usageStore);
         }
 
-        public static void SetMetricsService(IMetricsService instance)
-        {
-            Logger.Trace("SetMetricsService instance:{0}", instance?.ToString() ?? "Null");
-            metricsService = instance;
-        }
-
         public bool Enabled
         {
             get

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -116,13 +116,7 @@
     <Compile Include="UI\Window.cs" />
   </ItemGroup>
   <Choose>
-    <When Condition="$(Buildtype) == 'Internal'">
-      <ItemGroup>
-        <Compile Include="$(SolutionDir)\script\src\MetricsInitialization.cs">
-          <Link>Metrics\MetricsInitialization.cs</Link>
-        </Compile>
-      </ItemGroup>
-    </When>
+    <When Condition="$(Buildtype) == 'Internal'" />
   </Choose>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\GitHub.Api\GitHub.Api.csproj">

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -104,6 +104,8 @@ public NPath GitExecutablePath
             }
         }
 
+        public NPath NodeJsExecutablePath => defaultEnvironment.NodeJsExecutablePath;
+
         public NPath OctorunScriptPath { get; set; }
 
         public bool IsWindows => defaultEnvironment.IsWindows;