Support DevFS paths encoded as URIs

sdk/lib/vmservice/devfs.dart

 // Copyright (c) 2016, 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 dart._vmservice;
 
 String _encodeDevFSDisabledError(Message message) {
   return encodeRpcError(
       message, kFeatureDisabled,
       details: "DevFS is not supported by this Dart implementation");
@@ skipping 24 matching lines @@
     if (path.isEmpty) {
       return null;
     }
     Uri pathUri;
     try {
       pathUri = new Uri.file(path);
     } on FormatException catch(e) {
       return null;
     }
 
+    return resolve(pathUri);
+  }
+
+  Uri resolve(Uri pathUri) {
     try {
       // Make sure that this pathUri can be converted to a file path.
       pathUri.toFilePath();
     } on UnsupportedError catch (e) {
       return null;
     }
 
     Uri resolvedUri = uri.resolveUri(pathUri);
     if (!resolvedUri.toString().startsWith(uri.toString())) {
       // Resolved uri must be within the filesystem's base uri.
@@ skipping 61 matching lines @@
         return _listDevFSFiles(message);
       default:
         return encodeRpcError(
             message, kInternalError,
             details: 'Unexpected rpc ${message.method}');
     }
   }
 
   Future<String> handlePutStream(Object fsName,
                                  Object path,
+                                 Uri fsUri,
                                  Stream<List<int>> bytes) async {
     // A dummy Message for error message construction.
     Message message = new Message.forMethod('_writeDevFSFile');
     var writeStreamFile = VMServiceEmbedderHooks.writeStreamFile;
     if (writeStreamFile == null) {
       return _encodeDevFSDisabledError(message);
     }
     if (fsName == null) {
       return encodeMissingParamError(message, 'fsName');
     }
     if (fsName is! String) {
       return encodeInvalidParamError(message, 'fsName');
     }
     var fs = _fsMap[fsName];
     if (fs == null) {
       return _encodeFileSystemDoesNotExistError(message, fsName);
     }
-    if (path == null) {
-      return encodeMissingParamError(message, 'path');
-    }
-    if (path is! String) {
-      return encodeInvalidParamError(message, 'path');
-    }
-    Uri uri = fs.resolvePath(path);
+    Uri uri = fsUri;
     if (uri == null) {
-      return encodeInvalidParamError(message, 'path');
+      if (path == null) {
+        return encodeMissingParamError(message, 'path');
+      }
+      if (path is! String) {
+        return encodeInvalidParamError(message, 'path');
+      }
+      uri = fs.resolvePath(path);
+      if (uri == null) {
+        return encodeInvalidParamError(message, 'path');
+      }
+    } else {
+      uri = fs.resolve(uri);
+      if (uri == null) {
+        return encodeInvalidParamError(message, 'uri');
+      }
     }
     await writeStreamFile(uri, bytes);
     return encodeSuccess(message);
   }
 
   Future<String> _listDevFS(Message message) async {
     var result = {};
     result['type'] = 'FileSystemList';
     result['fsNames'] =  _fsMap.keys.toList();
     return encodeResult(message, result);
@@ skipping 50 matching lines @@
     if (fsName == null) {
       return encodeMissingParamError(message, 'fsName');
     }
     if (fsName is! String) {
       return encodeInvalidParamError(message, 'fsName');
     }
     var fs = _fsMap[fsName];
     if (fs == null) {
       return _encodeFileSystemDoesNotExistError(message, fsName);
     }
-    var path = message.params['path'];
-    if (path == null) {
-      return encodeMissingParamError(message, 'path');
+    Uri uri;
+    if (message.params['uri'] != null) {
+      try {
+        var uriParam = message.params['uri'];
+        if (uriParam is! String) {
+          return encodeInvalidParamError(message, 'uri');
+        }
+        Uri parsedUri = Uri.parse(uriParam);
+        uri = fs.resolve(parsedUri);
+        if (uri == null) {
+          return encodeInvalidParamError(message, 'uri');
+        }
+      } catch (e) {
+        return encodeInvalidParamError(message, 'uri');
+      }
+    } else {
+      var path = message.params['path'];
+      if (path == null) {
+        return encodeMissingParamError(message, 'path');
+      }
+      if (path is! String) {
+        return encodeInvalidParamError(message, 'path');
+      }
+      uri = fs.resolvePath(path);
+      if (uri == null) {
+        return encodeInvalidParamError(message, 'path');
+      }
     }
-    if (path is! String) {
-      return encodeInvalidParamError(message, 'path');
-    }
-    Uri uri = fs.resolvePath(path);
-    if (uri == null) {
-      return encodeInvalidParamError(message, 'path');
-    }
-
     try {
       List<int> bytes = await readFile(uri);
       var result = {
         'type': 'FSFile',
         'fileContents': BASE64.encode(bytes)
       };
       return encodeResult(message, result);
     } catch (e) {
       return encodeRpcError(
           message, kFileDoesNotExist,
@@ skipping 10 matching lines @@
     if (fsName == null) {
       return encodeMissingParamError(message, 'fsName');
     }
     if (fsName is! String) {
       return encodeInvalidParamError(message, 'fsName');
     }
     var fs = _fsMap[fsName];
     if (fs == null) {
       return _encodeFileSystemDoesNotExistError(message, fsName);
     }
-    var path = message.params['path'];
-    if (path == null) {
-      return encodeMissingParamError(message, 'path');
-    }
-    if (path is! String) {
-      return encodeInvalidParamError(message, 'path');
-    }
-    Uri uri = fs.resolvePath(path);
-    if (uri == null) {
-      return encodeInvalidParamError(message, 'path');
+    Uri uri;
+    if (message.params['uri'] != null) {
+      try {
+        var uriParam = message.params['uri'];
+        if (uriParam is! String) {
+          return encodeInvalidParamError(message, 'uri');
+        }
+        Uri parsedUri = Uri.parse(uriParam);
+        uri = fs.resolve(parsedUri);
+        if (uri == null) {
+          return encodeInvalidParamError(message, 'uri');
+        }
+      } catch (e) {
+        return encodeInvalidParamError(message, 'uri');
+      }
+    } else {
+      var path = message.params['path'];
+      if (path == null) {
+        return encodeMissingParamError(message, 'path');
+      }
+      if (path is! String) {
+        return encodeInvalidParamError(message, 'path');
+      }
+      uri = fs.resolvePath(path);
+      if (uri == null) {
+        return encodeInvalidParamError(message, 'path');
+      }

[turnidge, 2017/03/08 21:13:51]

Does this code duplicate the code above?  Can there be a helper function?

[Cutch, 2017/03/08 23:41:07]

A helper function is awkward here (see other DevFS methods that have duplicated
code) because of how errors are returned. Once Flutter integrates this we can
drop a bunch of the code.

     }
     var fileContents = message.params['fileContents'];
     if (fileContents == null) {
       return encodeMissingParamError(message, 'fileContents');
     }
     if (fileContents is! String) {
       return encodeInvalidParamError(message, 'fileContents');
     }
     List<int> decodedFileContents = BASE64.decode(fileContents);
 
@@ skipping 71 matching lines @@
     }
     var fileList = await listFiles(fs.uri);
     // Remove any url-encoding in the filenames.
     for (int i = 0; i < fileList.length; i++) {
       fileList[i]['name'] = Uri.decodeFull(fileList[i]['name']);
     }
     var result = { 'type': 'FSFileList', 'files': fileList };
     return encodeResult(message, result);
   }
 }