faye 1.4.0 → 1.4.2

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.
Files changed (44) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/LICENSE.md +1 -1
  3. package/client/faye-browser-min.js +1 -1
  4. package/client/faye-browser-min.js.map +1 -1
  5. package/client/faye-browser.js +225 -852
  6. package/client/faye-browser.js.map +1 -1
  7. package/package.json +5 -9
  8. package/src/adapters/node_adapter.js +37 -33
  9. package/src/adapters/static_server.js +12 -11
  10. package/src/engines/connection.js +2 -3
  11. package/src/engines/memory.js +32 -27
  12. package/src/engines/proxy.js +19 -20
  13. package/src/mixins/deferrable.js +12 -8
  14. package/src/mixins/logging.js +8 -8
  15. package/src/mixins/publisher.js +2 -3
  16. package/src/mixins/timeouts.js +9 -9
  17. package/src/protocol/channel.js +11 -16
  18. package/src/protocol/client.js +24 -21
  19. package/src/protocol/dispatcher.js +14 -14
  20. package/src/protocol/error.js +5 -6
  21. package/src/protocol/extensible.js +2 -3
  22. package/src/protocol/scheduler.js +5 -6
  23. package/src/protocol/server.js +25 -27
  24. package/src/protocol/socket.js +2 -1
  25. package/src/protocol/subscription.js +5 -5
  26. package/src/transport/cors.js +13 -14
  27. package/src/transport/event_source.js +12 -12
  28. package/src/transport/jsonp.js +13 -15
  29. package/src/transport/node_http.js +27 -19
  30. package/src/transport/node_local.js +3 -5
  31. package/src/transport/transport.js +29 -23
  32. package/src/transport/web_socket.js +16 -15
  33. package/src/transport/xhr.js +10 -9
  34. package/src/util/array.js +6 -5
  35. package/src/util/browser/event.js +6 -7
  36. package/src/util/class.js +1 -3
  37. package/src/util/constants.js +1 -1
  38. package/src/util/copy_object.js +6 -2
  39. package/src/util/namespace.js +6 -6
  40. package/src/util/set.js +10 -22
  41. package/src/util/uri.js +8 -67
  42. package/src/util/validate_options.js +3 -2
  43. package/src/util/assign.js +0 -16
  44. package/src/util/promise.js +0 -172
