node-pty 1.2.0-beta.1 → 1.2.0-beta.3

package/binding.gyp

@@ -14,8 +14,9 @@
                 '/guard:cf',
                 '/sdl',
                 '/W3',
-                '/w34244',
-                '/w34267',
+                '/we4146',
+                '/we4244',
+                '/we4267',
                 '/ZH:SHA_256'
               ]
             },
@@ -80,6 +81,7 @@
             '-lutil'
           ],
           'cflags': ['-Wall', '-O2', '-D_FORTIFY_SOURCE=2'],
+          'ldflags': [],
           'conditions': [
             # http://www.gnu.org/software/gnulib/manual/html_node/forkpty.html
             #   One some systems (at least including Cygwin, Interix,
@@ -88,6 +90,61 @@
               'libraries!': [
                 '-lutil'
               ]
+            }],
+            ['OS=="linux"', {
+              'variables': {
+                'sysroot%': '<!(node -p "process.env.SYSROOT_PATH || \'\'")',
+                'target_arch%': '<!(node -p "process.env.npm_config_arch || process.arch")',
+              },
+              'conditions': [
+                ['sysroot!=""', {
+                  'variables': {
+                    'gcc_include%': '<!(${CXX:-g++} -print-file-name=include)',
+                  },
+                  'conditions': [
+                    ['target_arch=="x64"', {
+                      'cflags': [
+                        '--sysroot=<(sysroot)',
+                        '-nostdinc',
+                        '-isystem<(gcc_include)',
+                        '-isystem<(sysroot)/usr/include',
+                        '-isystem<(sysroot)/usr/include/x86_64-linux-gnu'
+                      ],
+                      'cflags_cc': [
+                        '-nostdinc++',
+                        '-isystem<(sysroot)/../include/c++/10.5.0',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/x86_64-linux-gnu',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/backward'
+                      ],
+                      'ldflags': [
+                        '--sysroot=<(sysroot)',
+                        '-L<(sysroot)/lib',
+                        '-L<(sysroot)/usr/lib'
+                      ],
+                    }],
+                    ['target_arch=="arm64"', {
+                      'cflags': [
+                        '--sysroot=<(sysroot)',
+                        '-nostdinc',
+                        '-isystem<(gcc_include)',
+                        '-isystem<(sysroot)/usr/include',
+                        '-isystem<(sysroot)/usr/include/aarch64-linux-gnu'
+                      ],
+                      'cflags_cc': [
+                        '-nostdinc++',
+                        '-isystem<(sysroot)/../include/c++/10.5.0',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/aarch64-linux-gnu',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/backward'
+                      ],
+                      'ldflags': [
+                        '--sysroot=<(sysroot)',
+                        '-L<(sysroot)/lib',
+                        '-L<(sysroot)/usr/lib'
+                      ],
+                    }]
+                  ]
+                }]
+              ]
             }]
           ]
         }

package/deps/winpty/src/winpty.gyp

