parallel-park 0.2.1 → 0.2.2

package/dist/child-process-worker.js

@@ -30,7 +30,7 @@ debug("reading input data...");
 })
     .catch(onError);
 function onReady(inputs, fnString, callingFile) {
-    debug("in onReady", { inputs, fnString, callingFile });
+    debug("in onReady %o", { inputs, fnString, callingFile });
     // Relevant when callingFile is eg. "REPL2" (from Node.js repl)
     if (!path_1.default.isAbsolute(callingFile)) {
         callingFile = path_1.default.join(process.cwd(), "fake-path.js");
@@ -50,11 +50,11 @@ function onReady(inputs, fnString, callingFile) {
     }
 }
 function onSuccess(data) {
-    debug("in onSuccess", { data });
+    debug("in onSuccess %o", { data });
     commsOut.end(JSON.stringify({ type: "success", data }));
 }
 function onError(error) {
-    debug("in onError", { error });
+    debug("in onError %o", { error });
     commsOut.end(JSON.stringify({
         type: "error",
         error: {

package/dist/in-child-process.js

@@ -7,6 +7,7 @@ exports.inChildProcess = void 0;
 const child_process_1 = __importDefault(require("child_process"));
 const error_utils_1 = require("@suchipi/error-utils");
 const debug_1 = __importDefault(require("debug"));
+const util_1 = __importDefault(require("util"));
 const read_until_end_1 = require("./read-until-end");
 const debug = (0, debug_1.default)("parallel-park:in-child-process");
 const runnerPath = require.resolve("../dist/child-process-worker");
@@ -23,7 +24,7 @@ const inChildProcess = (...args) => {
     const here = new error_utils_1.ParsedError(new Error("here"));
     const callingFrame = here.stackFrames[1];
     const callingFile = (_a = callingFrame === null || callingFrame === void 0 ? void 0 : callingFrame.fileName) !== null && _a !== void 0 ? _a : "unknown file";
-    debug("spawning child process:", [process.argv[0], runnerPath]);
+    debug("spawning child process: %o", [process.argv[0], runnerPath]);
     const child = child_process_1.default.spawn(process.argv[0], [runnerPath], {
         stdio: ["inherit", "inherit", "inherit", "pipe", "pipe"],
     });
@@ -37,16 +38,16 @@ const inChildProcess = (...args) => {
                 functionToRun.toString(),
                 callingFile,
             ]);
-            debug("sending inputs to child process:", dataToSend);
+            debug("sending inputs to child process: %o", dataToSend);
             commsOut.end(dataToSend, "utf-8");
         });
         let receivedData = "";
         (0, read_until_end_1.readUntilEnd)(commsIn).then((data) => {
-            debug("received data from child process");
+            debug("received data from child process: %o", data);
             receivedData = data;
         });
         child.on("close", (code, signal) => {
-            debug("child process closed:", { code, signal });
+            debug("child process closed: %o", { code, signal });
             if (code !== 0) {
                 reject(new Error(`Child process exited with nonzero status code: ${JSON.stringify({
                     code,
@@ -55,13 +56,22 @@ const inChildProcess = (...args) => {
             }
             else {
                 debug("parsing received data from child process...");
-                const result = JSON.parse(receivedData);
+                let result;
+                try {
+                    result = JSON.parse(receivedData);
+                }
+                catch (err) {
+                    reject(new Error(`parallel-park error: failed to parse received data as JSON. data was: ${util_1.default.inspect(receivedData, { colors: true, depth: Infinity })}`));
+                    return;
+                }
                 switch (result.type) {
                     case "success": {
+                        debug("child process finished successfully with result: %o", result.data);
                         resolve(result.data);
                         break;
                     }
                     case "error": {
+                        debug("child process errored: %o", result.error);
                         const error = new Error(result.error.message);
                         Object.defineProperty(error, "name", { value: result.error.name });
                         Object.defineProperty(error, "stack", {

package/dist/read-until-end.js

@@ -8,16 +8,17 @@ const debug_1 = __importDefault(require("debug"));
 const debug = (0, debug_1.default)("parallel-park:read-until-end");
 let streamId = 0;
 function readUntilEnd(stream) {
-    const id = streamId;
+    const id = `${process.pid}-${streamId}`;
     streamId++;
     return new Promise((resolve) => {
         let data = "";
         stream.on("data", (chunk) => {
-            debug("received data chunk from stream", id);
-            data += chunk.toString("utf-8");
+            const chunkStr = chunk.toString("utf-8");
+            debug("received data chunk from stream %s: %o", id, chunkStr);
+            data += chunkStr;
         });
         stream.on("close", () => {
-            debug(`stream ${id} closed; resolving`);
+            debug("stream %s closed; resolving with: %o", id, data);
             resolve(data);
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parallel-park",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Parallel/concurrent async work, optionally using multiple processes",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/child-process-worker.ts

@@ -32,7 +32,7 @@ readUntilEnd(commsIn)
   .catch(onError);
 
 function onReady(inputs: any, fnString: string, callingFile: string) {
-  debug("in onReady", { inputs, fnString, callingFile });
+  debug("in onReady %o", { inputs, fnString, callingFile });
 
   // Relevant when callingFile is eg. "REPL2" (from Node.js repl)
   if (!path.isAbsolute(callingFile)) {
@@ -65,13 +65,13 @@ function onReady(inputs: any, fnString: string, callingFile: string) {
 }
 
 function onSuccess(data: any) {
-  debug("in onSuccess", { data });
+  debug("in onSuccess %o", { data });
 
   commsOut.end(JSON.stringify({ type: "success", data }));
 }
 
 function onError(error: Error) {
-  debug("in onError", { error });
+  debug("in onError %o", { error });
 
   commsOut.end(
     JSON.stringify({

package/src/in-child-process.ts

@@ -2,6 +2,7 @@ import child_process from "child_process";
 import type * as stream from "stream";
 import { ParsedError } from "@suchipi/error-utils";
 import makeDebug from "debug";
+import util from "util";
 import { readUntilEnd } from "./read-until-end";
 
 const debug = makeDebug("parallel-park:in-child-process");
@@ -38,7 +39,7 @@ export const inChildProcess: InChildProcess = (...args: Array<any>) => {
   const callingFrame = here.stackFrames[1];
   const callingFile = callingFrame?.fileName ?? "unknown file";
 
-  debug("spawning child process:", [process.argv[0], runnerPath]);
+  debug("spawning child process: %o", [process.argv[0], runnerPath]);
 
   const child = child_process.spawn(process.argv[0], [runnerPath], {
     stdio: ["inherit", "inherit", "inherit", "pipe", "pipe"],
@@ -56,18 +57,18 @@ export const inChildProcess: InChildProcess = (...args: Array<any>) => {
         functionToRun.toString(),
         callingFile,
       ]);
-      debug("sending inputs to child process:", dataToSend);
+      debug("sending inputs to child process: %o", dataToSend);
       commsOut.end(dataToSend, "utf-8");
     });
 
     let receivedData = "";
     readUntilEnd(commsIn).then((data) => {
-      debug("received data from child process");
+      debug("received data from child process: %o", data);
       receivedData = data;
     });
 
     child.on("close", (code, signal) => {
-      debug("child process closed:", { code, signal });
+      debug("child process closed: %o", { code, signal });
 
       if (code !== 0) {
         reject(
@@ -80,13 +81,31 @@ export const inChildProcess: InChildProcess = (...args: Array<any>) => {
         );
       } else {
         debug("parsing received data from child process...");
-        const result = JSON.parse(receivedData);
+        let result: any;
+        try {
+          result = JSON.parse(receivedData);
+        } catch (err) {
+          reject(
+            new Error(
+              `parallel-park error: failed to parse received data as JSON. data was: ${util.inspect(
+                receivedData,
+                { colors: true, depth: Infinity }
+              )}`
+            )
+          );
+          return;
+        }
         switch (result.type) {
           case "success": {
+            debug(
+              "child process finished successfully with result: %o",
+              result.data
+            );
             resolve(result.data);
             break;
           }
           case "error": {
+            debug("child process errored: %o", result.error);
             const error = new Error(result.error.message);
             Object.defineProperty(error, "name", { value: result.error.name });
             Object.defineProperty(error, "stack", {

package/src/read-until-end.ts

@@ -5,19 +5,20 @@ const debug = makeDebug("parallel-park:read-until-end");
 let streamId = 0;
 
 export function readUntilEnd(stream: stream.Readable): Promise<string> {
-  const id = streamId;
+  const id = `${process.pid}-${streamId}`;
   streamId++;
 
   return new Promise((resolve) => {
     let data = "";
 
     stream.on("data", (chunk) => {
-      debug("received data chunk from stream", id);
-      data += chunk.toString("utf-8");
+      const chunkStr = chunk.toString("utf-8");
+      debug("received data chunk from stream %s: %o", id, chunkStr);
+      data += chunkStr;
     });
 
     stream.on("close", () => {
-      debug(`stream ${id} closed; resolving`);
+      debug("stream %s closed; resolving with: %o", id, data);
       resolve(data);
     });
   });