clearlydefined
diff --git a/‎.github/workflows/test.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/test.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎DevDockerfile‎
Lines changed: 1 addition & 1 deletion b/‎DevDockerfile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion b/‎Dockerfile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app.js‎
Lines changed: 13 additions & 9 deletions b/‎app.js‎
Lines changed: 13 additions & 9 deletions
diff --git a/‎bin/config.js‎
Lines changed: 1 addition & 1 deletion b/‎bin/config.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bin/www‎
Lines changed: 20 additions & 12 deletions b/‎bin/www‎
Lines changed: 20 additions & 12 deletions
diff --git a/‎business/definitionService.js‎
Lines changed: 10 additions & 3 deletions b/‎business/definitionService.js‎
Lines changed: 10 additions & 3 deletions
diff --git a/‎full.env.json‎
Lines changed: 5 additions & 1 deletion b/‎full.env.json‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎lib/curation.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/curation.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/github.d.ts‎
Lines changed: 1 addition & 1 deletion b/‎lib/github.d.ts‎
Lines changed: 1 addition & 1 deletion
@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 24
           cache: 'npm'
           registry-url: 'https://npm.pkg.github.com'
           scope: '@clearlydefined'
 
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
 # SPDX-License-Identifier: MIT
 
-FROM docker.io/library/node:18
+FROM docker.io/library/node:24-bullseye
 ENV APPDIR=/opt/service
 
 ## get SSH server running
 
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
 # SPDX-License-Identifier: MIT
 
-FROM docker.io/library/node:18
+FROM docker.io/library/node:24-bullseye
 ENV APPDIR=/opt/service
 
 ## get SSH server running
 
@@ -28,13 +28,8 @@ function createApp(config) {
 
   const summaryService = require('./business/summarizer')(config.summary)
 
-  const cachingService = config.caching.service()
-  initializers.push(async () => cachingService.initialize())
-
   const harvestStore = config.harvest.store()
   initializers.push(async () => harvestStore.initialize())
-  const harvestService = config.harvest.service({ cachingService })
-  const harvestRoute = require('./routes/harvest')(harvestService, harvestStore, summaryService)
 
   const aggregatorService = require('./business/aggregator')(config.aggregator)
 
@@ -50,6 +45,12 @@ function createApp(config) {
   const searchService = config.search.service()
   initializers.push(async () => searchService.initialize())
 
+  const cachingService = config.caching.service()
+  initializers.push(async () => cachingService.initialize())
+
+  const harvestService = config.harvest.service({ cachingService })
+  const harvestRoute = require('./routes/harvest')(harvestService, harvestStore, summaryService)
+
   const curationService = config.curation.service(null, curationStore, config.endpoints, cachingService, harvestStore)
 
   const curationQueue = config.curation.queue()
@@ -109,9 +110,11 @@ function createApp(config) {
 
   const app = express()
   app.use(cors())
-  app.options('*', cors())
+  // new express v5 matching syntax: https://expressjs.com/en/guide/migrating-5.html#path-syntax
+  app.options('*splat', cors())
+  app.use(express.json({ limit: '100kb' }))
   app.use(cookieParser())
-  app.use(helmet())
+  app.use(helmet.default())
   app.use(requestId())
   app.use('/schemas', express.static('./schemas'))
 
@@ -199,7 +202,6 @@ function createApp(config) {
       url: req.url
     })
     const err = new Error('Not Found')
-    // @ts-ignore - Express error convention
     err.status = 404
     next(err)
   }
@@ -229,6 +231,8 @@ function createApp(config) {
     )
   }
 
+  app.init = requestHandler.init
+
   // error handler
   app.use((error, request, response, next) => {
     if (response.headersSent) return next(error)
@@ -250,7 +254,7 @@ function createApp(config) {
         error: {
           code: status.toString(),
           message: 'An error has occurred',
-          innererror: serializeError(response.locals.error)
+          innererror: serializeError.serializeError(response.locals.error)
         }
       })
   })
 
@@ -32,7 +32,7 @@ function loadOne(spec, namespace) {
     if (!target) target = require(requirePath)
     return objectPath ? get(target, objectPath) : target
   } catch (e) {
-    throw new Error(`could not load provider for ${requirePath}`)
+    throw new Error(`could not load provider for ${requirePath}. Error ${e.message}`)
   }
 }
 
 
@@ -6,7 +6,6 @@ const config = require('./config')
 const app = require('../app')(config)
 const debug = require('debug')('service:server')
 const http = require('http')
-const init = require('express-init')
 
 /**
  * Get port from environment and store in Express.
@@ -19,19 +18,30 @@ app.set('port', port)
  */
 const server = http.createServer(app)
 
+startServer()
+
 /**
  * Initialize the apps (if they have async init functions) and start listening
  */