@@ -50,6 +50,7 @@
                     'ExceptionHandling': '1', # /EHsc
                     'AdditionalOptions': [
                         '/guard:cf',
+                        '/w34146',
                         '/w34244',
                         '/w34267',
                         '/ZH:SHA_256'
@@ -152,6 +153,7 @@
                     'ExceptionHandling': '1', # /EHsc
                     'AdditionalOptions': [
                         '/guard:cf',
+                        '/w34146',
                         '/w34244',
                         '/w34267',
                         '/ZH:SHA_256'

package/lib/utils.js

@@ -24,7 +24,7 @@ function loadNativeModule(name) {
         var d = dirs_1[_i];
         for (var _a = 0, relative_1 = relative; _a < relative_1.length; _a++) {
             var r = relative_1[_a];
-            var dir = r + "/" + d + "/";
+            var dir = r + "/" + d;
             try {
                 return { dir: dir, module: require(dir + "/" + name + ".node") };
             }

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,SAAgB,MAAM,CAAC,MAAW;IAAE,iBAAiB;SAAjB,UAAiB,EAAjB,qBAAiB,EAAjB,IAAiB;QAAjB,gCAAiB;;IACnD,OAAO,CAAC,OAAO,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAzB,CAAyB,CAAC,EAA7D,CAA6D,CAAC,CAAC;IACzF,OAAO,MAAM,CAAC;AAChB,CAAC;AAHD,wBAGC;AAGD,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,0CAA0C;IAC1C,IAAM,IAAI,GAAG,CAAC,eAAe,EAAE,aAAa,EAAE,eAAa,OAAO,CAAC,QAAQ,SAAI,OAAO,CAAC,IAAM,CAAC,CAAC;IAC/F,sFAAsF;IACtF,IAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,SAAkB,CAAC;IACvB,KAAgB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI,EAAE;QAAjB,IAAM,CAAC,aAAA;QACV,KAAgB,UAAQ,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE;YAArB,IAAM,CAAC,iBAAA;YACV,IAAM,GAAG,GAAM,CAAC,SAAI,CAAC,MAAG,CAAC;YACzB,IAAI;gBACF,OAAO,EAAE,GAAG,KAAA,EAAE,MAAM,EAAE,OAAO,CAAI,GAAG,SAAI,IAAI,UAAO,CAAC,EAAE,CAAC;aACxD;YAAC,OAAO,CAAC,EAAE;gBACV,SAAS,GAAG,CAAC,CAAC;aACf;SACF;KACF;IACD,MAAM,IAAI,KAAK,CAAC,mCAAiC,IAAI,wBAAmB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAK,SAAW,CAAC,CAAC;AAC3G,CAAC;AAjBD,4CAiBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,SAAgB,MAAM,CAAC,MAAW;IAAE,iBAAiB;SAAjB,UAAiB,EAAjB,qBAAiB,EAAjB,IAAiB;QAAjB,gCAAiB;;IACnD,OAAO,CAAC,OAAO,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG,IAAI,OAAA,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAzB,CAAyB,CAAC,EAA7D,CAA6D,CAAC,CAAC;IACzF,OAAO,MAAM,CAAC;AAChB,CAAC;AAHD,wBAGC;AAGD,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,0CAA0C;IAC1C,IAAM,IAAI,GAAG,CAAC,eAAe,EAAE,aAAa,EAAE,eAAa,OAAO,CAAC,QAAQ,SAAI,OAAO,CAAC,IAAM,CAAC,CAAC;IAC/F,sFAAsF;IACtF,IAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,SAAkB,CAAC;IACvB,KAAgB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI,EAAE;QAAjB,IAAM,CAAC,aAAA;QACV,KAAgB,UAAQ,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE;YAArB,IAAM,CAAC,iBAAA;YACV,IAAM,GAAG,GAAM,CAAC,SAAI,CAAG,CAAC;YACxB,IAAI;gBACF,OAAO,EAAE,GAAG,KAAA,EAAE,MAAM,EAAE,OAAO,CAAI,GAAG,SAAI,IAAI,UAAO,CAAC,EAAE,CAAC;aACxD;YAAC,OAAO,CAAC,EAAE;gBACV,SAAS,GAAG,CAAC,CAAC;aACf;SACF;KACF;IACD,MAAM,IAAI,KAAK,CAAC,mCAAiC,IAAI,wBAAmB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAK,SAAW,CAAC,CAAC;AAC3G,CAAC;AAjBD,4CAiBC"}

package/package.json

@@ -4,7 +4,7 @@
   "author": {
     "name": "Microsoft Corporation"
   },
-  "version": "1.2.0-beta.1",
+  "version": "1.2.0-beta.3",
   "license": "MIT",
   "main": "./lib/index.js",
   "types": "./typings/node-pty.d.ts",

package/scripts/linux/checksums.txt

@@ -0,0 +1,2 @@
+3122af49c493c5c767c2b0772a41119cbdc9803125a705683445b4066dc88b82  x86_64-linux-gnu-glibc-2.28-gcc-10.5.0.tar.gz
+3baac81a39b69e0929e4700f4f78f022adefc515010054ec393565657c4fff32  aarch64-linux-gnu-glibc-2.28-gcc-10.5.0.tar.gz

package/scripts/linux/install-sysroot.js

@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const { execSync } = require('child_process');
+const { tmpdir } = require('os');
+const fs = require('fs');
+const path = require('path');
+const { createHash } = require('crypto');
+
+const REPO_ROOT = path.join(__dirname, '..', '..');
+
+const ghApiHeaders = {
+  Accept: 'application/vnd.github.v3+json',
+  'User-Agent': 'node-pty Build',
+};
+
+if (process.env.GITHUB_TOKEN) {
+  ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64');
+}
+
+const ghDownloadHeaders = {
+  ...ghApiHeaders,
+  Accept: 'application/octet-stream',
+};
+
+function getSysrootChecksum(expectedName) {
+  const checksumPath = path.join(REPO_ROOT, 'scripts', 'linux', 'checksums.txt');
+  const checksums = fs.readFileSync(checksumPath, 'utf8');
+  for (const line of checksums.split('\n')) {
+    const [checksum, name] = line.split(/\s+/);
+    if (name === expectedName) {
+      return checksum;
+    }
+  }
+  return undefined;
+}
+
+async function fetchUrl(options, retries = 10, retryDelay = 1000) {
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 30 * 1000);
+    const version = '20250407-330404';
+    try {
+      const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
+        headers: ghApiHeaders,
+        signal: controller.signal
+      });
+      if (response.ok && (response.status >= 200 && response.status < 300)) {
+        console.log(`Fetch completed: Status ${response.status}.`);
+        const contents = Buffer.from(await response.arrayBuffer());
+        const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName);
+        if (!asset) {
+          throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
+        }
+        console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
+        const assetResponse = await fetch(asset.url, {
+          headers: ghDownloadHeaders
+        });
+        if (assetResponse.ok && (assetResponse.status >= 200 && assetResponse.status < 300)) {
+          const assetContents = Buffer.from(await assetResponse.arrayBuffer());
+          console.log(`Fetched response body buffer: ${assetContents.byteLength} bytes`);
+          if (options.checksumSha256) {
+            const actualSHA256Checksum = createHash('sha256').update(assetContents).digest('hex');
+            if (actualSHA256Checksum !== options.checksumSha256) {
+              throw new Error(`Checksum mismatch for ${asset.url} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum})`);
+            }
+          }
+          console.log(`Verified SHA256 checksums match for ${asset.url}`);
+					const tarCommand = `tar -xz -C ${options.dest}`;
+					execSync(tarCommand, { input: assetContents });
+					console.log(`Fetch complete!`);
+					return;
+        }
+        throw new Error(`Request ${asset.url} failed with status code: ${assetResponse.status}`);
+      }
+      throw new Error(`Request https://api.github.com failed with status code: ${response.status}`);
+    } finally {
+      clearTimeout(timeout);
+    }
+  } catch (e) {
+    if (retries > 0) {
+      console.log(`Fetching failed: ${e}`);
+      await new Promise(resolve => setTimeout(resolve, retryDelay));
+      return fetchUrl(options, retries - 1, retryDelay);
+    }
+    throw e;
+  }
+}
+
+async function getSysroot(arch) {
+  let expectedName;
+  let triple;
+  const prefix = '-glibc-2.28-gcc-10.5.0';
+
+  switch (arch) {
+    case 'x64':
+      expectedName = `x86_64-linux-gnu${prefix}.tar.gz`;
+      triple = 'x86_64-linux-gnu';
+      break;
+    case 'arm64':
+      expectedName = `aarch64-linux-gnu${prefix}.tar.gz`;
+      triple = 'aarch64-linux-gnu';
+      break;
+    default:
+      throw new Error(`Unsupported architecture: ${arch}`);
+  }
+
+  console.log(`Fetching ${expectedName} for ${triple}`);
+  const checksumSha256 = getSysrootChecksum(expectedName);
+  if (!checksumSha256) {
+    throw new Error(`Could not find checksum for ${expectedName}`);
+  }
+
+  const sysroot = path.join(tmpdir(), `vscode-${arch}-sysroot`);
+  const stamp = path.join(sysroot, '.stamp');
+  const result = `${sysroot}/${triple}/${triple}/sysroot`;
+
+  if (fs.existsSync(stamp) && fs.readFileSync(stamp).toString() === expectedName) {
+    console.log(`Sysroot already installed: ${result}`);
+    return result;
+  }
+
+  console.log(`Installing ${arch} root image: ${sysroot}`);
+  fs.rmSync(sysroot, { recursive: true, force: true });
+  fs.mkdirSync(sysroot, { recursive: true });
+
+  await fetchUrl({
+    checksumSha256,
+    assetName: expectedName,
+    dest: sysroot
+  });
+
+  fs.writeFileSync(stamp, expectedName);
+  console.log(`Sysroot installed: ${result}`);
+  return result;
+}
+
+async function main() {
+  const arch = process.argv[2] || process.env.ARCH || 'x64';
+  console.log(`Installing sysroot for architecture: ${arch}`);
+
+  try {
+    const sysrootPath = await getSysroot(arch);
+    console.log(`SYSROOT_PATH=${sysrootPath}`);
+  } catch (error) {
+    console.error('Error installing sysroot:', error);
+    process.exit(1);
+  }
+}
+
+if (require.main === module) {
+  main();
+}
+
+module.exports = { getSysroot };

