summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/node.js6
-rw-r--r--test/mjsunit/test-http-server.js6
-rw-r--r--test/mjsunit/test-reconnecting-socket.js7
-rw-r--r--test/mjsunit/test-tcp-pingpong.js6
-rw-r--r--website/api.txt9
5 files changed, 17 insertions, 17 deletions
diff --git a/src/node.js b/src/node.js
index a4faaf0a9..6b2aaec44 100644
--- a/src/node.js
+++ b/src/node.js
@@ -11,6 +11,12 @@ node.createProcess = function (command) {
return process;
};
+node.tcp.createConnection = function (port, host) {
+ var connection = new node.tcp.Connection();
+ connection.connect(port, host);
+ return connection;
+};
+
// Timers
function setTimeout (callback, after) {
diff --git a/test/mjsunit/test-http-server.js b/test/mjsunit/test-http-server.js
index 6450727d8..fa726e29a 100644
--- a/test/mjsunit/test-http-server.js
+++ b/test/mjsunit/test-http-server.js
@@ -33,8 +33,10 @@ function onLoad() {
}).listen(port);
- var c = new node.tcp.Connection();
+ var c = node.tcp.createConnection(port);
+
c.setEncoding("utf8");
+
c.addListener("connect", function () {
c.send( "GET /hello HTTP/1.1\r\n\r\n" );
requests_sent += 1;
@@ -58,8 +60,6 @@ function onLoad() {
c.addListener("disconnect", function () {
assertEquals(c.readyState, "closed");
});
-
- c.connect(port);
}
function onExit () {
diff --git a/test/mjsunit/test-reconnecting-socket.js b/test/mjsunit/test-reconnecting-socket.js
index 39bb9d8e9..dcdf4363d 100644
--- a/test/mjsunit/test-reconnecting-socket.js
+++ b/test/mjsunit/test-reconnecting-socket.js
@@ -22,10 +22,13 @@ function onLoad () {
});
});
server.listen(port);
- var client = new node.tcp.Connection();
+
+ var client = node.tcp.createConnection(port);
client.setEncoding("UTF8");
+
client.addListener("connect", function () {
+ puts("client connected.");
});
client.addListener("receive", function (chunk) {
@@ -41,8 +44,6 @@ function onLoad () {
else
server.close();
});
-
- client.connect(port);
}
function onExit () {
diff --git a/test/mjsunit/test-tcp-pingpong.js b/test/mjsunit/test-tcp-pingpong.js
index d97d5b737..eea45c276 100644
--- a/test/mjsunit/test-tcp-pingpong.js
+++ b/test/mjsunit/test-tcp-pingpong.js
@@ -40,8 +40,7 @@ function pingPongTest (port, host, on_complete) {
});
server.listen(port, host);
- var client = new node.tcp.Connection();
- assertEquals("closed", client.readyState);
+ var client = node.tcp.createConnection(port, host);
client.setEncoding("utf8");
@@ -76,9 +75,6 @@ function pingPongTest (port, host, on_complete) {
if (on_complete) on_complete();
tests_run += 1;
});
-
- assertEquals("closed", client.readyState);
- client.connect(port, host);
}
function onLoad () {
diff --git a/website/api.txt b/website/api.txt
index 19c1c2100..c0add0980 100644
--- a/website/api.txt
+++ b/website/api.txt
@@ -952,12 +952,9 @@ socket for +node.tcp.Server+.
(TODO: access error codes.)
|=========================================================
-+new node.tcp.Connection()+::
- Creates a new connection object.
-
-
-+connection.connect(port, host="127.0.0.1")+::
- Opens a connection to the specified +port+ and
++node.tcp.createConnection(port, host="127.0.0.1")+::
+ Creates a new connection object and
+ opens a connection to the specified +port+ and
+host+. If the second parameter is omitted, localhost is
assumed.