@@ -1052,7 +1052,7 @@ window.Pusher = __webpack_require__(36);
1052
1052
1053
1053
window.Echo = new __WEBPACK_IMPORTED_MODULE_0_laravel_echo___default.a({
1054
1054
broadcaster: 'pusher',
1055
- key: '24828cfb3418ebc5ed17 ',
1055
+ key: '51aaa8133b2080a29f6d ',
1056
1056
cluster: 'mt1',
1057
1057
encrypted: true
1058
1058
});
@@ -31921,7 +31921,7 @@ var Connector = function () {
31921
31921
key: 'csrfToken',
31922
31922
value: function csrfToken() {
31923
31923
var selector = void 0;
31924
- if (window && window['Laravel'] && window['Laravel'].csrfToken) {
31924
+ if (typeof window !== 'undefined' && window['Laravel'] && window['Laravel'].csrfToken) {
31925
31925
return window['Laravel'].csrfToken;
31926
31926
} else if (this.options.csrfToken) {
31927
31927
return this.options.csrfToken;
@@ -32336,9 +32336,21 @@ var SocketIoConnector = function (_Connector) {
32336
32336
createClass(SocketIoConnector, [{
32337
32337
key: 'connect',
32338
32338
value: function connect() {
32339
+ var io = this.getSocketIO();
32339
32340
this.socket = io(this.options.host, this.options);
32340
32341
return this.socket;
32341
32342
}
32343
+ }, {
32344
+ key: 'getSocketIO',
32345
+ value: function getSocketIO() {
32346
+ if (typeof io !== 'undefined') {
32347
+ return io;
32348
+ }
32349
+ if (this.options.client !== 'undefined') {
32350
+ return this.options.client;
32351
+ }
32352
+ throw new Error('Socket.io client not found. Should be globally available or passed via options.client');
32353
+ }
32342
32354
}, {
32343
32355
key: 'listen',
32344
32356
value: function listen(name, event, callback) {
@@ -32501,7 +32513,7 @@ module.exports = Echo;
32501
32513
/***/ (function(module, exports, __webpack_require__) {
32502
32514
32503
32515
/*!
32504
- * Pusher JavaScript Library v4.2.1
32516
+ * Pusher JavaScript Library v4.2.2
32505
32517
* https://pusher.com/
32506
32518
*
32507
32519
* Copyright 2017, Pusher
@@ -32591,7 +32603,7 @@ return /******/ (function(modules) { // webpackBootstrap
32591
32603
var _this = this;
32592
32604
checkAppKey(app_key);
32593
32605
options = options || {};
32594
- if (!options.cluster) {
32606
+ if (!options.cluster && !(options.wsHost || options.httpHost) ) {
32595
32607
var suffix = url_store_1["default"].buildLogSuffix("javascriptQuickStart");
32596
32608
logger_1["default"].warn("You should always specify a cluster when connecting. " + suffix);
32597
32609
}
@@ -32978,11 +32990,12 @@ return /******/ (function(modules) { // webpackBootstrap
32978
32990
32979
32991
"use strict";
32980
32992
var Defaults = {
32981
- VERSION: "4.2.1 ",
32993
+ VERSION: "4.2.2 ",
32982
32994
PROTOCOL: 7,
32983
32995
host: 'ws.pusherapp.com',
32984
32996
ws_port: 80,
32985
32997
wss_port: 443,
32998
+ ws_path: '',
32986
32999
sockjs_host: 'sockjs.pusher.com',
32987
33000
sockjs_http_port: 80,
32988
33001
sockjs_https_port: 443,
@@ -33131,17 +33144,17 @@ return /******/ (function(modules) { // webpackBootstrap
33131
33144
args[_i - 0] = arguments[_i];
33132
33145
}
33133
33146
var message = collections_1.stringify.apply(this, arguments);
33134
- if ((window).console) {
33147
+ if (pusher_1["default"].log) {
33148
+ pusher_1["default"].log(message);
33149
+ }
33150
+ else if ((window).console) {
33135
33151
if ((window).console.warn) {
33136
33152
(window).console.warn(message);
33137
33153
}
33138
33154
else if ((window).console.log) {
33139
33155
(window).console.log(message);
33140
33156
}
33141
33157
}
33142
- if (pusher_1["default"].log) {
33143
- pusher_1["default"].log(message);
33144
- }
33145
33158
}
33146
33159
};
33147
33160
exports.__esModule = true;
@@ -33841,7 +33854,8 @@ return /******/ (function(modules) { // webpackBootstrap
33841
33854
}
33842
33855
exports.ws = {
33843
33856
getInitial: function (key, params) {
33844
- return getGenericURL("ws", params, getGenericPath(key, "flash=false"));
33857
+ var path = (params.httpPath || "") + getGenericPath(key, "flash=false");
33858
+ return getGenericURL("ws", params, path);
33845
33859
}
33846
33860
};
33847
33861
exports.http = {
@@ -34227,7 +34241,8 @@ return /******/ (function(modules) { // webpackBootstrap
34227
34241
return [
34228
34242
[":def", "ws_options", {
34229
34243
hostUnencrypted: config.wsHost + ":" + config.wsPort,
34230
- hostEncrypted: config.wsHost + ":" + config.wssPort
34244
+ hostEncrypted: config.wsHost + ":" + config.wssPort,
34245
+ httpPath: config.wsPath
34231
34246
}],
34232
34247
[":def", "wss_options", [":extend", ":ws_options", {
34233
34248
encrypted: true
@@ -36655,6 +36670,7 @@ return /******/ (function(modules) { // webpackBootstrap
36655
36670
wsHost: defaults_1["default"].host,
36656
36671
wsPort: defaults_1["default"].ws_port,
36657
36672
wssPort: defaults_1["default"].wss_port,
36673
+ wsPath: defaults_1["default"].ws_path,
36658
36674
httpHost: defaults_1["default"].sockjs_host,
36659
36675
httpPort: defaults_1["default"].sockjs_http_port,
36660
36676
httpsPort: defaults_1["default"].sockjs_https_port,
0 commit comments