@xarc/app-dev 10.0.9 → 10.1.0

package/src/lib/dev-admin/admin-server.ts

@@ -14,7 +14,7 @@ import isCI from "is-ci";
 import { doCleanup } from "./cleanup";
 import * as xaa from "xaa";
 import { formUrl } from "../utils";
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 const optionalRequire = makeOptionalRequire(require);
 
 const WT = optionalRequire("worker_threads");
@@ -28,7 +28,7 @@ import { devProxy } from "../../config/dev-proxy";
 const {
   settings: { useDevProxy: DEV_PROXY_ENABLED, adminLogLevel },
   fullDevServer,
-  controlPaths
+  controlPaths,
 } = devProxy;
 
 const ADMIN_LOG_LEVEL = parseInt(adminLogLevel) || 0;
@@ -47,10 +47,10 @@ const PROMPT_SPIN_INTERVAL = 3500;
 
 const SERVER_ENVS = {
   [APP_SERVER_NAME]: {
-    XARC_BABEL_TARGET: "node"
+    XARC_BABEL_TARGET: "node",
   },
   [DEV_SERVER_NAME]: {} as any,
-  [PROXY_SERVER_NAME]: {} as any
+  [PROXY_SERVER_NAME]: {} as any,
 };
 
 const getTerminalColumns = () => {
@@ -116,7 +116,7 @@ export class AdminServer {
     this._fullAppLogUrl = formUrl({ ...fullDevServer, path: controlPaths.appLog });
     this._adminHttp = new AdminHttp({
       getLogs: (app: string) => this.getLogs(app),
-      port: this._opts.port
+      port: this._opts.port,
     });
   }
 
@@ -132,7 +132,7 @@ export class AdminServer {
       name: DEV_ADMIN_STATUS,
       display: ck`[<green.inverse>DEV ADMIN</>]`,
       spinner: PROMPT_SPINNER,
-      spinInterval: PROMPT_SPIN_INTERVAL
+      spinInterval: PROMPT_SPIN_INTERVAL,
     });
     this.updateStatus("webpack is PENDING");
     this.handleUserInput();
