faye 1.4.1 → 1.4.3
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.
- package/CHANGELOG.md +14 -0
- package/LICENSE.md +1 -1
- package/client/faye-browser-min.js +1 -1
- package/client/faye-browser-min.js.map +1 -1
- package/client/faye-browser.js +228 -851
- package/client/faye-browser.js.map +1 -1
- package/package.json +3 -7
- package/src/adapters/node_adapter.js +37 -33
- package/src/adapters/static_server.js +12 -11
- package/src/engines/connection.js +2 -3
- package/src/engines/memory.js +32 -27
- package/src/engines/proxy.js +19 -20
- package/src/mixins/deferrable.js +16 -12
- package/src/mixins/logging.js +8 -8
- package/src/mixins/publisher.js +2 -3
- package/src/mixins/timeouts.js +9 -9
- package/src/protocol/channel.js +11 -16
- package/src/protocol/client.js +24 -21
- package/src/protocol/dispatcher.js +14 -14
- package/src/protocol/error.js +5 -6
- package/src/protocol/extensible.js +2 -3
- package/src/protocol/scheduler.js +5 -6
- package/src/protocol/server.js +25 -27
- package/src/protocol/socket.js +2 -1
- package/src/protocol/subscription.js +5 -5
- package/src/transport/cors.js +13 -14
- package/src/transport/event_source.js +12 -12
- package/src/transport/jsonp.js +13 -15
- package/src/transport/node_http.js +27 -19
- package/src/transport/node_local.js +3 -5
- package/src/transport/transport.js +29 -23
- package/src/transport/web_socket.js +16 -15
- package/src/transport/xhr.js +10 -9
- package/src/util/array.js +6 -5
- package/src/util/browser/event.js +6 -4
- package/src/util/class.js +1 -3
- package/src/util/constants.js +1 -1
- package/src/util/copy_object.js +6 -2
- package/src/util/namespace.js +6 -6
- package/src/util/set.js +10 -22
- package/src/util/uri.js +8 -67
- package/src/util/validate_options.js +3 -2
- package/src/util/assign.js +0 -16
- package/src/util/promise.js +0 -172
package/src/util/set.js
CHANGED
|
@@ -4,47 +4,35 @@ var Class = require('./class');
|
|
|
4
4
|
|
|
5
5
|
module.exports = Class({
|
|
6
6
|
initialize: function() {
|
|
7
|
-
this._index =
|
|
7
|
+
this._index = new Map();
|
|
8
8
|
},
|
|
9
9
|
|
|
10
10
|
add: function(item) {
|
|
11
11
|
var key = (item.id !== undefined) ? item.id : item;
|
|
12
|
-
if (this._index.
|
|
13
|
-
this._index
|
|
12
|
+
if (this._index.has(key)) return false;
|
|
13
|
+
this._index.set(key, item);
|
|
14
14
|
return true;
|
|
15
15
|
},
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (this._index.hasOwnProperty(key))
|
|
20
|
-
block.call(context, this._index[key]);
|
|
21
|
-
}
|
|
17
|
+
[Symbol.iterator]: function() {
|
|
18
|
+
return this._index.values();
|
|
22
19
|
},
|
|
23
20
|
|
|
24
21
|
isEmpty: function() {
|
|
25
|
-
|
|
26
|
-
if (this._index.hasOwnProperty(key)) return false;
|
|
27
|
-
}
|
|
28
|
-
return true;
|
|
22
|
+
return this._index.size === 0;
|
|
29
23
|
},
|
|
30
24
|
|
|
31
25
|
member: function(item) {
|
|
32
|
-
for (
|
|
33
|
-
if (
|
|
26
|
+
for (let value of this._index.values()) {
|
|
27
|
+
if (value === item) return true;
|
|
34
28
|
}
|
|
35
29
|
return false;
|
|
36
30
|
},
|
|
37
31
|
|
|
38
32
|
remove: function(item) {
|
|
39
33
|
var key = (item.id !== undefined) ? item.id : item;
|
|
40
|
-
var removed = this._index
|
|
41
|
-
|
|
34
|
+
var removed = this._index.get(key);
|
|
35
|
+
this._index.delete(key);
|
|
42
36
|
return removed;
|
|
43
|
-
},
|
|
44
|
-
|
|
45
|
-
toArray: function() {
|
|
46
|
-
var array = [];
|
|
47
|
-
this.forEach(function(item) { array.push(item) });
|
|
48
|
-
return array;
|
|
49
37
|
}
|
|
50
38
|
});
|
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.
|
|
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
|
-
|
|
19
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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
|
-
|
|
82
|
-
|
|
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 (
|
|
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
|
};
|
package/src/util/assign.js
DELETED
|
@@ -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
|
-
};
|
package/src/util/promise.js
DELETED
|
@@ -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;
|