Using builtin base64.

request · Aug 12, 2010 · cec3f3f · cec3f3f
1 parent 09e7ade
commit cec3f3f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -1,7 +1,11 @@
-var http = require('http'),
-    url = require('url'),
-    sys = require('sys'),
-    base64 = require('./base64');
+var http = require('http')
+  , url = require('url')
+  , sys = require('sys')
+  ;
+
+var toBase64 = function(str) {
+  return  (new Buffer(str || "", "ascii")).toString("base64");
+};
 
 function request (options, callback) {
   if (!options.uri) {
@@ -49,12 +53,12 @@ function request (options, callback) {
 
   var clientErrorHandler = function (error) {
     if (setHost) delete options.headers.host;
-    callback(error);
+    if (callback) callback(error);
   }
   options.client.addListener('error', clientErrorHandler);
 
   if (options.uri.auth && !options.headers.authorization) {
-    options.headers.authorization = "Basic " + base64.encode(options.uri.auth);
+    options.headers.authorization = "Basic " + toBase64(options.uri.auth);
   }
   options.fullpath = options.uri.href.replace(options.uri.protocol + '//' + options.uri.host, '');
   if (options.fullpath.length === 0) options.fullpath = '/' 
@@ -86,7 +90,7 @@ function request (options, callback) {
       }
 
       if (setHost) delete options.headers.host;
-      callback(null, response, buffer);
+      if (callback) callback(null, response, buffer);
     })
   })