@@ -255,7 +255,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
       } else if (child.terminate) {
         child.postMessage("kill");
         const defer1 = xaa.defer();
-        child.once("message", msg => defer1.resolve(msg));
+        child.once("message", (msg) => defer1.resolve(msg));
         await xaa.try(() => xaa.runTimeout(defer1.promise, 1000));
         child.terminate();
         const defer2 = xaa.defer();
@@ -278,7 +278,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
     await Promise.all([
       this.kill(DEV_SERVER_NAME, "SIGINT"),
       this.kill(APP_SERVER_NAME, "SIGINT"),
-      this.kill(PROXY_SERVER_NAME, "SIGINT")
+      this.kill(PROXY_SERVER_NAME, "SIGINT"),
     ]);
 
     this._io.shutdown();
@@ -322,7 +322,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
       x: () => this.kill(DEV_SERVER_NAME, "SIGINT"),
       z: () => this.toggleFullLogUrlMessage(APP_SERVER_NAME),
       // dev proxy server
-      p: () => DEV_PROXY_ENABLED && this.sendMsg(PROXY_SERVER_NAME, { name: "restart" })
+      p: () => DEV_PROXY_ENABLED && this.sendMsg(PROXY_SERVER_NAME, { name: "restart" }),
     };
 
     if (str === "^c") {
@@ -401,7 +401,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
         XARC_ADMIN_SERVER: true,
         // pass admin port to child process
         XARC_ADMIN_PORT: this._adminHttp._port,
-        ...SERVER_ENVS[name]
+        ...SERVER_ENVS[name],
       });
 
       if (Worker) {
@@ -409,7 +409,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
       } else {
         const forkOpts: any = {
           env,
-          silent: true
+          silent: true,
         };
 
         if (options.passThruArgs) {
@@ -446,7 +446,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
   //
   async startWebpackDevServer(debug = undefined) {
     const progSig = `<s> [webpack.Progress] `;
-    const waitStart = async info => {
+    const waitStart = async (info) => {
       const cwdRegex = new RegExp(process.env.XARC_CWD || process.cwd(), "g");
       let removeTimer;
       let progLine = "";
@@ -463,8 +463,8 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
         }, 2000).unref();
       };
 
-      const watchWdsLog = input => {
-        const processLine = data => {
+      const watchWdsLog = (input) => {
+        const processLine = (data) => {
           const line = data.toString();
           if (line.trim().length < 1) {
             return;
@@ -474,7 +474,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
             this._io.addItem({
               name: WDS_PROGRESS,
               spinner: true,
-              display: `Webpack Progress`
+              display: `Webpack Progress`,
             });
             this._io.updateItem(WDS_PROGRESS, progLine);
             const match = progLine.match(/\d{1,3}%/);
@@ -508,9 +508,9 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
 
       this._webpackDevRelay.setWebpackServer(info._child);
 
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const listenForReport = () =>
-          info._child.once("message", data => {
+          info._child.once("message", (data) => {
             if (data.name === "webpack-report") {
               if (data.port) {
                 SERVER_ENVS[PROXY_SERVER_NAME].WEBPACK_DEV_PORT = data.port;
@@ -537,7 +537,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
       exec: Path.join(__dirname, "dev-server.js"),
       debug: debug || false,
       skipWatch: debug === "--inspect-brk",
-      waitStart
+      waitStart,
     });
   }
 
@@ -559,7 +559,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
       name: LOG_ALERT,
       display: ck`[<orange.inverse>ALERT</>]`,
       spinner: PROMPT_SPINNER,
-      spinInterval: PROMPT_SPIN_INTERVAL
+      spinInterval: PROMPT_SPIN_INTERVAL,
     });
     const instruction = `<orange>View full logs at: <cyan.underline>${url}</></> - \
 <green>Press Z to hide or show this message</>`;
@@ -639,7 +639,7 @@ ${instruction}`
       }
       context._showFullLink = undefined;
       if (store.length > 25000) {
-        const cleanup = store.filter(x => x !== false);
+        const cleanup = store.filter((x) => x !== false);
         context.store = cleanup.slice(cleanup.length - 9999);
       }
     }, delay);
@@ -648,7 +648,7 @@ ${instruction}`
   saveLineOutput(context) {
     const { inputs, store } = context;
 
-    const handler = data => {
+    const handler = (data) => {
       const timeDiff = Date.now() - context._deferTimestamp;
       // if an error line has been detected, then only consider other lines following it
       // within 30 milliseconds as part of it.
@@ -680,7 +680,7 @@ ${instruction}`
       this._adminHttp.sendLogsToStreamClients();
     };
 
-    inputs.forEach(input => {
+    inputs.forEach((input) => {
       const reader = readline.createInterface({ input });
       reader.on("line", handler);
       return reader;
@@ -693,7 +693,7 @@ ${instruction}`
       tag: this._app,
       store: [],
       fullLogUrl: this._fullAppLogUrl,
-      checkLine: str => {
+      checkLine: (str) => {
         if (
           !this._fullyStarted &&
           (str.includes("server running") || str.includes("Server listening"))
@@ -707,7 +707,7 @@ ${instruction}`
           this.logTime(`App is ready in dev mode, total time took`);
         }
         return str;
-      }
+      },
     };
 
     await this.startServer({
@@ -721,12 +721,12 @@ ${instruction}`
       noTimeoutCheck: skipWatch,
       passThruArgs: this._passThru,
       logSaver,
-      waitStart: async info => {
+      waitStart: async (info) => {
         logSaver.inputs = [info._child.stdout, info._child.stderr];
         this.saveLineOutput(logSaver);
         await this.waitForAppServerStart(info);
         this._webpackDevRelay.setAppServer(info._child);
-      }
+      },
     });
   }
 
@@ -755,7 +755,7 @@ ${instruction}`
     let lineBuffers = [];
     let deferWrite;
 
-    reader.on("line", data => {
+    reader.on("line", (data) => {
       clearTimeout(deferWrite);
       deferWrite = setTimeout(() => {
         output.show(lineBuffers.join("\n"));
@@ -774,7 +774,7 @@ ${instruction}`
       killKey: "O",
       debug,
       exec: Path.join(__dirname, "redbird-spawn"),
-      waitStart: async info => {
+      waitStart: async (info) => {
         info._child.on("message", (data: any) => {
           // this._io.show(ck`<orange>proxy message ${JSON.stringify(data)}</>`, this._appPort);
           if (data.name === "proxy-started") {
@@ -786,7 +786,7 @@ ${instruction}`
         });
         this.passThruLineOutput(this._proxy, info._child.stdout, this._io);
         this.passThruLineOutput(this._proxy, info._child.stderr, this._io);
-      }
+      },
     });
   }
 
@@ -800,7 +800,7 @@ ${instruction}`
         this.sendMsg(PROXY_SERVER_NAME, {
           ...update,
           name: "update-ports",
-          quiet: true
+          quiet: true,
         });
       }, 250).unref();
     }
@@ -822,7 +822,7 @@ ${instruction}`
       }
     };
 
-    const checkStarted = data => {
+    const checkStarted = (data) => {
       if (started) {
         return true;
       }
@@ -912,7 +912,7 @@ ${info.name} - assuming it started.</>`);
     if (!info._watcher && !info.options.skipWatch && !_.isEmpty(info.options.watch)) {
       info._watcher = chokidar.watch(info.options.watch, {
         cwd: process.env.XARC_CWD || process.cwd(),
-        persistent: true
+        persistent: true,
       });
       info._watcher.on("change", restart);
     }

package/src/lib/dev-admin/json-formatter-js.js

@@ -46,7 +46,7 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
   m = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/,
   l =
     window.requestAnimationFrame ||
-    function(t) {
+    function (t) {
       return t(), 0;
     },
   d = {
@@ -57,9 +57,9 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
     animateClose: !0,
     theme: null,
     useToJSON: !0,
-    sortPropertiesBy: null
+    sortPropertiesBy: null,
   },
-  c = (function() {
+  c = (function () {
     function c(t, e, r, n) {
       void 0 === e && (e = 1),
         void 0 === r && (r = d),
@@ -79,17 +79,17 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
     }
     return (
       Object.defineProperty(c.prototype, "isOpen", {
-        get: function() {
+        get: function () {
           return null !== this._isOpen ? this._isOpen : this.open > 0;
         },
-        set: function(t) {
+        set: function (t) {
           this._isOpen = t;
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "isDate", {
-        get: function() {
+        get: function () {
           return (
             this.json instanceof Date ||
             ("string" === this.type &&
@@ -97,75 +97,75 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
           );
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "isUrl", {
-        get: function() {
+        get: function () {
           return "string" === this.type && 0 === this.json.indexOf("http");
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "isArray", {
-        get: function() {
+        get: function () {
           return Array.isArray(this.json);
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "isObject", {
-        get: function() {
+        get: function () {
           return e(this.json);
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "isEmptyObject", {
-        get: function() {
+        get: function () {
           return !this.keys.length && !this.isArray;
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "isEmpty", {
-        get: function() {
+        get: function () {
           return this.isEmptyObject || (this.keys && !this.keys.length && this.isArray);
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "useToJSON", {
-        get: function() {
+        get: function () {
           return this.config.useToJSON && "stringifiable" === this.type;
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "hasKey", {
-        get: function() {
+        get: function () {
           return void 0 !== this.key;
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "constructorName", {
-        get: function() {
+        get: function () {
           return r(this.json);
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "type", {
-        get: function() {
+        get: function () {
           return this.config.useToJSON && this.json && this.json.toJSON
             ? "stringifiable"
             : t(this.json);
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
       Object.defineProperty(c.prototype, "keys", {
-        get: function() {
+        get: function () {
           if (this.isObject) {
             var t = Object.keys(this.json);
             return !this.isArray && this.config.sortPropertiesBy
@@ -175,9 +175,9 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
           return [];
         },
         enumerable: !0,
-        configurable: !0
+        configurable: !0,
       }),
-      (c.prototype.toggleOpen = function() {
+      (c.prototype.toggleOpen = function () {
         (this.isOpen = !this.isOpen),
           this.element &&
             (this.isOpen
@@ -185,7 +185,7 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
               : this.removeChildren(this.config.animateClose),
             this.element.classList.toggle(i("open")));
       }),
-      (c.prototype.openAtDepth = function(t) {
+      (c.prototype.openAtDepth = function (t) {
         void 0 === t && (t = 1),
           t < 0 ||
             ((this.open = t),
@@ -197,20 +197,20 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
                 : (this.appendChildren(this.config.animateOpen),
                   this.element.classList.add(i("open")))));
       }),
-      (c.prototype.getInlinepreview = function() {
+      (c.prototype.getInlinepreview = function () {
         var t = this;
         if (this.isArray)
           return this.json.length > this.config.hoverPreviewArrayCount
             ? "Array[" + this.json.length + "]"
             : "[" + this.json.map(o).join(", ") + "]";
         var e = this.keys,
-          r = e.slice(0, this.config.hoverPreviewFieldCount).map(function(e) {
+          r = e.slice(0, this.config.hoverPreviewFieldCount).map(function (e) {
             return e + ":" + o(t.json[e]);
           }),
           n = e.length >= this.config.hoverPreviewFieldCount ? "…" : "";
         return "{" + r.join(", ") + n + "}";
       }),
-      (c.prototype.render = function() {
+      (c.prototype.render = function () {
         this.element = s("div", "row");
         var t = this.isObject ? s("a", "toggler-link") : s("span");
         if (
@@ -256,31 +256,31 @@ var a = /(^\d{1,4}[\.|\\/|-]\d{1,2}[\.|\\/|-]\d{1,4})(\s*(?:0?[1-9]:[0-5]|1(?=[0
           this.element
         );
       }),
-      (c.prototype.appendChildren = function(t) {
+      (c.prototype.appendChildren = function (t) {
         var e = this;
         void 0 === t && (t = !1);
         var r = this.element.querySelector("div." + i("children"));
         if (r && !this.isEmpty)
           if (t) {
             var n = 0,
-              o = function() {
+              o = function () {
                 var t = e.keys[n],
                   i = new c(e.json[t], e.open - 1, e.config, t);
                 r.appendChild(i.render()), (n += 1) < e.keys.length && (n > 10 ? o() : l(o));
               };
             l(o);
           } else
-            this.keys.forEach(function(t) {
+            this.keys.forEach(function (t) {
               var n = new c(e.json[t], e.open - 1, e.config, t);
               r.appendChild(n.render());
             });
       }),
-      (c.prototype.removeChildren = function(t) {
+      (c.prototype.removeChildren = function (t) {
         void 0 === t && (t = !1);
         var e = this.element.querySelector("div." + i("children"));
         if (t) {
           var r = 0,
-            n = function() {
+            n = function () {
               e && e.children.length && (e.removeChild(e.children[0]), (r += 1) > 10 ? n() : l(n));
             };
           l(n);

package/src/lib/dev-admin/log-view.js

@@ -17,38 +17,38 @@ const Levels = {
   error: {
     color: "red",
     index: 0,
-    name: "error"
+    name: "error",
   },
   warn: {
     color: "yellow",
     index: 1,
-    name: "warn"
+    name: "warn",
   },
   info: {
     color: "green",
     index: 2,
-    name: "info"
+    name: "info",
   },
   http: {
     color: "green",
     index: 3,
-    name: "http"
+    name: "http",
   },
   verbose: {
     color: "blue",
     index: 4,
-    name: "verbose"
+    name: "verbose",
   },
   debug: {
     color: "orange",
     index: 5,
-    name: "debug"
+    name: "debug",
   },
   silly: {
     color: "purple",
     index: 6,
-    name: "silly"
-  }
+    name: "silly",
+  },
 };
 
 const themeArr = ["", "adventure", "acai", "monikai"];
@@ -71,14 +71,14 @@ function startLogStream() {
   logStreamReconnectTimer = null;
 
   logStream = new EventSource("/__electrode_dev/stream-logs");
-  logStream.addEventListener("log-stream", e => {
+  logStream.addEventListener("log-stream", (e) => {
     if (debugStreamEvents) {
       console.log("stream event", e);
     }
     const data = JSON.parse(e.data);
     updateLogs(data);
   });
-  logStream.addEventListener("open", _e => {
+  logStream.addEventListener("open", (_e) => {
     console.log("log stream opened");
     logStreamReconnectDelay = 5000;
   });
@@ -132,7 +132,7 @@ const defaultLevelSelections = {
   http: true,
   verbose: true,
   debug: true,
-  silly: true
+  silly: true,
 };
 
 class HashValues {
@@ -161,7 +161,7 @@ class HashValues {
   toUrl() {
     const str = Object.keys(this._hash)
       .sort()
-      .map(k => `${k}=${this._hash[k]}`)
+      .map((k) => `${k}=${this._hash[k]}`)
       .join("&");
 
     return str ? "#" + str : "";
@@ -178,7 +178,7 @@ class HashValues {
   }
 
   remove(values) {
-    [].concat(values).forEach(k => delete this._hash[k]);
+    [].concat(values).forEach((k) => delete this._hash[k]);
     this.update();
   }
 
@@ -377,7 +377,7 @@ function prettyJSON(jsonObj) {
     theme: themeArr[curThemeIdx++],
     animateOpen: true,
     animateClose: true,
-    useToJSON: true
+    useToJSON: true,
   });
 
   //  alternatively display different theme
@@ -447,7 +447,7 @@ async function updateLogs(data, levelSelections, scrollToEnd = true) {
   } else {
     // filter received logs by timestamp, only the ones after current timestamp are kept
 
-    newLogs = data.logs.filter(l => {
+    newLogs = data.logs.filter((l) => {
       return compareEntryId(l, lastEntryId) > 0;
     });
   }
@@ -458,7 +458,7 @@ async function updateLogs(data, levelSelections, scrollToEnd = true) {
     bounding.bottom - (window.innerHeight || document.documentElement.clientHeight) < -25;
 
   if (newLogs.length > 0) {
-    newLogs.forEach(event => {
+    newLogs.forEach((event) => {
       const newLine = document.createElement("div");
       newLine.setAttribute("lvl", event.level);
       newLine.setAttribute("entryId", stringifyEntryId(event));
@@ -519,7 +519,7 @@ async function displayLogs(levelSelections, scrollToEnd = true) {
  *
  */
 function updateLevelCheckboxes() {
-  Object.keys(defaultLevelSelections).forEach(k => {
+  Object.keys(defaultLevelSelections).forEach((k) => {
     const elem = document.getElementById(`level.${k}`);
     if (elem) {
       elem.checked = hashVal.get(k) !== "false";
@@ -535,7 +535,7 @@ function parseEntryId(str) {
     const parts = str.split(",");
     return {
       ts: parseInt(parts[0]),
-      tx: parseInt(parts[1])
+      tx: parseInt(parts[1]),
     };
   }
 
@@ -563,7 +563,7 @@ window.addEventListener(
   false
 );
 
-window.addEventListener("keypress", event => {
+window.addEventListener("keypress", (event) => {
   if (event.ctrlKey && event.code === "KeyK") {
     wipeLogs();
   }