cleanup

bryntum · Jan 16, 2025 · 4e1de77 · 4e1de77
1 parent 676c1e5
commit 4e1de77
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 32 deletions.
diff --git a/__tests__/assertions.js b/__tests__/assertions.js
@@ -43,7 +43,7 @@ async function getFile(json, protocol, fileFormat, host, port, timeout) {
         });
 
         request.on('timeout', () => {
-            request.abort();
+            request.destroy();
 
             reject(new Error('timeout'));
         });

diff --git a/__tests__/samples/fileprotocol/data.json b/__tests__/samples/fileprotocol/data.json
@@ -1,6 +1,6 @@
 {
     "html": [
-        { "html" : "<!DOCTYPE html><html class=\"\" style=\"width: 8.25in; height: 11.69in;\"><head><meta content=\"text/html; charset=UTF-8\" http-equiv=\"Content-Type\"/><title></title><link rel=\"stylesheet\" href=\"file:///C:/foo.css\"><link rel=\"stylesheet\" href=\"file:///home/bar.css\"><style>body {background-image: url(\"file:///home/buz.css\");}</style><link rel=\"stylesheet\" href=\"https://bryntum.com/examples/build/grid.stockholm.css?455383\"></head><body></body></html>" }
+        { "html" : "<!DOCTYPE html><html class=\"\" style=\"width: 8.25in; height: 11.69in;\"><head><meta content=\"text/html; charset=UTF-8\" http-equiv=\"Content-Type\"/><title></title><link rel=\"stylesheet\" href=\"file:///C:/foo.css\"><link rel=\"stylesheet\" href=\"file:///home/bar.css\"><style>body {background-image: url(\"file:///home/buz.css\");}</style><link rel=\"stylesheet\" href=\"https://bryntum.com/products/grid/build/grid.stockholm.css?455383\"></head><body></body></html>" }
     ],
     "orientation": "portrait",
     "format": "A4",

diff --git a/__tests__/samples/parallel/parallel2.json b/__tests__/samples/parallel/parallel2.json
diff --git a/__tests__/samples/smoke/base_https.pdf b/__tests__/samples/smoke/base_https.pdf
diff --git a/__tests__/samples/smoke/base_https.pdf.json b/__tests__/samples/smoke/base_https.pdf.json
diff --git a/__tests__/samples/smoke/base_https.png.json b/__tests__/samples/smoke/base_https.png.json
diff --git a/__tests__/smoke.test.js b/__tests__/smoke.test.js
@@ -32,25 +32,25 @@ describe('Should export over HTTP', () => {
         const
             host       = 'localhost',
             protocol   = 'http',
-            port       = 8081,
+            port       = 8082,
             workers    = 1,
             fileFormat = 'pdf';
 
         server = await startServer({ protocol, port, workers, logger : getLoggerConfig('smoke_consequent') });
 
         await assertExportedFile({ protocol, host, port: server.httpPort, fileFormat });
 
-        // Waiting for 30 seconds, export server should kill all idle workers
+        // Waiting for 10 seconds, export server should kill all idle workers
         await new Promise(resolve => {
-            setTimeout(() => resolve(), 30000);
+            setTimeout(() => resolve(), 10000);
         });
 
         const promises = [
             assertExportedFile({ protocol, host, port: server.httpPort, fileFormat }),
             new Promise(resolve => {
                 setTimeout(() => {
                     resolve('timeout');
-                }, 1000 * 60 * 2);
+                }, 1000 * 30);
             })
         ];
 
@@ -59,7 +59,7 @@ describe('Should export over HTTP', () => {
         await Promise.allSettled(promises);
 
         if (winner === 'timeout') {
-            fail('Server have not returned file in 2 minutes');
+            fail('Server have not returned file in 30 seconds');
         }
     });
 });
@@ -69,7 +69,7 @@ describe('Should export over HTTPS', () => {
         test('Should export to PDF', async () => {
             const
                 protocol = 'https',
-                port     = 8081,
+                port     = 8083,
                 workers  = 1;
 
             server = await startServer({ protocol, port, workers, logger : getLoggerConfig('smoke_https_pdf') })

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,6 +32,7 @@
     "measure": "node ./src/utils/measure-export-time.js"
   },
   "dependencies": {
+    "@types/express": "^5.0.0",
     "body-parser": "~1.20.3",
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.3",

diff --git a/src/logger.js b/src/logger.js
@@ -3,8 +3,6 @@ require('winston-daily-rotate-file');
 
 let loggers = {};
 
-let loggerInstance;
-
 module.exports = {
     getLogger(config = {}) {
         let result;

diff --git a/src/server/ExportServer.js b/src/server/ExportServer.js
@@ -117,7 +117,7 @@ module.exports = class ExportServer {
                 },
                 dimension = format.split('*');
 
-            //format can be send in format 12in*14in. This has precedence over A4, Letter et cetera
+            // dimensions can be set in format 12in*14in. This has precedence over A4, Letter etc
             if (dimension.length === 2) {
                 config.width = dimension[0];
                 config.height = dimension[1];

diff --git a/src/server/WebServer.js b/src/server/WebServer.js
@@ -20,7 +20,7 @@ module.exports = class WebServer extends ExportServer {
     }
 
     /**
-     * Create the and initialise the webserver
+     * Create and initialise the webserver
      *
      * @param options The passed options from the command line
      */
@@ -232,14 +232,6 @@ module.exports = class WebServer extends ExportServer {
         }
     }
 
-    getHttpServer() {
-        return this.httpServer;
-    }
-
-    getHttpsServer() {
-        return this.httpsServer;
-    }
-
     /**
      * Start the service
      */