goblin-laboratory 4.8.0 → 4.10.0

package/lib/termux.js

@@ -297,9 +297,9 @@ class Termux extends Elf.Alone {
 
   async askForCompletion(input) {
     const prompt = getPrompt(this.user);
-    const tools = Object.keys(this._tools).filter((tool) =>
-      tool.startsWith(input)
-    );
+    const tools = Object.keys(this._tools)
+      .filter((tool) => tool.startsWith(input))
+      .sort();
     this.logic.askForCompletion(prompt, input, tools);
 
     const {completion} = this.state;
@@ -330,6 +330,9 @@ class Termux extends Elf.Alone {
     for (const item of items) {
       if (item in desc) {
         desc = desc[item];
+        if (!desc) {
+          continue;
+        }
         if (!Array.isArray(desc)) {
           cmds = Object.keys(desc);
           continue;
@@ -451,6 +454,58 @@ class Termux extends Elf.Alone {
     return '';
   }
 
+  async metrics$tool(horde, output) {
+    const {topology} = require('xcraft-core-etc')().load('xcraft-core-horde');
+    const _xcraftRPC = topology?.[horde]?.passive;
+
+    /* FIXME: must be moved on the server side */
+    if (_xcraftRPC && this.user.rank !== 'admin') {
+      throw new Error('Forbidden');
+    }
+
+    let metrics = await this.quest.cmd(`bus.${horde}.xcraftMetrics`, {
+      from: this.id,
+      _xcraftRPC,
+    });
+    metrics = JSON.stringify(metrics, null, 2);
+
+    if (!output) {
+      return metrics;
+    }
+
+    const fse = require('fs-extra');
+    await fse.writeFile(output, metrics);
+    return 'Metrics saved to: ' + output;
+  }
+
+  async heapdump$tool(horde) {
+    const {topology} = require('xcraft-core-etc')().load('xcraft-core-horde');
+    const _xcraftRPC = topology?.[horde]?.passive;
+
+    /* FIXME: must be moved on the server side */
+    if (_xcraftRPC && this.user.rank !== 'admin') {
+      throw new Error('Forbidden');
+    }
+
+    const output = await this.quest.cmd(`bus.${horde}.heapdump`, {_xcraftRPC});
+    return output;
+  }
+
+  async malloctrim$tool(horde) {
+    const {topology} = require('xcraft-core-etc')().load('xcraft-core-horde');
+    const _xcraftRPC = topology?.[horde]?.passive;
+
+    /* FIXME: must be moved on the server side */
+    if (_xcraftRPC && this.user.rank !== 'admin') {
+      throw new Error('Forbidden');
+    }
+
+    const output = await this.quest.cmd(`bus.${horde}.malloctrim`, {
+      _xcraftRPC,
+    });
+    return output;
+  }
+
   async $tool(tool) {
     if (tool === 'man') {
       return {
@@ -475,6 +530,36 @@ class Termux extends Elf.Alone {
           return autocomp;
         }, {});
     }
+    if (tool === 'metrics') {
+      const {resp} = this.quest;
+      const registry = resp.getCommandsRegistry();
+      return Object.keys(registry)
+        .filter((cmd) => /^bus[.][^.]+[.]xcraftMetrics$/.test(cmd))
+        .reduce((autocomp, cmd) => {
+          autocomp[cmd.split('.')[1]] = null;
+          return autocomp;
+        }, {});
+    }
+    if (tool === 'heapdump') {
+      const {resp} = this.quest;
+      const registry = resp.getCommandsRegistry();
+      return Object.keys(registry)
+        .filter((cmd) => /^bus[.][^.]+[.]heapdump$/.test(cmd))
+        .reduce((autocomp, cmd) => {
+          autocomp[cmd.split('.')[1]] = null;
+          return autocomp;
+        }, {});
+    }
+    if (tool === 'malloctrim') {
+      const {resp} = this.quest;
+      const registry = resp.getCommandsRegistry();
+      return Object.keys(registry)
+        .filter((cmd) => /^bus[.][^.]+[.]malloctrim$/.test(cmd))
+        .reduce((autocomp, cmd) => {
+          autocomp[cmd.split('.')[1]] = null;
+          return autocomp;
+        }, {});
+    }
     return {};
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-laboratory",
-  "version": "4.8.0",
+  "version": "4.10.0",
   "description": "Laboratory",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -26,6 +26,7 @@
     }
   },
   "dependencies": {
+    "fs-extra": "^11.3.3",
     "goblin-theme": "^2.0.0",
     "xcraft-core-goblin": "^5.0.0",
     "xcraft-core-log": "^2.2.0",
@@ -57,4 +58,4 @@
     "xcraft-traverse": "^0.7.0"
   },
   "prettier": "xcraft-dev-prettier"
-}
+}

package/widgets/connect-helpers/with-c.js

@@ -77,7 +77,7 @@ export default function withC(Component, dispatchProps = {}, {modelProp} = {}) {
   // It applies "inFunc" to the connected props and
   // prevents giving internal props (starting with "_") to the underlying component
   const ConnectedPropsMapper = (props) => {
-    let {_connectedProps, _connectedProp, ...otherProps} = props;
+    let {_connectedProps, _connectedProp, _model, ...otherProps} = props;
     const newProps = {};
     for (const prop of _connectedProps) {
       const inFunc = prop.inFunc;
@@ -158,7 +158,7 @@ export default function withC(Component, dispatchProps = {}, {modelProp} = {}) {
       if (path === null || path === undefined) {
         return null;
       }
-      const model = this.props.model || this.context.model;
+      const model = this.props._model || this.context.model;
       return joinModels(model, path);
     }
 
@@ -246,7 +246,8 @@ export default function withC(Component, dispatchProps = {}, {modelProp} = {}) {
 
     // Render function used when there is no connected prop
     renderNotConnected() {
-      return <Component {...this.props} />;
+      const {_model, ...props} = this.props;
+      return <Component {...props} />;
     }
 
     render() {
@@ -276,7 +277,7 @@ export default function withC(Component, dispatchProps = {}, {modelProp} = {}) {
 
   return (props) => (
     <ModelContext.Consumer>
-      {(model) => <WithC model={model} {...props} />}
+      {(model) => <WithC _model={model} {...props} />}
     </ModelContext.Consumer>
   );
 }

package/widgets/renderer.js

@@ -48,7 +48,7 @@ class Renderer {
   }
 
   newBackendState(transitState) {
-    setTimeout(() =>
+    queueMicrotask(() =>
       this.store.dispatch({
         type: 'NEW_BACKEND_STATE',
         data: transitState,

package/widgets/store/store.js

@@ -36,5 +36,18 @@ export default function configureStore(initialState, history, send) {
       store.replaceReducer(nextRootReducer);
     });
   }
+
+  const subscribe = store.subscribe.bind(store);
+  store.subscribe = (listener) => {
+    let previousState = undefined;
+    return subscribe(() => {
+      const state = store.getState();
+      if (state !== previousState) {
+        previousState = state;
+        listener();
+      }
+    });
+  };
+
   return store;
 }

package/widgets/widget/utils/connect.js

@@ -5,15 +5,28 @@ import Shredder from 'xcraft-core-shredder';
 import shallowEqualShredder from './shallowEqualShredder';
 import wrapMapStateToProps from './wrapMapStateToProps';
 
+let lastState = null;
+let lastShredder = null;
+
+function stateToShredder(state) {
+  if (state === lastState) {
+    return lastShredder;
+  }
+  const s = new Shredder({
+    backend: state.backend,
+    widgets: state.widgets,
+    network: state.network,
+  });
+  lastState = state;
+  lastShredder = s;
+  return s;
+}
+
 function withShredder(mapStateToProps) {
   mapStateToProps = wrapMapStateToProps(mapStateToProps);
 
   const mapStateToPropsWithOwnProps = (state, ownProps) => {
-    const s = new Shredder({
-      backend: state.backend,
-      widgets: state.widgets,
-      network: state.network,
-    });
+    const s = stateToShredder(state);
     return mapStateToProps(s, ownProps);
   };