Support DevFS paths encoded as URIs

runtime/bin/vmservice/server.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of vmservice_io;
 
 final bool silentObservatory =
     const bool.fromEnvironment('SILENT_OBSERVATORY');
 
 void serverPrint(String s) {
@@ skipping 215 matching lines @@
       // This is a cross origin attempt to connect
       request.response.close();
       return;
     }
     if (request.method == 'PUT') {
       // PUT requests are forwarded to DevFS for processing.
 
       List fsNameList;
       List fsPathList;
       List fsPathBase64List;
+      List fsUriBase64List;
       Object fsName;
       Object fsPath;
+      Object fsUri;
 
       try {
         // Extract the fs name and fs path from the request headers.
         fsNameList = request.headers['dev_fs_name'];
         fsName = fsNameList[0];
 
-        fsPathList = request.headers['dev_fs_path'];
-        fsPathBase64List = request.headers['dev_fs_path_b64'];
-        // If the 'dev_fs_path_b64' header field was sent, use that instead.
-        if ((fsPathBase64List != null) && (fsPathBase64List.length > 0)) {
-          fsPath = UTF8.decode(BASE64.decode(fsPathBase64List[0]));
-        } else {
-          fsPath = fsPathList[0];
+        // Prefer Uri encoding first.
+        fsUriBase64List = request.headers['dev_fs_uri_b64'];
+        if ((fsUriBase64List != null) && (fsUriBase64List.length > 0)) {
+          String decodedFsUri = UTF8.decode(BASE64.decode(fsUriBase64List[0]));
+          fsUri = Uri.parse(decodedFsUri);
+        }
+
+        // Fallback to path encoding.
+        if (fsUri == null) {
+          fsPathList = request.headers['dev_fs_path'];
+          fsPathBase64List = request.headers['dev_fs_path_b64'];
+          // If the 'dev_fs_path_b64' header field was sent, use that instead.
+          if ((fsPathBase64List != null) && (fsPathBase64List.length > 0)) {
+            fsPath = UTF8.decode(BASE64.decode(fsPathBase64List[0]));
+          } else {
+            fsPath = fsPathList[0];
+          }
         }
       } catch (e) { /* ignore */ }
 
       String result;
       try {
         result = await _service.devfs.handlePutStream(
             fsName,
             fsPath,
+            fsUri,
             request.transform(GZIP.decoder));
       } catch (e) { /* ignore */ }
 
       if (result != null) {
         request.response.headers.contentType =
             HttpRequestClient.jsonContentType;
         request.response.write(result);
       }
       request.response.close();
       return;
@@ skipping 101 matching lines @@
       _notifyServerState("");
       onServerAddressChange(null);
       return this;
     });
   }
 
 }
 
 void _notifyServerState(String uri)
     native "VMServiceIO_NotifyServerState";