Add a pub command for managing uploaders for packages.

utils/pub/io.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.
 
 /**
  * Helper functionality to make working with IO easier.
  */
 library io;
 
 import 'dart:io';
 import 'dart:isolate';
+import 'dart:json';
 import 'dart:uri';
 
-// TODO(nweiz): Make this import better.
-import '../../pkg/http/lib/http.dart' as http;
-import 'curl_client.dart';
 import 'log.dart' as log;
 import 'path.dart' as path;
 import 'utils.dart';
 
 bool _isGitInstalledCache;
 
 /// The cached Git command.
 String _gitCommandCache;
 
 final NEWLINE_PATTERN = new RegExp("\r\n?|\n\r?");
@@ skipping 468 matching lines @@
   };
 
   stream.onError = (e) {
     removeCallbacks();
     completer.completeException(e, stackTrace);
   };
 
   return completer.future;
 }
 
-// TODO(nweiz): make this configurable
-/**
- * The amount of time in milliseconds to allow HTTP requests before assuming
- * they've failed.
- */
-final HTTP_TIMEOUT = 30 * 1000;
-
-/// An HTTP client that transforms 40* errors and socket exceptions into more
-/// user-friendly error messages.
-class PubHttpClient extends http.BaseClient {
-  final http.Client _inner;
-
-  PubHttpClient([http.Client inner])
-    : _inner = inner == null ? new http.Client() : inner;
-
-  Future<http.StreamedResponse> send(http.BaseRequest request) {
-    log.io("Sending HTTP request $request.");
-    // TODO(rnystrom): Log request body when it's available and plaintext, but
-    // not when it contains OAuth2 credentials.
-
-    // TODO(nweiz): remove this when issue 4061 is fixed.
-    var stackTrace;
-    try {
-      throw null;
-    } catch (_, localStackTrace) {
-      stackTrace = localStackTrace;
-    }
-
-    // TODO(nweiz): Ideally the timeout would extend to reading from the
-    // response input stream, but until issue 3657 is fixed that's not feasible.
-    return timeout(_inner.send(request).chain((streamedResponse) {
-      log.fine("Got response ${streamedResponse.statusCode} "
-               "${streamedResponse.reasonPhrase}.");
-
-      var status = streamedResponse.statusCode;
-      // 401 responses should be handled by the OAuth2 client. It's very
-      // unlikely that they'll be returned by non-OAuth2 requests.
-      if (status < 400 || status == 401) {
-        return new Future.immediate(streamedResponse);
-      }
-
-      return http.Response.fromStream(streamedResponse).transform((response) {
-        throw new PubHttpException(response);
-      });
-    }).transformException((e) {
-      if (e is SocketIOException &&
-          e.osError != null &&
-          (e.osError.errorCode == 8 ||
-           e.osError.errorCode == -2 ||
-           e.osError.errorCode == -5 ||
-           e.osError.errorCode == 11004)) {
-        throw 'Could not resolve URL "${request.url.origin}".';
-      }
-      throw e;
-    }), HTTP_TIMEOUT, 'fetching URL "${request.url}"');
-  }
-}
-
-/// The HTTP client to use for all HTTP requests.
-final httpClient = new PubHttpClient();
-
-final curlClient = new PubHttpClient(new CurlClient());
-
 /**
  * Takes all input from [source] and writes it to [sink].
  *
  * Returns a future that completes when [source] is closed.
  */
 Future pipeInputToInput(InputStream source, ListInputStream sink) {
   var completer = new Completer();
   source.onClosed = () {
     sink.markEndOfStream();
     completer.complete(null);
@@ skipping 429 matching lines @@
       // TODO(rnystrom): Should log this and display it if an actual error
       // occurs.
       consumeInputStream(process.stderr);
       return pipeInputToInput(process.stdout, stream);
     });
   });
   return stream;
 }
 
 /**
- * Exception thrown when an HTTP operation fails.
- */
-class PubHttpException implements Exception {
-  final http.Response response;
-
-  const PubHttpException(this.response);
-
-  String toString() => 'HTTP error ${response.statusCode}: '
-      '${response.reasonPhrase}';
-}
-
-/**
  * Exception thrown when an operation times out.
  */
 class TimeoutException implements Exception {
   final String message;
 
   const TimeoutException(this.message);
 
   String toString() => message;
 }
 
@@ skipping 31 matching lines @@
   return new Directory(entry);
 }
 
 /**
  * Gets a [Uri] for [uri], which can either already be one, or be a [String].
  */
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return new Uri.fromString(uri);
 }