diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-03-27 12:45:18 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-03-27 12:45:18 +0900 |
| commit | 003ecd4c58dee078d40596a29fa56a7d5ce70e2d (patch) | |
| tree | 796d1411235b688f266e69133417b5cf46f0c5ef /src/web/app | |
| parent | Merge remote-tracking branch 'refs/remotes/origin/master' into domain (diff) | |
| download | sharkey-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')
| -rw-r--r-- | src/web/app/common/scripts/streaming/stream.ts | 5 | ||||
| -rw-r--r-- | src/web/app/config.ts | 2 |
2 files changed, 4 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); diff --git a/src/web/app/config.ts b/src/web/app/config.ts index 32710dd9c4..8ea6f70101 100644 --- a/src/web/app/config.ts +++ b/src/web/app/config.ts @@ -2,6 +2,7 @@ declare const _HOST_: string; declare const _HOSTNAME_: string; declare const _URL_: string; declare const _API_URL_: string; +declare const _WS_URL_: string; declare const _DOCS_URL_: string; declare const _STATS_URL_: string; declare const _STATUS_URL_: string; @@ -20,6 +21,7 @@ export const host = _HOST_; export const hostname = _HOSTNAME_; export const url = _URL_; export const apiUrl = _API_URL_; +export const wsUrl = _WS_URL_; export const docsUrl = _DOCS_URL_; export const statsUrl = _STATS_URL_; export const statusUrl = _STATUS_URL_; |