Merge branch 'main' into add-argv0-support

Author: mattieb

.config/tsaoptions.json

@@ -0,0 +1,10 @@
+{
+  "codebaseName": "devdiv_microsoft_vscode_node_pty",
+  "instanceUrl": "https://devdiv.visualstudio.com/defaultcollection",
+  "projectName": "DevDiv",
+  "areaPath": "DevDiv\\VS Code (compliance tracking only)\\Visual Studio Code NPM Packages",
+  "notificationAliases": [
+    "[email protected]",
+    "[email protected]"
+  ]
+}

.eslintrc.js

@@ -9,7 +9,10 @@ module.exports = {
     "project": "src/tsconfig.json",
     "sourceType": "module"
   },
-  "ignorePatterns": "**/typings/*.d.ts",
+  "ignorePatterns": [
+    "**/typings/*.d.ts",
+    "scripts/**/*"
+  ],
   "plugins": [
     "@typescript-eslint"
   ],

.gitignore

@@ -8,7 +8,7 @@ node_modules/
 builderror.log
 lib/
 npm-debug.log
-package-lock.json
 fixtures/space folder/
 .vscode/settings.json
 .vscode/ipch/
+yarn.lock

README.md

@@ -104,6 +104,7 @@ npm install --global --production windows-build-tools
 The following are also needed:
 
 - [Windows SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk) - only the "Desktop C++ Apps" components are needed to be installed
+- Spectre-mitigated libraries - In order to avoid the build error "MSB8040: Spectre-mitigated libraries are required for this project", open the Visual Studio Installer, press the Modify button, navigate to the "Individual components" tab, search "Spectre", and install an option like "MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest)" (the exact option to install will depend on your version of Visual Studio as well as your operating system architecture)
 
 ## Debugging
 

azure-pipelines.yml

@@ -3,96 +3,70 @@
 # Add steps that analyze code, save build artifacts, deploy, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
 
-jobs:
-- job: Linux
-  pool:
-    vmImage: 'ubuntu-latest'
-  strategy:
-    matrix:
-      node_16_x:
-        node_version: 16.x
-      node_18_x:
-        node_version: 18.x
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: $(node_version)
-    displayName: 'Install Node.js'
-  - script: |
-      npm i
-    displayName: 'Install dependencies and build'
-  - script: |
-      npm test
-    displayName: 'Test'
-  - script: |
-      npm run lint
-    displayName: 'Lint'
+resources:
+  repositories:
+    - repository: 1esPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
 
-- job: macOS
-  pool:
-    vmImage: 'macOS-latest'
-  strategy:
-    matrix:
-      node_16_x:
-        node_version: 16.x
-      node_18_x:
-        node_version: 18.x
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: $(node_version)
-    displayName: 'Install Node.js'
-  - script: |
-      npm i
-    displayName: 'Install dependencies and build'
-  - script: |
-      npm test
-    displayName: 'Test'
-  - script: |
-      npm run lint
-    displayName: 'Lint'
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      sourceAnalysisPool: 1es-oss-windows-2022-x64
+      tsa:
+        enabled: true
+    stages:
+      - stage: Build
+        jobs:
+        - job: Linux
+          pool:
+            name: 1es-oss-ubuntu-22.04-x64
+            os: Linux
+          steps:
+          - task: NodeTool@0
+            inputs:
+              versionSpec: 20.x
+            displayName: 'Install Node.js'
+          - script: npm ci
+            displayName: 'Install dependencies and build'
+          - script: npm test
+            displayName: 'Test'
+          - script: npm run lint
+            displayName: 'Lint'
 
