OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix custom socket path

Browse Source
This commit is contained in:
Asher 2020-03-16 12:52:18 -05:00
parent db4a4f0f50
commit 5f63d2b822
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/browser/socket.ts
View File

@ -44,7 +44,7 @@ export class ReconnectingSocket {
private _binaryType: typeof WebSocket.prototype.binaryType = "arraybuffer" private _binaryType: typeof WebSocket.prototype.binaryType = "arraybuffer"
public constructor(private customPath?: string, public readonly id: string = generateUuid(4)) { public constructor(private path: string, public readonly id: string = generateUuid(4)) {
// On Firefox the socket seems to somehow persist a page reload so the close // On Firefox the socket seems to somehow persist a page reload so the close
// event runs and we see "attempting to reconnect". // event runs and we see "attempting to reconnect".
if (typeof window !== "undefined") { if (typeof window !== "undefined") {
@ -155,12 +155,8 @@ export class ReconnectingSocket {
this.logger.info(`retrying in ${this.retryDelay}ms...`) this.logger.info(`retrying in ${this.retryDelay}ms...`)
} }
setTimeout(() => { setTimeout(() => {
this.logger.info("connecting...") this.logger.info("connecting...", field("path", this.path))
const socket = new WebSocket( const socket = new WebSocket(this.path)
`${location.protocol === "https:" ? "wss" : "ws"}://${location.host}${this.customPath || location.pathname}${
location.search ? `?${location.search}` : ""
}`,
)
const reject = (): void => { const reject = (): void => {
_reject(new Error("socket closed")) _reject(new Error("socket closed"))