fix: guardoni cli and electron build

YCAI/src/providers/dataDonation.provider.ts

@@ -10,7 +10,7 @@ import * as TE from 'fp-ts/lib/TaskEither';
 import _ from 'lodash';
 import { config } from '../config';
 import { Keypair, Settings } from '../models/Settings';
-import { getTimeISO8601 } from '../utils/date.utils';
+import { getTimeISO8601 } from '@shared/utils/date.utils';
 import { logger } from '../utils/logger.utils';
 import { sendAPIMessage } from './browser.provider';
 import security from './bs58.provider';

backend/bin/app.ts

@@ -260,8 +260,8 @@ export const makeApp = async (
     '/v2/guardoni/list/:directiveType/:key?',
     iowrapper('getAllExperiments')
   );
+  apiRouter.get('/v3/directives/public', iowrapper('getPublicDirectives'));
   apiRouter.post('/v3/directives/:directiveType', iowrapper('postDirective'));
-  apiRouter.get('/api/v3/directives/public', iowrapper('getPublicDirectives'));
   apiRouter.get('/v3/directives/:experimentId', iowrapper('fetchDirective'));
   apiRouter.post('/v2/handshake', iowrapper('experimentChannel3'));
   apiRouter.delete(

extension/webpack.config.js

@@ -25,13 +25,7 @@ const PRODUCTION = NODE_ENV === 'production';
 const DEVELOPMENT = NODE_ENV === 'development';
 const BUILDISODATE = new Date().toISOString();
 const GUARDONI_TARGET = process.env?.BUILD_TARGET === 'guardoni';
-const APP_VERSION = GUARDONI_TARGET
-  ? packageJSON.version
-      .split('.')
-      .filter((v, i) => i !== 2)
-      .concat('99')
-      .join('.')
-  : packageJSON.version;
+const APP_VERSION = packageJSON.version;
 
 console.log(
   'NODE_ENV [' + process.env.NODE_ENV + '] Prod:',

guardoni/.env

@@ -1,4 +1,3 @@
 NODE_ENV=production
-VERSION=1.9.0
 BACKEND=https://youtube.tracking.exposed/api
 DEBUG="guardoni:*"

guardoni/.env.development

@@ -1,4 +1,3 @@
 NODE_ENV=development
-VERSION=1.9.0.99
 BACKEND=http://localhost:9000/api
-DEBUG=guardoni:*
+DEBUG=@trex:*,guardoni:*

guardoni/.eslintignore

@@ -0,0 +1 @@
+bin

guardoni/README.md

@@ -6,6 +6,7 @@
     - [CLI commands](#cli-commands)
       - [Register CSV](#register-csv)
       - [Running an experiment by id](#running-an-experiment-by-id)
+      - [List public directives](#list-public-directives)
       - [Running a default experiment](#running-a-default-experiment)
   - [Build](#build)
     - [Package](#package)
@@ -80,7 +81,7 @@ Examples:
 
 ### CLI commands
 
-Three fundamental commands exist: `register`, `experiment` and "auto mode".
+Three fundamental commands exist: `register`, `experiment`, `list` and "auto mode".
 
 How do they works?
 
@@ -121,6 +122,14 @@ With an experiment id you can run guardoni quite easily:
 guardoni-cli experiment 123456
 ```
 
+#### List public directives
+
+With this command you can list the public directives available to run.
+
+```bash
+guardoni-cli list
+```
+
 #### Running a default experiment
 
 Guardoni provides also an `auto` method to run pre-configured experiment. At the moment there are only 2 experiments available that can be run:

guardoni/bin/guardoni-cli.js

@@ -4,62 +4,66 @@
 
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
-const { GetGuardoniCLI } = require('../build/guardoni/cli.js');
+const { GetGuardoniCLI, cliLogger } = require('../build/guardoni/cli.js');
+const puppeteer = require('puppeteer');
+const D = require('debug');
 
 const runGuardoni = ({
   _,
   $0,
   v,
-  headless,
   verbose,
-  backend,
-  basePath,
-  profile,
-  evidenceTag,
-  proxy,
-  ...command
+  c,
+  config,
+  command,
+  ...guardoniConf
 }) => {
-  return GetGuardoniCLI({
-    headless,
-    basePath,
-    profile,
-    verbose,
-    evidenceTag,
-    proxy,
-    backend,
-  })
+  if (verbose) {
+    if (config) {
+      console.log(`Configuration loaded from ${config}`, guardoniConf);
+    }
+  }
+
+  return GetGuardoniCLI({ ...guardoniConf, verbose }, puppeteer)
     .runOrThrow(command)
     .then(() => process.exit(0));
 };
 
 yargs(hideBin(process.argv))
   .scriptName('guardoni-cli')
+  .example('$0 --type comparison')
   .command(
     'experiment <experiment>',
     'Run guardoni from a given experiment',
     (yargs) =>
-      yargs
-        .positional('experiment', {
-          desc: 'Experiment id',
-          demandOption: 'Provide the experiment id',
-          type: 'string',
-        })
-        .example('$0 experiment 1234'),
-    (argv) => runGuardoni({ ...argv, run: 'experiment' })
+      yargs.positional('experiment', {
+        desc: 'Experiment id',
+        demandOption: 'Provide the experiment id',
+        type: 'string',
+      }),
+    ({ experiment, ...argv }) =>
+      runGuardoni({ ...argv, command: { run: 'experiment', experiment } })
   )
   .command(
     'register <file>',
     'Register an experiment from a CSV',
     (yargs) => {
-      return yargs
-        .positional('file', {
-          desc: 'CSV file to register an experiment',
-          type: 'string',
-          demandOption: 'Provide a valid path to a csv file',
-        })
-        .example('$0 csv ./path/to/file.csv');
+      return yargs.positional('file', {
+        desc: 'CSV file to register an experiment',
+        type: 'string',
+        demandOption: 'Provide a valid path to a csv file',
+      });
     },
-    (argv) => runGuardoni({ ...argv, run: 'register-csv' })
+    ({ file, ...argv }) =>
+      runGuardoni({ ...argv, command: { run: 'register-csv', file } })
+  )
+  .command(
+    'list',
+    'List available experiments',
+    (yargs) => {
+      return yargs.example('$0 list');
+    },
+    (argv) => runGuardoni({ ...argv, command: { run: 'list' } })
   )
   .usage(
     '$0 [index]',
@@ -71,9 +75,17 @@ yargs(hideBin(process.argv))
         demandOption: 'Run comparison or shadow ban experiment run',
       });
     },
-    (args) => runGuardoni({ ...args, run: 'auto' })
+    ({ index, ...args }) =>
+      runGuardoni({ ...args, command: { run: 'auto', index: index } })
   )
-  .example('$0 --type comparison')
+  .option('c', {
+    type: 'string',
+    alias: 'config',
+    desc: 'Guardoni configuration',
+    default: 'guardoni.config.json',
+    config: true,
+  })
+  .config()
   .option('headless', {
     type: 'boolean',
     desc: 'Run guardoni in headless mode.',
@@ -105,5 +117,4 @@ yargs(hideBin(process.argv))
     desc: 'Produce tons of logs',
     default: false,
   })
-  .strictCommands()
-  .parse();
+  .strictCommands().argv;

guardoni/electron-builder.yml

@@ -4,26 +4,28 @@ appId: guardoni.tracking.exposed
 
 productName: Guardoni
 
-asar: false
+asar: true
+asarUnpack: ['node_modules']
 
 extends: null
 
 extraMetadata:
-  main: "build/electron/main.js"
-
-files: [
-  "build/**",
-  "!profiles/**",
-  "!src/**",
-  "!screenshots/**",
-  "!static/**"
-]
-
-icon: ./static/yttrex-128.png
+  main: 'build/electron/main.js'
+
+files:
+  [
+    'build/**',
+    '!node_modules/**',
+    '!src/**',
+    '!profiles/**',
+    '!screenshots/**',
+    '!static/**',
+  ]
 
 linux:
-  target: ["deb"]
+  icon: ./static/linux/icons
+  target: ['deb']
   category: Network
 
 win:
-  target: ["portable"]
+  target: ['portable']

guardoni/guardoni.config.json

@@ -0,0 +1,3 @@
+{
+  "backend": "http://localhost:9000/api"
+}

guardoni/package.json

@@ -14,6 +14,7 @@
     "start": "electron .",
     "pack": "electron-builder build --dir",
     "dist:linux": "electron-builder build -l",
+    "dist:mac": "electron-builder build -m",
     "dist:windows": "electron-builder build -w",
     "dist:all": "scripts/dist-all.sh",
     "postinstall": "electron-builder install-app-deps",
@@ -45,7 +46,7 @@
     "csv-stringify": "^6.0.5",
     "debug": "^4.3.3",
     "electron-debug": "^3.2.0",
-    "electron-log": "^4.4.5",
+    "electron-log": "^4.4.6",
     "electron-squirrel-startup": "^1.0.0",
     "electron-store": "^8.0.1",
     "fp-ts": "^2.11.8",
@@ -77,7 +78,7 @@
     "chalk": "^5.0.0",
     "electron": "16.0.8",
     "electron-builder": "^22.14.13",
-    "electron-reloader": "^1.2.1",
+    "electron-reloader": "^1.2.2",
     "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard-with-typescript": "^21.0.1",
@@ -110,7 +111,8 @@
       "experiments/.keep",
       "static/index.html",
       "config/default.json",
-      "profiles/.keep"
+      "profiles/.keep",
+      "package.json"
     ],
     "targets": [
       "node16-linux-x64",

guardoni/scripts/dist-all.sh

@@ -2,14 +2,8 @@
 
 set -e -x
 
-yarn dist:linux
-# CONTAINER_NAME=electron-builder-node-16
-
-# docker exec --privileged $CONTAINER_NAME bash -c "yarn"
-# docker exec --privileged $CONTAINER_NAME bash -c "chown -R ${USER}:${GROUP} /project"
-# docker exec --privileged $CONTAINER_NAME bash -c "chown -R ${USER}:${GROUP} /root/.cache/"
-# docker exec $CONTAINER_NAME bash -c "yarn guardoni dist:linux"
-# docker exec $CONTAINER_NAME bash -c "yarn guardoni dist:windows"
+export NODE_ENV='production'
 
-# docker stop $CONTAINER_NAME
-# docker rm $CONTAINER_NAME
+yarn dist:linux
+# yarn dist:windows
+# yarn dist:mac

guardoni/scripts/pkg.sh

@@ -5,13 +5,12 @@ set -ex
 
 pkg ./package.json
 
-version=`grep version package.json | cut -b 15- | sed -es/\".*//`
-# 1.8.2
+version=$(grep version package.json | cut -b 15- | sed -es/\".*//)
 
 cd dist
 mv guardoni-win.exe guardoni-cli-$version.exe
 mv guardoni-macos guardoni-cli-$version-macos
 mv guardoni-linux guardoni-cli-$version-linux
-chmod +x *
+chmod +x *-cli-*
 ls -l
 cd ..

guardoni/src/electron/App.tsx

@@ -133,13 +133,17 @@ export const App: React.FC = () => {
       setConfig(config);
     });
 
-    // request guardoni config
-    ipcRenderer.send(GET_GUARDONI_CONFIG_EVENT.value);
+    if (config === undefined) {
+      setTimeout(() => {
+        // request guardoni config
+        ipcRenderer.send(GET_GUARDONI_CONFIG_EVENT.value);
+      }, 200);
+    }
 
     return () => {
       ipcRenderer.removeAllListeners(GET_GUARDONI_CONFIG_EVENT.value);
     };
-  }, []);
+  }, [config]);
 
   if (!config) {
     return <LinearProgress />;