summaryrefslogtreecommitdiff
path: root/src/web/app/common/scripts/streaming
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-27 12:45:18 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-27 12:45:18 +0900
commit003ecd4c58dee078d40596a29fa56a7d5ce70e2d (patch)
tree796d1411235b688f266e69133417b5cf46f0c5ef /src/web/app/common/scripts/streaming
parentMerge remote-tracking branch 'refs/remotes/origin/master' into domain (diff)
downloadsharkey-003ecd4c58dee078d40596a29fa56a7d5ce70e2d.tar.gz
sharkey-003ecd4c58dee078d40596a29fa56a7d5ce70e2d.tar.bz2
sharkey-003ecd4c58dee078d40596a29fa56a7d5ce70e2d.zip
Destory api. subdomain
api.example.com --> example.com/api
Diffstat (limited to 'src/web/app/common/scripts/streaming')
-rw-r--r--src/web/app/common/scripts/streaming/stream.ts5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/web/app/common/scripts/streaming/stream.ts b/src/web/app/common/scripts/streaming/stream.ts
index cb4041fd89..3912186ad3 100644
--- a/src/web/app/common/scripts/streaming/stream.ts
+++ b/src/web/app/common/scripts/streaming/stream.ts
@@ -1,7 +1,7 @@
import { EventEmitter } from 'eventemitter3';
import * as uuid from 'uuid';
import * as ReconnectingWebsocket from 'reconnecting-websocket';
-import { apiUrl } from '../../../config';
+import { wsUrl } from '../../../config';
import MiOS from '../../mios';
/**
@@ -42,14 +42,13 @@ export default class Connection extends EventEmitter {
this.state = 'initializing';
this.buffer = [];
- const host = apiUrl.replace('http', 'ws');
const query = params
? Object.keys(params)
.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
.join('&')
: null;
- this.socket = new ReconnectingWebsocket(`${host}/${endpoint}${query ? '?' + query : ''}`);
+ this.socket = new ReconnectingWebsocket(`${wsUrl}/${endpoint}${query ? '?' + query : ''}`);
this.socket.addEventListener('open', this.onOpen);
this.socket.addEventListener('close', this.onClose);
this.socket.addEventListener('message', this.onMessage);