ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-06-17 23:38:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

osConfigure/localFlash: Add support for Node.js v14

Browse Source 
* Replace old resin-image-fs with newer balena-image-fs
* package.json: Remove resin-image-fs package
* package: Install dependencies that work with node14
* Remove resin-image-fs typings
* Fix etcher-sdk related types
* local/flash: Add unmountOnSuccess, write, direct properties on flash
	Taken from https://github.com/balena-io-modules/etcher-sdk/blob/master/examples/multi-destination.ts
* tests/utils/eol-conversion: Remove ext2fs sample binary
	Specifically ext2fs/build/Release/bindings.node
	I removed it because the file doesn't exist
* tests/test-data/pkg: Add new expected warnings darwin/linux/windows
* os/configure: Remove windows check
* local/flash: Check if environment is WSL and show warning message
* Get tests to pass with certain Node v14 warning messages
* INSTALL-WINDOWS: Remove os configure warning

Improve push and logs support for Node.js v14 (bump 'net-keepalive')

Resolves: #2200
Resolves: #1990
Change-type: minor
Signed-off-by: Marios Balamatsias <mbalamatsias@gmail.com>
This commit is contained in:
Marios Balamatsias
2021-01-21 21:27:07 +02:00
parent 2737c9c53c
commit ac96616e4e
15 changed files with 1685 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/commands/local/flash.ts
View File

@ -16,6 +16,7 @@
*/
import { flags } from '@oclif/command';
import type { BlockDevice } from 'etcher-sdk/build/source-destination';
import Command from '../../command';
import { ExpectedError } from '../../errors';
import * as cf from '../../utils/common-flags';
@ -25,7 +26,6 @@ import {
getVisuals,
stripIndent,
} from '../../utils/lazy';
import type * as SDK from 'etcher-sdk';
interface FlagsDef {
yes: boolean;
@ -75,6 +75,23 @@ export default class LocalFlashCmd extends Command {
LocalFlashCmd,
);
if (process.platform === 'linux') {
const { promisify } = await import('util');
const { exec } = await import('child_process');
const execAsync = promisify(exec);
let distroVersion = '';
try {
const info = await execAsync('cat /proc/version');
distroVersion = info.stdout.toLowerCase();
// tslint:disable-next-line: no-empty
} catch {}
if (distroVersion.includes('microsoft')) {
throw new ExpectedError(stripIndent`
This command is known not to work on WSL. Please use a CLI release
for Windows (not WSL), or balenaEtcher.`);
}
}
const { sourceDestination, multiWrite } = await import('etcher-sdk');
const drive = await this.getDrive(options);
@ -93,10 +110,9 @@ export default class LocalFlashCmd extends Command {
process.exit(0);
}
const file = new sourceDestination.File(
params.image,
sourceDestination.File.OpenFlags.Read,
);
const file = new sourceDestination.File({
path: params.image,
});
const source = await file.getInnerSource();
const visuals = getVisuals();
@ -105,29 +121,37 @@ export default class LocalFlashCmd extends Command {
verifying: new visuals.Progress('Validating'),
};
await multiWrite.pipeSourceToDestinations(
await multiWrite.pipeSourceToDestinations({
source,
[drive],
(_, error) => {
// onFail
console.log(getChalk().red.bold(error.message));
destinations: [drive],
onFail: (_, error) => {
console.error(getChalk().red.bold(error.message));
if (error.message.includes('EACCES')) {
console.error(
getChalk().red.bold(
'Try running this command with elevated privileges, with sudo or in a shell running with admininstrator privileges.',
),
);
}
},
(progress: SDK.multiWrite.MultiDestinationProgress) => {
// onProgress
onProgress: (progress) => {
progressBars[progress.type].update(progress);
},
true, // verify
);
verify: true,
});
}
async getDrive(options: {
drive?: string;
}): Promise<SDK.sourceDestination.BlockDevice> {
async getDrive(options: { drive?: string }): Promise<BlockDevice> {
const drive = options.drive || (await getVisuals().drive('Select a drive'));
const sdk = await import('etcher-sdk');
const adapter = new sdk.scanner.adapters.BlockDeviceAdapter(() => false);
const adapter = new sdk.scanner.adapters.BlockDeviceAdapter({
includeSystemDrives: () => false,
unmountOnSuccess: false,
write: true,
direct: true,
});
const scanner = new sdk.scanner.Scanner([adapter]);
await scanner.start();
try {