Skip to content
This repository was archived by the owner on Jul 13, 2021. It is now read-only.

Fix bugs when using the server option together with different client/server URLs #108

Open
hedgepigdaniel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bugs when using the server option together with different client/server URLs #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e87012
fix: allow host/port to be unset when the server option is used
hedgepigdaniel May 15, 2019
ecfe594
fix: use the host.client option even when the server option is used
hedgepigdaniel May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = (opts = {}) => {
client: options.host,
server: options.host,
};
} else if (!options.host.server) {
} else if (!options.host.server && !options.server) {
throw new HotClientError(
'`host.server` must be defined when setting host to an Object'
);
Expand All @@ -64,7 +64,7 @@ module.exports = (opts = {}) => {
client: options.port,
server: options.port,
};
} else if (isNaN(parseInt(options.port.server, 10))) {
} else if (isNaN(parseInt(options.port.server, 10)) && !options.server) {
throw new HotClientError(
'`port.server` must be defined when setting host to an Object'
);
Expand All @@ -86,7 +86,7 @@ module.exports = (opts = {}) => {

if (server && server.listening) {
options.webSocket = {
host: server.address().address,
host: options.host.client || server.address().address,
// a port.client value of 0 will be falsy, so it should pull the server port
port: options.port.client || server.address().port,
};
Expand Down