Merge pull request #87 from highcharts/develop

Develop

Author: goransle

.github/workflows/test.yml

@@ -0,0 +1,40 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Check TypeScript compilation is up to date
+        run: |
+          npm run tsc
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "Error: Files have changed after running 'npm run tsc'. Please run 'npm run tsc' locally and commit the changes."
+            git status
+            git diff
+            exit 1
+          fi
+
+      - name: Setup config.json
+        run: echo '{"token":"","port":"90","repo":"highcharts/highcharts"}' > config.json
+
+      - name: Run tests
+        run: npm test

app/server.js

@@ -16,6 +16,7 @@ const {
   logErrors,
   setConnectionAborted
 } = require('./middleware.js')
+const { JobQueue } = require('./JobQueue')
 const router = require('./router.js')
 const { formatDate, log, compileTypeScript, compileTypeScriptProject } = require('./utilities.js')
 const { shouldUseWebpack } = require('./utils.js')
@@ -36,6 +37,18 @@ const state = {
   assembles: {}
 }
 
+const jobQueue = new JobQueue()
+
+function hasActiveJobs () {
+  const activeTypescriptJobs = Object.keys(state.typescriptJobs).length > 0
+  const activeAssemblyJobs = Object.keys(state.assembles).length > 0
+  const activeQueues =
+    jobQueue.getJobs('download').length > 0 ||
+    jobQueue.getJobs('compile').length > 0
+
+  return activeTypescriptJobs || activeAssemblyJobs || activeQueues
+}
+
 /**
  * Adds the compilation of the branch to the job registry
  * Returns the promise
@@ -176,18 +189,24 @@ APP.listen(PORT)
 
 // Clean up the tmp folder every now and then
 setInterval(async () => {
-  // Clean only after a certain amount of branches and when there are no jobs running
-  if (await shouldClean()) {
-    log(0, 'Cleaning up...')
-    await cleanUp().catch(error => {
-      console.log('Cleanup failed', error)
-    })
+  if (hasActiveJobs()) {
+    log(1, 'Skipping cleanup while jobs are active')
+    return
   }
+
+  if (!(await shouldClean())) {
+    return
+  }
+
+  log(0, 'Cleaning up...')
+  await cleanUp().catch(error => {
+    log(2, `Cleanup failed: ${error.message}`)
+  })
 }, config.cleanInterval || 2 * 60 * 1000)
 
 // Do a cleanup when restarting the server
-cleanUp().catch(() => {
-  log(0, 'Cleanup failed. Likely nothing to cleanup')
+cleanUp().catch(error => {
+  log(2, `Cleanup failed on startup: ${error.message}`)
 })
 
 module.exports = {