Node js 24

.github/workflows/Prepare prebuild environment.yml

@@ -17,7 +17,7 @@ env:
   # Order reversed so newer versions are built first - Add new versions to the front (fail fast)
   # electronBuildTargets version 28 has an issue
   oldNodeBuildTargets: -t 17.0.1 
-  currentNodeBuildTargets: -t 23.0.0 -t 22.0.0 -t 21.0.0 -t 20.0.0 -t 19.0.0 -t 18.0.0 
+  currentNodeBuildTargets: -t 24.0.0 -t 23.0.0 -t 22.0.0 -t 21.0.0 -t 20.0.0 -t 19.0.0 -t 18.0.0 
   oldElectronBuildTargets: -t 19.0.0 -t 18.0.0 -t 17.0.0 
   electronBuildTargets: -t 29.0.0 -t 27.0.0 -t 26.0.0 -t 25.0.0 -t 24.0.0 -t 23.0.0 -t 22.0.0 -t 21.0.0 -t 20.0.0
   winIA32nodeBuildTargets: -t 17.0.1 

.gitignore

@@ -14,3 +14,4 @@ fixtures/space folder/
 prebuilds
 .vscode/ipch/
 .idea
+yarn.lock

.prebuild/Dockerfile.debian

@@ -12,7 +12,7 @@ RUN [ "$(uname -m)" = "x86_64" ] && apt-get install -y g++-multilib gcc-multilib
 
 ## Linux 32 bit support was dropped with NodeJS 18.4.0
 
-ENV NODE_VERSION 18.18.2
+ENV NODE_VERSION=18.18.2
 
 RUN case "${QEMU_ARCH}" in \
     x86_64) NODE_ARCH='x64';; \

.prebuild/Dockerfile.oldDebian

@@ -21,7 +21,7 @@ RUN wget -q https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tgz && tar xf
 && cd Python-3.6.15 && ./configure --prefix=/usr --enable-optimizations --enable-shared && make -j8 build_all \
 && make -j8 altinstall && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 50
 
-ENV NODE_VERSION 16.20.2
+ENV NODE_VERSION=16.20.2
 
 RUN case "${QEMU_ARCH}" in \
     x86_64) NODE_ARCH='x64';; \

azure-pipelines.yml

@@ -24,164 +24,49 @@ extends:
           pool:
             name: 1es-oss-ubuntu-22.04-x64
             os: Linux
-          strategy:
-            matrix:
-              node_18_x:
-                node_version: 18.x
           steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: $(node_version)
+              versionSpec: 20.x
             displayName: 'Install Node.js'
-          - script: |
-              npm i
+          - script: npm ci
             displayName: 'Install dependencies and build'
-          - script: |
-              npm test
+          - script: npm test
             displayName: 'Test'
-          - script: |
-              npm run lint
+          - script: npm run lint
             displayName: 'Lint'
 
         - job: macOS
           pool:
             name: Azure Pipelines
-            vmImage: 'macOS-latest'
+            vmImage: 'macOS-14'
             os: macOS
-          strategy:
-            matrix:
-              node_18_x:
-                node_version: 18.x
           steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: $(node_version)
+              versionSpec: 20.x
             displayName: 'Install Node.js'
-          - script: |
-              python3 -m pip install setuptools
+          - script: python3 -m pip install setuptools
             displayName: Install setuptools (macOS)
-          - script: |
-              npm i
+          - script: npm ci
             displayName: 'Install dependencies and build'
-          - script: |
-              npm test
+          - script: npm test
             displayName: 'Test'
-          - script: |
-              npm run lint
+          - script: npm run lint
             displayName: 'Lint'
 
         - job: Windows
           pool:
             name: 1es-oss-windows-2022-x64
             os: Windows
-          strategy:
-            matrix:
-              node_18_x:
-                node_version: 18.x
           steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: $(node_version)
+              versionSpec: 20.x
             displayName: 'Install Node.js'
-          - script: |
-              npm i
+          - script: npm ci
             displayName: 'Install dependencies and build'
-          - script: |
-              npm test
+          - script: npm test
             displayName: 'Test'
-          - script: |
-              npm run lint
+          - script: npm run lint
             displayName: 'Lint'
