Skip to content

add option to listen on unix domain socket #145

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

Merged
merged 2 commits into from
Oct 11, 2021
Merged

add option to listen on unix domain socket #145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e72f34
add option to listen on unix domain socket
leifwalsh Oct 8, 2021
edadd76
clean up server on exit regardless of address family
leifwalsh Oct 8, 2021
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
38 changes: 23 additions & 15 deletions src/vs/server/node/server.main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,13 @@ async function handleFetchCallback(req: http.IncomingMessage, res: http.ServerRe
interface ServerParsedArgs extends NativeParsedArgs {
port?: string
host?: string
socket?: string
}
const SERVER_OPTIONS: OptionDescriptions<ServerParsedArgs> = {
...OPTIONS,
port: { type: 'string' },
host: { type: 'string' }
host: { type: 'string' },
socket: { type: 'string' }
};

export interface IStartServerResult {
Expand Down Expand Up @@ -1008,25 +1010,31 @@ export async function main(options: IServerOptions): Promise<void> {
});
});

let port = 3000;
if (parsedArgs.port) {
port = Number(parsedArgs.port);
} else if (typeof options.port === 'number') {
port = options.port;
}

const host = parsedArgs.host || '0.0.0.0';
server.on('error', () => {
server.close();
process.exit(1);
});

server.listen(port, host, () => {
const addressInfo = server.address() as net.AddressInfo;
const address = addressInfo.address === '0.0.0.0' || addressInfo.address === '127.0.0.1' ? 'localhost' : addressInfo.address;
const formattedPort = addressInfo.port === 80 ? '' : String(addressInfo.port);
logService.info(`Web UI available at http://${address}:${formattedPort}`);
});
if (parsedArgs.socket) {
server.listen(parsedArgs.socket, () => {
logService.info(`Server listening on ${parsedArgs.socket}`);
});
} else {
let port = 3000;
if (parsedArgs.port) {
port = Number(parsedArgs.port);
} else if (typeof options.port === 'number') {
port = options.port;
}

const host = parsedArgs.host || '0.0.0.0';
server.listen(port, host, () => {
const addressInfo = server.address() as net.AddressInfo;
const address = addressInfo.address === '0.0.0.0' || addressInfo.address === '127.0.0.1' ? 'localhost' : addressInfo.address;
const formattedPort = addressInfo.port === 80 ? '' : String(addressInfo.port);
logService.info(`Web UI available at http://${address}:${formattedPort}`);
});
}

});
}