faye 1.2.3 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,12 +3,12 @@
3
3
  var Class = require('../util/class'),
4
4
  URI = require('../util/uri'),
5
5
  copyObject = require('../util/copy_object'),
6
- extend = require('../util/extend'),
6
+ assign = require('../util/assign'),
7
7
  Deferrable = require('../mixins/deferrable'),
8
8
  Transport = require('./transport'),
9
9
  XHR = require('./xhr');
10
10
 
11
- var EventSource = extend(Class(Transport, {
11
+ var EventSource = assign(Class(Transport, {
12
12
  initialize: function(dispatcher, endpoint) {
13
13
  Transport.prototype.initialize.call(this, dispatcher, endpoint);
14
14
  if (!global.EventSource) return this.setDeferredStatus('failed');
@@ -92,6 +92,6 @@ var EventSource = extend(Class(Transport, {
92
92
  }
93
93
  });
94
94
 
95
- extend(EventSource.prototype, Deferrable);
95
+ assign(EventSource.prototype, Deferrable);
96
96
 
97
97
  module.exports = EventSource;
@@ -3,11 +3,11 @@
3
3
  var Class = require('../util/class'),
4
4
  URI = require('../util/uri'),
5
5
  copyObject = require('../util/copy_object'),
6
- extend = require('../util/extend'),
6
+ assign = require('../util/assign'),
7
7
  toJSON = require('../util/to_json'),
8
8
  Transport = require('./transport');
9
9
 
10
- var JSONP = extend(Class(Transport, {
10
+ var JSONP = assign(Class(Transport, {
11
11
  encode: function(messages) {
12
12
  var url = copyObject(this.endpoint);
13
13
  url.query.message = toJSON(messages);
@@ -46,7 +46,7 @@ var JSONP = extend(Class(Transport, {
46
46
  self._handleError(messages);
47
47
  };
48
48
 
49
- return {abort: cleanup};
49
+ return { abort: cleanup };
50
50
  }
51
51
  }), {
52
52
  _cbCount: 0,
@@ -1,16 +1,17 @@
1
1
  'use strict';
2
2
 
3
- var http = require('http'),
3
+ var Buffer = require('safe-buffer').Buffer,
4
+ http = require('http'),
4
5
  https = require('https'),
5
6
  tunnel = require('tunnel-agent');
6
7
 
7
8
  var Class = require('../util/class'),
8
9
  URI = require('../util/uri'),
9
- extend = require('../util/extend'),
10
+ assign = require('../util/assign'),
10
11
  toJSON = require('../util/to_json'),
11
12
  Transport = require('./transport');
12
13
 
13
- var NodeHttp = extend(Class(Transport, {
14
+ var NodeHttp = assign(Class(Transport, { className: 'NodeHttp',
14
15
  SECURE_PROTOCOLS: ['https:', 'wss:'],
15
16
 
16
17
  initialize: function() {
@@ -22,7 +23,7 @@ var NodeHttp = extend(Class(Transport, {
22
23
  var proxy = this._proxy;
23
24
  if (!proxy.origin) return;
24
25
 
25
- this._proxyUri = url.parse(proxy.origin);
26
+ this._proxyUri = URI.parse(proxy.origin);
26
27
  this._proxySecure = (this.SECURE_PROTOCOLS.indexOf(this._proxyUri.protocol) >= 0);
27
28
 
28
29
  if (!this._endpointSecure) {
@@ -30,17 +31,17 @@ var NodeHttp = extend(Class(Transport, {
30
31
  return;
31
32
  }
32
33
 
33
- var options = extend({
34
+ var options = assign({
34
35
  proxy: {
35
36
  host: this._proxyUri.hostname,
36
37
  port: this._proxyUri.port || this.DEFAULT_PORTS[this._proxyUri.protocol],
37
38
  proxyAuth: this._proxyUri.auth,
38
- headers: extend({host: this.endpoint.host}, proxy.headers)
39
+ headers: assign({ host: this.endpoint.host }, proxy.headers)
39
40
  }
40
41
  }, this._dispatcher.tls);
41
42
 
42
43
  if (this._proxySecure) {
43
- extend(options.proxy, proxy.tls);
44
+ assign(options.proxy, proxy.tls);
44
45
  this._tunnel = tunnel.httpsOverHttps(options);
45
46
  } else {
46
47
  this._tunnel = tunnel.httpsOverHttp(options);
@@ -52,7 +53,7 @@ var NodeHttp = extend(Class(Transport, {
52
53
  },
53
54
 
54
55
  request: function(messages) {
55
- var content = new Buffer(this.encode(messages), 'utf8'),
56
+ var content = Buffer.from(this.encode(messages), 'utf8'),
56
57
  params = this._buildParams(content),
57
58
  request = this._httpClient.request(params),
58
59
  self = this;
@@ -63,6 +64,7 @@ var NodeHttp = extend(Class(Transport, {
63
64
  });
64
65
 
65
66
  request.on('error', function(error) {
67
+ self.error('HTTP error: ' + error.message);
66
68
  self._handleError(messages);
67
69
  });
68
70
 
@@ -75,16 +77,21 @@ var NodeHttp = extend(Class(Transport, {
75
77
  proxy = this._proxyUri,
76
78
  target = this._tunnel ? uri : (proxy || uri);
77
79
 
80
+ var headers = {
81
+ 'Content-Length': content.length,
82
+ 'Content-Type': 'application/json',
83
+ 'Host': uri.host
84
+ };
85
+
86
+ if (uri.auth)
87
+ headers['Authorization'] = 'Basic ' + Buffer.from(uri.auth, 'utf8').toString('base64');
88
+
78
89
  var params = {
79
90
  method: 'POST',
80
91
  host: target.hostname,
81
92
  port: target.port || this.DEFAULT_PORTS[target.protocol],
82
93
  path: uri.path,
83
- headers: extend({
84
- 'Content-Length': content.length,
85
- 'Content-Type': 'application/json',
86
- 'Host': uri.host
87
- }, this._dispatcher.headers)
94
+ headers: assign(headers, this._dispatcher.headers)
88
95
  };
89
96
 
90
97
  var cookie = this._getCookies();
@@ -93,12 +100,12 @@ var NodeHttp = extend(Class(Transport, {
93
100
  if (this._tunnel) {
94
101
  params.agent = this._tunnel;
95
102
  } else if (this._endpointSecure) {
96
- extend(params, this._dispatcher.tls);
103
+ assign(params, this._dispatcher.tls);
97
104
  } else if (proxy) {
98
105
  params.path = this.endpoint.href;
99
- extend(params, this._proxy.tls);
106
+ assign(params, this._proxy.tls);
100
107
  if (proxy.auth)
101
- params.headers['Proxy-Authorization'] = new Buffer(proxy.auth, 'utf8').toString('base64');
108
+ params.headers['Proxy-Authorization'] = Buffer.from(proxy.auth, 'utf8').toString('base64');
102
109
  }
103
110
 
104
111
  return params;
@@ -4,11 +4,11 @@ var asap = require('asap'),
4
4
  Class = require('../util/class'),
5
5
  URI = require('../util/uri'),
6
6
  copyObject = require('../util/copy_object'),
7
- extend = require('../util/extend'),
7
+ assign = require('../util/assign'),
8
8
  Server = require('../protocol/server'),
9
9
  Transport = require('./transport');
10
10
 
11
- var NodeLocal = extend(Class(Transport, {
11
+ var NodeLocal = assign(Class(Transport, {
12
12
  batching: false,
13
13
 
14
14
  request: function(messages) {
@@ -3,15 +3,14 @@
3
3
  var Class = require('../util/class'),
4
4
  Cookie = require('../util/cookies').Cookie,
5
5
  Promise = require('../util/promise'),
6
- URI = require('../util/uri'),
7
6
  array = require('../util/array'),
8
- extend = require('../util/extend'),
7
+ assign = require('../util/assign'),
9
8
  Logging = require('../mixins/logging'),
10
9
  Timeouts = require('../mixins/timeouts'),
11
10
  Channel = require('../protocol/channel');
12
11
 
13
- var Transport = extend(Class({ className: 'Transport',
14
- DEFAULT_PORTS: {'http:': 80, 'https:': 443, 'ws:': 80, 'wss:': 443},
12
+ var Transport = assign(Class({ className: 'Transport',
13
+ DEFAULT_PORTS: { 'http:': 80, 'https:': 443, 'ws:': 80, 'wss:': 443 },
15
14
  MAX_DELAY: 0,
16
15
 
17
16
  batching: true,
@@ -20,7 +19,7 @@ var Transport = extend(Class({ className: 'Transport',
20
19
  this._dispatcher = dispatcher;
21
20
  this.endpoint = endpoint;
22
21
  this._outbox = [];
23
- this._proxy = extend({}, this._dispatcher.proxy);
22
+ this._proxy = assign({}, this._dispatcher.proxy);
24
23
 
25
24
  if (!this._proxy.origin)
26
25
  this._proxy.origin = this._findProxy();
@@ -34,7 +33,7 @@ var Transport = extend(Class({ className: 'Transport',
34
33
 
35
34
  sendMessage: function(message) {
36
35
  this.debug('Client ? sending message to ?: ?',
37
- this._dispatcher.clientId, URI.stringify(this.endpoint), message);
36
+ this._dispatcher.clientId, this.endpoint.href, message);
38
37
 
39
38
  if (!this.batching) return Promise.resolve(this.request([message]));
40
39
 
@@ -73,7 +72,7 @@ var Transport = extend(Class({ className: 'Transport',
73
72
  this.removeTimeout('publish');
74
73
 
75
74
  if (this._outbox.length > 1 && this._connectMessage)
76
- this._connectMessage.advice = {timeout: 0};
75
+ this._connectMessage.advice = { timeout: 0 };
77
76
 
78
77
  this._resolvePromise(this.request(this._outbox));
79
78
 
@@ -97,7 +96,7 @@ var Transport = extend(Class({ className: 'Transport',
97
96
  replies = [].concat(replies);
98
97
 
99
98
  this.debug('Client ? received from ? via ?: ?',
100
- this._dispatcher.clientId, URI.stringify(this.endpoint), this.connectionType, replies);
99
+ this._dispatcher.clientId, this.endpoint.href, this.connectionType, replies);
101
100
 
102
101
  for (var i = 0, n = replies.length; i < n; i++)
103
102
  this._dispatcher.handleResponse(replies[i]);
@@ -107,7 +106,7 @@ var Transport = extend(Class({ className: 'Transport',
107
106
  messages = [].concat(messages);
108
107
 
109
108
  this.debug('Client ? failed to send to ? via ?: ?',
110
- this._dispatcher.clientId, URI.stringify(this.endpoint), this.connectionType, messages);
109
+ this._dispatcher.clientId, this.endpoint.href, this.connectionType, messages);
111
110
 
112
111
  for (var i = 0, n = messages.length; i < n; i++)
113
112
  this._dispatcher.handleError(messages[i]);
@@ -115,7 +114,7 @@ var Transport = extend(Class({ className: 'Transport',
115
114
 
116
115
  _getCookies: function() {
117
116
  var cookies = this._dispatcher.cookies,
118
- url = URI.stringify(this.endpoint);
117
+ url = this.endpoint.href;
119
118
 
120
119
  if (!cookies) return '';
121
120
 
@@ -126,7 +125,7 @@ var Transport = extend(Class({ className: 'Transport',
126
125
 
127
126
  _storeCookies: function(setCookie) {
128
127
  var cookies = this._dispatcher.cookies,
129
- url = URI.stringify(this.endpoint),
128
+ url = this.endpoint.href,
130
129
  cookie;
131
130
 
132
131
  if (!setCookie || !cookies) return;
@@ -189,7 +188,7 @@ var Transport = extend(Class({ className: 'Transport',
189
188
  callback.call(context, transport);
190
189
  });
191
190
  }, function() {
192
- throw new Error('Could not find a usable connection type for ' + URI.stringify(endpoint));
191
+ throw new Error('Could not find a usable connection type for ' + endpoint.href);
193
192
  });
194
193
  },
195
194
 
@@ -202,10 +201,17 @@ var Transport = extend(Class({ className: 'Transport',
202
201
  return array.map(this._transports, function(t) { return t[0] });
203
202
  },
204
203
 
204
+ disable: function(feature) {
205
+ if (feature !== 'autodisconnect') return;
206
+
207
+ for (var i = 0; i < this._transports.length; i++)
208
+ this._transports[i][1]._unloaded = false;
209
+ },
210
+
205
211
  _transports: []
206
212
  });
207
213
 
208
- extend(Transport.prototype, Logging);
209
- extend(Transport.prototype, Timeouts);
214
+ assign(Transport.prototype, Logging);
215
+ assign(Transport.prototype, Timeouts);
210
216
 
211
217
  module.exports = Transport;
@@ -6,13 +6,13 @@ var Class = require('../util/class'),
6
6
  URI = require('../util/uri'),
7
7
  browser = require('../util/browser'),
8
8
  copyObject = require('../util/copy_object'),
9
- extend = require('../util/extend'),
9
+ assign = require('../util/assign'),
10
10
  toJSON = require('../util/to_json'),
11
11
  ws = require('../util/websocket'),
12
12
  Deferrable = require('../mixins/deferrable'),
13
13
  Transport = require('./transport');
14
14
 
15
- var WebSocket = extend(Class(Transport, {
15
+ var WebSocket = assign(Class(Transport, {
16
16
  UNCONNECTED: 1,
17
17
  CONNECTING: 2,
18
18
  CONNECTED: 3,
@@ -63,7 +63,6 @@ var WebSocket = extend(Class(Transport, {
63
63
  self._socket = socket;
64
64
  self._state = self.CONNECTED;
65
65
  self._everConnected = true;
66
- self._ping();
67
66
  self.setDeferredStatus('succeeded', socket);
68
67
  };
69
68
 
@@ -77,7 +76,6 @@ var WebSocket = extend(Class(Transport, {
77
76
 
78
77
  delete self._socket;
79
78
  self._state = self.UNCONNECTED;
80
- self.removeTimeout('ping');
81
79
 
82
80
  var pending = self._pending ? self._pending.toArray() : [];
83
81
  delete self._pending;
@@ -117,17 +115,15 @@ var WebSocket = extend(Class(Transport, {
117
115
  extensions = this._dispatcher.wsExtensions,
118
116
  cookie = this._getCookies(),
119
117
  tls = this._dispatcher.tls,
120
- options = {extensions: extensions, headers: headers, proxy: this._proxy, tls: tls};
118
+ options = { extensions: extensions, headers: headers, proxy: this._proxy, tls: tls };
121
119
 
122
120
  if (cookie !== '') options.headers['Cookie'] = cookie;
123
121
 
124
- return ws.create(url, [], options);
125
- },
126
-
127
- _ping: function() {
128
- if (!this._socket || this._socket.readyState !== 1) return;
129
- this._socket.send('[]');
130
- this.addTimeout('ping', this._dispatcher.timeout / 2, this._ping, this);
122
+ try {
123
+ return ws.create(url, [], options);
124
+ } catch (e) {
125
+ // catch CSP error to allow transport to fallback to next connType
126
+ }
131
127
  }
132
128
 
133
129
  }), {
@@ -153,9 +149,13 @@ var WebSocket = extend(Class(Transport, {
153
149
  }
154
150
  });
155
151
 
156
- extend(WebSocket.prototype, Deferrable);
152
+ assign(WebSocket.prototype, Deferrable);
157
153
 
158
- if (browser.Event && global.onbeforeunload !== undefined)
159
- browser.Event.on(global, 'beforeunload', function() { WebSocket._unloaded = true });
154
+ if (browser.Event && global.onbeforeunload !== undefined) {
155
+ browser.Event.on(global, 'beforeunload', function() {
156
+ if (WebSocket._unloaded === undefined)
157
+ WebSocket._unloaded = true;
158
+ });
159
+ }
160
160
 
161
161
  module.exports = WebSocket;
@@ -3,11 +3,11 @@
3
3
  var Class = require('../util/class'),
4
4
  URI = require('../util/uri'),
5
5
  browser = require('../util/browser'),
6
- extend = require('../util/extend'),
6
+ assign = require('../util/assign'),
7
7
  toJSON = require('../util/to_json'),
8
8
  Transport = require('./transport');
9
9
 
10
- var XHR = extend(Class(Transport, {
10
+ var XHR = assign(Class(Transport, {
11
11
  encode: function(messages) {
12
12
  return toJSON(messages);
13
13
  },
@@ -0,0 +1,16 @@
1
+ 'use strict';
2
+
3
+ var forEach = Array.prototype.forEach,
4
+ hasOwn = Object.prototype.hasOwnProperty;
5
+
6
+ module.exports = function(target) {
7
+ forEach.call(arguments, function(source, i) {
8
+ if (i === 0) return;
9
+
10
+ for (var key in source) {
11
+ if (hasOwn.call(source, key)) target[key] = source[key];
12
+ }
13
+ });
14
+
15
+ return target;
16
+ };
package/src/util/class.js CHANGED
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var extend = require('./extend');
3
+ var assign = require('./assign');
4
4
 
5
5
  module.exports = function(parent, methods) {
6
6
  if (typeof parent !== 'function') {
@@ -17,7 +17,7 @@ module.exports = function(parent, methods) {
17
17
  bridge.prototype = parent.prototype;
18
18
 
19
19
  klass.prototype = new bridge();
20
- extend(klass.prototype, methods);
20
+ assign(klass.prototype, methods);
21
21
 
22
22
  return klass;
23
23
  };
@@ -1,5 +1,5 @@
1
1
  module.exports = {
2
- VERSION: '1.2.3',
2
+ VERSION: '1.4.0',
3
3
 
4
4
  BAYEUX_VERSION: '1.0',
5
5
  ID_LENGTH: 160,
@@ -2,123 +2,132 @@
2
2
 
3
3
  var asap = require('asap');
4
4
 
5
- var PENDING = 0,
6
- FULFILLED = 1,
7
- REJECTED = 2;
8
-
9
- var RETURN = function(x) { return x },
10
- THROW = function(x) { throw x };
5
+ var PENDING = -1,
6
+ FULFILLED = 0,
7
+ REJECTED = 1;
11
8
 
12
9
  var Promise = function(task) {
13
- this._state = PENDING;
14
- this._onFulfilled = [];
15
- this._onRejected = [];
16
-
17
- if (typeof task !== 'function') return;
18
- var self = this;
10
+ this._state = PENDING;
11
+ this._value = null;
12
+ this._defer = [];
19
13
 
20
- task(function(value) { resolve(self, value) },
21
- function(reason) { reject(self, reason) });
14
+ execute(this, task);
22
15
  };
23
16
 
24
17
  Promise.prototype.then = function(onFulfilled, onRejected) {
25
- var next = new Promise();
26
- registerOnFulfilled(this, onFulfilled, next);
27
- registerOnRejected(this, onRejected, next);
28
- return next;
29
- };
18
+ var promise = new Promise();
30
19
 
31
- Promise.prototype.catch = function(onRejected) {
32
- return this.then(null, onRejected);
33
- };
20
+ var deferred = {
21
+ promise: promise,
22
+ onFulfilled: onFulfilled,
23
+ onRejected: onRejected
24
+ };
34
25
 
35
- var registerOnFulfilled = function(promise, onFulfilled, next) {
36
- if (typeof onFulfilled !== 'function') onFulfilled = RETURN;
37
- var handler = function(value) { invoke(onFulfilled, value, next) };
26
+ if (this._state === PENDING)
27
+ this._defer.push(deferred);
28
+ else
29
+ propagate(this, deferred);
38
30
 
39
- if (promise._state === PENDING) {
40
- promise._onFulfilled.push(handler);
41
- } else if (promise._state === FULFILLED) {
42
- handler(promise._value);
43
- }
31
+ return promise;
44
32
  };
45
33
 
46
- var registerOnRejected = function(promise, onRejected, next) {
47
- if (typeof onRejected !== 'function') onRejected = THROW;
48
- var handler = function(reason) { invoke(onRejected, reason, next) };
49
-
50
- if (promise._state === PENDING) {
51
- promise._onRejected.push(handler);
52
- } else if (promise._state === REJECTED) {
53
- handler(promise._reason);
54
- }
34
+ Promise.prototype['catch'] = function(onRejected) {
35
+ return this.then(null, onRejected);
55
36
  };
56
37
 
57
- var invoke = function(fn, value, next) {
58
- asap(function() { _invoke(fn, value, next) });
59
- };
38
+ var execute = function(promise, task) {
39
+ if (typeof task !== 'function') return;
60
40
 
61
- var _invoke = function(fn, value, next) {
62
- var outcome;
41
+ var calls = 0;
42
+
43
+ var resolvePromise = function(value) {
44
+ if (calls++ === 0) resolve(promise, value);
45
+ };
46
+
47
+ var rejectPromise = function(reason) {
48
+ if (calls++ === 0) reject(promise, reason);
49
+ };
63
50
 
64
51
  try {
65
- outcome = fn(value);
52
+ task(resolvePromise, rejectPromise);
66
53
  } catch (error) {
67
- return reject(next, error);
54
+ rejectPromise(error);
68
55
  }
56
+ };
69
57
 
70
- if (outcome === next) {
71
- reject(next, new TypeError('Recursive promise chain detected'));
72
- } else {
73
- resolve(next, outcome);
74
- }
58
+ var propagate = function(promise, deferred) {
59
+ var state = promise._state,
60
+ value = promise._value,
61
+ next = deferred.promise,
62
+ handler = [deferred.onFulfilled, deferred.onRejected][state],
63
+ pass = [resolve, reject][state];
64
+
65
+ if (typeof handler !== 'function')
66
+ return pass(next, value);
67
+
68
+ asap(function() {
69
+ try {
70
+ resolve(next, handler(value));
71
+ } catch (error) {
72
+ reject(next, error);
73
+ }
74
+ });
75
75
  };
76
76
 
77
77
  var resolve = function(promise, value) {
78
- var called = false, type, then;
78
+ if (promise === value)
79
+ return reject(promise, new TypeError('Recursive promise chain detected'));
80
+
81
+ var then;
79
82
 
80
83
  try {
81
- type = typeof value;
82
- then = value !== null && (type === 'function' || type === 'object') && value.then;
83
-
84
- if (typeof then !== 'function') return fulfill(promise, value);
85
-
86
- then.call(value, function(v) {
87
- if (!(called ^ (called = true))) return;
88
- resolve(promise, v);
89
- }, function(r) {
90
- if (!(called ^ (called = true))) return;
91
- reject(promise, r);
92
- });
84
+ then = getThen(value);
93
85
  } catch (error) {
94
- if (!(called ^ (called = true))) return;
95
- reject(promise, error);
86
+ return reject(promise, error);
96
87
  }
88
+
89
+ if (!then) return fulfill(promise, value);
90
+
91
+ execute(promise, function(resolvePromise, rejectPromise) {
92
+ then.call(value, resolvePromise, rejectPromise);
93
+ });
97
94
  };
98
95
 
99
- var fulfill = function(promise, value) {
100
- if (promise._state !== PENDING) return;
96
+ var getThen = function(value) {
97
+ var type = typeof value,
98
+ then = (type === 'object' || type === 'function') && value && value.then;
101
99
 
102
- promise._state = FULFILLED;
103
- promise._value = value;
104
- promise._onRejected = [];
100
+ return (typeof then === 'function')
101
+ ? then
102
+ : null;
103
+ };
105
104
 
106
- var onFulfilled = promise._onFulfilled, fn;
107
- while (fn = onFulfilled.shift()) fn(value);
105
+ var fulfill = function(promise, value) {
106
+ settle(promise, FULFILLED, value);
108
107
  };
109
108
 
110
109
  var reject = function(promise, reason) {
111
- if (promise._state !== PENDING) return;
110
+ settle(promise, REJECTED, reason);
111
+ };
112
+
113
+ var settle = function(promise, state, value) {
114
+ var defer = promise._defer, i = 0;
112
115
 
113
- promise._state = REJECTED;
114
- promise._reason = reason;
115
- promise._onFulfilled = [];
116
+ promise._state = state;
117
+ promise._value = value;
118
+ promise._defer = null;
116
119
 
117
- var onRejected = promise._onRejected, fn;
118
- while (fn = onRejected.shift()) fn(reason);
120
+ if (defer.length === 0) return;
121
+ while (i < defer.length) propagate(promise, defer[i++]);
119
122
  };
120
123
 
121
124
  Promise.resolve = function(value) {
125
+ try {
126
+ if (getThen(value)) return value;
127
+ } catch (error) {
128
+ return Promise.reject(error);
129
+ }
130
+
122
131
  return new Promise(function(resolve, reject) { resolve(value) });
123
132
  };
124
133
 
@@ -132,12 +141,14 @@ Promise.all = function(promises) {
132
141
 
133
142
  if (n === 0) return resolve(list);
134
143
 
135
- for (i = 0; i < n; i++) (function(promise, i) {
144
+ var push = function(promise, i) {
136
145
  Promise.resolve(promise).then(function(value) {
137
146
  list[i] = value;
138
147
  if (--n === 0) resolve(list);
139
148
  }, reject);
140
- })(promises[i], i);
149
+ };
150
+
151
+ for (i = 0; i < n; i++) push(promises[i], i);
141
152
  });
142
153
  };
143
154
 
@@ -148,7 +159,7 @@ Promise.race = function(promises) {
148
159
  });
149
160
  };
150
161
 
151
- Promise.deferred = Promise.pending = function() {
162
+ Promise.deferred = function() {
152
163
  var tuple = {};
153
164
 
154
165
  tuple.promise = new Promise(function(resolve, reject) {