package/scripts/linux/verify-glibc-requirements.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Get all files with .node extension from given folder
+files=$(find $SEARCH_PATH -name "*.node")
+
+echo "Verifying requirements for files: $files"
+
+for file in $files; do
+  glibc_version="$EXPECTED_GLIBC_VERSION"
+  glibcxx_version="$EXPECTED_GLIBCXX_VERSION"
+  while IFS= read -r line; do
+    if [[ $line == *"GLIBC_"* ]]; then
+      version=$(echo "$line" | awk '{if ($5 ~ /^[0-9a-fA-F]+$/) print $6; else print $5}' | tr -d '()')
+      version=${version#*_}
+      if [[ $(printf "%s\n%s" "$version" "$glibc_version" | sort -V | tail -n1) == "$version" ]]; then
+        glibc_version=$version
+      fi
+    elif [[ $line == *"GLIBCXX_"* ]]; then
+      version=$(echo "$line" | awk '{if ($5 ~ /^[0-9a-fA-F]+$/) print $6; else print $5}' | tr -d '()')
+      version=${version#*_}
+      if [[ $(printf "%s\n%s" "$version" "$glibcxx_version" | sort -V | tail -n1) == "$version" ]]; then
+        glibcxx_version=$version
+      fi
+    fi
+  done < <("$SYSROOT_PATH/../bin/objdump" -T "$file")
+
+  if [[ "$glibc_version" != "$EXPECTED_GLIBC_VERSION" ]]; then
+    echo "Error: File $file has dependency on GLIBC > $EXPECTED_GLIBC_VERSION, found $glibc_version"
+    exit 1
+  fi
+  if [[ "$glibcxx_version" != "$EXPECTED_GLIBCXX_VERSION" ]]; then
+    echo "Error: File $file has dependency on GLIBCXX > $EXPECTED_GLIBCXX_VERSION, found $glibcxx_version"
+  fi
+done

package/scripts/prebuild.js

@@ -31,4 +31,12 @@ if (!fs.existsSync(PREBUILD_DIR)) {
   process.exit(1);
 }
 
+// Ensure spawn-helper has execute permission (may be stripped by npm pack)
+if (process.platform === 'darwin') {
+  const spawnHelper = path.join(PREBUILD_DIR, 'spawn-helper');
+  if (fs.existsSync(spawnHelper)) {
+    fs.chmodSync(spawnHelper, 0o755);
+  }
+}
+
 process.exit(0);

package/src/utils.ts

@@ -17,7 +17,7 @@ export function loadNativeModule(name: string): {dir: string, module: any} {
   let lastError: unknown;
   for (const d of dirs) {
     for (const r of relative) {
-      const dir = `${r}/${d}/`;
+      const dir = `${r}/${d}`;
       try {
         return { dir, module: require(`${dir}/${name}.node`) };
       } catch (e) {