Provide feedback per device if successful deploy. Update readme with latest commands.

Author: versx

README.md

@@ -8,10 +8,16 @@ Reboot, grab a screenshot, running iOS versions, kill specific running processes
   Retrieve a list of iOS versions running on devices for all machines or a specific one.  
 - `screen iPhone1, iPhone2`  
   Take a screenshot of specific devices.  
+- `reopen iPhone1,iPhone2`  
+  Send restart game request to device IP address.  
 - `reboot iPhone1,iPhone2`  
   Reboot specific devices.  
 - `shutdown iPhone1,iPhone2`  
   Shutdown specific devices.  
+- `resign  https://mega.nz/file/yS7C#Dsh0lZDkk 1.33.0b1 iPhone1,iPhone2`  
+  Download latest app, resign, and deploy to specified devices (leave blank or specify `All` for all devices connected to the machine)  
+- `deploy iPhone1,iPhone2`  
+  Deploy latest already signed app from releases folder to specific devices.  
 - `rm-pogo iPhone1,iPhone2`  
   Removes Pokemon Go from specific devices.  
 - `kill usbmuxd [machine_name]`  
@@ -27,22 +33,22 @@ Reboot, grab a screenshot, running iOS versions, kill specific running processes
 ### Prerequisites:  
 __idevicediagnostics__  
 1. `brew update`  
-2. `brew uninstall --ignore-dependencies libimobiledevice`  
-3. `brew uninstall --ignore-dependencies usbmuxd`  
-4. `brew install --HEAD usbmuxd`  
-5. `brew unlink usbmuxd`  
-6. `brew link usbmuxd`  
-7. `brew install --HEAD libimobiledevice`  
-8. `brew unlink libimobiledevice && brew link libimobiledevice`  
-9. `brew install --HEAD ideviceinstaller`  
-10. `brew unlink ideviceinstaller && brew link ideviceinstaller`  
-11. `sudo chmod -R 777 /var/db/lockdown/`  
+1. `brew uninstall --ignore-dependencies libimobiledevice`  
+1. `brew uninstall --ignore-dependencies usbmuxd`  
+1. `brew install --HEAD usbmuxd`  
+1. `brew unlink usbmuxd`  
+1. `brew link usbmuxd`  
+1. `brew install --HEAD libimobiledevice`  
+1. `brew unlink libimobiledevice && brew link libimobiledevice`  
+1. `brew install --HEAD ideviceinstaller`  
+1. `brew unlink ideviceinstaller && brew link ideviceinstaller`  
+1. `sudo chmod -R 777 /var/db/lockdown/`  
 
 __ios-deploy__  
 If you have previously installed ios-deploy via npm, uninstall it:  
 1. `sudo npm uninstall -g ios-deploy`  
 Install ios-deploy via Homebrew by running:  
-2. `brew install ios-deploy`  
+1. `brew install ios-deploy`  
 
 __MegaTools__  
 1. `brew install megatools`  
@@ -55,24 +61,23 @@ wget https://raw.githubusercontent.com/versx/iPhoneController/master/install.sh
 
 **Manually:**  
 1. `wget https://dotnetwebsite.azurewebsites.net/download/dotnet-core/scripts/v1/dotnet-install.sh && chmod +x dotnet-install.sh && ./dotnet-install.sh --version 2.1.803 && rm dotnet-install.sh`  
-2. `git clone https://github.com/versx/iPhoneController`  
-3. `cd iPhoneController`  
-4. `~/.dotnet/dotnet build`  
-5. `cp config.example.json bin/Debug/netcoreapp2.1/config.json`  
-6. `cd bin/Debug/netcoreapp2.1`  
-7. `nano config.json` / `vi config.json` (Fill out config)  
-8. `~/.dotnet/dotnet iPhoneController.dll`  
+1. `git clone https://github.com/versx/iPhoneController`  
+1. `cd iPhoneController`  
+1. `~/.dotnet/dotnet build`  
+1. `cp config.example.json bin/config.json`  
+1. `cd bin`  
+1. `nano config.json` / `vi config.json` (Fill out config)  
+1. `~/.dotnet/dotnet iPhoneController.dll`  
 
 ## Updating  
 1. `git pull` (from root of folder)  
-2. `~/.dotnet/dotnet build`  
-3. `cd bin/Debug/netcoreapp2.1`  
-4. `~/.dotnet/dotnet iPhoneController.dll`  
+1. `~/.dotnet/dotnet build`  
+1. `cd bin`  
+1. `~/.dotnet/dotnet iPhoneController.dll`  
 
 ## Running  
