From 23a037c7d3f26047740222d9a22602e6b6f59b0d Mon Sep 17 00:00:00 2001 From: afrokick Date: Sat, 28 Nov 2020 10:33:44 +0300 Subject: [PATCH] add test fix ssl options #230 --- changelog.md | 4 +++ dist/src/config/index.js | 4 --- src/config/index.ts | 4 --- test/peerjs.ts | 56 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 test/peerjs.ts diff --git a/changelog.md b/changelog.md index f2afa3d..023fa70 100644 --- a/changelog.md +++ b/changelog.md @@ -2,7 +2,11 @@ ### vNEXT + +### 0.6.1 + * New: PeerJS Server in Docker capture ^C signal and terminate gracefully. #205 +* Fix: SSL options in default config. #230 ### 0.6.0 diff --git a/dist/src/config/index.js b/dist/src/config/index.js index 08ffc18..2cad192 100644 --- a/dist/src/config/index.js +++ b/dist/src/config/index.js @@ -11,9 +11,5 @@ const defaultConfig = { allow_discovery: false, proxied: false, cleanup_out_msgs: 1000, - ssl: { - key: "", - cert: "" - } }; exports.default = defaultConfig; diff --git a/src/config/index.ts b/src/config/index.ts index 70910fc..b048d16 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -27,10 +27,6 @@ const defaultConfig: IConfig = { allow_discovery: false, proxied: false, cleanup_out_msgs: 1000, - ssl: { - key: "", - cert: "" - } }; export default defaultConfig; diff --git a/test/peerjs.ts b/test/peerjs.ts new file mode 100644 index 0000000..a3db33f --- /dev/null +++ b/test/peerjs.ts @@ -0,0 +1,56 @@ +import { expect } from 'chai'; +import http from 'http'; +import expectedJson from '../app.json'; +import { spawn } from 'child_process'; +import path from 'path'; + +const PORT = '9000'; + +async function makeRequest() { + return new Promise((resolve, reject) => { + http.get(`http://localhost:${PORT}/`, resp => { + let data = ''; + + resp.on('data', chunk => { + data += chunk; + }); + + resp.on('end', () => { + resolve(JSON.parse(data)); + }); + + }).on("error", err => { + console.log("Error: " + err.message); + reject(err); + }); + }); +} + +describe('Check bin/peerjs', () => { + it('should return content of app.json file', async () => { + let resolver: () => void; + let rejecter: (err: Error) => void; + const promise = new Promise((resolve, reject) => { + resolver = resolve; + rejecter = reject; + }); + + const ls = spawn('node', [path.join(__dirname, '../', 'bin/peerjs'), '--port', PORT]); + + ls.stdout.on('data', async (data: string) => { + if (!data.includes('Started')) return; + + try { + const resp = await makeRequest(); + expect(resp).to.deep.eq(expectedJson); + resolver(); + } catch (error) { + rejecter(error); + } finally { + ls.kill('SIGINT'); + } + }); + + return promise; + }); +});