feat: update nodejs

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 24
           cache: 'npm'
 
       - name: Install dependencies

.gitignore

@@ -1,8 +1,30 @@
+
+# Dependency directories
 node_modules/
+
+
+# Log files
 npm-debug.log
+
+
+# Coverage output (used by tools like Istanbul/nyc)
 coverage/
-.DS_Store
-.npmrc
 .nyc_output
+
+
+# System files
+.DS_Store
+
+
+# Editor and OS backup files
 *~
 \#*#
+
+
+# Configuration files
+.npmrc
+
+
+# Environment variable files
+.env
+env.json

DevDockerfile

@@ -1,13 +1,13 @@
 # Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
 # SPDX-License-Identifier: MIT
 
-FROM node:18-bullseye
+FROM node:24-bullseye
 ENV APPDIR=/opt/service
 
 # Set environment variables from build arguments
 ARG BUILD_NUMBER=0
-ENV BUILD_NUMBER=$APP_VERSION
 ARG APP_VERSION="UNKNOWN"
+ENV BUILD_NUMBER=$APP_VERSION
 ENV APP_VERSION=$APP_VERSION
 ARG BUILD_SHA="UNKNOWN"
 ENV BUILD_SHA=$BUILD_SHA
@@ -54,11 +54,11 @@ RUN mkdir -p "${APPDIR}" && cp -a /tmp/node_modules "${APPDIR}"
 WORKDIR "${APPDIR}"
 COPY . "${APPDIR}"
 
-ENV NODE_ENV "localhost"
+ENV NODE_ENV="localhost"
 
 # Uncomment this if you want to see debug output
 #ENV DEBUG=*
 
-ENV PORT 5000
+ENV PORT=5000
 EXPOSE 5000
 ENTRYPOINT ["node", "index.js"]

Dockerfile

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
 # SPDX-License-Identifier: MIT
 
-FROM node:18-bullseye
+FROM node:24-bullseye
 ENV APPDIR=/opt/service
 
 # Set environment variables from build arguments
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --no-install-su
   gem install bundler -v 2.5.4 --no-document
 
 # Scancode
-ARG SCANCODE_VERSION="32.1.0"
+ARG SCANCODE_VERSION="32.3.3"
 RUN pip3 install --upgrade pip setuptools wheel && \
   curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt && \
   pip3 install --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION && \
@@ -40,7 +40,7 @@ RUN gem install nokogiri:1.16.0 --no-document && \
 
 # REUSE
 RUN pip3 install setuptools
-RUN pip3 install reuse==3.0.1
+RUN pip3 install reuse==5.0.2
 
 # Crawler config
 ENV CRAWLER_DEADLETTER_PROVIDER=cd(azblob)
@@ -62,6 +62,6 @@ RUN mkdir -p "${APPDIR}" && cp -a /tmp/node_modules "${APPDIR}"
 WORKDIR "${APPDIR}"
 COPY . "${APPDIR}"
 
-ENV PORT 5000
+ENV PORT=5000
 EXPOSE 5000
 ENTRYPOINT ["node", "index.js"]

ghcrawler/lib/crawler.js

@@ -239,6 +239,20 @@ class Crawler {
     //    else release
     //      if release fails abandon as everyone will think it is still in the queue
     //      else delete
+
+    // TODO ELAINE: remove this commented code later
+    // if (!request.type || !request.url) {
+    //   console.log(`[ERROR] Request object corrupted: type=${request.type}, url=${request.url}`)
+    //   console.log(`[ERROR] Request keys:`, Object.keys(request).slice(0, 10))
+    //   request = Request.adopt(request)
+    // }
+
+    if (request && typeof request.toUniqueString !== 'function') {
+      console.log(
+        `[DEBUG] Calling adopt in _completeRequest for ${request ? request.type : 'undefined'}@${request ? request.url : 'undefined'}`
+      )
+      request = Request.adopt(request)
+    }
     const loopName = request.meta ? request.meta.loopName : ''
     debug(`_completeRequest(${loopName}:${request.toUniqueString()}): enter (force: ${forceRequeue})`)
     const self = this

ghcrawler/lib/request.js

@@ -46,6 +46,26 @@ class Request {
     return object
   }
 
+//   static adopt(object) {
+//   console.log(`[DEBUG] Request.adopt called for ${object ? object.type : 'undefined'}@${object ? object.url : 'undefined'}`);
+//   console.log(`[DEBUG] Before adoption: hasProto=${!!object}, isRequestProto=${object && object.__proto__ === Request.prototype}`);
+
+//   if (object && object.__proto__ !== Request.prototype) {
+//     console.log(`[DEBUG] Restoring prototype chain to Request`);
+//     object.__proto__ = Request.prototype;
+//   }
+
+//   if (object && object.policy) {
+//     object.policy = Request._getResolvedPolicy(object);
+//     Policy.adopt(object.policy);
+//   } else if (object && object.type) {
+//     object.policy = Policy.default(object.type);
+//   }
+
+//   console.log(`[DEBUG] After adoption: hasToUniqueString=${object && typeof object.toUniqueString === 'function'}`);
+
+//   return object;
+// }
   static _getResolvedPolicy(request) {
     let policyOrSpec = request.policy
     if (typeof policyOrSpec !== 'string') {

lib/fetch.js

@@ -2,11 +2,15 @@
 // SPDX-License-Identifier: MIT
 
 const axios = require('axios')
+const { HttpsProxyAgent } = require('https-proxy-agent')
 
 const defaultHeaders = Object.freeze({ 'User-Agent': 'clearlydefined.io crawler (clearlydefined@outlook.com)' })
 
 axios.defaults.headers = defaultHeaders
 
+const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy
+const httpsAgent = httpsProxy ? new HttpsProxyAgent(httpsProxy) : undefined
+
 function buildRequestOptions(request) {
   let responseType = 'text'
   if (request.json) {
@@ -26,6 +30,8 @@ function buildRequestOptions(request) {
     responseType,
     headers: request.headers,
     data: request.body,
+    httpsAgent,
+    proxy: false, // to make sure the httpsAgent proxy will be used if set
     ...validateOptions
   }
 }
@@ -45,7 +51,11 @@ async function callFetch(request, axiosInstance = axios) {
 }
 
 function withDefaults(opts) {
-  const axiosInstance = axios.create(opts)
+  const axiosInstance = axios.create({
+    ...opts,
+    httpsAgent,
+    proxy: false
+  })
   return request => callFetch(request, axiosInstance)
 }