Remove the timeout for downloading packages.

lib/src/source/hosted.dart

 // Copyright (c) 2012, 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.
 
 library pub.source.hosted;
 
 import 'dart:async';
 import 'dart:io' as io;
 import "dart:convert";
 
@@ skipping 64 matching lines @@
       var parsed = _parseDescription(id.description);
       _throwFriendlyError(error, stackTrace, id.name, parsed.last);
     }
 
     return new Pubspec.fromMap(
         version['pubspec'], systemCache.sources,
         expectedName: id.name, location: url);
   }
 
   /// Downloads the package identified by [id] to the system cache.
-  Future<Package> downloadToSystemCache(PackageId id) {
-    return isInSystemCache(id).then((inCache) {
-      // Already cached so don't download it.
-      if (inCache) return true;
-
+  Future<Package> downloadToSystemCache(PackageId id) async {
+    if (!(await isInSystemCache(id))) {
       var packageDir = _getDirectory(id);
       ensureDir(path.dirname(packageDir));
       var parsed = _parseDescription(id.description);
-      return _download(parsed.last, parsed.first, id.version, packageDir);
-    }).then((found) {
-      if (!found) fail('Package $id not found.');
-      return new Package.load(id.name, _getDirectory(id), systemCache.sources);
-    });
+      await _download(parsed.last, parsed.first, id.version, packageDir);
+    }
+
+    return new Package.load(id.name, _getDirectory(id), systemCache.sources);
   }
 
   /// The system cache directory for the hosted source contains subdirectories
   /// for each separate repository URL that's used on the system.
   ///
   /// Each of these subdirectories then contains a subdirectory for each
   /// package downloaded from that site.
   Future<String> getDirectory(PackageId id) =>
       new Future.value(_getDirectory(id));
 
@@ skipping 64 matching lines @@
     var cacheDir = path.join(systemCacheRoot, dir);
     if (!dirExists(cacheDir)) return [];
 
     return listDir(cacheDir)
         .map((entry) => new Package.load(null, entry, systemCache.sources))
         .toList();
   }
 
   /// Downloads package [package] at [version] from [server], and unpacks it
   /// into [destPath].
-  Future<bool> _download(String server, String package, Version version,
-      String destPath) {
-    return new Future.sync(() {
-      var url = Uri.parse("$server/packages/$package/versions/$version.tar.gz");
-      log.io("Get package from $url.");
-      log.message('Downloading ${log.bold(package)} ${version}...');
+  Future _download(String server, String package, Version version,
+      String destPath) async {
+    var url = Uri.parse("$server/packages/$package/versions/$version.tar.gz");
+    log.io("Get package from $url.");
+    log.message('Downloading ${log.bold(package)} ${version}...');
 
-      // Download and extract the archive to a temp directory.
-      var tempDir = systemCache.createTempDir();
-      return httpClient.send(new http.Request("GET", url))
-          .then((response) => response.stream)
-          .then((stream) {
-        return timeout(extractTarGz(stream, tempDir), HTTP_TIMEOUT, url,
-            'downloading $url');
-      }).then((_) {
-        // Remove the existing directory if it exists. This will happen if
-        // we're forcing a download to repair the cache.
-        if (dirExists(destPath)) deleteEntry(destPath);
+    // Download and extract the archive to a temp directory.
+    var tempDir = systemCache.createTempDir();
+    var response = await httpClient.send(new http.Request("GET", url));
+    await extractTarGz(response.stream, tempDir);
 
-        // Now that the get has succeeded, move it to the real location in the
-        // cache. This ensures that we don't leave half-busted ghost
-        // directories in the user's pub cache if a get fails.
-        renameDir(tempDir, destPath);
-        return true;
-      });
-    });
+    // Remove the existing directory if it exists. This will happen if
+    // we're forcing a download to repair the cache.
+    if (dirExists(destPath)) deleteEntry(destPath);
+
+    // Now that the get has succeeded, move it to the real location in the
+    // cache. This ensures that we don't leave half-busted ghost
+    // directories in the user's pub cache if a get fails.
+    renameDir(tempDir, destPath);
   }
 
   /// When an error occurs trying to read something about [package] from [url],
   /// this tries to translate into a more user friendly error message.
   ///
   /// Always throws an error, either the original one or a better one.
   void _throwFriendlyError(error, StackTrace stackTrace, String package,
       String url) {
     if (error is PubHttpException &&
         error.response.statusCode == 404) {
       throw new PackageNotFoundException(
           "Could not find package $package at $url.", error, stackTrace);
     }
 
-    if (error is TimeoutException) {
-      fail("Timed out trying to find package $package at $url.",
-          error, stackTrace);
-    }
-
     if (error is io.SocketException) {
       fail("Got socket error trying to find package $package at $url.",
            error, stackTrace);
     }
 
     // Otherwise re-throw the original exception.
     throw error;
   }
 }
 
@@ skipping 16 matching lines @@
 
     // If there are no versions in the cache, report a clearer error.
     if (versions.isEmpty) {
       throw new PackageNotFoundException(
           "Could not find package $name in cache.");
     }
 
     return versions;
   }
 
-  Future<bool> _download(String server, String package, Version version,
+  Future _download(String server, String package, Version version,
       String destPath) {
     // Since HostedSource is cached, this will only be called for uncached
     // packages.
     throw new UnsupportedError("Cannot download packages when offline.");
   }
 
   Future<Pubspec> describeUncached(PackageId id) {
     throw new PackageNotFoundException(
         "${id.name} ${id.version} is not available in your system cache.");
   }
@@ skipping 89 matching lines @@
   var name = description["name"];
   if (name is! String) {
     throw new FormatException("The 'name' key must have a string value.");
   }
 
   var url = description["url"];
   if (url == null) url = HostedSource.defaultUrl;
 
   return new Pair<String, String>(name, url);
 }