-From the `bin/debug/netcoreapp2.1` folder type the following:  
+From the `bin` folder type the following:  
 `~/.dotnet/dotnet iPhoneController.dll`  
 
 ## TODO  
-- Localization  
-- Reinstall PoGo
+- Localization  

src/Commands/PhoneControl.cs

@@ -54,7 +54,7 @@ public async Task ListDevicesAsync(CommandContext ctx,
 
             var devices = Device.GetAll();
             var keys = devices.Keys.ToList();
-            var pages = SplitPages();
+            var pages = SplitDevicePages();
             for (var i = 0; i < pages.Count; i++)
             {
                 var msg = pages[i];
@@ -373,30 +373,32 @@ public async Task ResignPoGoAsync(CommandContext ctx,
             [Description("iPhone names i.e. `iPhoneAB1SE`. Comma delimiter supported `iPhoneAB1SE,iPhoneCD2SE`"), RemainingText]
             string phoneNames = Strings.All)
         {
-            //if (!HasRequiredRoles(ctx.Member))
-            //{
-            //    await ctx.RespondAsync($":no_entry: {ctx.User.Username} Unauthorized permissions.");
-            //    return;
-            //}
+            if (!HasRequiredRoles(ctx.Member))
+            {
+                await ctx.RespondAsync($":no_entry: {ctx.User.Username} Unauthorized permissions.");
+                return;
+            }
 
-            //if (!IsValidChannel(ctx.Channel.Id))
-            //    return;
+            if (!IsValidChannel(ctx.Channel.Id))
+                return;
 
             var deployer = new IpaDeployer(_dep.Config.Developer, _dep.Config.ProvisioningProfile)
             {
                 ResignApp = true,
             };
             await ctx.RespondAsync("Starting resign...");
-            var result = deployer.Resign(megaLink, version);
-            if (!result)
+            if (!deployer.Resign(megaLink, version))
             {
                 await ctx.RespondAsync($"Failed to resign IPA");
                 return;
             }
-            await ctx.RespondAsync($"Resign complete, deploying...");
+            await ctx.RespondAsync($"Resign complete, starting deployment to {phoneNames}...");
 
-            deployer.Deploy(deployer.SignedReleaseFileName, phoneNames);
-            await ctx.RespondAsync($"Deploy complete");
+            var result = deployer.Deploy(deployer.SignedReleaseFileName, phoneNames);
+            var successful = result.Item1.Count > 0 ? $"Successfully deployed app to:\n{string.Join(", ", result.Item1)}" : null;
+            var failed = result.Item2.Count > 0 ? $"Failed to deploy app to:\n{string.Join(", ", result.Item2)}" : null;
+            // TODO: Check for content length over 2048 and split messages if so
+            await ctx.RespondAsync($"{successful}\n{failed}");
         }
 
         [
@@ -407,14 +409,14 @@ public async Task DeployPoGoAsync(CommandContext ctx,
             [Description("iPhone names i.e. `iPhoneAB1SE`. Comma delimiter supported `iPhoneAB1SE,iPhoneCD2SE`"), RemainingText]
             string phoneNames = Strings.All)
         {
-            //if (!HasRequiredRoles(ctx.Member))
-            //{
-            //    await ctx.RespondAsync($":no_entry: {ctx.User.Username} Unauthorized permissions.");
-            //    return;
-            //}
+            if (!HasRequiredRoles(ctx.Member))
+            {
+                await ctx.RespondAsync($":no_entry: {ctx.User.Username} Unauthorized permissions.");
+                return;
+            }
 
-            //if (!IsValidChannel(ctx.Channel.Id))
-            //    return;
+            if (!IsValidChannel(ctx.Channel.Id))
+                return;
 
             var devices = Device.GetAll();
             var deployAppDevices = new List<string>(phoneNames.RemoveSpaces());
@@ -443,11 +445,19 @@ public async Task DeployPoGoAsync(CommandContext ctx,
                     _logger.Info($"Deploying to device {device.Name} ({device.Uuid})...");
                     var output = Shell.Execute("ios-deploy", args, out var exitCode, true);
                     _logger.Debug($"{device.Name} ({device.Uuid}) Deployment output: {output}");
-                    if (output.Length > 2000)
+                    var success = output.ToLower().Contains($"[100%] installed package {appPath}");
+                    if (success)
+                    {
+                        await ctx.RespondAsync($"Deployed {appPath} to {device.Name} ({device.Uuid}) successfully.");
+                    }
+                    else
                     {
-                        output = string.Join("", output.TakeLast(1900));
+                        if (output.Length > 2000)
+                        {
+                            output = string.Join("", output.TakeLast(1900));
+                        }
+                        await ctx.RespondAsync($"Failed to deploy {appPath} to {device.Name} ({device.Uuid})\nOutput: {output}");
                     }
-                    await ctx.RespondAsync($"Deployed Pokemon Go to {device.Name} ({device.Uuid})\r\nOutput: {output}");
                 }
             });
         }
@@ -511,7 +521,7 @@ private bool IsValidChannel(ulong channelId)
             return _dep.Config.ChannelIds.Count == 0 || _dep.Config.ChannelIds.Contains(channelId);
         }
 
