iproutejs 2.3.3 → 2.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/common/classes/command-with-filepath.js +2 -4
- package/lib/common/classes/command-with-filepath.js.map +1 -1
- package/lib/common/classes/command-with-redirect-from-filepath-and-returned-data.js +2 -4
- package/lib/common/classes/command-with-redirect-from-filepath-and-returned-data.js.map +1 -1
- package/lib/common/classes/command-with-redirect-from-filepath.js +2 -4
- package/lib/common/classes/command-with-redirect-from-filepath.js.map +1 -1
- package/lib/common/classes/command-with-redirect-to-filepath.js +2 -4
- package/lib/common/classes/command-with-redirect-to-filepath.js.map +1 -1
- package/lib/common/classes/command-with-returned-data.js +2 -4
- package/lib/common/classes/command-with-returned-data.js.map +1 -1
- package/lib/common/classes/command-with-stdin.js +2 -4
- package/lib/common/classes/command-with-stdin.js.map +1 -1
- package/lib/common/classes/command.js +2 -4
- package/lib/common/classes/command.js.map +1 -1
- package/lib/common/exec-command.d.ts +14 -0
- package/lib/common/exec-command.js +45 -0
- package/lib/common/exec-command.js.map +1 -0
- package/package.json +1 -1
|
@@ -12,13 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const
|
|
16
|
-
const child_process_1 = require("child_process");
|
|
15
|
+
const exec_command_1 = require("../exec-command");
|
|
17
16
|
const schemas_1 = require("../constants/schemas");
|
|
18
17
|
const command_1 = require("../errors/command");
|
|
19
18
|
const command_2 = __importDefault(require("./command"));
|
|
20
19
|
const misc_1 = require("../misc");
|
|
21
|
-
const promisifiedExec = (0, util_1.promisify)(child_process_1.exec);
|
|
22
20
|
class CommandWithFilepath extends command_2.default {
|
|
23
21
|
constructor(schemaId, schema, options, globalOptions, ipCmd) {
|
|
24
22
|
super(schemaId, schema, options, globalOptions, ipCmd);
|
|
@@ -40,7 +38,7 @@ class CommandWithFilepath extends command_2.default {
|
|
|
40
38
|
if (this.globalOptions.dryRun) {
|
|
41
39
|
return this;
|
|
42
40
|
}
|
|
43
|
-
const { stderr } = yield
|
|
41
|
+
const { stderr } = yield (0, exec_command_1.execCommand)(this._cmdToExec);
|
|
44
42
|
if (!stderr) {
|
|
45
43
|
return this;
|
|
46
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-with-filepath.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-filepath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"command-with-filepath.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-filepath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA8C;AAG9C,kDAA6E;AAC7E,+CAAiD;AAEjD,wDAAgC;AAChC,kCAAmC;AAGnC,MAAqB,mBAElB,SAAQ,iBAAyB;IAElC,YAAsB,QAAmB,EACnB,MAAwC,EACxC,OAAyB,EACzB,aAAgD,EAChD,KAAe;QAEnC,KAAK,CAAC,QAAQ,EACZ,MAAM,EACN,OAAO,EACP,aAAa,EACb,KAAK,CAAC,CAAC;QAVW,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAkC;QACxC,YAAO,GAAP,OAAO,CAAkB;QACzB,kBAAa,GAAb,aAAa,CAAmC;QAChD,UAAK,GAAL,KAAK,CAAU;QAQnC,IAAA,eAAQ,EAAoC,mBAAS,CAAC,oBAAoB,EAAE,oCAA0B,EAAE,aAAa,CAAC,CAAC;QACvH,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAEkB,QAAQ;QACzB,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEjB,IAAI,CAAC,IAAI,GAAS,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAI,IAAI,CAAC,aAAa,CAAC,QAAS,EAAE,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAEc,IAAI;;YACjB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACb;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,IAAI,CAAC;aACb;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,IAAI,sBAAY,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;KAAA;CACF;AAzCD,sCAyCC"}
|
|
@@ -12,12 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const
|
|
16
|
-
const child_process_1 = require("child_process");
|
|
15
|
+
const exec_command_1 = require("../exec-command");
|
|
17
16
|
const command_1 = require("../errors/command");
|
|
18
17
|
const command_with_redirect_from_filepath_1 = __importDefault(require("./command-with-redirect-from-filepath"));
|
|
19
18
|
const parse_output_1 = require("../parse-output");
|
|
20
|
-
const promisifiedExec = (0, util_1.promisify)(child_process_1.exec);
|
|
21
19
|
class CommandWithRedirectFromFilepathAndReturnedData extends command_with_redirect_from_filepath_1.default {
|
|
22
20
|
constructor(schemaId, schema, options, globalOptions, ipCmd) {
|
|
23
21
|
super(schemaId, schema, options, globalOptions, ipCmd);
|
|
@@ -32,7 +30,7 @@ class CommandWithRedirectFromFilepathAndReturnedData extends command_with_redire
|
|
|
32
30
|
if (this.globalOptions.dryRun) {
|
|
33
31
|
return this;
|
|
34
32
|
}
|
|
35
|
-
const { stderr, stdout } = yield
|
|
33
|
+
const { stderr, stdout } = yield (0, exec_command_1.execCommand)(this._cmdToExec);
|
|
36
34
|
if (!stderr) {
|
|
37
35
|
return (0, parse_output_1.parseCommandOutput)(stdout);
|
|
38
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-with-redirect-from-filepath-and-returned-data.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-redirect-from-filepath-and-returned-data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"command-with-redirect-from-filepath-and-returned-data.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-redirect-from-filepath-and-returned-data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA8C;AAI9C,+CAAsE;AAEtE,gHAA0F;AAC1F,kDAAoE;AAGpE,MAAqB,8CAElB,SAAQ,6CAAiD;IAE1D,YAAsB,QAAmB,EACnB,MAAwC,EACxC,OAAyB,EACzB,aAAgD,EAChD,KAAe;QAEnC,KAAK,CAAC,QAAQ,EACZ,MAAM,EACN,OAAO,EACP,aAAa,EACb,KAAK,CAAC,CAAC;QAVW,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAkC;QACxC,YAAO,GAAP,OAAO,CAAkB;QACzB,kBAAa,GAAb,aAAa,CAAmC;QAChD,UAAK,GAAL,KAAK,CAAU;IAOrC,CAAC;IAEc,IAAI;;YACjB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACb;YAED,MAAM,EACE,MAAM,EACN,MAAM,EACP,GAAG,MAAM,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE7C,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,IAAA,iCAAkB,EAAe,MAAM,CAAC,CAAC;aACjD;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,IAAI,sBAAY,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;KAAA;CACF;AAlCD,iEAkCC"}
|
|
@@ -12,13 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const
|
|
16
|
-
const child_process_1 = require("child_process");
|
|
15
|
+
const exec_command_1 = require("../exec-command");
|
|
17
16
|
const schemas_1 = require("../constants/schemas");
|
|
18
17
|
const command_1 = require("../errors/command");
|
|
19
18
|
const command_2 = __importDefault(require("./command"));
|
|
20
19
|
const misc_1 = require("../misc");
|
|
21
|
-
const promisifiedExec = (0, util_1.promisify)(child_process_1.exec);
|
|
22
20
|
class CommandWithRedirectFromFilepath extends command_2.default {
|
|
23
21
|
constructor(schemaId, schema, options, globalOptions, ipCmd) {
|
|
24
22
|
super(schemaId, schema, options, globalOptions, ipCmd);
|
|
@@ -40,7 +38,7 @@ class CommandWithRedirectFromFilepath extends command_2.default {
|
|
|
40
38
|
if (this.globalOptions.dryRun) {
|
|
41
39
|
return this;
|
|
42
40
|
}
|
|
43
|
-
const { stderr } = yield
|
|
41
|
+
const { stderr } = yield (0, exec_command_1.execCommand)(this._cmdToExec);
|
|
44
42
|
if (!stderr) {
|
|
45
43
|
return this;
|
|
46
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-with-redirect-from-filepath.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-redirect-from-filepath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"command-with-redirect-from-filepath.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-redirect-from-filepath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA8C;AAG9C,kDAA6E;AAC7E,+CAA0E;AAE1E,wDAAkE;AAClE,kCAAgE;AAGhE,MAAqB,+BAAoF,SAAQ,iBAAyB;IACxI,YAAsB,QAAmB,EACnB,MAAwC,EACxC,OAAyB,EACzB,aAAgD,EAChD,KAAe;QAEnC,KAAK,CAAC,QAAQ,EACZ,MAAM,EACN,OAAO,EACP,aAAa,EACb,KAAK,CAAC,CAAC;QAVW,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAkC;QACxC,YAAO,GAAP,OAAO,CAAkB;QACzB,kBAAa,GAAb,aAAa,CAAmC;QAChD,UAAK,GAAL,KAAK,CAAU;QAQnC,IAAA,eAAQ,EAAoC,mBAAS,CAAC,oBAAoB,EAAE,oCAA0B,EAAE,aAAa,CAAC,CAAC;QAEvH,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAEkB,QAAQ;QACzB,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEjB,IAAI,CAAC,IAAI,GAAS,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAE,GAAG,EAAE,GAAI,IAAI,CAAC,aAAa,CAAC,QAAS,EAAE,CAAE,CAAC,CAAC;QAClF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAEc,IAAI;;YACjB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACb;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,IAAI,CAAC;aACb;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,IAAI,sBAAY,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;KAAA;CACF;AAvCD,kDAuCC"}
|
|
@@ -12,13 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const
|
|
16
|
-
const child_process_1 = require("child_process");
|
|
15
|
+
const exec_command_1 = require("../exec-command");
|
|
17
16
|
const schemas_1 = require("../constants/schemas");
|
|
18
17
|
const command_1 = require("../errors/command");
|
|
19
18
|
const command_2 = __importDefault(require("./command"));
|
|
20
19
|
const misc_1 = require("../misc");
|
|
21
|
-
const promisifiedExec = (0, util_1.promisify)(child_process_1.exec);
|
|
22
20
|
class CommandWithRedirectToFilepath extends command_2.default {
|
|
23
21
|
constructor(schemaId, schema, options, globalOptions, ipCmd) {
|
|
24
22
|
super(schemaId, schema, options, globalOptions, ipCmd);
|
|
@@ -40,7 +38,7 @@ class CommandWithRedirectToFilepath extends command_2.default {
|
|
|
40
38
|
if (this.globalOptions.dryRun) {
|
|
41
39
|
return this;
|
|
42
40
|
}
|
|
43
|
-
const { stderr } = yield
|
|
41
|
+
const { stderr } = yield (0, exec_command_1.execCommand)(this._cmdToExec);
|
|
44
42
|
if (!stderr) {
|
|
45
43
|
return this;
|
|
46
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-with-redirect-to-filepath.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-redirect-to-filepath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"command-with-redirect-to-filepath.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-redirect-to-filepath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA8C;AAG9C,kDAA6E;AAC7E,+CAA0E;AAE1E,wDAAkE;AAClE,kCAAgE;AAGhE,MAAqB,6BAAkF,SAAQ,iBAAyB;IACtI,YAAsB,QAAmB,EACnB,MAAwC,EACxC,OAAyB,EACzB,aAAgD,EAChD,KAAe;QAEnC,KAAK,CAAC,QAAQ,EACZ,MAAM,EACN,OAAO,EACP,aAAa,EACb,KAAK,CAAC,CAAC;QAVW,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAkC;QACxC,YAAO,GAAP,OAAO,CAAkB;QACzB,kBAAa,GAAb,aAAa,CAAmC;QAChD,UAAK,GAAL,KAAK,CAAU;QAQnC,IAAA,eAAQ,EAAoC,mBAAS,CAAC,oBAAoB,EAAE,oCAA0B,EAAE,aAAa,CAAC,CAAC;QACvH,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAEkB,QAAQ;QACzB,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEjB,IAAI,CAAC,IAAI,GAAS,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAE,GAAG,EAAE,GAAI,IAAI,CAAC,aAAa,CAAC,QAAS,EAAE,CAAE,CAAC,CAAC;QAClF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAEc,IAAI;;YACjB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACb;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,IAAI,CAAC;aACb;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,IAAI,sBAAY,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;KAAA;CACF;AAtCD,gDAsCC"}
|
|
@@ -12,12 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const
|
|
16
|
-
const child_process_1 = require("child_process");
|
|
15
|
+
const exec_command_1 = require("../exec-command");
|
|
17
16
|
const command_1 = require("../errors/command");
|
|
18
17
|
const command_2 = __importDefault(require("./command"));
|
|
19
18
|
const parse_output_1 = require("../parse-output");
|
|
20
|
-
const promisifiedExec = (0, util_1.promisify)(child_process_1.exec);
|
|
21
19
|
class CommandWithReturnedData extends command_2.default {
|
|
22
20
|
constructor(schemaId, schema, options, globalOptions, ipCmd) {
|
|
23
21
|
super(schemaId, schema, options, globalOptions, ipCmd);
|
|
@@ -32,7 +30,7 @@ class CommandWithReturnedData extends command_2.default {
|
|
|
32
30
|
if (this.globalOptions.dryRun) {
|
|
33
31
|
return this;
|
|
34
32
|
}
|
|
35
|
-
const { stderr, stdout } = yield
|
|
33
|
+
const { stderr, stdout } = yield (0, exec_command_1.execCommand)(this._cmdToExec);
|
|
36
34
|
if (!stderr) {
|
|
37
35
|
return (0, parse_output_1.parseCommandOutput)(stdout);
|
|
38
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-with-returned-data.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-returned-data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA
|
|
1
|
+
{"version":3,"file":"command-with-returned-data.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-returned-data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kDAA8C;AAG9C,+CAAkD;AAElD,wDAA0C;AAC1C,kDAAqD;AAErD,MAAqB,uBAA4E,SAAQ,iBAAyB;IAChI,YAAsB,QAAmB,EACnB,MAAwC,EACxC,OAAyB,EACzB,aAA4B,EAC5B,KAAe;QAEnC,KAAK,CAAC,QAAQ,EACZ,MAAM,EACN,OAAO,EACP,aAAa,EACb,KAAK,CAAC,CAAC;QAVW,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAkC;QACxC,YAAO,GAAP,OAAO,CAAkB;QACzB,kBAAa,GAAb,aAAa,CAAe;QAC5B,UAAK,GAAL,KAAK,CAAU;IAOrC,CAAC;IAEc,IAAI;;YACjB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACb;YAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE9D,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,IAAA,iCAAkB,EAAe,MAAM,CAAC,CAAC;aACjD;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,IAAI,sBAAY,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;KAAA;CACF;AA5BD,0CA4BC"}
|
|
@@ -12,13 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const
|
|
16
|
-
const child_process_1 = require("child_process");
|
|
15
|
+
const exec_command_1 = require("../exec-command");
|
|
17
16
|
const schemas_1 = require("../constants/schemas");
|
|
18
17
|
const command_1 = require("../errors/command");
|
|
19
18
|
const command_2 = __importDefault(require("./command"));
|
|
20
19
|
const misc_1 = require("../misc");
|
|
21
|
-
const promisifiedExec = (0, util_1.promisify)(child_process_1.exec);
|
|
22
20
|
class CommandWithStdin extends command_2.default {
|
|
23
21
|
constructor(schemaId, schema, options, globalOptions, ipCmd) {
|
|
24
22
|
super(schemaId, schema, options, globalOptions, ipCmd);
|
|
@@ -40,7 +38,7 @@ class CommandWithStdin extends command_2.default {
|
|
|
40
38
|
if (this.globalOptions.dryRun) {
|
|
41
39
|
return this;
|
|
42
40
|
}
|
|
43
|
-
const { stderr } = yield
|
|
41
|
+
const { stderr } = yield (0, exec_command_1.execCommand)(this._cmdToExec);
|
|
44
42
|
if (!stderr) {
|
|
45
43
|
return this;
|
|
46
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-with-stdin.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-stdin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"command-with-stdin.js","sourceRoot":"","sources":["../../../src/common/classes/command-with-stdin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA8C;AAG9C,kDAA0E;AAC1E,+CAAiD;AAEjD,wDAAgC;AAChC,kCAAmC;AAGnC,MAAqB,gBAElB,SAAQ,iBAAyB;IAClC,YAAsB,QAAmB,EACnB,MAAwC,EACxC,OAAyB,EACzB,aAA6C,EAC7C,KAAe;QAEnC,KAAK,CAAC,QAAQ,EACZ,MAAM,EACN,OAAO,EACP,aAAa,EACb,KAAK,CAAC,CAAC;QAVW,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAAkC;QACxC,YAAO,GAAP,OAAO,CAAkB;QACzB,kBAAa,GAAb,aAAa,CAAgC;QAC7C,UAAK,GAAL,KAAK,CAAU;QAQnC,IAAA,eAAQ,EAAiC,mBAAS,CAAC,iBAAiB,EAAE,iCAAuB,EAAE,aAAa,CAAC,CAAC;QAE9G,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAEkB,QAAQ;QACzB,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEjB,IAAI,CAAC,IAAI,GAAS,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,GAAI,IAAI,CAAC,aAAa,CAAC,KAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9F,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAEc,IAAI;;YACjB,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACb;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,0BAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,IAAI,CAAC;aACb;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,IAAI,sBAAY,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;KAAA;CACF;AAzCD,mCAyCC"}
|
|
@@ -12,13 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const exec_command_1 = require("../exec-command");
|
|
15
16
|
const lodash_isplainobject_1 = __importDefault(require("lodash.isplainobject"));
|
|
16
|
-
const util_1 = require("util");
|
|
17
|
-
const child_process_1 = require("child_process");
|
|
18
17
|
const schemas_1 = require("../constants/schemas");
|
|
19
18
|
const command_1 = require("../errors/command");
|
|
20
19
|
const misc_1 = require("../misc");
|
|
21
|
-
const promisifiedExec = (0, util_1.promisify)(child_process_1.exec);
|
|
22
20
|
/**
|
|
23
21
|
* Class to group common behavior among commands.
|
|
24
22
|
*
|
|
@@ -131,7 +129,7 @@ class Command {
|
|
|
131
129
|
if (this.globalOptions.dryRun) {
|
|
132
130
|
return this;
|
|
133
131
|
}
|
|
134
|
-
const { stderr } = yield
|
|
132
|
+
const { stderr } = yield (0, exec_command_1.execCommand)(this._cmdToExec);
|
|
135
133
|
if (!stderr) {
|
|
136
134
|
return this;
|
|
137
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/classes/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/common/classes/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Promisified `exec` wrapper that converts non-zero exit codes to {@link CommandError}.
|
|
3
|
+
*
|
|
4
|
+
* Node's `promisify(exec)` throws a raw `Error` (with `.stderr` / `.stdout` attached)
|
|
5
|
+
* when the child process exits with a non-zero exit code. This wrapper catches that
|
|
6
|
+
* error and re-throws it as a typed `CommandError` so callers always deal with one
|
|
7
|
+
* consistent error class — including the derived `code` from {@link CommandErrorCodes}.
|
|
8
|
+
*
|
|
9
|
+
* @internal
|
|
10
|
+
*/
|
|
11
|
+
export declare function execCommand(cmd: string): Promise<{
|
|
12
|
+
stdout: string;
|
|
13
|
+
stderr: string;
|
|
14
|
+
}>;
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.execCommand = void 0;
|
|
13
|
+
const util_1 = require("util");
|
|
14
|
+
const child_process_1 = require("child_process");
|
|
15
|
+
const command_1 = require("./errors/command");
|
|
16
|
+
const _exec = (0, util_1.promisify)(child_process_1.exec);
|
|
17
|
+
/**
|
|
18
|
+
* Promisified `exec` wrapper that converts non-zero exit codes to {@link CommandError}.
|
|
19
|
+
*
|
|
20
|
+
* Node's `promisify(exec)` throws a raw `Error` (with `.stderr` / `.stdout` attached)
|
|
21
|
+
* when the child process exits with a non-zero exit code. This wrapper catches that
|
|
22
|
+
* error and re-throws it as a typed `CommandError` so callers always deal with one
|
|
23
|
+
* consistent error class — including the derived `code` from {@link CommandErrorCodes}.
|
|
24
|
+
*
|
|
25
|
+
* @internal
|
|
26
|
+
*/
|
|
27
|
+
function execCommand(cmd) {
|
|
28
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
+
try {
|
|
30
|
+
return yield _exec(cmd);
|
|
31
|
+
}
|
|
32
|
+
catch (err) {
|
|
33
|
+
// promisify(exec) attaches .stderr and .stdout to the thrown Error when
|
|
34
|
+
// the child process exits with a non-zero exit code.
|
|
35
|
+
const stderr = err.stderr || '';
|
|
36
|
+
if (stderr) {
|
|
37
|
+
throw new command_1.CommandError(stderr.replace(/\n/g, ''), cmd);
|
|
38
|
+
}
|
|
39
|
+
// Fallback: command failed without stderr (e.g. binary not found).
|
|
40
|
+
throw new command_1.CommandError((err.message || String(err)).replace(/\n/g, ''), cmd);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
exports.execCommand = execCommand;
|
|
45
|
+
//# sourceMappingURL=exec-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exec-command.js","sourceRoot":"","sources":["../../src/common/exec-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAiC;AACjC,iDAA0C;AAE1C,8CAAgD;AAEhD,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC;AAE9B;;;;;;;;;GASG;AACH,SAAsB,WAAW,CAAC,GAAW;;QAC3C,IAAI;YACF,OAAO,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;SACzB;QACD,OAAO,GAAQ,EAAE;YACf,wEAAwE;YACxE,qDAAqD;YACrD,MAAM,MAAM,GAAY,GAAG,CAAC,MAAiB,IAAI,EAAE,CAAC;YACpD,IAAI,MAAM,EAAE;gBACV,MAAM,IAAI,sBAAY,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;aACxD;YACD,mEAAmE;YACnE,MAAM,IAAI,sBAAY,CAAC,CAAC,GAAG,CAAC,OAAiB,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SACxF;IACH,CAAC;CAAA;AAdD,kCAcC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iproutejs",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.4",
|
|
4
4
|
"description": "Show and manipulate network devices, addresses, routing, policy routing, tunnels, IP forwarding, address labels and other `iproute` objects.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|