Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: download x86 versions of Node.js #11560

Merged
merged 1 commit into from
Oct 15, 2019
Merged

fix: download x86 versions of Node.js #11560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 33 additions & 35 deletions Tasks/UseNodeV1/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import * as restm from 'typed-rest-client/RestClient';
import * as os from 'os';
import * as path from 'path';

let osPlat: string = os.platform();
let osArch: string = os.arch();
const osPlat: string = os.platform();
// Don't use `os.arch()` to construct download URLs,
// Node.js uses a different set of arch identifiers for those.
const osArch: string = (os.arch() === 'ia32') ? 'x86' : os.arch();

//
// Node versions interface
Expand Down Expand Up @@ -85,16 +87,16 @@ async function queryLatestMatch(versionSpec: string): Promise<string> {
// node offers a json list of versions
let dataFileName: string;
switch (osPlat) {
case "linux": dataFileName = "linux-" + osArch; break;
case "darwin": dataFileName = "osx-" + osArch + '-tar'; break;
case "win32": dataFileName = "win-" + osArch + '-exe'; break;
case 'linux': dataFileName = 'linux-' + osArch; break;
case 'darwin': dataFileName = 'osx-' + osArch + '-tar'; break;
case 'win32': dataFileName = 'win-' + osArch + '-exe'; break;
default: throw new Error(`Unexpected OS '${osPlat}'`);
}

let versions: string[] = [];
let dataUrl = "https://nodejs.org/dist/index.json";
let rest: restm.RestClient = new restm.RestClient('vsts-node-tool');
let nodeVersions: INodeVersion[] = (await rest.get<INodeVersion[]>(dataUrl)).result;
const versions: string[] = [];
const dataUrl = 'https://nodejs.org/dist/index.json';
const rest: restm.RestClient = new restm.RestClient('vsts-node-tool');
const nodeVersions: INodeVersion[] = (await rest.get<INodeVersion[]>(dataUrl)).result;
nodeVersions.forEach((nodeVersion:INodeVersion) => {
// ensure this version supports your os and platform
if (nodeVersion.files.indexOf(dataFileName) >= 0) {
Expand All @@ -106,7 +108,7 @@ async function queryLatestMatch(versionSpec: string): Promise<string> {
});

// get the latest version that matches the version spec
let latestVersion: string = toolLib.evaluateVersions(versions, versionSpec);
const latestVersion: string = toolLib.evaluateVersions(versions, versionSpec);
return nodeVersions.find(v => v.semanticVersion === latestVersion).version;
}

Expand All @@ -115,24 +117,20 @@ async function acquireNode(version: string): Promise<string> {
// Download - a tool installer intimately knows how to get the tool (and construct urls)
//
version = toolLib.cleanVersion(version);
let fileName: string = osPlat == 'win32'? 'node-v' + version + '-win-' + os.arch() :
'node-v' + version + '-' + osPlat + '-' + os.arch();
let urlFileName: string = osPlat == 'win32'? fileName + '.7z':
fileName + '.tar.gz';
const fileName: string = osPlat === 'win32' ? 'node-v' + version + '-win-' + osArch :
'node-v' + version + '-' + osPlat + '-' + osArch;
const urlFileName: string = osPlat === 'win32' ? fileName + '.7z':
fileName + '.tar.gz';

let downloadUrl = 'https://nodejs.org/dist/v' + version + '/' + urlFileName;
const downloadUrl = 'https://nodejs.org/dist/v' + version + '/' + urlFileName;

let downloadPath: string;

try
{
try {
downloadPath = await toolLib.downloadTool(downloadUrl);
}
catch (err)
{
catch (err) {
if (err['httpStatusCode'] &&
err['httpStatusCode'] === '404')
{
err['httpStatusCode'] === '404') {
return await acquireNodeFromFallbackLocation(version);
}

Expand All @@ -143,13 +141,13 @@ async function acquireNode(version: string): Promise<string> {
// Extract
//
let extPath: string;
if (osPlat == 'win32') {
if (osPlat === 'win32') {
extPath = taskLib.getVariable('Agent.TempDirectory');
if (!extPath) {
throw new Error('Expected Agent.TempDirectory to be set');
}

let _7zPath = path.join(__dirname, '7zr.exe');
const _7zPath = path.join(__dirname, '7zr.exe');
extPath = await toolLib.extract7z(downloadPath, extPath, _7zPath);
}
else {
Expand All @@ -159,7 +157,7 @@ async function acquireNode(version: string): Promise<string> {
//
// Install into the local tool cache - node extracts with a root folder that matches the fileName downloaded
//
let toolRoot = path.join(extPath, fileName);
const toolRoot = path.join(extPath, fileName);
return await toolLib.cacheDir(toolRoot, 'node', version);
}

Expand All @@ -177,27 +175,27 @@ async function acquireNode(version: string): Promise<string> {
// and lib file in a folder, not zipped.
async function acquireNodeFromFallbackLocation(version: string): Promise<string> {
// Create temporary folder to download in to
let tempDownloadFolder: string = 'temp_' + Math.floor(Math.random() * 2000000000);
let tempDir: string = path.join(taskLib.getVariable('agent.tempDirectory'), tempDownloadFolder);
const tempDownloadFolder: string = 'temp_' + Math.floor(Math.random() * 2e9);
const tempDir: string = path.join(taskLib.getVariable('agent.tempDirectory'), tempDownloadFolder);
taskLib.mkdirP(tempDir);

let exeUrl: string;
let libUrl: string;
try {
exeUrl = `https://nodejs.org/dist/v${version}/win-${os.arch()}/node.exe`;
libUrl = `https://nodejs.org/dist/v${version}/win-${os.arch()}/node.lib`;
exeUrl = `https://nodejs.org/dist/v${version}/win-${osArch}/node.exe`;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the change be made here too?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, maybe just move the change up to where we define osArch in line 8? That way it propogates to error messages too. So it could be

const arch = os.arch(); 
const osArch = (arch === 'ia32') ? 'x86' : arch;

Copy link
Contributor Author

@alexeykuzmin alexeykuzmin Oct 15, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, 'x86' should be used in all cases here. Done.

libUrl = `https://nodejs.org/dist/v${version}/win-${osArch}/node.lib`;

await toolLib.downloadTool(exeUrl, path.join(tempDir, "node.exe"));
await toolLib.downloadTool(libUrl, path.join(tempDir, "node.lib"));
await toolLib.downloadTool(exeUrl, path.join(tempDir, 'node.exe'));
await toolLib.downloadTool(libUrl, path.join(tempDir, 'node.lib'));
}
catch (err) {
if (err['httpStatusCode'] &&
err['httpStatusCode'] === '404')
{
err['httpStatusCode'] === '404') {
exeUrl = `https://nodejs.org/dist/v${version}/node.exe`;
libUrl = `https://nodejs.org/dist/v${version}/node.lib`;

await toolLib.downloadTool(exeUrl, path.join(tempDir, "node.exe"));
await toolLib.downloadTool(libUrl, path.join(tempDir, "node.lib"));
await toolLib.downloadTool(exeUrl, path.join(tempDir, 'node.exe'));
await toolLib.downloadTool(libUrl, path.join(tempDir, 'node.lib'));
}
else {
throw err;
Expand Down
2 changes: 1 addition & 1 deletion Tasks/UseNodeV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 159,
"Minor": 160,
"Patch": 0
},
"satisfies": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/UseNodeV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 159,
"Minor": 160,
"Patch": 0
},
"satisfies": [
Expand Down