@plugjs/plug 0.6.0-beta.1 → 0.6.0-beta.2
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/dist/cli.mjs +1 -1
- package/dist/fork.cjs +19 -3
- package/dist/fork.cjs.map +1 -1
- package/dist/fork.mjs +20 -4
- package/dist/fork.mjs.map +1 -1
- package/dist/fs.d.ts +0 -2
- package/dist/globals.cjs +3 -0
- package/dist/globals.cjs.map +2 -2
- package/dist/globals.d.ts +1 -1
- package/dist/globals.mjs +2 -0
- package/dist/globals.mjs.map +2 -2
- package/dist/index.cjs +2 -0
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.mjs +2 -0
- package/dist/index.mjs.map +1 -1
- package/dist/logging/options.d.ts +0 -3
- package/package.json +1 -1
- package/src/fork.ts +27 -7
- package/src/globals.ts +1 -3
- package/src/index.ts +3 -6
package/dist/cli.mjs
CHANGED
|
@@ -15,7 +15,7 @@ var { TRACE, DEBUG, INFO, NOTICE, WARN, ERROR, OFF } = logLevels;
|
|
|
15
15
|
var $bnd = (s) => $blu($und(s));
|
|
16
16
|
var $gnd = (s) => $gry($und(s));
|
|
17
17
|
var $wnd = (s) => $wht($und(s));
|
|
18
|
-
var version = true ? "0.6.0-beta.
|
|
18
|
+
var version = true ? "0.6.0-beta.2" : "0.0.0-dev";
|
|
19
19
|
function help() {
|
|
20
20
|
console.log(`${$bnd("Usage:")}
|
|
21
21
|
|
package/dist/fork.cjs
CHANGED
|
@@ -25,6 +25,8 @@ __export(fork_exports, {
|
|
|
25
25
|
});
|
|
26
26
|
module.exports = __toCommonJS(fork_exports);
|
|
27
27
|
var import_node_child_process = require("node:child_process");
|
|
28
|
+
var import_node_console = require("node:console");
|
|
29
|
+
var import_node_stream = require("node:stream");
|
|
28
30
|
var import_asserts = require("./asserts.cjs");
|
|
29
31
|
var import_async = require("./async.cjs");
|
|
30
32
|
var import_files = require("./files.cjs");
|
|
@@ -119,8 +121,9 @@ var ForkingPlug = class {
|
|
|
119
121
|
}
|
|
120
122
|
};
|
|
121
123
|
if (process.argv[1] === (0, import_paths.requireFilename)(__filename) && process.send) {
|
|
124
|
+
const originalConsole = globalThis.console;
|
|
122
125
|
process.on("uncaughtException", (error, origin) => {
|
|
123
|
-
|
|
126
|
+
originalConsole.error(
|
|
124
127
|
(0, import_logging.$red)("\n= UNCAUGHT EXCEPTION ========================================="),
|
|
125
128
|
`
|
|
126
129
|
Error (${origin}):`,
|
|
@@ -132,7 +135,7 @@ Node.js ${process.version} (pid=${process.pid})
|
|
|
132
135
|
process.nextTick(() => process.exit(3));
|
|
133
136
|
});
|
|
134
137
|
const timeout = setTimeout(() => {
|
|
135
|
-
|
|
138
|
+
originalConsole.error("Fork not initialized in 5 seconds");
|
|
136
139
|
process.exit(2);
|
|
137
140
|
}, 5e3).unref();
|
|
138
141
|
process.on("message", (message) => {
|
|
@@ -148,6 +151,19 @@ Node.js ${process.version} (pid=${process.pid})
|
|
|
148
151
|
logIndent
|
|
149
152
|
} = message;
|
|
150
153
|
import_emit.emit.emitter = import_emit.emitForked;
|
|
154
|
+
const stdout = new class extends import_node_stream.Writable {
|
|
155
|
+
_write(chunk, _, callback) {
|
|
156
|
+
import_emit.emit.emitter({ level: import_logging.NOTICE, taskName }, [chunk.toString()]);
|
|
157
|
+
callback();
|
|
158
|
+
}
|
|
159
|
+
}();
|
|
160
|
+
const stderr = new class extends import_node_stream.Writable {
|
|
161
|
+
_write(chunk, _, callback) {
|
|
162
|
+
import_emit.emit.emitter({ level: import_logging.WARN, taskName }, [chunk.toString()]);
|
|
163
|
+
callback();
|
|
164
|
+
}
|
|
165
|
+
}();
|
|
166
|
+
globalThis.console = new import_node_console.Console(stdout, stderr);
|
|
151
167
|
const context = new import_pipe.Context(buildFile, taskName);
|
|
152
168
|
context.log.indent = logIndent;
|
|
153
169
|
context.log.debug("Message from parent process for PID", process.pid, message);
|
|
@@ -183,7 +199,7 @@ Node.js ${process.version} (pid=${process.pid})
|
|
|
183
199
|
promise.then(() => {
|
|
184
200
|
context.log.debug("Forked plug with pid", process.pid, "exiting");
|
|
185
201
|
}, (error) => {
|
|
186
|
-
|
|
202
|
+
originalConsole.error("\n\nError sending message back to parent process", error);
|
|
187
203
|
process.exitCode = 1;
|
|
188
204
|
}).finally(() => {
|
|
189
205
|
process.disconnect();
|
package/dist/fork.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/fork.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["result", "message"]
|
|
6
6
|
}
|
package/dist/fork.mjs
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
// fork.ts
|
|
2
2
|
import { fork } from "node:child_process";
|
|
3
|
+
import { Console } from "node:console";
|
|
4
|
+
import { Writable } from "node:stream";
|
|
3
5
|
import { assert, BuildFailure } from "./asserts.mjs";
|
|
4
6
|
import { runAsync } from "./async.mjs";
|
|
5
7
|
import { Files } from "./files.mjs";
|
|
6
|
-
import { $gry, $p, $red, logOptions } from "./logging.mjs";
|
|
8
|
+
import { $gry, $p, $red, logOptions, NOTICE, WARN } from "./logging.mjs";
|
|
7
9
|
import { emit, emitForked } from "./logging/emit.mjs";
|
|
8
10
|
import { requireFilename, resolveFile } from "./paths.mjs";
|
|
9
11
|
import { Context, install } from "./pipe.mjs";
|
|
@@ -94,8 +96,9 @@ var ForkingPlug = class {
|
|
|
94
96
|
}
|
|
95
97
|
};
|
|
96
98
|
if (process.argv[1] === requireFilename(import.meta.url) && process.send) {
|
|
99
|
+
const originalConsole = globalThis.console;
|
|
97
100
|
process.on("uncaughtException", (error, origin) => {
|
|
98
|
-
|
|
101
|
+
originalConsole.error(
|
|
99
102
|
$red("\n= UNCAUGHT EXCEPTION ========================================="),
|
|
100
103
|
`
|
|
101
104
|
Error (${origin}):`,
|
|
@@ -107,7 +110,7 @@ Node.js ${process.version} (pid=${process.pid})
|
|
|
107
110
|
process.nextTick(() => process.exit(3));
|
|
108
111
|
});
|
|
109
112
|
const timeout = setTimeout(() => {
|
|
110
|
-
|
|
113
|
+
originalConsole.error("Fork not initialized in 5 seconds");
|
|
111
114
|
process.exit(2);
|
|
112
115
|
}, 5e3).unref();
|
|
113
116
|
process.on("message", (message) => {
|
|
@@ -123,6 +126,19 @@ Node.js ${process.version} (pid=${process.pid})
|
|
|
123
126
|
logIndent
|
|
124
127
|
} = message;
|
|
125
128
|
emit.emitter = emitForked;
|
|
129
|
+
const stdout = new class extends Writable {
|
|
130
|
+
_write(chunk, _, callback) {
|
|
131
|
+
emit.emitter({ level: NOTICE, taskName }, [chunk.toString()]);
|
|
132
|
+
callback();
|
|
133
|
+
}
|
|
134
|
+
}();
|
|
135
|
+
const stderr = new class extends Writable {
|
|
136
|
+
_write(chunk, _, callback) {
|
|
137
|
+
emit.emitter({ level: WARN, taskName }, [chunk.toString()]);
|
|
138
|
+
callback();
|
|
139
|
+
}
|
|
140
|
+
}();
|
|
141
|
+
globalThis.console = new Console(stdout, stderr);
|
|
126
142
|
const context = new Context(buildFile, taskName);
|
|
127
143
|
context.log.indent = logIndent;
|
|
128
144
|
context.log.debug("Message from parent process for PID", process.pid, message);
|
|
@@ -158,7 +174,7 @@ Node.js ${process.version} (pid=${process.pid})
|
|
|
158
174
|
promise.then(() => {
|
|
159
175
|
context.log.debug("Forked plug with pid", process.pid, "exiting");
|
|
160
176
|
}, (error) => {
|
|
161
|
-
|
|
177
|
+
originalConsole.error("\n\nError sending message back to parent process", error);
|
|
162
178
|
process.exitCode = 1;
|
|
163
179
|
}).finally(() => {
|
|
164
180
|
process.disconnect();
|
package/dist/fork.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/fork.ts"],
|
|
4
|
-
"mappings": ";AAAA,SAAS,YAAY;
|
|
4
|
+
"mappings": ";AAAA,SAAS,YAAY;AACrB,SAAS,eAAe;AACxB,SAAS,gBAAgB;AAEzB,SAAS,QAAQ,oBAAoB;AACrC,SAAS,gBAAgB;AACzB,SAAS,aAAa;AACtB,SAAS,MAAM,IAAI,MAAM,YAAY,QAAQ,YAAY;AACzD,SAAS,MAAM,kBAAkB;AACjC,SAAS,iBAAiB,mBAAmB;AAC7C,SAAS,SAAS,eAAe;AAkD1B,IAAe,cAAf,MAAuD;AAAA,EAC5D,YACqB,aACA,YACA,aACnB;AAHmB;AACA;AACA;AAAA,EAClB;AAAA,EAEH,KAAK,OAAc,SAAuC;AACxD,UAAM,UAAoB;AAAA,MACxB,YAAY,KAAK;AAAA,MACjB,YAAY,KAAK;AAAA,MACjB,iBAAiB,KAAK;AAAA,MACtB,UAAU,QAAQ;AAAA,MAClB,WAAW,QAAQ;AAAA,MACnB,UAAU,MAAM;AAAA,MAChB,WAAW,CAAE,GAAG,MAAM,cAAc,CAAE;AAAA,MACtC,WAAW,QAAQ,IAAI;AAAA,IACzB;AAGA,UAAM,SAAS,gBAAgB,eAAS;AACxC,YAAQ,IAAI,MAAM,2BAA2B,GAAG,KAAK,WAAW,CAAC;AAGjE,UAAM,MAAM,EAAE,GAAG,QAAQ,KAAK,GAAG,WAAW,QAAQ,QAAQ,QAAQ,EAAE;AAGtE,aAAS,IAAI,KAAK,WAAW,SAAS,GAAG,KAAK,GAAG,KAAM;AACrD,UAAI,KAAK,WAAW,CAAC,KAAK,KAAM;AAChC,UAAI,OAAO,KAAK,WAAW,CAAC,MAAM,UAAU;AAC1C,YAAI,OAAO,KAAK,WAAW,CAAC,EAAE,gBAAgB,UAAU;AACtD,gBAAM,MAAM,IAAI,mBAAmB,QAAQ,QAAQ,KAAK,WAAW,CAAC,EAAE,WAAW;AACjF,kBAAQ,IAAI,MAAM,2CAA2C,GAAG,GAAG,CAAC;AAAA,QACtE;AACA,YAAI,OAAO,KAAK,WAAW,CAAC,EAAE,gBAAgB,UAAU;AACtD,gBAAM,QAAQ,IAAI,yBAAyB,KAAK,WAAW,CAAC,EAAE;AAC9D,kBAAQ,IAAI,MAAM,4CAA4C,GAAG,KAAK,CAAC;AAAA,QACzE;AAAA,MACF;AAAA,IACF;AAGA,UAAM,QAAQ,KAAK,QAAQ;AAAA,MACzB,OAAO,CAAE,UAAU,WAAW,WAAW,KAAM;AAAA,MAC/C,eAAe;AAAA,MACf;AAAA,IACF,CAAC;AAGD,YAAQ,IAAI,KAAK,WAAW,GAAG,MAAM,GAAG,KAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AAGlE,QAAI,OAAO;AACX,WAAO,IAAI,QAAoB,CAAC,SAAS,WAAW;AAClD,UAAI,WAAmC;AAEvC,YAAM,GAAG,SAAS,CAAC,UAAU;AAC3B,gBAAQ,IAAI,MAAM,6BAA6B,KAAK;AACpD,eAAO,QAAQ,OAAO,aAAa,KAAK,CAAC;AAAA,MAC3C,CAAC;AAED,YAAM,GAAG,WAAW,CAAC,YAA2C;AAC9D,YAAI,cAAc,SAAS;AACzB,gBAAM,EAAE,UAAU,UAAU,MAAM,IAAI;AACtC,gBAAM,QAAQ,CAAC,SAAS;AAGtB,YAAC,QAAQ,IAAY,MAAM,UAAU,CAAE,IAAK,GAAG,QAAQ;AAAA,UACzD,CAAC;AAAA,QACH,OAAO;AACL,kBAAQ,IAAI,MAAM,6CAA6C,MAAM,KAAK,OAAO;AACjF,qBAAW;AAAA,QACb;AAAA,MACF,CAAC;AAED,YAAM,GAAG,QAAQ,CAAC,MAAM,WAAW;AACjC,YAAI,QAAQ;AACV,kBAAQ,IAAI,MAAM,0CAA0C,MAAM,IAAI,KAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AAChG,iBAAO,QAAQ,OAAO,aAAa,KAAK,CAAC;AAAA,QAC3C,WAAW,SAAS,GAAG;AACrB,kBAAQ,IAAI,MAAM,wCAAwC,IAAI,IAAI,KAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AAC5F,iBAAO,QAAQ,OAAO,aAAa,KAAK,CAAC;AAAA,QAC3C,WAAW,CAAE,UAAU;AACrB,kBAAQ,IAAI,MAAM,6CAA6C,KAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AACzF,iBAAO,QAAQ,OAAO,aAAa,KAAK,CAAC;AAAA,QAC3C,WAAW,SAAS,QAAQ;AAE1B,iBAAO,QAAQ,OAAO,aAAa,KAAK,CAAC;AAAA,QAC3C;AAGA,eAAO,QAAQ,QAAQ,SAAS,YAAY,SAAS,YACjD,MAAM,QAAQ,SAAS,QAAQ,EAAE,IAAI,GAAG,SAAS,SAAS,EAAE,MAAM,IAClE,MAAS;AAAA,MACf,CAAC;AAGD,UAAI;AAOF,cAAM,KAAK,SAAS,CAAC,UAAU;AAC7B,cAAI,OAAO;AACT,oBAAQ,IAAI,MAAM,mEAAmE,KAAK;AAC1F,mBAAO,aAAa,KAAK,CAAC;AAAA,UAC5B;AAAA,QACF,CAAC;AAAA,MACH,SAAS,OAAO;AACd,gBAAQ,IAAI,MAAM,mEAAmE,KAAK;AAC1F,eAAO,aAAa,KAAK,CAAC;AAAA,MAC5B;AAAA,IACF,CAAC,EAAE,QAAQ,MAAM,OAAO,IAAI;AAAA,EAC9B;AACF;AAYA,IAAK,QAAQ,KAAK,CAAC,MAAM,gBAAgB,eAAS,KAAO,QAAQ,MAAO;AAEtE,QAAM,kBAAkB,WAAW;AAGnC,UAAQ,GAAG,qBAAqB,CAAC,OAAO,WAAW;AACjD,oBAAgB;AAAA,MACZ,KAAK,kEAAkE;AAAA,MACvE;AAAA,SAAY,MAAM;AAAA,MAAM;AAAA,MACxB;AAAA,UAAa,QAAQ,OAAO,SAAS,QAAQ,GAAG;AAAA;AAAA,IAAK;AACzD,YAAQ,SAAS,MAAM,QAAQ,KAAK,CAAC,CAAC;AAAA,EACxC,CAAC;AAGD,QAAM,UAAU,WAAW,MAAM;AAC/B,oBAAgB,MAAM,mCAAmC;AACzD,YAAQ,KAAK,CAAC;AAAA,EAChB,GAAG,GAAI,EAAE,MAAM;AAGf,UAAQ,GAAG,WAAW,CAAC,YAAsB;AAC3C,iBAAa,OAAO;AAEpB,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,IAAI;AAGJ,SAAK,UAAU;AAGf,UAAM,SAAS,IAAI,cAAc,SAAS;AAAA,MACxC,OAAO,OAAY,GAAmB,UAAgD;AACpF,aAAK,QAAQ,EAAE,OAAO,QAAQ,SAAS,GAAG,CAAE,MAAM,SAAS,CAAE,CAAC;AAC9D,iBAAS;AAAA,MACX;AAAA,IACF;AAEA,UAAM,SAAS,IAAI,cAAc,SAAS;AAAA,MACxC,OAAO,OAAY,GAAmB,UAAgD;AACpF,aAAK,QAAQ,EAAE,OAAO,MAAM,SAAS,GAAG,CAAE,MAAM,SAAS,CAAE,CAAC;AAC5D,iBAAS;AAAA,MACX;AAAA,IACF;AAGA,eAAW,UAAU,IAAI,QAAQ,QAAQ,MAAM;AAG/C,UAAM,UAAU,IAAI,QAAQ,WAAW,QAAQ;AAC/C,YAAQ,IAAI,SAAS;AACrB,YAAQ,IAAI,MAAM,uCAAuC,QAAQ,KAAK,OAAO;AAG7E,YAAQ,WAAW;AACnB,UAAM,SAAS,SAAS,SAAS,YAAY;AAE3C,aAAO,YAAY,UAAU,GAAG,eAAe,GAAG,UAAU,CAAC,YAAY;AACzE,YAAM,SAAS,MAAM,OAAO;AAG5B,UAAI;AACJ,UAAI,eAAe,WAAW;AAC5B,eAAO;AACP,eAAO,QAAS,OAAO,SAAS,WAAa,QAAO,KAAK;AACzD,eAAO,OAAO,SAAS,YAAY,UAAU,GAAG,UAAU,CAAC,wCAAwC;AAAA,MACrG,OAAO;AACL,eAAO,OAAO,UAAU;AACxB,YAAK,CAAE,QAAU,OAAO,QAAU,QAAO,OAAO,QAAQ,UAAU;AAClE,eAAO,OAAO,SAAS,YAAY,UAAU,GAAG,UAAU,CAAC,qBAAqB,UAAU,GAAG;AAAA,MAC/F;AAGA,YAAM,OAAO,IAAI,KAAK,GAAG,eAAe;AACxC,YAAM,QAAQ,MAAM,QAAQ,QAAQ,EAAE,IAAI,GAAG,SAAS,EAAE,MAAM;AAG9D,aAAO,KAAK,KAAK,OAAO,OAAO;AAAA,IACjC,CAAC;AAGD,UAAM,UAAU,OAAO,KAAK,CAACA,YAAW;AACtC,YAAMC,WAAsBD,UAC1B,EAAE,QAAQ,OAAO,UAAUA,QAAO,WAAW,WAAW,CAAE,GAAGA,QAAO,cAAc,CAAE,EAAE,IACtF,EAAE,QAAQ,MAAM;AAClB,aAAO,IAAI,QAAc,CAAC,SAAS,WAAW;AAC5C,gBAAQ,KAAMC,UAAS,CAAC,QAAe,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC;AAAA,MACtE,CAAC;AAAA,IACH,GAAG,CAAC,UAAU;AACZ,cAAQ,IAAI,MAAM,KAAK;AACvB,aAAO,IAAI,QAAc,CAAC,SAAS,WAAW;AAC5C,gBAAQ,KAAM,EAAE,QAAQ,KAAK,GAAG,CAAC,QAAe,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC;AAAA,MAC/E,CAAC;AAAA,IACH,CAAC;AAGD,YAAQ,KAAK,MAAM;AACjB,cAAQ,IAAI,MAAM,wBAAwB,QAAQ,KAAK,SAAS;AAAA,IAClE,GAAG,CAAC,UAAU;AACZ,sBAAgB,MAAM,oDAAoD,KAAK;AAC/E,cAAQ,WAAW;AAAA,IACrB,CAAC,EAAE,QAAQ,MAAM;AACf,cAAQ,WAAW;AACnB,cAAQ,KAAK,QAAQ,QAAQ;AAAA,IAC/B,CAAC;AAAA,EACH,CAAC;AACH;AAmBO,SAAS,eACZ,UACA,YACA,aAAqB,WACjB;AAEN,QAAM,OAAO,cAAc,YAAY;AAAA,IACrC,eAAe,MAAa;AAC1B,YAAM,YAAY,MAAM,UAAU;AAAA,IACpC;AAAA,EACF;AAGA,UAAQ,UAAU,IAAW;AAC/B;",
|
|
5
5
|
"names": ["result", "message"]
|
|
6
6
|
}
|
package/dist/fs.d.ts
CHANGED
package/dist/globals.cjs
CHANGED
package/dist/globals.cjs.map
CHANGED
package/dist/globals.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
import '../types/globals.d.ts';
|
package/dist/globals.mjs
CHANGED
package/dist/globals.mjs.map
CHANGED
package/dist/index.cjs
CHANGED
|
@@ -60,6 +60,8 @@ __export(src_exports, {
|
|
|
60
60
|
utils: () => utils
|
|
61
61
|
});
|
|
62
62
|
module.exports = __toCommonJS(src_exports);
|
|
63
|
+
var import_globals_d = require("../types/globals.d.ts");
|
|
64
|
+
var import_fixes_d = require("../types/fixes.d.ts");
|
|
63
65
|
var import_files = require("./files.cjs");
|
|
64
66
|
var asserts = __toESM(require("./asserts.cjs"), 1);
|
|
65
67
|
var async = __toESM(require("./async.cjs"), 1);
|
package/dist/index.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/index.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,uBAAO;AACP,qBAAO;AAMP,mBAAsB;AAqBtB,cAAyB;AACzB,YAAuB;AACvB,YAAuB;AACvB,WAAsB;AACtB,SAAoB;AACpB,cAAyB;AACzB,YAAuB;AACvB,WAAsB;AACtB,YAAuB;AAGvB,qBAA2C;AAC3C,qBAA+F;AAG/F,wBAAc,wBA5Cd;AA6CA,wBAAc,0BA7Cd;AA8CA,wBAAc,wBA9Cd;AA+CA,wBAAc,wBA/Cd;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import '../types/globals.d.ts';
|
|
2
|
+
import '../types/fixes.d.ts';
|
|
3
3
|
import type { Files } from './files';
|
|
4
4
|
import type { Plug, PlugFunction } from './pipe';
|
|
5
5
|
export { Files } from './files';
|
package/dist/index.mjs
CHANGED
package/dist/index.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/index.ts"],
|
|
4
|
-
"mappings": ";
|
|
4
|
+
"mappings": ";AACA,OAAO;AACP,OAAO;AAMP,SAAS,aAAa;AAqBtB,YAAY,aAAa;AACzB,YAAY,WAAW;AACvB,YAAY,WAAW;AACvB,YAAY,UAAU;AACtB,YAAY,QAAQ;AACpB,YAAY,aAAa;AACzB,YAAY,WAAW;AACvB,YAAY,UAAU;AACtB,YAAY,WAAW;AAGvB,SAAS,cAAc,QAAQ,YAAY;AAC3C,SAAS,MAAM,MAAM,MAAM,MAAM,MAAM,KAAK,IAAI,MAAM,IAAI,MAAM,MAAM,MAAM,QAAQ,WAAW;AAG/F,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
package/src/fork.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { fork } from 'node:child_process'
|
|
2
|
+
import { Console } from 'node:console'
|
|
3
|
+
import { Writable } from 'node:stream'
|
|
2
4
|
|
|
3
5
|
import { assert, BuildFailure } from './asserts'
|
|
4
6
|
import { runAsync } from './async'
|
|
5
7
|
import { Files } from './files'
|
|
6
|
-
import { $gry, $p, $red, logOptions } from './logging'
|
|
8
|
+
import { $gry, $p, $red, logOptions, NOTICE, WARN } from './logging'
|
|
7
9
|
import { emit, emitForked } from './logging/emit'
|
|
8
10
|
import { requireFilename, resolveFile } from './paths'
|
|
9
11
|
import { Context, install } from './pipe'
|
|
@@ -185,10 +187,12 @@ export abstract class ForkingPlug implements Plug<PlugResult> {
|
|
|
185
187
|
* for the message and respond once the plug returns _something_!
|
|
186
188
|
*/
|
|
187
189
|
if ((process.argv[1] === requireFilename(__fileurl)) && (process.send)) {
|
|
190
|
+
/* Save the original console, we'll replace it on "message" */
|
|
191
|
+
const originalConsole = globalThis.console
|
|
192
|
+
|
|
188
193
|
/* Unhandled exceptions and graceful termination */
|
|
189
194
|
process.on('uncaughtException', (error, origin) => {
|
|
190
|
-
|
|
191
|
-
console.error(
|
|
195
|
+
originalConsole.error(
|
|
192
196
|
$red('\n= UNCAUGHT EXCEPTION ========================================='),
|
|
193
197
|
`\nError (${origin}):`, error,
|
|
194
198
|
`\nNode.js ${process.version} (pid=${process.pid})\n`)
|
|
@@ -197,8 +201,7 @@ if ((process.argv[1] === requireFilename(__fileurl)) && (process.send)) {
|
|
|
197
201
|
|
|
198
202
|
/* If we haven't processed our message in 5 seconds, fail _badly_ */
|
|
199
203
|
const timeout = setTimeout(() => {
|
|
200
|
-
|
|
201
|
-
console.error('Fork not initialized in 5 seconds')
|
|
204
|
+
originalConsole.error('Fork not initialized in 5 seconds')
|
|
202
205
|
process.exit(2)
|
|
203
206
|
}, 5000).unref()
|
|
204
207
|
|
|
@@ -220,6 +223,24 @@ if ((process.argv[1] === requireFilename(__fileurl)) && (process.send)) {
|
|
|
220
223
|
/* Before anything else, capture logs! */
|
|
221
224
|
emit.emitter = emitForked // replace the log emitter...
|
|
222
225
|
|
|
226
|
+
/* Create a couple of writers for our fake "stdout" and "stderr" */
|
|
227
|
+
const stdout = new class extends Writable {
|
|
228
|
+
_write(chunk: any, _: BufferEncoding, callback: (error?: Error | null) => void): void {
|
|
229
|
+
emit.emitter({ level: NOTICE, taskName }, [ chunk.toString() ])
|
|
230
|
+
callback()
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
const stderr = new class extends Writable {
|
|
235
|
+
_write(chunk: any, _: BufferEncoding, callback: (error?: Error | null) => void): void {
|
|
236
|
+
emit.emitter({ level: WARN, taskName }, [ chunk.toString() ])
|
|
237
|
+
callback()
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
/* Replace the console with our own sending messages as logs */
|
|
242
|
+
globalThis.console = new Console(stdout, stderr)
|
|
243
|
+
|
|
223
244
|
/* First of all, our plug context */
|
|
224
245
|
const context = new Context(buildFile, taskName)
|
|
225
246
|
context.log.indent = logIndent
|
|
@@ -271,8 +292,7 @@ if ((process.argv[1] === requireFilename(__fileurl)) && (process.send)) {
|
|
|
271
292
|
promise.then(() => {
|
|
272
293
|
context.log.debug('Forked plug with pid', process.pid, 'exiting')
|
|
273
294
|
}, (error) => {
|
|
274
|
-
|
|
275
|
-
console.error('\n\nError sending message back to parent process', error)
|
|
295
|
+
originalConsole.error('\n\nError sending message back to parent process', error)
|
|
276
296
|
process.exitCode = 1
|
|
277
297
|
}).finally(() => {
|
|
278
298
|
process.disconnect()
|
package/src/globals.ts
CHANGED
package/src/index.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
//
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
// Reference our extra "webassembly" type fix here. As we're using esbuild
|
|
5
|
-
// everywhere, we want our dependants to have this type known...
|
|
6
|
-
/// <reference path="../types/fixes.d.ts" />
|
|
1
|
+
// Reference our globals and type fixes
|
|
2
|
+
import '../types/globals.d.ts'
|
|
3
|
+
import '../types/fixes.d.ts'
|
|
7
4
|
|
|
8
5
|
// This is a main constituent of our build system!
|
|
9
6
|
import type { Files } from './files'
|