-- job: Windows
-  pool:
-    vmImage: 'windows-2019'
-  strategy:
-    matrix:
-      node_16_x:
-        node_version: 16.x
-      node_18_x:
-        node_version: 18.x
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: $(node_version)
-    displayName: 'Install Node.js'
-  - script: |
-      npm i
-    displayName: 'Install dependencies and build'
-  - script: |
-      npm test
-    displayName: 'Test'
-  - script: |
-      npm run lint
-    displayName: 'Lint'
-
-- job: Release
-  dependsOn:
-  - Linux
-  - macOS
-  - Windows
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
-  pool:
-    vmImage: 'ubuntu-latest'
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '16.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'
+        - job: macOS
+          pool:
+            name: Azure Pipelines
+            vmImage: 'macOS-14'
+            os: macOS
+          steps:
+          - task: NodeTool@0
+            inputs:
+              versionSpec: 20.x
+            displayName: 'Install Node.js'
+          - script: python3 -m pip install setuptools
+            displayName: Install setuptools (macOS)
+          - script: npm ci
+            displayName: 'Install dependencies and build'
+          - script: npm test
+            displayName: 'Test'
+          - script: npm run lint
+            displayName: 'Lint'
 
+        - job: Windows
+          pool:
+            name: 1es-oss-windows-2022-x64
+            os: Windows
+          steps:
+          - task: NodeTool@0
+            inputs:
+              versionSpec: 20.x
+            displayName: 'Install Node.js'
+          - script: npm ci
+            displayName: 'Install dependencies and build'
+          - script: npm test
+            displayName: 'Test'
+          - script: npm run lint
+            displayName: 'Lint'

binding.gyp

@@ -1,5 +1,8 @@
 {
   'target_defaults': {
+    'dependencies': [
+      "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
+    ],
     'conditions': [
       ['OS=="win"', {
         'msvs_configuration_attributes': {
@@ -28,9 +31,6 @@
       'targets': [
         {
           'target_name': 'conpty',
-          'include_dirs' : [
-            '<!(node -e "require(\'nan\')")'
-          ],
           'sources' : [
             'src/win/conpty.cc',
             'src/win/path_util.cc'
@@ -41,17 +41,14 @@
         },
         {
           'target_name': 'conpty_console_list',
-          'include_dirs' : [
-            '<!(node -e "require(\'nan\')")'
-          ],
           'sources' : [
             'src/win/conpty_console_list.cc'
           ],
         },
         {
           'target_name': 'pty',
           'include_dirs' : [
-            '<!(node -e "require(\'nan\')")',
+            '<!(node -p "require(\'node-addon-api\').include_dir")',
             'deps/winpty/src/include',
           ],
           # Disabled due to winpty
@@ -73,9 +70,6 @@
       'targets': [
         {
           'target_name': 'pty',
-          'include_dirs' : [
-            '<!(node -e "require(\'nan\')")'
-          ],
           'sources': [
             'src/unix/pty.cc',
           ],
@@ -91,11 +85,6 @@
               'libraries!': [
                 '-lutil'
               ]
-            }],
-            ['OS=="mac"', {
-              "xcode_settings": {
-                "MACOSX_DEPLOYMENT_TARGET":"10.7"
-              }
             }]
           ]
         }

deps/winpty/src/agent/Agent.cc

@@ -224,9 +224,17 @@ Agent::Agent(LPCWSTR controlPipeName,
 Agent::~Agent()
 {
     trace("Agent::~Agent entered");
-    agentShutdown();
-    if (m_childProcess != NULL) {
-        CloseHandle(m_childProcess);
+    try {
+        agentShutdown();
+        if (m_childProcess != NULL) {
+            CloseHandle(m_childProcess);
+        }
+    } catch (const std::exception &e) {
+        // Log the exception or handle it as needed
+        trace("Exception in Agent::~Agent: %s", e.what());
+    } catch (...) {
+        // Catch any other types of exceptions
+        trace("Unknown exception in Agent::~Agent");
     }
 }
 

examples/fork/index.js

@@ -10,7 +10,8 @@ const ptyProcess = pty.spawn(shell, [], {
   rows: 26,
   cwd: isWindows ? process.env.USERPROFILE : process.env.HOME,
   env: Object.assign({ TEST: "Environment vars work" }, process.env),
-  useConpty: true
+  useConpty: true,
+  useConptyDll: true
 });
 
 ptyProcess.onData(data => process.stdout.write(data));