1.0.237

CHANGELOG.txt

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 v1.0.236: Fixed Pause bug
+=======
+>>>>>>> 9b0a806796fc418c65387d092c7ce525ae4da93d
 v1.0.235: Improved Serial Buffer check
 v1.0.234: Added check for USB Selective Suspend to Troubleshooting tab, improved simulation of arcs, Fixed right-click menu in Gcode Editor
 v1.0.233: Cleanup code

fullchain1.pem

@@ -0,0 +1,58 @@
+-----BEGIN CERTIFICATE-----
+MIIFZzCCBE+gAwIBAgISA8BWuo1WCqLFT1+26LHt89REMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA2MDExNjA5MzFaFw0y
+MDA4MzAxNjA5MzFaMCMxITAfBgNVBAMTGG15bWFjaGluZS5vcGVuYnVpbGRzLmNv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiYZEE4iHklQFsWC1KB
+zY45IGCir0SD9aRriF/rof6+Bo8U2HEyTIBRSdfCqt5uv/ij2ZY4NJktcYk4iI5l
+lVA7X1guebXLrypVhQM+Mbp7HVFBtwnNZ47ZjvReeHKsDz8xM5Efc81UYyQp7g06
+YOIFf1dDbE3k530zaW5Fd0NqhenJvyOhz3yxnepd/dy1zn3/A0F1vkk4nUhqC4sX
+tRuEe/x4kCrU7Mf4LkT23HMeA7brWDSzE1qmn38aMN0rM1fUoZUguSsSM97yGXd0
+a5dZkEZ8LruGcyE0FxxrOQ5PjQtx3LF5AOnLiIUODb5UnNITGg3Gvsr8w/XM0Zub
+2+cCAwEAAaOCAmwwggJoMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUrjInjcvb6WU5
+DRQJJf02y2KrwL0wHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYI
+KwYBBQUHAQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0
+c2VuY3J5cHQub3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0
+c2VuY3J5cHQub3JnLzAjBgNVHREEHDAaghhteW1hY2hpbmUub3BlbmJ1aWxkcy5j
+b20wTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEF
+BQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEDBgorBgEEAdZ5AgQC
+BIH0BIHxAO8AdQBep3P531bA57U2SH3QSeAyepGaDIShEhKEGHWWgXFFWAAAAXJw
+3BloAAAEAwBGMEQCIDcE3s6KW56n/v+21TDz+x60eRAkXSkXZ9uRTj5H2Ej/AiBC
+tTudyS4Z7l6kNv40+bb3GnDojax9L3xyiHj+Z60tZAB2AAe3XBvlfWj/8bDGHSMV
+x7rmV3xXlLdq7rxhOhpp06IcAAABcnDcGYgAAAQDAEcwRQIgaq2+xZoftATBzABK
+AOYurZqWn7bwdFnuvA3AFarIhAYCIQDw6MqpUMf9D5vci6lm2nZ8ucNeYiZYJpjm
+T40YMPGF6DANBgkqhkiG9w0BAQsFAAOCAQEADD7bHLtv0ESr8edQYnhXUTtgO+K8
+RgOw/t3Pw3AfYKIADias2d7Olge3JHBLufSyWadmGOSHg/BmmAimaRfZOjJ+5Svn
+G/pj2o61tdeTk1EqcGzGY1QYPGql98CcTXtUSduJ0JMBJLBsViKZdbSqpO2ZJSxF
+B5Me9g9z+uClVBWospHjb4lHSaFCdV3J24/zLhNcJzvzxe5BKkMdHE1k5I/ryXge
+4T3Nt+wd6njS6uFfllkPqmD/hVSE4VL+UDIKu3sRqiJCYvDFDlPz1AuT7W8SIvKf
+/u0LHtrne6LZyZV6E+HgSBPrZL8oZacdYGLGgp7r+6iNQReyiQhtz6jTRw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----

index.js

