Skip to content

Adding Core support for Promises #5020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chrisdickinson wants to merge 33 commits into from
Closed

Adding Core support for Promises #5020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c1613c0
internal: add {callback,promis}ify.js
chrisdickinson Feb 1, 2016
a8efd4f
zlib: promisify
chrisdickinson Feb 1, 2016
4af7ec2
repl: promisify
chrisdickinson Feb 1, 2016
0e0a2d9
readline: promisify .question + callbackify completer
chrisdickinson Feb 1, 2016
8798a26
build: add callbackify and promisify to node.gyp
chrisdickinson Feb 1, 2016
355205b
net: promisify socket.setTimeout; add connectAsync
chrisdickinson Feb 1, 2016
7b8e57d
internal: fixup promisify
chrisdickinson Feb 1, 2016
3f2b0d8
http,https: add {request,get}Async
chrisdickinson Feb 1, 2016
23ba073
fs: no callback -> return promise
chrisdickinson Feb 1, 2016
68837b8
dns: promisify
chrisdickinson Feb 1, 2016
3317652
dgram: promisify .{bind,close,send}
chrisdickinson Feb 1, 2016
846bd49
doc,dgram: add promise notes to dgram docs
chrisdickinson Feb 1, 2016
d90b42c
internal: add hooks for specifying different promise resolver
chrisdickinson Feb 1, 2016
adbe352
crypto: promisify pbkdf2, add randomBytesAsync
chrisdickinson Feb 1, 2016
697ce01
child_process,cluster: promisify .send(), add exec{File,}Async
chrisdickinson Feb 1, 2016
f36b62d
add process.setPromiseImplementation
chrisdickinson Feb 1, 2016
082fa08
process: add setPromiseImplementation API
chrisdickinson Feb 1, 2016
54e3001
tls,net: connectAsync should resolve to Socket
chrisdickinson Feb 1, 2016
014fb3e
lib: repromisify
chrisdickinson Feb 2, 2016
15a42c1
repromisify
chrisdickinson Feb 2, 2016
8586b10
src,lib: move back to native promises
chrisdickinson Feb 2, 2016
40ca55e
domain,promise,src: add shim to make promises work with async_wrap + …
chrisdickinson Feb 2, 2016
3928beb
domain: promises capture process.domain at .then time
chrisdickinson Feb 2, 2016
fa725b3
src: back asyncwrap integration out of this pr
chrisdickinson Feb 2, 2016
0528d74
internal: lint
chrisdickinson Feb 3, 2016
010224a
http{,s}: getAsync only listens for error once
chrisdickinson Feb 5, 2016
6ae09c5
http{s,}: nix {request,get}Async
chrisdickinson Feb 10, 2016
670a9c2
rework promisifier
chrisdickinson Feb 10, 2016
240c72d
src: add flag
chrisdickinson Feb 10, 2016
565dfe2
fix handler
chrisdickinson Feb 11, 2016
3384ab0
introduce .promised
chrisdickinson Feb 11, 2016
4e38057
bugfix: use outer arguments
chrisdickinson Feb 11, 2016
8c97549
wip: add recovery object
chrisdickinson Feb 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
dgram: promisify .{bind,close,send}
  • Loading branch information
@chrisdickinson
chrisdickinson committed Feb 1, 2016
commit 3317652505017eca3346500e57c4804a528f536e
17 changes: 9 additions & 8 deletions lib/dgram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

const assert = require('assert');
const promisify = require('internal/promisify');
const Buffer = require('buffer').Buffer;
const util = require('util');
const EventEmitter = require('events');
Expand Down Expand Up @@ -134,7 +135,7 @@ function replaceHandle(self, newHandle) {
self._handle = newHandle;
}

Socket.prototype.bind = function(port_ /*, address, callback*/) {
Socket.prototype.bind = promisify(function(port_ /*, address, callback*/) {
Copy link
Copy Markdown
Member

@jasnell jasnell Feb 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quick clarification question: bind is one of those methods that can throw in some cases, even with a callback. that is, If binding fails, an 'error' event is generated. In rare case (e.g. attempting to bind with a closed socket), an Error may be thrown. ... How is that handled with this approach? Is the Error still thrown or is it encapsulated into the Promise logic if the callback is not provided? Since the callback is already optional, existing code that does not currently pass a callback and is not paying attention to the return value could end up losing important errors if the throws get wrapped into the Promise.

Copy link
Copy Markdown
Member

@jasnell jasnell Feb 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, also noted that these API changes aren't reflected in the docs :-)

Copy link
Copy Markdown
Contributor Author

@chrisdickinson chrisdickinson Feb 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jasnell Yep, I tried to get everything but missed some bits — I am tracking that over here.

var self = this;
let port = port_;

Expand Down Expand Up @@ -223,11 +224,11 @@ Socket.prototype.bind = function(port_ /*, address, callback*/) {
});

return self;
};
});


// thin wrapper around `send`, here for compatibility with dgram_legacy.js
Socket.prototype.sendto = function(buffer,
Socket.prototype.sendto = promisify(function(buffer,
offset,
length,
port,
Expand All @@ -240,7 +241,7 @@ Socket.prototype.sendto = function(buffer,
throw new Error(this.type + ' sockets must send to port, address');

this.send(buffer, offset, length, port, address, callback);
};
});


function sliceBuffer(buffer, offset, length) {
Expand Down Expand Up @@ -286,7 +287,7 @@ function enqueue(self, toEnqueue) {
}


Socket.prototype.send = function(buffer,
Socket.prototype.send = promisify(function(buffer,
offset,
length,
port,
Expand Down Expand Up @@ -339,7 +340,7 @@ Socket.prototype.send = function(buffer,
self._handle.lookup(address, function afterDns(ex, ip) {
doSend(ex, self, ip, buffer, address, port, callback);
});
};
});


function doSend(ex, self, ip, buffer, address, port, callback) {
Expand Down Expand Up @@ -384,7 +385,7 @@ function afterSend(err, sent) {
}


Socket.prototype.close = function(callback) {
Socket.prototype.close = promisify(function(callback) {
if (typeof callback === 'function')
this.on('close', callback);
this._healthCheck();
Expand All @@ -395,7 +396,7 @@ Socket.prototype.close = function(callback) {
process.nextTick(socketCloseNT, self);

return this;
};
});


function socketCloseNT(self) {
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-dgram-bind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ socket.on('listening', function() {
socket.close();
});

var result = socket.bind(); // should not throw

var result = socket.bind(() => {}); // should not throw
assert.strictEqual(result, socket); // should have returned itself