spawn-rx 5.0.2 → 5.0.4
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/src/index.js +11 -9
- package/lib/src/index.js.map +1 -1
- package/package.json +1 -2
- package/src/index.ts +16 -10
package/lib/src/index.js
CHANGED
|
@@ -40,7 +40,6 @@ exports.spawnPromise = spawnPromise;
|
|
|
40
40
|
var path = require("path");
|
|
41
41
|
var net = require("net");
|
|
42
42
|
var sfs = require("fs");
|
|
43
|
-
var assign = require("lodash.assign");
|
|
44
43
|
var rxjs_1 = require("rxjs");
|
|
45
44
|
var operators_1 = require("rxjs/operators");
|
|
46
45
|
var child_process_1 = require("child_process");
|
|
@@ -175,11 +174,14 @@ function findActualExecutable(exe, args) {
|
|
|
175
174
|
function spawnDetached(exe, params, opts) {
|
|
176
175
|
var _a = findActualExecutable(exe, params !== null && params !== void 0 ? params : []), cmd = _a.cmd, args = _a.args;
|
|
177
176
|
if (!isWindows) {
|
|
178
|
-
return spawn(cmd, args, assign({}, opts || {}, { detached: true }));
|
|
177
|
+
return spawn(cmd, args, Object.assign({}, opts || {}, { detached: true }));
|
|
179
178
|
}
|
|
180
179
|
var newParams = [cmd].concat(args);
|
|
181
180
|
var target = path.join(__dirname, "..", "..", "vendor", "jobber", "Jobber.exe");
|
|
182
|
-
var options = assign({}, opts || {}, {
|
|
181
|
+
var options = Object.assign({}, opts || {}, {
|
|
182
|
+
detached: true,
|
|
183
|
+
jobber: true,
|
|
184
|
+
});
|
|
183
185
|
d("spawnDetached: ".concat(target, ", ").concat(newParams));
|
|
184
186
|
return spawn(target, newParams, options);
|
|
185
187
|
}
|
|
@@ -323,14 +325,14 @@ function wrapObservableInSplitPromise(obs) {
|
|
|
323
325
|
obs.subscribe({
|
|
324
326
|
next: function (x) { return (x.source === "stdout" ? (out += x.text) : (err += x.text)); },
|
|
325
327
|
error: function (e) {
|
|
326
|
-
var
|
|
328
|
+
var error = new Error("".concat(out, "\n").concat(e.message));
|
|
327
329
|
if ("exitCode" in e) {
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
330
|
+
error.exitCode = e.exitCode;
|
|
331
|
+
error.code = e.exitCode;
|
|
332
|
+
error.stdout = out;
|
|
333
|
+
error.stderr = err;
|
|
332
334
|
}
|
|
333
|
-
rej(
|
|
335
|
+
rej(error);
|
|
334
336
|
},
|
|
335
337
|
complete: function () { return res([out, err]); },
|
|
336
338
|
});
|
package/lib/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoFA,oDA8DC;AA6ED,sCAgCC;AA2DD,sBAgIC;AAkGD,oDAcC;AAqDD,oCAcC;AA7mBD,uDAAuD;AACvD,2BAA6B;AAC7B,yBAA2B;AAC3B,wBAA0B;AAG1B,6BAAyE;AACzE,4CAA6C;AAC7C,+CAA+D;AAC/D,+BAA0B;AAE1B,IAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AAE/C,IAAM,CAAC,GAAG,IAAA,eAAK,EAAC,UAAU,CAAC,CAAC,CAAC,sCAAsC;AAEnE;;;;;;;GAOG;AACH,SAAS,mBAAmB,CAAC,IAAY;IACvC,IAAI,CAAC;QACH,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,WAAW,CAAC,GAAW;IAC9B,sEAAsE;IACtE,aAAa;IAEb,uDAAuD;IACvD,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,CAAC,CAAC,sCAAsC,CAAC,CAAC;QAC1C,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACnC,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,CAAC,CAAC,iDAA0C,MAAM,CAAE,CAAC,CAAC;QACtD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAChE,KAAgB,UAAQ,EAAR,qBAAQ,EAAR,sBAAQ,EAAR,IAAQ,EAAE,CAAC;QAAtB,IAAM,CAAC,iBAAA;QACV,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACjC,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,CAAC,CAAC,4CAA4C,CAAC,CAAC;IAChD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,oBAAoB,CAClC,GAAW,EACX,IAAc;IAKd,qEAAqE;IACrE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,gFAAgF;QAChF,+EAA+E;QAC/E,uCAAuC;QACvC,IAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,KAAkB,UAAY,EAAZ,6BAAY,EAAZ,0BAAY,EAAZ,IAAY,EAAE,CAAC;YAA5B,IAAM,GAAG,qBAAA;YACZ,IAAM,gBAAgB,GAAG,WAAW,CAAC,UAAG,GAAG,SAAG,GAAG,CAAE,CAAC,CAAC;YAErD,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACrC,OAAO,oBAAoB,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACzB,IAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CACnB,OAAO,CAAC,GAAG,CAAC,UAAW,EACvB,UAAU,EACV,mBAAmB,EACnB,MAAM,EACN,gBAAgB,CACjB,CAAC;QACF,IAAM,MAAM,GAAG;YACb,kBAAkB;YAClB,cAAc;YACd,SAAS;YACT,iBAAiB;YACjB,OAAO;YACP,GAAG;SACJ,CAAC;QAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;QAC/B,IAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAW,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QACtE,IAAM,OAAO,kBAAI,IAAI,EAAE,GAAG,GAAK,IAAI,OAAC,CAAC;QAErC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACrC,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,IAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC7B,IAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvB,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IACnD,CAAC;IAED,YAAY;IACZ,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAClC,CAAC;AA4DD;;;;;;;;;;;;;;;;GAgBG;AACH,SAAgB,aAAa,CAC3B,GAAW,EACX,MAAgB,EAChB,IAAmC;IAE7B,IAAA,KAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,EAArD,GAAG,SAAA,EAAE,IAAI,UAA4C,CAAC;IAE9D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,KAAK,CACV,GAAG,EACH,IAAI,EACJ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAQ,CACzD,CAAC;IACJ,CAAC;IAED,IAAM,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAErC,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,YAAY,CACb,CAAC;IACF,IAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,IAAI,EAAE,EAAE;QAC5C,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,CAAC,CAAC,yBAAkB,MAAM,eAAK,SAAS,CAAE,CAAC,CAAC;IAC5C,OAAO,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,OAAc,CAAC,CAAC;AAClD,CAAC;AA4CD;;;;;;;;;;;;;;GAcG;AACH,SAAgB,KAAK,CACnB,GAAW,EACX,MAAgB,EAChB,IAAmC;IAEnC,IAAI,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC;IAClB,IAAM,QAAQ,GAA2B,IAAI,iBAAU,CACrD,UAAC,IAA0B;QACzB,6DAA6D;QACrD,IAAA,KAAK,GAA4C,IAAI,MAAhD,EAAE,MAAM,GAAoC,IAAI,OAAxC,EAAE,KAAK,GAA6B,IAAI,MAAjC,EAAE,QAAQ,GAAmB,IAAI,SAAvB,EAAK,SAAS,UAAK,IAAI,EAAvD,wCAAgD,CAAF,CAAU;QACxD,IAAA,KAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,EAA/C,GAAG,SAAA,EAAE,IAAI,UAAsC,CAAC;QACxD,CAAC,CACC,4BAAqB,GAAG,cAAI,IAAI,CAAC,IAAI,EAAE,eAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAE,CACxE,CAAC;QAEF,IAAM,IAAI,GAAG,IAAA,qBAAO,EAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAE3C,IAAM,UAAU,GACd,UAAC,MAA2B,IAAK,OAAA,UAAC,CAAkB;YAClD,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjB,OAAO;YACT,CAAC;YACD,IAAI,KAAK,GAAG,qCAAqC,CAAC;YAClD,IAAI,CAAC;gBACH,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC1B,KAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YAAC,WAAM,CAAC;gBACP,KAAK,GAAG,8CAAuC,GAAG,2BAAiB,CAAC,CAAC,MAAM,OAAI,CAAC;YAClF,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,CAAC,EAhBgC,CAgBhC,CAAC;QAEJ,IAAM,GAAG,GAAG,IAAI,mBAAY,EAAE,CAAC;QAE/B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,GAAG,CAAC,GAAG,CACL,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;oBACnB,IAAI,EAAE,UAAC,CAAM,IAAK,OAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAnB,CAAmB;oBACrC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC5B,QAAQ,EAAE,cAAM,OAAA,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAhB,CAAgB;iBACjC,CAAC,CACH,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CACR,IAAI,KAAK,CACP,oFAAoF,CACrF,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,eAAe,GAAkD,IAAI,CAAC;QAC1E,IAAI,eAAe,GAAkD,IAAI,CAAC;QAC1E,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,eAAe,GAAG,IAAI,mBAAY,EAAW,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;gBACrB,eAAqC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjD,eAAqC,CAAC,QAAQ,EAAE,CAAC;YACpD,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,eAAe,GAAG,IAAI,mBAAY,EAAW,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;gBACrB,eAAqC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjD,eAAqC,CAAC,QAAQ,EAAE,CAAC;YACpD,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,CAAQ;YACxB,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,IAAY;YAC5B,OAAO,GAAG,IAAI,CAAC;YACf,IAAM,WAAW,GAAG,IAAA,YAAK,EAAC,eAAgB,EAAE,eAAgB,CAAC,CAAC,IAAI,CAChE,IAAA,kBAAM,EAAC,UAAC,GAAG,IAAK,OAAA,GAAG,EAAH,CAAG,EAAE,IAAI,CAAC,CAC3B,CAAC;YAEF,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,WAAW,CAAC,SAAS,CAAC,cAAM,OAAA,IAAI,CAAC,QAAQ,EAAE,EAAf,CAAe,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,SAAS,CAAC;oBACpB,IAAM,CAAC,GAAQ,IAAI,KAAK,CAAC,iCAA0B,IAAI,CAAE,CAAC,CAAC;oBAC3D,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAClB,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;oBAEd,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,GAAG,CACL,IAAI,mBAAY,CAAC;YACf,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO;YACT,CAAC;YAED,CAAC,CAAC,2BAAoB,GAAG,cAAI,IAAI,CAAC,IAAI,EAAE,CAAE,CAAC,CAAC;YAC5C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,qDAAqD;gBACrD,GAAG,CAAC,OAAO,CAAC,8BAAuB,IAAI,CAAC,GAAG,CAAE,CAAC,CAAC;gBAC/C,UAAU,CAAC,cAAM,OAAA,IAAI,CAAC,IAAI,EAAE,EAAX,CAAW,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,GAAG,CAAC;IACb,CAAC,CACF,CAAC;IAEF,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,eAAG,EAAC,UAAC,CAAM,IAAK,OAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,EAAP,CAAO,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,uBAAuB,CAAC,GAAuB;IACtD,OAAO,IAAI,OAAO,CAAS,UAAC,GAAG,EAAE,GAAG;QAClC,IAAI,GAAG,GAAG,EAAE,CAAC;QAEb,GAAG,CAAC,SAAS,CAAC;YACZ,IAAI,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,GAAG,IAAI,CAAC,CAAC,EAAV,CAAU;YACvB,KAAK,EAAE,UAAC,CAAC;gBACP,IAAM,GAAG,GAAQ,IAAI,KAAK,CAAC,UAAG,GAAG,eAAK,CAAC,CAAC,OAAO,CAAE,CAAC,CAAC;gBACnD,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;oBACpB,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;oBAC1B,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC;gBACxB,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,CAAC;YACX,CAAC;YACD,QAAQ,EAAE,cAAM,OAAA,GAAG,CAAC,GAAG,CAAC,EAAR,CAAQ;SACzB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,4BAA4B,CAAC,GAA2B;IAC/D,OAAO,IAAI,OAAO,CAAmB,UAAC,GAAG,EAAE,GAAG;QAC5C,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,GAAG,EAAE,CAAC;QAEb,GAAG,CAAC,SAAS,CAAC;YACZ,IAAI,EAAE,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAA3D,CAA2D;YACxE,KAAK,EAAE,UAAC,CAAC;gBACP,IAAM,KAAK,GAAQ,IAAI,KAAK,CAAC,UAAG,GAAG,eAAK,CAAC,CAAC,OAAO,CAAE,CAAC,CAAC;gBAErD,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;oBACpB,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;oBAC5B,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC;oBACxB,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC;oBACnB,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC;gBACrB,CAAC;gBACD,GAAG,CAAC,KAAK,CAAC,CAAC;YACb,CAAC;YACD,QAAQ,EAAE,cAAM,OAAA,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAf,CAAe;SAChC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA0CD;;;;;;;;;;;;;GAaG;AACH,SAAgB,oBAAoB,CAClC,GAAW,EACX,MAAgB,EAChB,IAAmC;IAEnC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,EAAE,CAAC;QAChB,OAAO,4BAA4B,CACjC,aAAa,CAAC,GAAG,EAAE,MAAM,wBAAO,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,KAAE,KAAK,EAAE,IAAI,IAAG,CAC7D,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,uBAAuB,CAC5B,aAAa,CAAC,GAAG,EAAE,MAAM,wBAAO,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,KAAE,KAAK,EAAE,KAAK,IAAG,CAC9D,CAAC;IACJ,CAAC;AACH,CAAC;AAwCD;;;;;;;;;;;;GAYG;AACH,SAAgB,YAAY,CAC1B,GAAW,EACX,MAAgB,EAChB,IAAmC;IAEnC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,EAAE,CAAC;QAChB,OAAO,4BAA4B,CACjC,KAAK,CAAC,GAAG,EAAE,MAAM,wBAAO,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,KAAE,KAAK,EAAE,IAAI,IAAG,CACrD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,uBAAuB,CAC5B,KAAK,CAAC,GAAG,EAAE,MAAM,wBAAO,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,KAAE,KAAK,EAAE,KAAK,IAAG,CACtD,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "spawn-rx",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.4",
|
|
4
4
|
"description": "An Rx-version of child_process.spawn",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"doc": "echo \"esdoc may not work correctly\" && esdoc -c ./esdoc.json",
|
|
@@ -28,7 +28,6 @@
|
|
|
28
28
|
"homepage": "https://github.com/anaisbetts/spawn-rx",
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"debug": "^4.3.7",
|
|
31
|
-
"lodash.assign": "^4.2.0",
|
|
32
31
|
"rxjs": "^7.8.1"
|
|
33
32
|
},
|
|
34
33
|
"devDependencies": {
|
package/src/index.ts
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
import * as path from "path";
|
|
3
3
|
import * as net from "net";
|
|
4
4
|
import * as sfs from "fs";
|
|
5
|
-
import * as assign from "lodash.assign";
|
|
6
5
|
|
|
7
6
|
import type { Observer, Subject } from "rxjs";
|
|
8
7
|
import { Observable, Subscription, AsyncSubject, of, merge } from "rxjs";
|
|
@@ -230,7 +229,11 @@ export function spawnDetached(
|
|
|
230
229
|
const { cmd, args } = findActualExecutable(exe, params ?? []);
|
|
231
230
|
|
|
232
231
|
if (!isWindows) {
|
|
233
|
-
return spawn(
|
|
232
|
+
return spawn(
|
|
233
|
+
cmd,
|
|
234
|
+
args,
|
|
235
|
+
Object.assign({}, opts || {}, { detached: true }) as any,
|
|
236
|
+
);
|
|
234
237
|
}
|
|
235
238
|
|
|
236
239
|
const newParams = [cmd].concat(args);
|
|
@@ -243,10 +246,13 @@ export function spawnDetached(
|
|
|
243
246
|
"jobber",
|
|
244
247
|
"Jobber.exe",
|
|
245
248
|
);
|
|
246
|
-
const options = assign({}, opts || {}, {
|
|
249
|
+
const options = Object.assign({}, opts || {}, {
|
|
250
|
+
detached: true,
|
|
251
|
+
jobber: true,
|
|
252
|
+
});
|
|
247
253
|
|
|
248
254
|
d(`spawnDetached: ${target}, ${newParams}`);
|
|
249
|
-
return spawn(target, newParams, options);
|
|
255
|
+
return spawn(target, newParams, options as any);
|
|
250
256
|
}
|
|
251
257
|
|
|
252
258
|
/**
|
|
@@ -463,15 +469,15 @@ function wrapObservableInSplitPromise(obs: Observable<OutputLine>) {
|
|
|
463
469
|
obs.subscribe({
|
|
464
470
|
next: (x) => (x.source === "stdout" ? (out += x.text) : (err += x.text)),
|
|
465
471
|
error: (e) => {
|
|
466
|
-
const
|
|
472
|
+
const error: any = new Error(`${out}\n${e.message}`);
|
|
467
473
|
|
|
468
474
|
if ("exitCode" in e) {
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
475
|
+
error.exitCode = e.exitCode;
|
|
476
|
+
error.code = e.exitCode;
|
|
477
|
+
error.stdout = out;
|
|
478
|
+
error.stderr = err;
|
|
473
479
|
}
|
|
474
|
-
rej(
|
|
480
|
+
rej(error);
|
|
475
481
|
},
|
|
476
482
|
complete: () => res([out, err]),
|
|
477
483
|
});
|