goblin-laboratory 4.7.3 → 4.9.1

package/lib/termux.js

@@ -240,7 +240,7 @@ class Termux extends Elf.Alone {
       const tool = getTool(this._tools, name);
       const {required, optional} = tool.options.params;
       let args = required.concat(optional).reduce((args, arg, index) => {
-        args[arg] = params[index];
+        args[arg] = arg.startsWith('...') ? params.slice(index) : params[index];
         return args;
       }, {});
       this.logic.beginCommand(null, null, tool.name);
@@ -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;
@@ -318,15 +318,38 @@ class Termux extends Elf.Alone {
       return;
     }
 
-    const desc = await this.quest.cmd(`${name}.$tool`, {tool});
+    let desc = await this.quest.cmd(`${name}.$tool`, {tool});
     if (items.length === 1) {
       this.logic.askForCompletion(prompt, input, Object.keys(desc));
       return;
     }
 
-    const cmds = Object.keys(desc)
-      .filter((option) => option.startsWith(items[1]))
-      .map((option) => `${tool} ${option}`);
+    let cmds = Object.keys(desc);
+    items.shift();
+
+    for (const item of items) {
+      if (item in desc) {
+        desc = desc[item];
+        if (!Array.isArray(desc)) {
+          cmds = Object.keys(desc);
+          continue;
+        }
+        cmds = [
+          'Arguments:',
+          ...desc.map((obj) =>
+            Object.entries(obj)
+              .map(([k, v]) => `${k}:${v}`)
+              .join(' ')
+          ),
+        ];
+        break;
+      }
+      const slice = items.slice(0, -1).join(' ');
+      cmds = cmds
+        .filter((option) => option.startsWith(item))
+        .map((option) => `${tool} ${slice.length ? `${slice} ` : ''}${option}`);
+    }
+
     this.logic.askForCompletion(prompt, input.trim(), cmds);
   }
 
@@ -402,9 +425,112 @@ class Termux extends Elf.Alone {
     return result;
   }
 
+  async buslog$tool(horde, verbosityLevel, ...moduleNames) {
+    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');
+    }
+
+    verbosityLevel = parseInt(verbosityLevel);
+    if (verbosityLevel >= 0 && verbosityLevel < 4) {
+      await this.quest.cmd(`buslog.${horde}.verbosity`, {
+        level: verbosityLevel,
+        _xcraftRPC,
+      });
+    }
+    if (Array.isArray(moduleNames)) {
+      moduleNames = moduleNames.filter((entry) => !!entry);
+      await this.quest.cmd(`buslog.${horde}.modulenames`, {
+        modulenames: moduleNames,
+        _xcraftRPC,
+      });
+    }
+    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 $tool(tool) {
     if (tool === 'man') {
-      return {...this._tools};
+      return {
+        ...Object.keys(this._tools).reduce((obj, tool) => {
+          obj[tool] = null;
+          return obj;
+        }, {}),
+      };
+    }
+    if (tool === 'buslog') {
+      const {resp} = this.quest;
+      const registry = resp.getCommandsRegistry();
+      return Object.keys(registry)
+        .filter((cmd) => /^buslog[.][^.]+[.]verbosity$/.test(cmd))
+        .reduce((autocomp, cmd) => {
+          autocomp[cmd.split('.')[1]] = {
+            '0': null,
+            '1': null,
+            '2': null,
+            '3': null,
+          };
+          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;
+        }, {});
     }
     return {};
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-laboratory",
-  "version": "4.7.3",
+  "version": "4.9.1",
   "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/widget/utils/connect.js

@@ -34,7 +34,7 @@ export default function (
 ) {
   return connect(
     withShredder(mapStateToProps),
-    mapDispatchToProps,
+    mapDispatchToProps || (() => ({})),
     mergeProps,
     {
       pure: true,