Merge.

CHANGELOG.md

@@ -69,7 +69,7 @@ _Enhancements:_
 - Optimized logic and corrected the url (from `version/change` to `version_change`) in the `versionChange.js` router.
 - Refactored `exportHandler` (to `requestExport`) by moving some logic to the `validaion` middleware and refactoring the rest.
 - Removed unnecessary `doCallbacks` from the export router.
-- Moved `server/error.js` and `server/rateLimiting.js` to `middlewares/`, optimizing error handling and rate limiting.
+- Moved `./lib/server/error.js` and `./lib/server/rateLimiting.js` to `./lib/server/middlewares/`, optimizing error handling and rate limiting.
 - The `nodeEnv` option is now obtained from `getOptions`, not directly from the environment variables in the `error.js` middleware.
 - Refactored and optimized the entire logic for checking the cache and fetching scripts.
 - Refactored and split the `_updateCache` function into smaller, more manageable parts.
@@ -245,7 +245,7 @@ _Enhancements:_
 - Updated the `killPool` function.
 - The `uncaughtException` handler now kills the pool, browser, and terminates the process with exit code 1, when enabled.
 - The browser instance should be correctly closed now when an error occurs during pool creation.
-- Corrected error handling and response sending in the `/change_hc_version.js` route.
+- Corrected error handling and response sending in the `./lib/server/routes/change_hc_version.js` route.
 - Corrected the `handleResources` function.
 - Corrected samples, test scenarios, and test runners.
 - Bumped versions of most packages, with an updating deprecated `Puppeteer` from `v21.1.1` to latest.

README.md

@@ -1115,7 +1115,7 @@ There are two main ways to debug code:
 
 - By adding a `debugger` statement within any client-side code (e.g., inside a `page.evaluate` callback). With the `--devtools` option set to **true**, the code execution will stop automatically.
 
-- By running the export server with the `--inspect-brk=<PORT>` flag, and adding a `debugger` statement within any server-side code. Subsequently, navigate to `chrome://inspect/`, input the server's IP address and port (e.g., `localhost:9229`) in the Configure section. Clicking 'inspect' initiates debugging of the server-side code.
+- By running the Export Server with the `--inspect-brk=<PORT>` flag, and adding a `debugger` statement within any server-side code. Subsequently, navigate to `chrome://inspect/`, input the server's IP address and port (e.g., `localhost:9229`) in the Configure section. Clicking 'inspect' initiates debugging of the server-side code.
 
 The `npm run start:debug` script from the `package.json` allows debugging code using both methods simultaneously. In this setup, client-side code is accessible from the devTools of a specific Puppeteer browser's page, while server-side code can be debugged from the devTools of `chrome://inspect/`.
 

bin/cli.js

@@ -145,5 +145,5 @@ async function start() {
   }
 }
 
-// Start the export server process
+// Start the Export Server process
 start();

lib/schemas/config.js

@@ -856,7 +856,7 @@ const defaultConfig = {
       types: ['boolean'],
       envLink: 'UI_ENABLE',
       cliName: 'enableUi',
-      description: 'Enables or disables the UI for the export server',
+      description: 'Enables or disables the UI for the Export Server',
       promptOptions: {
         type: 'toggle'
       }

lib/server/routes/ui.js

@@ -13,7 +13,7 @@ See LICENSE file in root for details.
 *******************************************************************************/
 
 /**
- * @overview Defines an Express route for serving the UI for the export server
+ * @overview Defines an Express route for serving the UI for the Export Server
  * when enabled.
  */
 
@@ -34,7 +34,7 @@ export default function uiRoutes(app) {
   // Add the UI endpoint only if required
   if (getOptions().ui.enable) {
     /**
-     * Adds the GET '/' - A route for a UI when enabled on the export server.
+     * Adds the GET '/' - A route for a UI when enabled on the Export Server.
      */
     app.get(getOptions().ui.route || '/', (request, response, next) => {
       try {

public/index.html

@@ -49,7 +49,7 @@ <h1>Highcharts Export Server</h1>
 
           <p>
             This page allows you to experiment with different options for the
-            export server. If you use the public Export Server at
+            Export Server. If you use the public Export Server at
             <a href="https://export.highcharts.com"
               >https://export.highcharts.com</a
             >

tests/cli/cliTestRunnerSingle.js

@@ -81,7 +81,7 @@ if (existsSync(file) && file.endsWith('.json')) {
         getNewDateTime() - startDate
       }ms.`;
 
-      // If code is 1, it means that export server thrown an error
+      // If code is 1, it means that Export Server thrown an error
       if (code === 1) {
         return console.error(`[Fail] ${endMessage}`.red);
       }

tests/http/httpTestRunner.js

@@ -36,7 +36,7 @@ console.log(
   '(results are stored in the ./tests/http/_results).\n'.green
 );
 
-// Url of Puppeteer export server
+// Url of Puppeteer Export Server
 const url = 'http://127.0.0.1:7801';
 
 // Perform a health check before continuing

tests/http/httpTestRunnerSingle.js

@@ -30,7 +30,7 @@ console.log(
   '(results are stored in the ./tests/http/_results).\n'.green
 );
 
-// Url of Puppeteer export server
+// Url of Puppeteer Export Server
 const url = 'http://127.0.0.1:7801';
 
 // Perform a health check before continuing

tests/other/sideBySide.js

@@ -27,7 +27,7 @@ const resultsPath = join(__dirname, 'tests', 'other', '_results');
 // Create results folder for CLI exports if doesn't exist
 !existsSync(resultsPath) && mkdirSync(resultsPath);
 
-// Urls of Puppeteer and PhantomJS export servers
+// Urls of Puppeteer and PhantomJS Export Servers
 const urls = ['http://127.0.0.1:7801', 'http://127.0.0.1:7802'];
 
 // Test message