Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support assetPrefix specific protocol #31213

Merged
merged 3 commits into from Nov 9, 2021
Merged

Support assetPrefix specific protocol #31213

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9591abf
Support assetPrefix specific protocol
genetschneider Nov 9, 2021
d584fd8
Merge branch 'canary' into fix-https-connections
genetschneider Nov 9, 2021
0e809db
Merge branch 'canary' into fix-https-connections
ijjk Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion packages/next/client/dev/error-overlay/websocket.ts
View file
Open in desktop
Expand Up @@ -2,6 +2,17 @@ let source: WebSocket
const eventCallbacks: ((event: any) => void)[] = []
let lastActivity = Date.now()

function getSocketProtocol(assetPrefix: string): string {
let protocol = location.protocol

try {
// assetPrefix is a url
protocol = new URL(assetPrefix).protocol
} catch (_) {}

return protocol === 'http:' ? 'ws' : 'wss'
}

export function addMessageListener(cb: (event: any) => void) {
eventCallbacks.push(cb)
}
Expand Down Expand Up @@ -32,7 +43,7 @@ export function connectHMR(options: {
function init() {
if (source) source.close()
const { hostname, port } = location
const protocol = location.protocol === 'http:' ? 'ws' : 'wss'
const protocol = getSocketProtocol(options.assetPrefix || '')
const assetPrefix = options.assetPrefix.replace(/^\/+/, '')

let url = `${protocol}://${hostname}:${port}${
Expand Down