-        private List<string> SplitPages()
+        private List<string> SplitDevicePages()
         {
             var devices = Device.GetAll();
             var keys = devices.Keys.ToList();

src/Deployment/IpaDeployer.cs

@@ -88,15 +88,18 @@ public bool Resign(string megaLink, string version)
             return result;
         }
 
-        public void Deploy(string ipaPath, string deviceNames = Strings.All)
+        public (List<string>, List<string>) Deploy(string appPath, string deviceNames = Strings.All)
         {
+            var successful = new List<string>();
+            var failed = new List<string>();
             var devices = Device.GetAll();
             var deployAppDevices = new List<string>(deviceNames.RemoveSpaces());
             if (string.Compare(deviceNames, Strings.All, true) == 0)
             {
                 deployAppDevices = devices.Keys.ToList();
             }
-            _logger.Info($"Deploying app {ipaPath} to {string.Join(", ", deployAppDevices)}");
+            _logger.Info($"Deploying app {appPath} to {string.Join(", ", deployAppDevices)}");
+            // TODO: Provide better feedback of successful and failed deployments
             Parallel.ForEach(deployAppDevices, deviceName =>
             {
                 if (!devices.ContainsKey(deviceName))
@@ -106,13 +109,24 @@ public void Deploy(string ipaPath, string deviceNames = Strings.All)
                 else
                 {
                     var device = devices[deviceName];
-                    var args = $"--id {device.Uuid} --bundle {ipaPath}";
+                    var args = $"--id {device.Uuid} --bundle {appPath}";
                     _logger.Info($"Deploying to device {device.Name} ({device.Uuid})...");
                     var output = Shell.Execute("ios-deploy", args, out var exitCode, true);
-                    _logger.Info($"Deployed Pokemon Go to {device.Name} ({device.Uuid})\r\nOutput: {output}");
+                    var success = output.ToLower().Contains($"[100%] installed package {appPath}");
+                    if (success)
+                    {
+                        successful.Add(device.Name);
+                        _logger.Info($"Deployed {appPath} to {device.Name} ({device.Uuid}) successfully.");
+                    }
+                    else
+                    {
+                        failed.Add(device.Name);
+                        _logger.Warn($"Failed to deploy {appPath} to {device.Name} ({device.Uuid})\nOutput: {output}");
+                    }
                     // TODO: OnDeployCompleted event
                 }
             });
+            return (successful, failed);
         }
 
         public static string GetLatestAppPath()
@@ -125,7 +139,6 @@ public static string GetLatestAppPath()
             return files.FirstOrDefault();
         }
 
-
         private bool InternalResignApp(string ipaPath, string ipaPathSigned)
         {
             _logger.Info($"Beginning to resign {ipaPath}");
@@ -178,7 +191,6 @@ private bool InternalResignApp(string ipaPath, string ipaPathSigned)
             foreach (var file in files)
             {
                 _logger.Debug($"Signing component {file}...");
-                //Shell.Execute(Strings.CodesignPath, $@"--continue -f -s ""{_developer}"" --entitlements {entitlementsPath} {file}", out var _);
                 Codesign(file, true, entitlementsPath);
             }
 
@@ -189,9 +201,6 @@ private bool InternalResignApp(string ipaPath, string ipaPathSigned)
                 var destinationConfigPath = Path.Combine(pogoDir, "config.json");
                 _logger.Info($"Copying custom config to payload folder.");
                 File.Copy(configPath, destinationConfigPath);
-
-                //_logger.Info($"Signing custom config.json...");
-                //Codesign(destinationConfigPath);
             }
             else
             {
@@ -205,7 +214,6 @@ private bool InternalResignApp(string ipaPath, string ipaPathSigned)
             foreach (var frameworkFile in frameworkFiles)
             {
                 _logger.Debug($"Signing framework {frameworkFile}");
-                //Shell.Execute(Strings.CodesignPath, $@"-f -s ""{_developer}"" {frameworkFile}", out var _);
                 Codesign(frameworkFile);
             }