diff --git a/.vscode/launch.json b/.vscode/launch.json index fcb9d05..2ff73f7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "type": "chrome", "request": "launch", "name": "Launch Chrome", - "url": "http://localhost:8000", + "url": "https://localhost:8000", "webRoot": "${workspaceFolder}/client" }, diff --git a/client/ws-client.js b/client/ws-client.js index cfdcbab..a5e75d9 100644 --- a/client/ws-client.js +++ b/client/ws-client.js @@ -99,7 +99,7 @@ var questionNumDisplay = document.querySelector('.quest'); // #endregion // websocket to communicate with the server -var ws = new WebSocket('ws://' + window.location.host + window.location.pathname + 'ws'); +var ws = new WebSocket('wss://' + window.location.host + window.location.pathname + 'ws'); // #region speech recognition initialization var recognition = new SpeechRecognition(); diff --git a/server/cert.pem b/server/cert.pem new file mode 100644 index 0000000..649b950 --- /dev/null +++ b/server/cert.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID1zCCAr8CFFQdsOqUqVpXkNcENXj66TeS6crHMA0GCSqGSIb3DQEBCwUAMIGn +MQswCQYDVQQGEwJERTEQMA4GA1UECAwHQkFWQVJJQTESMBAGA1UEBwwJTlVSRU1C +RVJHMQwwCgYDVQQKDANPSE0xDjAMBgNVBAsMBURFTUJBMTMwMQYDVQQDDCpodHRw +czovL21lZGluZi5lZmkudGgtbnVlcm5iZXJnLmRlL2RlbWVuei8xHzAdBgkqhkiG +9w0BCQEWEG5pa29fYmVsZUBnbXguZGUwHhcNMTkwOTA1MTQ0MjMzWhcNNDcwMTIw +MTQ0MjMzWjCBpzELMAkGA1UEBhMCREUxEDAOBgNVBAgMB0JBVkFSSUExEjAQBgNV +BAcMCU5VUkVNQkVSRzEMMAoGA1UECgwDT0hNMQ4wDAYDVQQLDAVERU1CQTEzMDEG +A1UEAwwqaHR0cHM6Ly9tZWRpbmYuZWZpLnRoLW51ZXJuYmVyZy5kZS9kZW1lbnov +MR8wHQYJKoZIhvcNAQkBFhBuaWtvX2JlbGVAZ214LmRlMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA56EWGyHlMUIuMn8YgSafG+a6tMq42o0lD1bYdxep +XtzwrAkj4o+3WBMzA8fhlo1giF2V20gl0lAsB4qj4BBW9RjwFjdxegRIu9bGbmHw +YzUgUuGvUJVNgfxXsIfwFh7umlh5cR2vVR1KfO8doYpXP0VfFdlIILl41G5tvKXk +vgB61LE2D8jkBwX71OLSw5qEJP3gGmvhOdxoOf56KY6tDHvPMLiTrK4W6cZXIcw0 +IPuHt9VTVfApk8Amq+QWTup3szdoGfnDANZrbip+SsRneXPgGSvf6uv3+RefBrZN +qCLadUjpjRyqlCxjnvHhUtDzn/dy5DvYw2rY5ylqtgGPPQIDAQABMA0GCSqGSIb3 +DQEBCwUAA4IBAQBGgbENTZjSbjokv4sqkHBEMCQSnLtsjiYWVaTdJlBdAB2B4xgH +xygnqQOl3RnN07OZ91TTlLPQYAWEmvmUG0aoJQCW2ZeyB9YfCWct7uLFpZCm0C8w +uWq4Uc+PzuJ/QTM6Yz4TJJzni/XzZT1lyxz07XQDlvJj1ex8ifyDPXqGcwaGrZ/Z +b+iBvTF1KbaYSZ6RB8jr2BH8HWk3gdGtndThnKxaDv5101LUoVYZR3TqsTxLpAoG +dTNwZtGRD5jg9r0icjsUV1yH2ZieouJZECi7Oia2cZ6iIJqio2ARuPEP/H3vbwFM +Juy1ZC1b1X7dRGZigTQqBE7By38yXg4Y++BU +-----END CERTIFICATE----- diff --git a/server/key.pem b/server/key.pem new file mode 100644 index 0000000..aa05a05 --- /dev/null +++ b/server/key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEA56EWGyHlMUIuMn8YgSafG+a6tMq42o0lD1bYdxepXtzwrAkj +4o+3WBMzA8fhlo1giF2V20gl0lAsB4qj4BBW9RjwFjdxegRIu9bGbmHwYzUgUuGv +UJVNgfxXsIfwFh7umlh5cR2vVR1KfO8doYpXP0VfFdlIILl41G5tvKXkvgB61LE2 +D8jkBwX71OLSw5qEJP3gGmvhOdxoOf56KY6tDHvPMLiTrK4W6cZXIcw0IPuHt9VT +VfApk8Amq+QWTup3szdoGfnDANZrbip+SsRneXPgGSvf6uv3+RefBrZNqCLadUjp +jRyqlCxjnvHhUtDzn/dy5DvYw2rY5ylqtgGPPQIDAQABAoIBAHr9tw47JkbMnFkl +0W4qgsu+7R64kgVCcw49D/3Uq5N6f7TpuYtAwpravvjf9rIJaduezca8/ZA6D9cF +T9TW+EV2s20ojXG7up87AOx1xr325K39tih0zs4ZnrpWxC4KyKleF0Xv/DyWrAnA +shwnqAIppL6mPD1cHoO2C0DjWZ1lAzG3pjs5ipEa6Z5csWsHJlv8i12da1Zjhr+4 +GoBTyUcQFzegf/RlyJC/5yEyydoD82XDhSEfRu0eijGaktymCbXy0Oop1l7mjdbD +eswhYB8zX1Hht3GoxmSfVZGyhXxBXJO2MRWXuVFUR0HQxvGBjuzZE0B9nn2PTLr6 +uYvBIQECgYEA90N9ocDuHwuO19oV6crW8By5+ItlGjrOsFp7Z4PCuj/49GyPFkEC +avcrtNxazszglgsSUX6yAiA0PoDT0SAS1vu2VOgQ6MrloI+PrWu2b0BqhTBTtPmN +AlGdu3GyLY7D2Y5y+Q6rSChbyk7h2qsUGRVl/4WAgOs8zQYtZzymm/0CgYEA79Au +keVg1iIKHmbDOv/HJpLL/Y22E5YqRnpJhWRFGUZPgP8ekYx/U6aQP1FakXCTlK7a +AwkBuijnWKfpuddb8JRWCk70eqibgLLaZPBqKs1VUJnms60MmG/IJXltrtULdORB +WKgat8GtCHgiJZwD2xNIL6vK3ZW8uWcXNtOUBEECgYB8IMF85mGj7CV1buH5T/6+ +42zovPGwTT1dgs7YlGi5H0xXR/g8773K/PJQBR8BGhDUwhIcH0I1lv0jM4EiRruu +eQZ7cVSryM+l3uv930jiaLAQ1MXw4CZNt7M7WkRcYoMnQD+vkBGkU75gvWDcaW3Z +eciOkfKExZLsSeGZJfVt8QKBgFhkR4YHIfZLfadPAU7R0Dnribzfauk1REfN8yNz +nfR+8fb+Eepb+uJ+VlTAS72n3P3EpR7RRw2y3fLTkVaqhnzacAxEpeBAHXEGe3ER +HFDCdlvLHjnD4wycxwzpAQCcDij7qQpgi9iHTpv8i7mJE/K/3K+VhqS9+F3uHaRb +wAcBAoGAe58kt4AHnHa67MutpTSBiM9CFqzOOJnp1HcU3eRlVgqoe8okZeaqTSQW +hyte4cpsMLlfiVFU+xxzzSCRDAksmEewdy1/cEovdEEKeBn2UDFpVe9pix73jxnU +roPAtn8PPB7VWRpClVpkOefMM+1mj5U+xdq/mM+LNPQvALENsbE= +-----END RSA PRIVATE KEY----- diff --git a/server/ws-server.js b/server/ws-server.js index 9b2dad9..7ee926e 100644 --- a/server/ws-server.js +++ b/server/ws-server.js @@ -3,7 +3,9 @@ const dialogflow = require('dialogflow'); // server and websocket const WebSocket = require('ws'); +var fs = require('fs'); const http = require('http'); +const https = require('https'); const path = require('path'); const express = require('express'); @@ -20,7 +22,11 @@ app.use(express.static(__dirname + '/../client')); app.use('/', router); -var server = http.createServer(app); +// var server = http.createServer(app); +var server = https.createServer({ + key: fs.readFileSync('key.pem'), + cert: fs.readFileSync('cert.pem') +}, app); server.listen(process.env.port || webSocketsServerPort, function () { console.log((new Date()) + ' Server is listening on port ' +