-
-        # - job: APIScan
-        #   dependsOn: []
-        #   pool:
-        #     name: 1es-oss-windows-2022-x64
-        #     os: Windows
-        #   strategy:
-        #     matrix:
-        #       node_18_x:
-        #         node_version: 18.x
-        #   steps:
-        #   - task: NodeTool@0
-        #     inputs:
-        #       versionSpec: $(node_version)
-        #     displayName: 'Install Node.js'
-        #   - pwsh: |
-        #       $includes = @'
-        #         {
-        #           'target_defaults': {
-        #             'conditions': [
-        #               ['OS=="win"', {
-        #                 'msvs_settings': {
-        #                   'VCCLCompilerTool': {
-        #                     'AdditionalOptions': [
-        #                       '/Zi',
-        #                       '/FS'
-        #                     ],
-        #                   },
-        #                   'VCLinkerTool': {
-        #                     'AdditionalOptions': [
-        #                       '/profile'
-        #                     ]
-        #                   }
-        #                 }
-        #               }]
-        #             ]
-        #           }
-        #         }
-        #       '@
-
-        #       if (!(Test-Path "~/.gyp")) {
-        #         mkdir "~/.gyp"
-        #         echo $includes > "~/.gyp/include.gypi"
-        #       }
-        #     displayName: Create include.gypi
-        #   - script: |
-        #       npm i
-        #     displayName: 'Install dependencies and build'
-
-        #   - task: APIScan@2
-        #     inputs:
-        #       softwareFolder: $(Build.SourcesDirectory)\build\Release
-        #       softwareName: 'vscode-node-pty'
-        #       softwareVersionNum: '1'
-        #       isLargeApp: false
-        #       toolVersion: 'Latest'
-        #     displayName: Run ApiScan
-        #     condition: succeeded()
-        #     env:
-        #       AzureServicesAuthConnectionString: $(apiscan-connectionstring)
-
-        #   - task: PublishSecurityAnalysisLogs@3
-        #     inputs:
-        #       ArtifactName: CodeAnalysisLogs
-        #       ArtifactType: Container
-        #       PublishProcessedResults: false
-        #       AllTools: true
-
-      - stage: Release
-        dependsOn: Build
-        jobs:
-          - job: Release
-            condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
-            # Output artifact to produce SBOM and to run SDL checks
-            templateContext:
-              outputs:
-              - output: pipelineArtifact
-                targetPath: $(Build.SourcesDirectory)
-                artifactName: drop
-            pool:
-              name: 1es-oss-ubuntu-22.04-x64
-              os: Linux
-            steps:
-            - task: NodeTool@0
-              inputs:
-                versionSpec: '18.x'
-              displayName: 'Install Node.js'
-            - script: |
-                npm i
-              displayName: 'Install dependencies and build'
-            - script: |
-                NPM_AUTH_TOKEN="$(NPM_AUTH_TOKEN)" node ./scripts/publish.js
-              displayName: 'Publish to npm'

build.sh

@@ -6,7 +6,7 @@
 set -e
 
 export oldNodeBuildTargets='-t 17.0.1 -t 18.0.0'
-export nodeBuildTargets='-t 23.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 -t 22.0.0'
+export nodeBuildTargets='-t 24.0.0 -t 23.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 -t 22.0.0'
 
 export oldElectronBuildTargets='-t 17.0.0 -t 18.0.0 -t 19.0.0'
 export electronBuildTargets='-t 20.0.0 -t 21.0.0 -t 22.0.0 -t 23.0.0 -t 24.0.0 -t 25.0.0 -t 26.0.0 -t 27.0.0 -t 28.0.0'
@@ -45,8 +45,10 @@ export CMD="./.prebuild/build.sh .prebuild/prebuild.js ${nodeBuildTargets}"
 echo
 echo "--------------------------- $QEMU_ARCH - $DOCKERFILE -------------------------------"
 echo
-# docker build -f .prebuild/$DOCKERFILE --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
-# docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"
+docker build -f .prebuild/$DOCKERFILE --build-arg QEMU_ARCH=${QEMU_ARCH} -t multiarch-build .
+docker run --rm -v $(pwd):/node-pty multiarch-build bash -c "$CMD"
+
+exit 1
 
 #docker run -v $(pwd):/node-pty multiarch-build ./.prebuild/build.sh .prebuild/prebuild.js ${nodeBuildTargets}
 #docker run --rm -v $(pwd):/node-pty multiarch-build ./.prebuild/build.sh .prebuild/prebuildify.js ${nodeBuildTargets}

deps/winpty/src/winpty.gyp

@@ -24,7 +24,7 @@
             # Add the 'src/gen' directory to the include path and force gyp to
             # run the script (re)generating the version header.
             '<!(cmd /c "cd shared && UpdateGenVersion.bat <(WINPTY_COMMIT_HASH)")',
-        ],
+        ]
     },
     'targets' : [
         {
@@ -41,12 +41,26 @@
                 '-lshell32',
                 '-luser32',
             ],
+            'msvs_configuration_attributes': {
+                'SpectreMitigation': 'Spectre'
+            },
             'msvs_settings': {
                 # Specify this setting here to override a setting from somewhere
                 # else, such as node's common.gypi.
                 'VCCLCompilerTool': {
                     'ExceptionHandling': '1', # /EHsc
+                    'AdditionalOptions': [
+                        '/guard:cf',
+                        '/w34244',
+                        '/w34267',
+                        '/ZH:SHA_256'
+                    ]
                 },
+                'VCLinkerTool': {
+                    'AdditionalOptions': [
+                        '/guard:cf'
+                    ]
+                }
             },
             'sources' : [
                 'agent/Agent.h',
@@ -129,12 +143,26 @@
                 '-ladvapi32',
                 '-luser32',
             ],
+            'msvs_configuration_attributes': {
+                'SpectreMitigation': 'Spectre'
+            },
             'msvs_settings': {
                 # Specify this setting here to override a setting from somewhere
                 # else, such as node's common.gypi.
                 'VCCLCompilerTool': {
                     'ExceptionHandling': '1', # /EHsc
+                    'AdditionalOptions': [
+                        '/guard:cf',
+                        '/w34244',
+                        '/w34267',
+                        '/ZH:SHA_256'
+                    ]
                 },
+                'VCLinkerTool': {
+                    'AdditionalOptions': [
+                        '/guard:cf'
+                    ]
+                }
             },
             'sources' : [
                 'include/winpty.h',

package.json

@@ -60,12 +60,12 @@
     "@typescript-eslint/parser": "^2.27.0",
     "cross-env": "^5.1.4",
     "eslint": "^6.8.0",
-    "node-abi": "^3.71.0",
     "mocha": "10",
+    "node-abi": "^3.75.0",
     "node-gyp": "=10.1.0",
     "prebuild": "^13.0.1",
     "prebuildify": "^5.0.1",
     "ps-list": "^6.0.0",
     "typescript": "^3.8.3"
   }
-}
+}