Skip to content

feat(relay): add HTTPS support to relay client #44

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

Open
myml wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(relay): add HTTPS support to relay client #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions relay-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const chalk = require('chalk');
const http = require('http');
const https = require('https');
const readline = require('readline');
const crypto = require('crypto');

Expand Down Expand Up @@ -177,7 +178,7 @@ function collectProjectData(selectedFolders) {
/**
* POST data to relay server.
*/
function postToRelay(host, port, username, data, authToken) {
function postToRelay(scheme, host, port, username, data, authToken) {
return new Promise((resolve, reject) => {
const payload = JSON.stringify({
username,
Expand All @@ -200,8 +201,8 @@ function postToRelay(host, port, username, data, authToken) {
method: 'POST',
headers,
};

const req = http.request(options, (res) => {
const client = scheme === 'https' ? https : http
const req = client.request(options, (res) => {
let body = '';
res.on('data', (chunk) => { body += chunk; });
res.on('end', () => {
Expand Down Expand Up @@ -234,6 +235,7 @@ async function startJoinClient(relayAddress, username) {

// Parse host:port
const parts = relayAddress.replace(/^https?:\/\//, '').split(':');
const scheme = relayAddress.startsWith("https://") ? "https" : 'http'
const host = parts[0] || 'localhost';
const port = parseInt(parts[1]) || 4638;

Expand All @@ -245,7 +247,7 @@ async function startJoinClient(relayAddress, username) {

// Test connection
try {
const testResult = await postToRelay(host, port, username, { projects: [], chats: [], messages: [], stats: [] }, authToken);
const testResult = await postToRelay(scheme, host, port, username, { projects: [], chats: [], messages: [], stats: [] }, authToken);
if (!testResult.ok) {
const msg = testResult.error || 'unknown error';
if (msg === 'Unauthorized') {
Expand Down Expand Up @@ -278,7 +280,7 @@ async function startJoinClient(relayAddress, username) {
cache.scanAll(() => {}, { resetCaches: true });
const data = collectProjectData(selectedFolders);
data.projects = selectedFolders;
const result = await postToRelay(host, port, username, data, authToken);
const result = await postToRelay(scheme, host, port, username, data, authToken);
if (result.ok) {
const s = result.synced || {};
process.stdout.write(chalk.dim(`\r ⟳ Synced: ${s.chats || 0} chats, ${s.messages || 0} messages — ${new Date().toLocaleTimeString()} `));
Expand Down