x3d-tidy 1.0.48 → 1.0.49

package/bin/x3d-tidy.js

@@ -1,17 +1,10 @@
 #!/usr/bin/env node
 "use strict"
 
-const path = require ("path")
-const { execFile } = require ("child_process")
+const os = require ("os")
+const { spawn } = require ("child_process")
 
-execFile ("npm", ["start", "--", ... process .argv .slice (2)], (error, stdout, stderr) =>
-{
-   if (error)
-      return process .stderr .write (error .message)
+const p = spawn (os .platform () === "win32" ? "npm.cmd" : "npm", ["start", "--silent", "--", ... process .argv .slice (2)])
 
-   if (stdout)
-      process .stdout .write (stdout)
-
-   if (stderr)
-      process .stderr .write (stderr)
-})
+p .stdout .pipe (process .stdout)
+p .stderr .pipe (process .stderr)

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "x3d-tidy",
-   "version": "1.0.48",
+   "version": "1.0.49",
    "description": "X3D Converter, Beautifier and Minimizer",
    "bin": {
       "x3d-tidy": "bin/x3d-tidy.js"
@@ -41,6 +41,7 @@
    },
    "homepage": "https://www.npmjs.com/package/x3d-tidy",
    "dependencies": {
+      "console": "^0.7.2",
       "electron": "^25.1.1",
       "x_ite": "^8.9.1",
       "yargs": "^17.7.2"

package/src/convert.js

@@ -1,21 +1,26 @@
 "use strict"
 
 const
-   X3D      = require ("x_ite"),
-   infer    = require ("./infer"),
-   pkg      = require ("../package.json"),
-   metadata = require ("./metadata"),
-   electron = require ("electron"),
-   yargs    = require ("yargs"),
-   url      = require ("url"),
-   path     = require ("path"),
-   fs       = require ("fs"),
-   zlib     = require ("zlib"),
-   DEBUG    = false
+   X3D         = require ("x_ite"),
+   infer       = require ("./infer"),
+   pkg         = require ("../package.json"),
+   metadata    = require ("./metadata"),
+   electron    = require ("electron"),
+   yargs       = require ("yargs"),
+   url         = require ("url"),
+   path        = require ("path"),
+   fs          = require ("fs"),
+   zlib        = require ("zlib"),
+   nodeConsole = require ("console"),
+   DEBUG       = false
 
 // DEBUG: npm start -- --version` to reset cache.
 
-process .exit = (status) => electron .ipcRenderer .send (status ? "error" : "ready", "")
+console = nodeConsole .Console (process .stdout, process .stderr)
+
+process .exit          = (status)  => electron .ipcRenderer .send (status ? "error" : "ready", "")
+process .stdout .write = (message) => electron .ipcRenderer .send ("output", message)
+process .stderr .write = (message) => electron .ipcRenderer .send ("error", message)
 
 electron .ipcRenderer .on ("convert", async (event, argv) => main (argv))
 
@@ -35,10 +40,6 @@ async function main (argv)
 
 async function convert (argv)
 {
-   console .log   = output .bind (null, process .stdout)
-   console .warn  = output .bind (null, process .stdout)
-   console .error = output .bind (null, process .stderr)
-
    const args = yargs (argv)
    .scriptName ("x3d-tidy")
    .usage ("$0 args")
@@ -197,9 +198,4 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) })}
     <p>Made with <a href="https://www.npmjs.com/package/x3d-tidy" target="_blank">x3d-tidy.</a></p>
   </body>
 </html>`
-   }
-
-function output (stdout, ... args)
-{
-   stdout .write (args .join (" ") + "\n")
 }

package/src/main.js

@@ -5,6 +5,7 @@ const
    path     = require ("path")
 
 process .env .ELECTRON_DISABLE_SECURITY_WARNINGS = "true"
+process .env .ELECTRON_ENABLE_LOGGING            = 1
 
 if (process .platform === "darwin")
 {
@@ -27,11 +28,16 @@ electron .app .whenReady () .then (async () =>
 
    electron .ipcMain .on ("ready", () => electron .app .quit ())
 
+   electron .ipcMain .on ("output", (event, message) =>
+   {
+      process .stderr .write (message)
+      process .stderr .write ("\n")
+   })
+
    electron .ipcMain .on ("error", (event, message) =>
    {
       process .stderr .write (message)
       process .stderr .write ("\n")
-      process .exit (1)
    })
 
    await window .loadFile (path .join (__dirname, "window.html"))