cleaning things up and debugging send queue

Author: Domiii

dbux-projects/src/buildTools/WebpackBuilder.js

@@ -76,7 +76,8 @@ class WebpackBuilder {
       'webpack': '^5',
       'webpack-cli': '^4',
       // 'webpack-config-utils': '???',
-      // 'copy-webpack-plugin': '^8'
+      'copy-webpack-plugin': '^8',
+      'clean-webpack-plugin': '^8'
     };
     if (this.needsDevServer) {
       deps['webpack-dev-server'] = '^3';

dbux-projects/src/projectLib/Project.js

@@ -726,9 +726,12 @@ Sometimes a reset (by using the \`Delete project folder\` button) can help fix t
       await this.exec(`${this.gitCommand} add ${files.map(name => `"${name}"`).join(' ')}`);
 
       message && (message = ' ' + message);
+
       // TODO: should not need '--allow-empty', if `checkFilesChanged` is correct (but somehow still bugs out)
       const errResult = await this.execCaptureErr(`${this.gitCommand} commit -am '"[dbux auto commit]${message}"'`);
-      this.logger.debug(`commit errResult:###\n${errResult}\n###\n`);
+      if (errResult.trim()) {
+        this.logger.debug(`commit errResult:###\n${errResult}\n###\n`);
+      }
     }
   }
 

dbux-projects/src/projects/Editor.md/Project.js

@@ -3,8 +3,9 @@ import WebpackBuilder from '../../buildTools/WebpackBuilder';
 
 /**
  * Debug
- * 
- * console.warn(`cmUnbindScroll ${_dbux2._runtimeMonitor._runtime.peekCurrentContextId()}`);
+ *
+// dbux disable
+console.warn(`cmUnbindScroll ${__dbux__._r._runtime.peekCurrentContextId()}`);
  */
 
 /**

dbux-runtime/src/client/SendQueue.js

@@ -8,6 +8,7 @@ import { newLogger } from '@dbux/common/src/log/logger';
 const { log, debug, warn, error: logError } = newLogger('Client/queue');
 
 const Verbose = 0;
+const DEBUG_ROOTS = true;
 // const Verbose = 1;
 const MAX_BLOCK_SIZE = 65535; // max parameter array size for use in Webkit
 
@@ -73,15 +74,38 @@ class SendQueue {
     return this.buffers.every(buf => isBufferEmpty(buf));
   }
 
-  bufferDebug(msg) {
-    debug(`${msg}: ${this.iBufferSent}/${this.iBufferCreated} - ${JSON.stringify(this.bufferMap.entries(), null, 2)}`);
+  _debugMessages;
+  _debugLastId;
+
+  bufferDebug(msg, flush = true) {
+    if (DEBUG_ROOTS) {
+      msg =
+        `${msg}: ${this.iBufferSent}/${this.iBufferCreated} - ` +
+        `${JSON.stringify(Array.from(this.bufferMap.entries()), null, 2)}`;
+
+      this._debugMessages = this._debugMessages || [];
+      this._debugMessages.push(msg);
+
+      if (flush) {
+        // flush now
+        this._debugMessages.forEach(debug);
+        this._debugMessages = [];
+      }
+    }
   }
 
   send(dataName, newEntry) {
     const buf = this.currentBuffer;
     const entries = (buf[dataName] = buf[dataName] || []);
     entries.push(newEntry);
 
+    if (DEBUG_ROOTS) {
+      if (dataName === 'executionContexts') {
+        // TODO: _debugLastId
+        this.bufferDebug(``, false);
+      }
+    }
+
     this._flushLater();
   }
 

dbux-runtime/src/data/executionContextCollection.js

@@ -165,10 +165,11 @@ export class ExecutionContextCollection extends Collection {
     const context = this._allocate(
       type, stackDepth, runId, parentContextId, parentTraceId, contextId, definitionTid, staticContextId, orderId, schedulerTraceId, tracesDisabled
     );
+    this._pushAndSend(context);
+    
     if (!parentContextId) {
-      this.logger.warn(`CREATE root: ${context.contextId}`, context);
+      this.logger.warn(`CREATE root: ${context.contextId}`, this.makeContextInfo(contextId));
     }
-    this._pushAndSend(context);
 
     if (this._firstContextChild.get(parentContextId) === undefined) {
       this._firstContextChild.set(parentContextId, context.contextId);

dbux-runtime/src/index.js

@@ -25,6 +25,11 @@ const dbux = {
 let __global__;
 
 function registerDbuxAsGlobal() {
+  if (__global__.__dbux__) {
+    // TODO: add version checking?
+    // eslint-disable-next-line no-console
+    console.warn(`@dbux/runtime registered more than once - this could be a bundling deoptimization, or a serious conflict.`);
+  }
   /* eslint-disable no-var */
   __global__.__dbux__ = dbux;
 }

package.json

@@ -23,6 +23,7 @@
     "@babel/preset-env": "^7.10.1",
     "@babel/register": "^7.10.1",
     "babel-loader": "^8.2.2",
+    "clean-webpack-plugin": "^4.0.0",
     "cloc": "^2.5.1",
     "copy-webpack-plugin": "^8",
     "css-loader": "^3.4.2",

scripts/killPort.js

@@ -5,6 +5,13 @@ console.log(`looking for port=${port}`);
 
 // TODO: windows only
 // TODO: consider https://github.com/ksathyanm/find-pid-from-port/blob/main/index.js
+/**
+ * e.g.:
+ * X = lastWordOf(
+ *  netstat -ano | findstr "TCP" | findStr "3844"
+ * )
+ * kill -f X
+ */
 const s = sh.exec(`netstat -ano | findstr "TCP" | findStr "${port}"`);
 console.log(
   s

yarn.lock

@@ -4485,6 +4485,13 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
+clean-webpack-plugin@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz#72947d4403d452f38ed61a9ff0ada8122aacd729"
+  integrity sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==
+  dependencies:
+    del "^4.1.1"
+
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"