@@ -48,8 +48,8 @@ app.use(express.static(path.join(__dirname, "app")));
 //               Error: error:06000066:public key routines:OPENSSL_internal:DECODE_ERROR
 
 var httpsOptions = {
-  key: fs.readFileSync(path.join(__dirname, 'domain-key.key')),
-  cert: fs.readFileSync(path.join(__dirname, 'domain-crt.cer'))
+  key: fs.readFileSync(path.join(__dirname, 'privkey1.pem')),
+  cert: fs.readFileSync(path.join(__dirname, 'fullchain1.pem'))
 };
 
 const httpsserver = https.createServer(httpsOptions, app).listen(3001, function() {

privkey1.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC4mGRBOIh5JUBb
+FgtSgc2OOSBgoq9Eg/Wka4hf66H+vgaPFNhxMkyAUUnXwqrebr/4o9mWODSZLXGJ
+OIiOZZVQO19YLnm1y68qVYUDPjG6ex1RQbcJzWeO2Y70XnhyrA8/MTORH3PNVGMk
+Ke4NOmDiBX9XQ2xN5Od9M2luRXdDaoXpyb8joc98sZ3qXf3ctc59/wNBdb5JOJ1I
+aguLF7UbhHv8eJAq1OzH+C5E9txzHgO261g0sxNapp9/GjDdKzNX1KGVILkrEjPe
+8hl3dGuXWZBGfC67hnMhNBccazkOT40LcdyxeQDpy4iFDg2+VJzSExoNxr7K/MP1
+zNGbm9vnAgMBAAECggEAWLxo9TFH6XSOyzp9ltvvBD9R4SJTPoxwuOk4VWPgK6UN
+YhqTMVcMj2KELMPXf7WdctjQ7/V0022U9nHGsy0B6d+gpbMxrsKLIb6agkSTgyFL
+ppQAeSXUckcDAVWocPdlHOt57nlAIaQ/RFMjrBg0GnKqFDjFB2zSGs1sESYzfqQV
+A3xDnr5iQyVyog9Db/+0m2zyR8J1ZJMgl9onsV+25ZBVqO1lYXVdI3H2/JZT3M47
+lDbvN+3u6UoC/zUMxdgOCUSq++d9DI+55OjNRU6++mEKuZodj2WyGaX6im8j9BLZ
+dIB1VcKwsRamIepPywzCcXpaS+3rxxIrZdaH2JXMAQKBgQDmOlkLL9Go9Xg2A5HB
+19BIoCW2V5UkjGb0mDa4cPIJ0UypCg6h0nuK6FekuzdbbYIx6Q3fZ36W0yDqtaxB
+sSVIuM8+3S7I4CUeuKy5GOpFwH3bCX8ysHAA5D9sIlV6z4Mds4drgGznyWorCy4T
+3rgxgGYWBU50wdoEWP7HdS6MIQKBgQDNQljaN6otiV8xfoKZ5WhH446PcXHZxyal
+m9StXnmXfBXMgDxPNzzrnjyZzT9vccOqhQlCVZ05H3AGGfk2l4Go0p14CVCEWN0r
+FZttxrbWlfsACl96V0AJ+KHQav1QOe7HbxujU7I0h2w6TWf1R4VtSJnOzklKg+MF
+XZoNaF0nBwKBgDn4ey9b7Rj0Jj7Di1IZ+3IuERDm4MEBMXNpWG380pUyRHFT/Pc2
+PrFta5QpJ/k3i87xdfLI5pEnvGQdNrCb4F19W4Hiw8ME3ZPswGEjKupBW+9pZsPm
+tW0kC+w4gPmZgtRZvkGNZt6+UqNf/0w1in+8avgkgerYXQM3PYAPu5bBAoGAIgaN
+lB8GJuZO0XWXUMumrcQbLcwwg1lwHqPmbZbrsSDwvCXF2ZvejXB9u0E68s55ERtc
+nZJzrbR4bYqAtXwIEmRXlj51CntwrmO2kEwQoyHZqfgOO8ma5AxDRrl1pIb1/jl8
+62ZEdFC+sCuEwDRK+gK+/HlVzPRv/cO2deKHDqECgYAZoZGmO1PCP3GdOsZXLTMB
+nGAyS5n/fKX7OVa5j7EgVPm/Y3VZi9hhJclkymHWUTILVn3zsk8a6cgEN4l7OMli
+VEUkZLagXuKyOnMCtaJn7TZWpem0zG8QfgTInIQFS/j2FtfzFLvINO/73tENlzjN
+TUEmI2jpnUxLjpzYCsTNXQ==
+-----END PRIVATE KEY-----