From e119cb187b6c106ddc337d2f534ebc56293495b8 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 1 Mar 2021 12:28:54 +0100 Subject: [PATCH 1/9] - Be more resilient if process.stdout is not available (e.g. if the process runs in a non-interactive script). - bin.js should actually be in dist/bin.js, not dist/src/bin.js (fixes ENOENT error on npm install -g). --- package.json | 2 +- src/modules/Html/ProgressBar.ts | 28 +++++++++++++++++----------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 67ab913..bce0efb 100755 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "docs": "./node_modules/.bin/typedoc.cmd --out dist/docs --mode modules ./src/" }, "bin": { - "androidjs": "./dist/src/bin.js" + "androidjs": "./dist/bin.js" }, "dependencies": { "@types/jest": "^25.1.3", diff --git a/src/modules/Html/ProgressBar.ts b/src/modules/Html/ProgressBar.ts index 1d8a6b3..29ec4be 100644 --- a/src/modules/Html/ProgressBar.ts +++ b/src/modules/Html/ProgressBar.ts @@ -39,13 +39,16 @@ export class LoadingBar{ let _left = this.currentIndex - 1; _left = _left < 0 ? 0 : _left; let _right = this.bar_length - _left - 1; - process.stdout.write(`${this.message}${this.chunksDownloaded} :` + chalk.green(` ${this.empty.repeat(_left)}${this.fill}${this.empty.repeat(_right)}`)); + if (process.stdout.write) + process.stdout.write(`${this.message}${this.chunksDownloaded} :` + chalk.green(` ${this.empty.repeat(_left)}${this.fill}${this.empty.repeat(_right)}`)); } clear(){ - //@ts-ignore - process.stdout.clearLine(); - //@ts-ignore - process.stdout.cursorTo(0); + if (process.stdout.clearLine) + //@ts-ignore + process.stdout.clearLine(); + if (process.stdout.cursorTo) + //@ts-ignore + process.stdout.cursorTo(0); } start(speed?:number) { @@ -83,7 +86,7 @@ export class ProgressBar { constructor(total?:number) { this.total = total || null; this.current = 0; - this.bar_length = process.stdout.columns - 30; + this.bar_length = process.stdout.columns ? process.stdout.columns - 30 : 0; // this.bar_length = 50; } next(progress) { @@ -96,13 +99,16 @@ export class ProgressBar { this.clearLine(); const _str = ` ${_p}% : ${chalk.green(this.bar_fill.repeat(_left-1)+_in_progress_code)}${ this.barr_empty.repeat(_right)}`; - process.stdout.write(_str); + if (process.stdout.write) + process.stdout.write(_str); // console.log(_left, _right) } clearLine() { - //@ts-ignore - process.stdout.clearLine(); - //@ts-ignore - process.stdout.cursorTo(0); + if (process.stdout.clearLine) + //@ts-ignore + process.stdout.clearLine(); + if (process.stdout.cursorTo) + //@ts-ignore + process.stdout.cursorTo(0); } } From 2a48174b8e30dcf904d195a969b606f5fad88a4d Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 1 Mar 2021 12:35:05 +0100 Subject: [PATCH 2/9] Reverted package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bce0efb..67ab913 100755 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "docs": "./node_modules/.bin/typedoc.cmd --out dist/docs --mode modules ./src/" }, "bin": { - "androidjs": "./dist/bin.js" + "androidjs": "./dist/src/bin.js" }, "dependencies": { "@types/jest": "^25.1.3", From 3ad4ec840ff28503752cd7e8e6315468197fe800 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 1 Mar 2021 15:21:50 +0100 Subject: [PATCH 3/9] bin.js is actually under dist, not dist/src --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67ab913..bce0efb 100755 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "docs": "./node_modules/.bin/typedoc.cmd --out dist/docs --mode modules ./src/" }, "bin": { - "androidjs": "./dist/src/bin.js" + "androidjs": "./dist/bin.js" }, "dependencies": { "@types/jest": "^25.1.3", From c41af78c70cfbe786cf8b3bba8aa48bb2f57110c Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 1 Mar 2021 18:46:40 +0100 Subject: [PATCH 4/9] Revert "bin.js is actually under dist, not dist/src" This reverts commit 3ad4ec840ff28503752cd7e8e6315468197fe800. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bce0efb..67ab913 100755 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "docs": "./node_modules/.bin/typedoc.cmd --out dist/docs --mode modules ./src/" }, "bin": { - "androidjs": "./dist/bin.js" + "androidjs": "./dist/src/bin.js" }, "dependencies": { "@types/jest": "^25.1.3", From f99fb26bf1ab611eeb2603ef780cebc039c82c08 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Tue, 2 Mar 2021 01:41:44 +0100 Subject: [PATCH 5/9] Do not prefix the package name with com.androidjs --- src/modules/Html/ManifestBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Html/ManifestBuilder.ts b/src/modules/Html/ManifestBuilder.ts index f8b76b0..aa6e2b6 100644 --- a/src/modules/Html/ManifestBuilder.ts +++ b/src/modules/Html/ManifestBuilder.ts @@ -91,7 +91,7 @@ export function getManifest(env: IEnv, args, permissions: Array, deep_li name: 'manifest', keys: { 'xmlns:android': "http://schemas.android.com/apk/res/android", - 'package':`com.androidjs.${package_name}`, + 'package': package_name, platformBuildVersionCode: env_manifist.platformBuildVersionCode, platformBuildVersionName: env_manifist.platformBuildVersionName } From 23cf5a5c0a1d3268784879b0ef1093c84206cde9 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 14 Mar 2022 14:24:32 +0100 Subject: [PATCH 6/9] Update src/modules/Html/ProgressBar.ts Co-authored-by: Harendra Chhekur <820121223505e@gmail.com> --- src/modules/Html/ProgressBar.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/Html/ProgressBar.ts b/src/modules/Html/ProgressBar.ts index 29ec4be..67aa5da 100644 --- a/src/modules/Html/ProgressBar.ts +++ b/src/modules/Html/ProgressBar.ts @@ -39,8 +39,7 @@ export class LoadingBar{ let _left = this.currentIndex - 1; _left = _left < 0 ? 0 : _left; let _right = this.bar_length - _left - 1; - if (process.stdout.write) - process.stdout.write(`${this.message}${this.chunksDownloaded} :` + chalk.green(` ${this.empty.repeat(_left)}${this.fill}${this.empty.repeat(_right)}`)); + process.stdout?.write(`${this.message}${this.chunksDownloaded} :` + chalk.green(` ${this.empty.repeat(_left)}${this.fill}${this.empty.repeat(_right)}`)); } clear(){ if (process.stdout.clearLine) From 7a60eed8ff3567d9568b12aa86636e7459d24f92 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 14 Mar 2022 14:24:42 +0100 Subject: [PATCH 7/9] Update src/modules/Html/ProgressBar.ts Co-authored-by: Harendra Chhekur <820121223505e@gmail.com> --- src/modules/Html/ProgressBar.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/Html/ProgressBar.ts b/src/modules/Html/ProgressBar.ts index 67aa5da..e32171d 100644 --- a/src/modules/Html/ProgressBar.ts +++ b/src/modules/Html/ProgressBar.ts @@ -42,12 +42,10 @@ export class LoadingBar{ process.stdout?.write(`${this.message}${this.chunksDownloaded} :` + chalk.green(` ${this.empty.repeat(_left)}${this.fill}${this.empty.repeat(_right)}`)); } clear(){ - if (process.stdout.clearLine) - //@ts-ignore - process.stdout.clearLine(); - if (process.stdout.cursorTo) - //@ts-ignore - process.stdout.cursorTo(0); + //@ts-ignore + process.stdout?.clearLine(); + //@ts-ignore + process.stdout?.cursorTo(0); } start(speed?:number) { From 3293bad0de5f3bf6e90ab250b22ca563b5ed18c8 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 14 Mar 2022 14:24:49 +0100 Subject: [PATCH 8/9] Update src/modules/Html/ProgressBar.ts Co-authored-by: Harendra Chhekur <820121223505e@gmail.com> --- src/modules/Html/ProgressBar.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/Html/ProgressBar.ts b/src/modules/Html/ProgressBar.ts index e32171d..cdc7a49 100644 --- a/src/modules/Html/ProgressBar.ts +++ b/src/modules/Html/ProgressBar.ts @@ -96,8 +96,7 @@ export class ProgressBar { this.clearLine(); const _str = ` ${_p}% : ${chalk.green(this.bar_fill.repeat(_left-1)+_in_progress_code)}${ this.barr_empty.repeat(_right)}`; - if (process.stdout.write) - process.stdout.write(_str); + process.stdout?.write(_str); // console.log(_left, _right) } clearLine() { From f1321addb54735407071a63ea5a97cb84be3320f Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Mon, 14 Mar 2022 14:24:56 +0100 Subject: [PATCH 9/9] Update src/modules/Html/ProgressBar.ts Co-authored-by: Harendra Chhekur <820121223505e@gmail.com> --- src/modules/Html/ProgressBar.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/Html/ProgressBar.ts b/src/modules/Html/ProgressBar.ts index cdc7a49..fd329ff 100644 --- a/src/modules/Html/ProgressBar.ts +++ b/src/modules/Html/ProgressBar.ts @@ -100,11 +100,9 @@ export class ProgressBar { // console.log(_left, _right) } clearLine() { - if (process.stdout.clearLine) - //@ts-ignore - process.stdout.clearLine(); - if (process.stdout.cursorTo) - //@ts-ignore - process.stdout.cursorTo(0); + //@ts-ignore + process.stdout?.clearLine(); + //@ts-ignore + process.stdout?.cursorTo(0); } }