From 2c77ba3c23a12c5bf73689f3b8003ae80a26893d Mon Sep 17 00:00:00 2001 From: Benjamin Stefan <145866889+Benjamin-Stefan@users.noreply.github.com> Date: Sat, 28 Sep 2024 00:30:40 +0200 Subject: [PATCH] chore: update SSH command processing logic --- dist/index.js | 3 ++- dist/index.mjs | 3 ++- dist/uqmiClient.d.ts.map | 2 +- src/uqmiClient.ts | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index a9e3f81..2789a6e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -127,8 +127,9 @@ var UqmiClient = class { */ async runCommand(args) { try { + args.unshift(`--device=${this.device}`); const escapedArgs = args.map(this.escapeShellArg).join(" "); - const stdout = await runSSHCommand(`uqmi --device=${this.device} ${escapedArgs}`, this.sshOptions); + const stdout = await runSSHCommand(`uqmi ${escapedArgs}`, this.sshOptions); return stdout.trim(); } catch (error) { throw new Error(`Error executing uqmi command: ${error}`); diff --git a/dist/index.mjs b/dist/index.mjs index e5d360e..464af7b 100644 --- a/dist/index.mjs +++ b/dist/index.mjs @@ -101,8 +101,9 @@ var UqmiClient = class { */ async runCommand(args) { try { + args.unshift(`--device=${this.device}`); const escapedArgs = args.map(this.escapeShellArg).join(" "); - const stdout = await runSSHCommand(`uqmi --device=${this.device} ${escapedArgs}`, this.sshOptions); + const stdout = await runSSHCommand(`uqmi ${escapedArgs}`, this.sshOptions); return stdout.trim(); } catch (error) { throw new Error(`Error executing uqmi command: ${error}`); diff --git a/dist/uqmiClient.d.ts.map b/dist/uqmiClient.d.ts.map index 16e6750..c1a6bd7 100644 --- a/dist/uqmiClient.d.ts.map +++ b/dist/uqmiClient.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"uqmiClient.d.ts","sourceRoot":"","sources":["../src/uqmiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC;;GAEG;AACH,qBAAa,UAAU;IACnB,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,UAAU,EAAG,UAAU,CAAC;IAElC;;;;;OAKG;gBACS,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAQlD;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAKtB;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAW3D;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;;;OAKG;IACU,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhF;;;;OAIG;IACU,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI9D;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC;;;;;;;;OAQG;IACU,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,GAAG,MAAM,GAAG,aAA6B,GAAG,OAAO,CAAC,MAAM,CAAC;IAOpM;;;;;OAKG;IACU,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAM3E;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7C;;;;OAIG;IACU,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAIpF;;;;OAIG;IACU,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAItF;;;OAGG;IACU,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlD;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/C;;;OAGG;IACU,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5C;;;;OAIG;IACU,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD;;;;OAIG;IACU,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD;;;;;OAKG;IACU,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3F;;;;;OAKG;IACU,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI5F;;;;;OAKG;IACU,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIxE;;;;;OAKG;IACU,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIxE;;;;;OAKG;IACU,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAItE;;;;;OAKG;IACU,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAItE;;;OAGG;IACU,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAIvC;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAIvC;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAIzC;;;OAGG;IACU,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC;;;OAGG;IACU,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAItD;;;;OAIG;IACU,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,cAAc,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,GAAG,sBAAsB,GAAG,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAI5L;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1C;;;;OAIG;IACU,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIxD;;;;OAIG;IACU,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIxD;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;;OAIG;IACU,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAK9D;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/C;;;;;OAKG;IACU,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/D;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAIvC;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7C;;;;OAIG;IACU,YAAY,CAAC,OAAO,GAAE,KAAK,GAAG,IAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAIzE;;;;;OAKG;IACU,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,KAAK,GAAG,IAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAItF;;;;;OAKG;IACU,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,KAAK,GAAG,IAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF;;;;;OAKG;IACU,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,KAAK,GAAG,IAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAItF;;;;;;;OAOG;IACU,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO5H;;;;OAIG;IACU,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrE;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;CAGhD"} \ No newline at end of file +{"version":3,"file":"uqmiClient.d.ts","sourceRoot":"","sources":["../src/uqmiClient.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/uqmiClient.ts b/src/uqmiClient.ts index 696d9d9..14b435d 100644 --- a/src/uqmiClient.ts +++ b/src/uqmiClient.ts @@ -42,9 +42,11 @@ export class UqmiClient { */ protected async runCommand(args: string[]): Promise { try { + args.unshift(`--device=${this.device}`); + // Escape all arguments before concatenating them into a single command string const escapedArgs = args.map(this.escapeShellArg).join(" "); - const stdout = await runSSHCommand(`uqmi --device=${this.device} ${escapedArgs}`, this.sshOptions); + const stdout = await runSSHCommand(`uqmi ${escapedArgs}`, this.sshOptions); return stdout.trim(); } catch (error) { throw new Error(`Error executing uqmi command: ${error}`);