[cdc_stream] Add a CLI client to start/stop asset streaming sessions (#4)

Implements the cdc_stream client and adjusts asset streaming in
various places to work better outside of a GGP environment.

This CL tries to get quoting for SSH commands right. It also brings
back the ability to start a streaming session from
asset_stream_manager.

Also cleans up Bazel targets setup. Since the sln file is now in root,
it is no longer necessary to prepend ../ to relative filenames to
make clicking on errors work.

cdc_rsync/cdc_rsync.vcxproj

@@ -69,16 +69,15 @@
     <BazelTargets>//cdc_rsync</BazelTargets>
     <BazelOutputFile>cdc_rsync.exe</BazelOutputFile>
     <BazelIncludePaths>..\;..\third_party\absl;..\third_party\blake3\c;..\bazel-stadia-file-transfer\external\com_github_zstd\lib;..\third_party\googletest\googletest\include;..\third_party\protobuf\src;$(VC_IncludePath);$(WindowsSDK_IncludePath)</BazelIncludePaths>
-    <BazelSourcePathPrefix>..\/</BazelSourcePathPrefix>
   </PropertyGroup>
   <Import Project="..\NMakeBazelProject.targets" />
   <!-- For some reason, msbuild doesn't include this file, so copy it explicitly. -->
   <!-- TODO: Reenable once we can cross-compile these.
   <PropertyGroup>
-    <GgpRsyncServerFile>$(SolutionDir)bazel-out\k8-$(BazelCompilationMode)\bin\cdc_rsync_server\cdc_rsync_server</GgpRsyncServerFile>
+    <CdcRsyncServerFile>$(SolutionDir)bazel-out\k8-$(BazelCompilationMode)\bin\cdc_rsync_server\cdc_rsync_server</CdcRsyncServerFile>
   </PropertyGroup>
-  <Target Name="CopyServer" Inputs="$(GgpRsyncServerFile)" Outputs="$(OutDir)cdc_rsync_server" AfterTargets="Build">
-    <Copy SourceFiles="$(GgpRsyncServerFile)" DestinationFiles="$(OutDir)cdc_rsync_server" />
+  <Target Name="CopyServer" Inputs="$(CdcRsyncServerFile)" Outputs="$(OutDir)cdc_rsync_server" AfterTargets="Build">
+    <Copy SourceFiles="$(CdcRsyncServerFile)" DestinationFiles="$(OutDir)cdc_rsync_server" />
   </Target>
   -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

cdc_rsync/cdc_rsync_client.cc

@@ -46,8 +46,8 @@ constexpr int kExitCodeNotFound = 127;
 
 constexpr int kForwardPortFirst = 44450;
 constexpr int kForwardPortLast = 44459;
-constexpr char kGgpServerFilename[] = "cdc_rsync_server";
-constexpr char kRemoteToolsBinDir[] = "~/.cache/cdc_file_transfer/";
+constexpr char kCdcServerFilename[] = "cdc_rsync_server";
+constexpr char kRemoteToolsBinDir[] = "~/.cache/cdc-file-transfer/bin/";
 
 SetOptionsRequest::FilterRule::Type ToProtoType(PathFilter::Rule::Type type) {
   switch (type) {
@@ -178,7 +178,7 @@ absl::Status CdcRsyncClient::StartServer() {
 
   std::vector<GameletComponent> components;
   status = GameletComponent::Get(
-      {path::Join(component_dir, kGgpServerFilename)}, &components);
+      {path::Join(component_dir, kCdcServerFilename)}, &components);
   if (!status.ok()) {
     return MakeStatus(
         "Required instance component not found. Make sure the file "
@@ -202,7 +202,7 @@ absl::Status CdcRsyncClient::StartServer() {
   int port = *port_res;
 
   std::string remote_server_path =
-      std::string(kRemoteToolsBinDir) + kGgpServerFilename;
+      std::string(kRemoteToolsBinDir) + kCdcServerFilename;
   // Test existence manually to prevent misleading bash output message
   // "bash: .../cdc_rsync_server: No such file or directory".
   // Also create the bin dir because otherwise scp below might fail.
@@ -411,9 +411,9 @@ absl::Status CdcRsyncClient::DeployServer() {
 
   // scp cdc_rsync_server to a temp location on the gamelet.
   std::string remoteServerTmpPath =
-      absl::StrFormat("%s%s.%s", kRemoteToolsBinDir, kGgpServerFilename,
+      absl::StrFormat("%s%s.%s", kRemoteToolsBinDir, kCdcServerFilename,
                       Util::GenerateUniqueId());
-  std::string localServerPath = path::Join(exe_dir, kGgpServerFilename);
+  std::string localServerPath = path::Join(exe_dir, kCdcServerFilename);
   status = remote_util_.Scp({localServerPath}, remoteServerTmpPath,
                             /*compress=*/true);
   if (!status.ok()) {
@@ -424,9 +424,9 @@ absl::Status CdcRsyncClient::DeployServer() {
   // - Make the old cdc_rsync_server writable (if it exists).
   // - Make the new cdc_rsync_server executable.
   // - Replace the old cdc_rsync_server by the new one.
-  std::string old_path = RemoteUtil::EscapeForWindows(
-      std::string(kRemoteToolsBinDir) + kGgpServerFilename);
-  std::string new_path = RemoteUtil::EscapeForWindows(remoteServerTmpPath);
+  std::string old_path = RemoteUtil::QuoteForWindows(
+      std::string(kRemoteToolsBinDir) + kCdcServerFilename);
+  std::string new_path = RemoteUtil::QuoteForWindows(remoteServerTmpPath);
   std::string replace_cmd = absl::StrFormat(
       " ([ ! -f %s ] || chmod u+w %s) && chmod a+x %s && mv %s %s", old_path,
       old_path, new_path, new_path, old_path);

cdc_rsync/params.cc

@@ -73,10 +73,10 @@ Options:
 -R, --relative            Use relative path names
     --existing            Skip creating new files on instance
     --copy-dest dir       Use files from dir as sync base if files are missing
-    --ssh-command         Path and arguments of SSH command to use, e.g.
+    --ssh-command         Path and arguments of ssh command to use, e.g.
                           C:\path\to\ssh.exe -F config -i id_rsa -oStrictHostKeyChecking=yes -oUserKnownHostsFile="""known_hosts"""
                           Can also be specified by the CDC_SSH_COMMAND environment variable.
-    --scp-command         Path and arguments of SSH command to use, e.g.
+    --scp-command         Path and arguments of scp command to use, e.g.
                           C:\path\to\scp.exe -F config -i id_rsa -oStrictHostKeyChecking=yes -oUserKnownHostsFile="""known_hosts"""
                           Can also be specified by the CDC_SCP_COMMAND environment variable.
 -h  --help                Help for cdc_rsync