-init(app, error => {
-  if (error) {
-    console.log('Error initializing the Express app: ' + error)
-    throw new Error(error)
+async function startServer() {
+  try {
+    if (typeof app.init === 'function') {
+      await new Promise((resolve, reject) => {
+        app.init(app, err => {
+          if (err) reject(err)
+          else resolve()
+        })
+      })
+    }
+    server.listen(port)
+    server.on('error', onError)
+    server.on('listening', onListening)
+    console.log(`Service listening on port: ${port}`)
+  } catch (error) {
+    console.error('Error initializing the Express app:', error)
+    process.exit(1)
   }
-  server.listen(port)
-  server.on('error', onError)
-  server.on('listening', onListening)
-  console.log(`Service listening on port: ${port}`)
-})
+}
 
 /**
  * Normalize a port into a number, string, or false.
@@ -56,11 +66,9 @@ function onError(error) {
     case 'EACCES':
       console.error(bind + ' requires elevated privileges')
       process.exit(1)
-      break
     case 'EADDRINUSE':
       console.error(bind + ' is already in use')
       process.exit(1)
-      break
     default:
       throw error
   }
 
@@ -26,7 +26,7 @@ const {
   simplifyAttributions,
   updateSourceLocation
 } = require('../lib/utils')
-const minimatch = require('minimatch')
+const { minimatch } = require('minimatch')
 const extend = require('extend')
 const logger = require('../providers/logging/logger')
 const validator = require('../schemas/validator')
@@ -74,6 +74,7 @@ class DefinitionService {
       const curation = this.curationService.get(coordinates, pr)
       return this.compute(coordinates, curation)
     }
+
     const existing = await this._cacheExistingAside(coordinates, force)
     let result = await this.upgradeHandler.validate(existing)
     if (result) {
@@ -186,6 +187,9 @@ class DefinitionService {
         try {
           return await this.list(coordinates)
         } catch (error) {
+          this.logger.error('failed to list definitions', {
+            error: error.message
+          })
           return null
         }
       })
@@ -309,9 +313,10 @@ class DefinitionService {
       })
     }
   }
-
   async _store(definition) {
+    this.logger.debug('storing definition', { coordinates: definition.coordinates.toString() })
     await this.definitionStore.store(definition)
+    this.logger.debug('definition stored successfully', { coordinates: definition.coordinates.toString() })
     await this._setDefinitionInCache(this._getCacheKey(definition.coordinates), definition)
     await this.harvestService.done(definition.coordinates)
   }
@@ -458,12 +463,14 @@ class DefinitionService {
     if (!declared || !discovered) return 0
     return discovered.every(expression => SPDX.satisfies(expression, declared)) ? weights.consistency : 0
   }
-
   _computeSPDXScore(definition) {
     try {
       parse(get(definition, 'licensed.declared')) // use strict spdx-expression-parse
       return weights.spdx
     } catch (e) {
+      this.logger.debug('Could not parse declared license expression.', {
+        errorMessage: e.message
+      })
       return 0
     }
   }
 
@@ -51,5 +51,9 @@
 
   "========== Heapstats Logging settings (OPTIONAL) ==========": "",
   "LOG_NODE_HEAPSTATS": "<true|false>",
-  "LOG_NODE_HEAPSTATS_INTERVAL_MS": "<time_in_milliseconds (e.g. '30000')>"
+  "LOG_NODE_HEAPSTATS_INTERVAL_MS": "<time_in_milliseconds (e.g. '30000')>",
+
+  "========== Logging settings ==========": "",
+  "ENABLE_REST_VALIDATION_ERRORS": "<true|false>",
+  "LOGGER_LOG_TO_CONSOLE": "<true|false>"
 }
@@ -28,7 +28,7 @@ class Curation {
 
   load(content) {
     try {
-      return yaml.safeLoad(content)
+      return yaml.load(content)
     } catch (error) {
       this.errors.push({ message: 'Invalid yaml', error })
     }
 
@@ -5,7 +5,7 @@
  * GitHub API client instance from @octokit/rest package. This represents the authenticated GitHub client with all
  * available API methods.
  */
-export type GitHubClient = import('@octokit/rest')
+export type GitHubClient = import('@octokit/rest').Octokit
 
 /** Options for configuring GitHub client authentication. */
 export interface GitHubClientOptions {
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ function loadOne(spec, namespace) {`
`32`	`32`	`if (!target) target = require(requirePath)`
`33`	`33`	`return objectPath ? get(target, objectPath) : target`
`34`	`34`	`} catch (e) {`
`35`		- throw new Error(`could not load provider for ${requirePath}`)
	`35`	+ throw new Error(`could not load provider for ${requirePath}. Error ${e.message}`)
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Curation {`
`28`	`28`
`29`	`29`	`load(content) {`
`30`	`30`	`try {`
`31`		`- return yaml.safeLoad(content)`
	`31`	`+ return yaml.load(content)`
`32`	`32`	`} catch (error) {`
`33`	`33`	`this.errors.push({ message: 'Invalid yaml', error })`
`34`	`34`	`}`