package/src/util/uri.js CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  module.exports = {
4
4
  isURI: function(uri) {
5
- return uri && uri.protocol && uri.host && uri.path;
5
+ return uri && uri.protocol && uri.host && uri.pathname;
6
6
  },
7
7
 
8
8
  isSameOrigin: function(uri) {
@@ -11,80 +11,21 @@ module.exports = {
11
11
  uri.port === location.port;
12
12
  },
13
13
 
14
- parse: function(url) {
14
+ parse: function(url, base) {
15
15
  if (typeof url !== 'string') return url;
16
- var uri = {}, parts, query, pairs, i, n, data;
17
16
 
18
- var consume = function(name, pattern) {
19
- url = url.replace(pattern, function(match) {
20
- uri[name] = match;
21
- return '';
22
- });
23
- uri[name] = uri[name] || '';
24
- };
25
-
26
- consume('protocol', /^[a-z]+\:/i);
27
- consume('host', /^\/\/[^\/\?#]+/);
28
-
29
- if (!/^\//.test(url) && !uri.host)
30
- url = location.pathname.replace(/[^\/]*$/, '') + url;
31
-
32
- consume('pathname', /^[^\?#]*/);
33
- consume('search', /^\?[^#]*/);
34
- consume('hash', /^#.*/);
35
-
36
- uri.protocol = uri.protocol || location.protocol;
37
-
38
- if (uri.host) {
39
- uri.host = uri.host.substr(2);
40
-
41
- if (/@/.test(uri.host)) {
42
- uri.auth = uri.host.split('@')[0];
43
- uri.host = uri.host.split('@')[1];
44
- }
45
- parts = uri.host.match(/^\[([^\]]+)\]|^[^:]+/);
46
- uri.hostname = parts[1] || parts[0];
47
- uri.port = (uri.host.match(/:(\d+)$/) || [])[1] || '';
17
+ if (typeof location === 'undefined') {
18
+ return new URL(url, base);
48
19
  } else {
49
- uri.host = location.host;
50
- uri.hostname = location.hostname;
51
- uri.port = location.port;
20
+ return new URL(url, base || location.href);
52
21
  }
53
-
54
- uri.pathname = uri.pathname || '/';
55
- uri.path = uri.pathname + uri.search;
56
-
57
- query = uri.search.replace(/^\?/, '');
58
- pairs = query ? query.split('&') : [];
59
- data = {};
60
-
61
- for (i = 0, n = pairs.length; i < n; i++) {
62
- parts = pairs[i].split('=');
63
- data[decodeURIComponent(parts[0] || '')] = decodeURIComponent(parts[1] || '');
64
- }
65
-
66
- uri.query = data;
67
-
68
- uri.href = this.stringify(uri);
69
- return uri;
70
22
  },
71
23
 
72
24
  stringify: function(uri) {
73
- var auth = uri.auth ? uri.auth + '@' : '',
74
- string = uri.protocol + '//' + auth + uri.host;
75
-
76
- string += uri.pathname + this.queryString(uri.query) + (uri.hash || '');
77
-
78
- return string;
25
+ return (typeof uri === 'string') ? uri : uri.href;
79
26
  },
80
27
 
81
- queryString: function(query) {
82
- var pairs = [];
83
- for (var key in query) {
84
- if (!query.hasOwnProperty(key)) continue;
85
- pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(query[key]));
86
- }
87
- if (pairs.length === 0) return '';
88
- return '?' + pairs.join('&');
28
+ clone: function(url) {
29
+ return this.parse(url.href);
89
30
  }
90
31
  };
@@ -3,8 +3,9 @@
3
3
  var array = require('./array');
4
4
 
5
5
  module.exports = function(options, validKeys) {
6
- for (var key in options) {
7
- if (array.indexOf(validKeys, key) < 0)
6
+ for (let key of Object.keys(options)) {
7
+ if (array.indexOf(validKeys, key) < 0) {
8
8
  throw new Error('Unrecognized option: ' + key);
9
+ }
9
10
  }
10
11
  };
@@ -1,16 +0,0 @@
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
- };
@@ -1,172 +0,0 @@
1
- 'use strict';
2
-
3
- var asap = require('asap');
4
-
5
- var PENDING = -1,
6
- FULFILLED = 0,
7
- REJECTED = 1;
8
-
9
- var Promise = function(task) {
10
- this._state = PENDING;
11
- this._value = null;
12
- this._defer = [];
13
-
14
- execute(this, task);
15
- };
16
-
17
- Promise.prototype.then = function(onFulfilled, onRejected) {
18
- var promise = new Promise();
19
-
20
- var deferred = {
21
- promise: promise,
22
- onFulfilled: onFulfilled,
23
- onRejected: onRejected
24
- };
25
-
26
- if (this._state === PENDING)
27
- this._defer.push(deferred);
28
- else
29
- propagate(this, deferred);
30
-
31
- return promise;
32
- };
33
-
34
- Promise.prototype['catch'] = function(onRejected) {
35
- return this.then(null, onRejected);
36
- };
37
-
38
- var execute = function(promise, task) {
39
- if (typeof task !== 'function') return;
40
-
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
- };
50
-
51
- try {
52
- task(resolvePromise, rejectPromise);
53
- } catch (error) {
54
- rejectPromise(error);
55
- }
56
- };
57
-
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
- };
76
-
77
- var resolve = function(promise, value) {
78
- if (promise === value)
79
- return reject(promise, new TypeError('Recursive promise chain detected'));
80
-
81
- var then;
82
-
83
- try {
84
- then = getThen(value);
85
- } catch (error) {
86
- return reject(promise, error);
87
- }
88
-
89
- if (!then) return fulfill(promise, value);
90
-
91
- execute(promise, function(resolvePromise, rejectPromise) {
92
- then.call(value, resolvePromise, rejectPromise);
93
- });
94
- };
95
-
96
- var getThen = function(value) {
97
- var type = typeof value,
98
- then = (type === 'object' || type === 'function') && value && value.then;
99
-
100
- return (typeof then === 'function')
101
- ? then
102
- : null;
103
- };
104
-
105
- var fulfill = function(promise, value) {
106
- settle(promise, FULFILLED, value);
107
- };
108
-
109
- var reject = function(promise, reason) {
110
- settle(promise, REJECTED, reason);
111
- };
112
-
113
- var settle = function(promise, state, value) {
114
- var defer = promise._defer, i = 0;
115
-
116
- promise._state = state;
117
- promise._value = value;
118
- promise._defer = null;
119
-
120
- if (defer.length === 0) return;
121
- while (i < defer.length) propagate(promise, defer[i++]);
122
- };
123
-
124
- Promise.resolve = function(value) {
125
- try {
126
- if (getThen(value)) return value;
127
- } catch (error) {
128
- return Promise.reject(error);
129
- }
130
-
131
- return new Promise(function(resolve, reject) { resolve(value) });
132
- };
133
-
134
- Promise.reject = function(reason) {
135
- return new Promise(function(resolve, reject) { reject(reason) });
136
- };
137
-
138
- Promise.all = function(promises) {
139
- return new Promise(function(resolve, reject) {
140
- var list = [], n = promises.length, i;
141
-
142
- if (n === 0) return resolve(list);
143
-
144
- var push = function(promise, i) {
145
- Promise.resolve(promise).then(function(value) {
146
- list[i] = value;
147
- if (--n === 0) resolve(list);
148
- }, reject);
149
- };
150
-
151
- for (i = 0; i < n; i++) push(promises[i], i);
152
- });
153
- };
154
-
155
- Promise.race = function(promises) {
156
- return new Promise(function(resolve, reject) {
157
- for (var i = 0, n = promises.length; i < n; i++)
158
- Promise.resolve(promises[i]).then(resolve, reject);
159
- });
160
- };
161
-
162
- Promise.deferred = function() {
163
- var tuple = {};
164
-
165
- tuple.promise = new Promise(function(resolve, reject) {
166
- tuple.resolve = resolve;
167
- tuple.reject = reject;
168
- });
169
- return tuple;
170
- };
171
-
172
- module.exports = Promise;