From 4f53a5e2b837c768635f22b3342762ba68ec7d74 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Sat, 21 Apr 2018 20:49:08 -0400
Subject: [PATCH 01/68] v4 in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 50c3989..138b9db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "1.1.2",
+  "version": "4.0.0",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From a42dd3a2a675506da98964e68a9e9610e54b91ad Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Sat, 21 Apr 2018 20:49:51 -0400
Subject: [PATCH 02/68] minor

---
 CHANGELOG | 3 +--
 LICENSE   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c95d645..36127cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,8 @@
 # CHANGELOG
 
-## 4.0.0 (current)
+## 4.0.0
 - show-conf command.
 - Replace default nodeGame copyright string.
-- TODO: multiple templates.
 
 ## 1.1.2
 - Minor fix for autoplay template.
diff --git a/LICENSE b/LICENSE
index 26c0955..054092c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2015 Stefano Balietti
+Copyright (c) 2018 Stefano Balietti
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

From 48df23edd0a5965f47d0fe7c5973ebb56aaf1db3 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 7 Sep 2018 03:41:47 -0400
Subject: [PATCH 03/68] travis

---
 .travis.yml  | 4 +++-
 bin/nodegame | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1aa99b..7ced4f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ node_js:
   - 6
   - 7
   - 8
+  - 10
 
 before_install:
 # Get installer script.
@@ -12,7 +13,8 @@ before_install:
 
 install:
   - npm install --only=dev
-  - node nodegame-installer.js @dev --install-dir node_modules --no-spinner --branch v4 --yes
+    # --branch v4
+  - node nodegame-installer.js @dev --install-dir node_modules --no-spinner --yes
 
 script:
 # Add module tests here.
diff --git a/bin/nodegame b/bin/nodegame
index 3c6ce43..24cccb3 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -18,7 +18,8 @@ var pkg = require('../package.json');
 var version = pkg.version;
 
 var root = path.resolve(__dirname, '..');
-var confFile = root + '/conf/generator.conf.json';
+var confFile = path.resolve(root, 'conf', 'generator.conf.json');
+var gamesFolder =
 
 // Re-assign process.exit because of commander
 process.exit = exit

From 5bac11051b668f91b8e67121bef357cdb92e7aa5 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 7 Sep 2018 08:09:28 -0400
Subject: [PATCH 04/68] auto-detect nodeGame installation

---
 bin/nodegame                      | 251 +++++++++++++++++++++---------
 conf/generator.conf.json.template |   2 +-
 2 files changed, 176 insertions(+), 77 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 24cccb3..940ab76 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -1,25 +1,26 @@
 #!/usr/bin/env node
 
-var program = require('commander');
-var mkdirp = require('mkdirp');
-var os = require('os');
-var fs = require('fs-extra');
-var path = require('path');
-var readline = require('readline');
-var sortedObject = require('sorted-object');
+const program = require('commander');
+const mkdirp = require('mkdirp');
+const os = require('os');
+const fs = require('fs-extra');
+const path = require('path');
+const readline = require('readline');
+const sortedObject = require('sorted-object');
 
-var J = require('JSUS').JSUS;
-var ngt = require('nodegame-game-template');
+const J = require('JSUS').JSUS;
+const ngt = require('nodegame-game-template');
 
-var _exit = process.exit;
-var eol = os.EOL;
-var pkg = require('../package.json');
+const _exit = process.exit;
+const pkg = require('../package.json');
+const version = pkg.version;
 
-var version = pkg.version;
+const isWin = /^win/.test(process.platform);
 
-var root = path.resolve(__dirname, '..');
-var confFile = path.resolve(root, 'conf', 'generator.conf.json');
-var gamesFolder =
+// This file is "copied" and not linked in Windows,
+// therefore we need to be agnostic while loading the root path.
+const root = J.resolveModuleDir('nodegame-generator');
+const confFile = path.resolve(root, 'conf', 'generator.conf.json');
 
 // Re-assign process.exit because of commander
 process.exit = exit
@@ -28,7 +29,11 @@ process.exit = exit
 var conf = {
     author: 'author',
     email: 'email',
-    gamesFolder: undefined
+    ngDir: undefined,
+    // Properties below won't be saved in conf file.
+    ngVersion: undefined,
+    ngGamesAvailDir: undefined,
+    ngGamesEnabledDir: undefined,
 };
 
 // Available templates.
@@ -66,7 +71,7 @@ before(program, 'outputHelp', function () {
 //             if (templates.hasOwnProperty(t)) {
 //                 str = ' - ' + t;
 //                 if (t === DEFAULT_TEMPLATE) str += '  **default**';
-//                 console.log(str);                
+//                 console.log(str);
 //             }
 //         }
 //         console.log();
@@ -95,7 +100,7 @@ program
     .command('create-game [game_name] [author] [author_email]')
     .description('Creates a new game in the games directory')
     .option('    --git', 'add .gitignore')
-    // .option('-t, --template <template>', 'set the template for game')
+// .option('-t, --template <template>', 'set the template for game')
     .option('-f, --force', 'force on non-empty directory')
     .option('-v, --verbose', 'verbose output')
     .action(function(gameName, author, email, options) {
@@ -111,6 +116,78 @@ program
 
     });
 
+/**
+ * ## detectNodeGameInstallation
+ *
+ * Try to detect a nodeGame normal installation
+ *
+ * First looks 2 and then 1 directories above.
+ *
+ * @return {object|boolean} An object with paths, or FALSE if detection failed.
+ */
+function detectNodeGameInstallation() {
+    let ngDir = path.resolve(root, '..', '..');
+    let ngPkg = {};
+    try {
+        ngPkg = require(path.resolve(ngDir, 'package.json'));
+    }
+    catch(e) {
+        ngDir = path.resolve(root, '..');
+    }
+    if (!ngPkg) {
+        try {
+            let ngPkg = require(path.resolve(ngDir, 'package.json'));
+        }
+        catch(e) {}
+    }
+    if (ngPkg.name === 'nodegame') {
+
+        console.log('NodeGame v' + ngPkg.version +
+                    ' installation detected in: ');
+        console.log(ngDir);
+        console.log('');
+
+        let gameDirs = checkGameDirs(ngDir);
+        if (!gameDirs) {
+            console.log('However, folders games and/or games_available ' +
+                        'could not be found');
+        }
+        else {
+            return {
+                ngVersion: ngPkg.version,
+                ngDir: ngDir + path.sep,
+                ngGamesAvailDir: gameDirs.ngGamesAvailDir,
+                ngGamesEnabledDir: gameDirs.ngGamesEnabledDir
+            };
+        }
+    }
+    return false;
+}
+
+
+/**
+ * ## checkGameDirs
+ *
+ * Verifies that games and games_available exist in the given folder
+ *
+ * @param {string} ngDir The path to the nodegame installation
+ *
+ * @return {object|boolean} An object with paths, or FALSE if detection failed.
+ */
+function checkGameDirs(ngDir) {
+    let ngGamesAvail = path.resolve(ngDir, 'games_available');
+    if (fs.existsSync(ngGamesAvail)) {
+        let ngGames = path.resolve(ngDir, 'games');
+        if (fs.existsSync(ngGames)) {
+            return {
+                ngGamesEnabledDir: ngGames + path.sep,
+                ngGamesAvailDir: ngGamesAvail + path.sep
+            };
+        }
+    }
+    return false;
+}
+
 /**
  * Install a before function; AOP.
  */
@@ -155,7 +232,8 @@ function createGameDir(template, gameName, outDir,
     var nodegameCopyright;
     var fileName;
 
-    nodegameCopyright = 'Copyright(c) 2017 Stefano Balietti <ste@nodegame.org>';
+    nodegameCopyright = 'Copyright(c) ' + year +
+        ' Stefano Balietti <ste@nodegame.org>';
 
     // Make full copyright string.
     fullCopyright = 'Copyright(c) ' + year;
@@ -163,7 +241,7 @@ function createGameDir(template, gameName, outDir,
     if (authorEmail) fullCopyright += ' <' + authorEmail + '>';
 
     // Fix trailing slash.
-    if (outDir.charAt(outDir.length) !== '/') outDir = outDir += '/';
+    if (outDir.charAt(outDir.length) !== path.sep) outDir = outDir += path.sep;
 
     console.log();
 
@@ -194,41 +272,37 @@ function createGameDir(template, gameName, outDir,
     function complete() {
         var prompt, tmp;
         if (--wait) return;
+
+        // Enable by making a link in games/.
+        makeLink(outDir, path.resolve(conf.ngGamesEnabledDir, gameName));
+
         prompt = launchedFromCmd() ? '>' : '$';
         if (verbose) console.log();
 
-        console.log('   \x1b[36mcopyright string\x1b[0m:');
+        console.log('   \x1b[36mCopyright string\x1b[0m:');
         console.log('        ' + fullCopyright);
         console.log();
 
-        console.log('   \x1b[36mtemplate\x1b[0m:');
+        console.log('   \x1b[36mTemplate\x1b[0m:');
         console.log('        ' + template);
         console.log();
 
-        console.log('   \x1b[36mgame created\x1b[0m:');
-        console.log('        ' + outDir);
+        console.log('   \x1b[36mGame created\x1b[0m:');
+        console.log('        ' + outDir.substr(0, outDir.length-1));
         console.log();
 
-        tmp = '        channel/channel.secret.js.sample      -> ' +
-            'channel/channel.secret.js';
-        console.log('   \x1b[36medit and rename\x1b[0m:');
-        tmp = '        channel/channel.credentials.js.sample -> ' +
-            'channel/channel.credentials.js';
+        let channel = 'channel' + path.sep;
+        tmp = '        ' + channel + 'channel.secret.js.sample      -> ' +
+            channel + 'channel.secret.js';
+        console.log('   \x1b[36mEdit and rename\x1b[0m:');
         console.log(tmp);
+        tmp = '        ' + channel +
+            'channel.credentials.js.sample -> ' +
+            channel + 'channel.credentials.js';
         console.log(tmp);
         console.log();
 
         console.log();
-
-//        console.log('   run the app:');
-//
-//        if (launchedFromCmd()) {
-//          console.log('     %s SET DEBUG=%s:* & npm start', prompt, gameName);
-//        } else {
-//            console.log('     %s DEBUG=%s:* npm start', prompt, gameName);
-//        }
-//
-//        console.log();
     }
 
 
@@ -421,15 +495,15 @@ function createGameDir(template, gameName, outDir,
         });
 
         // Package.json
-         var pkg = {
-             name: gameName
-             , version: '0.0.1'
-             , description: 'This is a nodeGame game based on ' + template
-             , author: author + ' ' + '<' + authorEmail + '>'
-             , license: "MIT/X11"
-             , homepage: 'http://nodegame.org'
-//             , private: true
-         }
+        var pkg = {
+            name: gameName
+            , version: '0.0.1'
+            , description: 'This is a nodeGame game based on ' + template
+            , author: author + ' ' + '<' + authorEmail + '>'
+            , license: "MIT/X11"
+            , homepage: 'http://nodegame.org'
+            //             , private: true
+        }
 
 
         // sort dependencies like npm(1)
@@ -516,15 +590,15 @@ function launchedFromCmd() {
  */
 function loadTemplate(template, file) {
     var templatePath;
-// Uncomment when loading templates from templatesDir works.
-//     templatePath = path.join(templatesDir, templates[template], file);
-//     if (!fs.existsSync(templatePath)) {
-//         // Try to use the default one.
-//         templatePath = ngt.resolve(file);
-//         if (!fs.existsSync(templatePath)) {
-//             throw new Error('Cannot find template file: ' + file);
-//         }
-//     }
+    // Uncomment when loading templates from templatesDir works.
+    //     templatePath = path.join(templatesDir, templates[template], file);
+    //     if (!fs.existsSync(templatePath)) {
+    //         // Try to use the default one.
+    //         templatePath = ngt.resolve(file);
+    //         if (!fs.existsSync(templatePath)) {
+    //             throw new Error('Cannot find template file: ' + file);
+    //         }
+    //     }
     templatePath = ngt.resolve(file);
     if (!fs.existsSync(templatePath)) {
         throw new Error('Cannot find template file: ' + file);
@@ -554,13 +628,13 @@ function createGame(options) {
     }
     else {
         // Is there a default game folder?
-        if (!conf.gamesFolder) {
+        if (!conf.ngGamesAvailDir) {
             console.log('Error: no default game folder found. Please ' +
                         'provide an absolute path for the game, or ' +
                         'set the default game folder');
             return;
         }
-        destinationPath = conf.gamesFolder + options.game;
+        destinationPath = path.resolve(conf.ngGamesAvailDir, options.game);
     }
     // App name.
     appName = path.basename(path.resolve(destinationPath));
@@ -634,14 +708,26 @@ function createConfFile(cb) {
     });
 
     console.log('');
-    str = 'Path to nodeGame games_available folder: ';
-    if (conf.gamesFolder) str += '[' + conf.gamesFolder + '] ';
+    str = 'Path to nodeGame installation folder: ';
+    if (!conf.ngDir) {
+        let ngInfo = detectNodeGameInstallation();
+        if (ngInfo) J.mixin(conf, ngInfo);
+    }
+    if (conf.ngDir) str += '[' + conf.ngDir + '] ';
+
+    colorWrite('Input missing information, enter to keep default');
 
     rl.question(str, function(answer) {
-        
-        if (!answer) answer = conf.gamesFolder;
+
+        answer = answer || conf.ngDir;
+
+        if (!answer) {
+            console.log('Error: no directory provided and no default found.');
+            process.exit();
+            return;
+        }
         if (!path.isAbsolute(answer)) answer = path.join(process.cwd(), answer);
-        
+
         if (!fs.existsSync(answer)) {
             console.log('Error: directory not existing: ' + answer);
             process.exit();
@@ -654,10 +740,11 @@ function createConfFile(cb) {
             if (answer.substring(answer.length-2)!== '\\') answer += '\\';
         }
         else {
-            if (answer.charAt(answer.length-1) !== '/') answer += '/';
+            if (answer.charAt(answer.length-1) !== path.sep) answer += path.sep;
         }
 
-        conf.gamesFolder = answer;
+        // Set nodeGame dir.
+        conf.ngDir = answer;
 
         str = 'Default author name: ';
         if (conf.author) str += '[' + conf.author +'] ';
@@ -680,11 +767,16 @@ function createConfFile(cb) {
             });
         });
     });
+
+//     // Normalize to absolute if not already.
+//     if (!path.isAbsolute(conf.ngGamesAvailDir)) {
+//         conf.ngGamesAvailDir = path.normalize(root, confFile.ngGamesAvailDir);
+//     }
 }
 
 function loadTemplates() {
-    let dir = conf.gamesFolder;
-    
+    let dir = conf.ngGamesAvailDir;
+
     fs.readdirSync(dir).forEach(function(file, index){
         let curPath = path.join(dir, file);
         //  Recurse.
@@ -693,7 +785,7 @@ function loadTemplates() {
             try {
                 let packageJson = require(path.join(curPath, 'package.json'));
                 name = packageJson.name;
-                if (name) templates[name] = curPath;            
+                if (name) templates[name] = curPath;
             }
             catch(e) {
                 // Ignore errors for now.
@@ -708,7 +800,7 @@ function showConf(localConf) {
     console.log('');
     colorWrite('Configuration: ');
     console.log('');
-    console.log("    Games folder path: ", conf.gamesFolder);
+    console.log("    Games folder path: ", conf.ngGamesAvailDir);
     console.log("          Author name: ", conf.author);
     console.log("         Author email: ", conf.email);
     console.log('');
@@ -738,7 +830,7 @@ function loadConfFile(cb) {
     // Try to load configuration. If not found start utility to create it.
     try {
         conf = require(confFile);
-        if (!conf.author || !conf.email || !conf.gamesFolder) {
+        if (!conf.author || !conf.email || !conf.ngDir) {
             createConfFile(cb);
         }
         else {
@@ -748,10 +840,7 @@ function loadConfFile(cb) {
     catch(e) {
         console.log('');
         colorWrite('Warning!');
-        console.log('');
-        console.log('nodegame-generator conf file ' +
-                    'not found or not readable');
-        console.log('');
+        console.log('nodegame-generator conf file not found or not readable');
         createConfFile(cb);
     }
 }
@@ -760,6 +849,16 @@ function colorWrite(str) {
     console.log('\x1b[36m' + str + '\x1b[0m');
 }
 
+function makeLink(from, to, type) {
+    if (isWin) {
+        if (type === 'file') fs.linkSync(from, to, 'file');
+        else fs.symlinkSync(from, to, 'junction');
+    }
+    else {
+        fs.symlinkSync(from, to);
+    }
+}
+
 // Parsing options.
 program.parse(process.argv);
 
diff --git a/conf/generator.conf.json.template b/conf/generator.conf.json.template
index 0d172dd..c4b3055 100644
--- a/conf/generator.conf.json.template
+++ b/conf/generator.conf.json.template
@@ -1,5 +1,5 @@
 {
     "author": "author",
     "email": "author@me.com",
-    "gamesFolder": "/path/to/games/folder"
+    "ngDir": "/path/to/nodeGame"
 }

From 446a35da2a8ab5ae560ea60f721ebfbf6ed51134 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 7 Sep 2018 08:11:01 -0400
Subject: [PATCH 05/68] 4.1.0

---
 CHANGELOG    | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 36127cd..9d6b9cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 4.1.0
+- Auto-detect nodeGame installation folder
+- Enable games created in games/.
+- Small fixes.
+
 ## 4.0.0
 - show-conf command.
 - Replace default nodeGame copyright string.
diff --git a/package.json b/package.json
index 138b9db..56c8184 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From e82bef8540964afab8744202585b2ac47bca10f7 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 7 Sep 2018 08:12:16 -0400
Subject: [PATCH 06/68] minor

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8af16ab..358522c 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ This generator can also be further configured with the following command line fl
 
 ## Kudos
 
-Based on a fork of [Express Generator](https://github.com/expressjs/generator).
+Originally based on a fork of [Express Generator](https://github.com/expressjs/generator).
 
 ## License
 

From 86bfe1600d2b4901ea3bc7fd514f88da6a84b762 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 7 Sep 2018 08:55:31 -0400
Subject: [PATCH 07/68] mods

---
 bin/nodegame | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/nodegame b/bin/nodegame
index 940ab76..b6114d4 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -709,7 +709,7 @@ function createConfFile(cb) {
 
     console.log('');
     str = 'Path to nodeGame installation folder: ';
-    if (!conf.ngDir) {
+    if (!conf.ngDir || ! conf.ngGamesAvailDir || !conf.ngGamesEnabledDir) {
         let ngInfo = detectNodeGameInstallation();
         if (ngInfo) J.mixin(conf, ngInfo);
     }

From 649a3054b02b29a0ce60e5c205f1edd13e871139 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Wed, 12 Sep 2018 05:04:38 -0400
Subject: [PATCH 08/68] improved parameter checking

---
 bin/nodegame | 63 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index b6114d4..57d6639 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -77,20 +77,33 @@ before(program, 'outputHelp', function () {
 //         console.log();
 //     });
 
+program.version(version);
 
 program
-    .version(version)
     .command('update-conf')
     .description('Updates stored configuration (author, games dir, etc.)')
-    .action(function(env, options){
-        createConfFile(options);
+    .allowUnknownOption()
+    .action(function(options){
+
+        // This is a commander bug, get around it.
+        let c = options.parent.rawArgs[3];
+        if (c == '--help' || c == '--h') return
+
+        loadConfFile(function() {
+            // Nothing.
+        }, true);
     });
 
 program
-    .version(version)
     .command('show-conf')
     .description('Shows current configuration')
-    .action(function(env, options){
+    .allowUnknownOption()
+    .action(function(options) {
+
+        // This is a commander bug, get around it.
+        let c = options.parent.rawArgs[3];
+        if (c == '--help' || c == '--h') return
+
         loadConfFile(function() {
             showConf();
         });
@@ -99,12 +112,16 @@ program
 program
     .command('create-game [game_name] [author] [author_email]')
     .description('Creates a new game in the games directory')
-    .option('    --git', 'add .gitignore')
 // .option('-t, --template <template>', 'set the template for game')
     .option('-f, --force', 'force on non-empty directory')
     .option('-v, --verbose', 'verbose output')
+    .allowUnknownOption()
     .action(function(gameName, author, email, options) {
 
+        // This is a commander bug, get around it.
+        let c = options.parent.rawArgs[3];
+        if (c == '--help' || c == '--h') return;
+
         loadConfFile(function() {
             createGame({
                 game: gameName,
@@ -226,7 +243,6 @@ function createGameDir(template, gameName, outDir,
     // Number of synchronous / asynchronous operations.
     var wait = 9;
     var verbose = !!options.verbose;
-    var doGit = !!options.git;
     var d = new Date();
     var year = d.getFullYear();
     var nodegameCopyright;
@@ -511,11 +527,8 @@ function createGameDir(template, gameName, outDir,
 
         // write files
         write(outDir + 'package.json', JSON.stringify(pkg, null, 4));
-
-        if (doGit) {
-            write(outDir + '.gitignore',
-                  fs.readFileSync(root + '/.gitignore', 'utf-8'));
-        }
+        write(outDir + '.gitignore',
+              fs.readFileSync(path.resolve(root, '.gitignore'), 'utf-8'));
 
         complete();
     });
@@ -826,11 +839,14 @@ function writeConfFile(conf, cb) {
     });
 }
 
-function loadConfFile(cb) {
+function loadConfFile(cb, force) {
     // Try to load configuration. If not found start utility to create it.
     try {
         conf = require(confFile);
-        if (!conf.author || !conf.email || !conf.ngDir) {
+        if (force || !conf.author || !conf.email || !conf.ngDir) {
+            if (!force) {
+                console.log('Missing or incomple conf. Trying to recover it.');
+            }
             createConfFile(cb);
         }
         else {
@@ -862,7 +878,20 @@ function makeLink(from, to, type) {
 // Parsing options.
 program.parse(process.argv);
 
-if (!program.args.length &&
-    program.rawArgs[2] !== '--help' && program.rawArgs[2] !== '-h') {
-    console.log('Error: no command provided.');
+let firstCommand = program.rawArgs[2]
+if (!program.args.length) {
+    if (firstCommand !== '--help' && firstCommand !== '-h' &&
+        firstCommand !== '--version' && firstCommand !== '-V'
+       ) {
+        console.log('Error: no command provided.');
+    }
+}
+else {
+
+    if (firstCommand !== 'create-game' &&
+        firstCommand !== 'show-conf' &&
+        firstCommand !== 'update-conf') {
+
+        console.log('Error: invalid command: ' + firstCommand);
+    }
 }

From 54ed7720d7fdd16ebc6563657ec4ff36fca4bffb Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Wed, 12 Sep 2018 05:08:40 -0400
Subject: [PATCH 09/68] 4.1.1

---
 CHANGELOG    | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9d6b9cf..d0555af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 4.1.1
+- Improved parameter checking, display of help.
+- Fixed bug update-conf not loading the latest author and email parameters.
+
 ## 4.1.0
 - Auto-detect nodeGame installation folder
 - Enable games created in games/.
diff --git a/package.json b/package.json
index 56c8184..ee3af63 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From 21b8c457562d48222e66a3331809dd7c819d7434 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Wed, 12 Sep 2018 05:09:19 -0400
Subject: [PATCH 10/68] minor

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d0555af..182703d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ## 4.1.1
 - Improved parameter checking, display of help.
 - Fixed bug update-conf not loading the latest author and email parameters.
+- File .gitignore is added by default.
 
 ## 4.1.0
 - Auto-detect nodeGame installation folder

From 2336b15216177a171f9dbd6136d77312150441d3 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 13 Sep 2018 05:17:04 -0400
Subject: [PATCH 11/68] admin pwd and secret ; path.resolve

---
 bin/nodegame | 502 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 308 insertions(+), 194 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 57d6639..dce57c4 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -22,6 +22,11 @@ const isWin = /^win/.test(process.platform);
 const root = J.resolveModuleDir('nodegame-generator');
 const confFile = path.resolve(root, 'conf', 'generator.conf.json');
 
+let rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+
 // Re-assign process.exit because of commander
 process.exit = exit
 
@@ -220,18 +225,26 @@ function before(obj, method, fn) {
 /**
  * Prompt for confirmation on STDOUT/STDIN
  */
-function confirm(msg, callback) {
-    var rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
+function confirm(msg, cb) {
+    rl.question(msg, function(input) {
+        // rl.close();
+        cb(/^y|yes|ok|true$/i.test(input));
     });
+}
 
-    rl.question(msg, function (input) {
-        rl.close();
-        callback(/^y|yes|ok|true$/i.test(input));
+function questionNoBlank(msg, cb) {
+    rl.question(msg, function(answer) {
+        // console.log('ANSWER WAS: ' + answer);
+        if ('undefined' === typeof answer || answer.trim() === '') {
+            questionNoBlank(msg, cb);
+            // Needed return otherwise it continues.
+            return;
+        }
+        cb(answer);
     });
 }
 
+
 /**
  * Create application at the given directory `path`.
  *
@@ -246,7 +259,7 @@ function createGameDir(template, gameName, outDir,
     var d = new Date();
     var year = d.getFullYear();
     var nodegameCopyright;
-    var fileName;
+    var fileName, str;
 
     nodegameCopyright = 'Copyright(c) ' + year +
         ' Stefano Balietti <ste@nodegame.org>';
@@ -259,6 +272,8 @@ function createGameDir(template, gameName, outDir,
     // Fix trailing slash.
     if (outDir.charAt(outDir.length) !== path.sep) outDir = outDir += path.sep;
 
+    console.log();
+    colorWrite('Creating Game');
     console.log();
 
     function substituteHeader(str) {
@@ -286,252 +301,356 @@ function createGameDir(template, gameName, outDir,
     }
 
     function complete() {
-        var prompt, tmp;
-        if (--wait) return;
+        if (--wait) return
+        let prompt, tmp;
 
         // Enable by making a link in games/.
         makeLink(outDir, path.resolve(conf.ngGamesEnabledDir, gameName));
 
+
         prompt = launchedFromCmd() ? '>' : '$';
         if (verbose) console.log();
 
-        console.log('   \x1b[36mCopyright string\x1b[0m:');
-        console.log('        ' + fullCopyright);
+        colorWrite('Copyright string');
+        console.log(' ' + fullCopyright);
         console.log();
 
-        console.log('   \x1b[36mTemplate\x1b[0m:');
-        console.log('        ' + template);
+        colorWrite('Template');
+        console.log(' ' + template);
         console.log();
 
-        console.log('   \x1b[36mGame created\x1b[0m:');
-        console.log('        ' + outDir.substr(0, outDir.length-1));
+        colorWrite('Game created');
+        console.log(' ' + outDir.substr(0, outDir.length-1));
         console.log();
 
-        let channel = 'channel' + path.sep;
-        tmp = '        ' + channel + 'channel.secret.js.sample      -> ' +
-            channel + 'channel.secret.js';
-        console.log('   \x1b[36mEdit and rename\x1b[0m:');
-        console.log(tmp);
-        tmp = '        ' + channel +
-            'channel.credentials.js.sample -> ' +
-            channel + 'channel.credentials.js';
-        console.log(tmp);
-        console.log();
+        // Not needed now.
+        // let channel = 'channel' + path.sep;
+        // tmp = '        ' + channel + 'channel.secret.js.sample      -> ' +
+        //     channel + 'channel.secret.js';
+        // console.log('   \x1b[36mEdit and rename\x1b[0m:');
+        // console.log(tmp);
+        // tmp = '        ' + channel +
+        //     'channel.credentials.js.sample -> ' +
+        //     channel + 'channel.credentials.js';
+        // console.log(tmp);
+        // console.log();
 
         console.log();
+        rl.close();
     }
 
+    str = ' - Type a secret passphrase or leave blank to generate a ' +
+        'random one\n' +
+        '   (Hint: it is used to sign auth tokens, it won\'t be asked again): ';
 
-    // Loading Templates.
+    rl.question(str, function(secret) {
 
-    // AUTH.
-    var auth = loadTemplate(template, 'auth/auth.js');
-    var authSettings = loadTemplate(template, 'auth/auth.settings.js');
-    var authCodes = loadTemplate(template, 'auth/auth.codes.js');
+        if ('undefined' === typeof secret || secret.trim() === '') {
+            secret = J.randomString(15, 'aA!_1');
+        }
 
-    // CHANNEL.
-    var channelSettings = loadTemplate(template, 'channel/channel.settings.js');
-    var channelSecret = loadTemplate(template, 'channel/channel.secret.js');
-    var channelCredentials = loadTemplate(template,
-                                          'channel/channel.credentials.js');
+        console.log();
+        str = ' - Enter the ADMIN username: ';
+        questionNoBlank(str, function(admin) {
 
-    // GAME.
-    var gameStages = loadTemplate(template, 'game/game.stages.js');
-    var gameSetup = loadTemplate(template, 'game/game.setup.js');
-    var gameSettings = loadTemplate(template, 'game/game.settings.js');
+            str = ' - Enter the ADMIN password: ';
+            questionNoBlank(str, function(pwd) {
 
-    // GAME / client_types.
-    var typePlayer = loadTemplate(template, 'game/client_types/player.js');
-    var typeBot = loadTemplate(template, 'game/client_types/bot.js');
-    var typeLogic = loadTemplate(template, 'game/client_types/logic.js');
-    var typePhantom = loadTemplate(template, 'game/client_types/phantom.js');
-    var typeAutoplay = loadTemplate(template, 'game/client_types/autoplay.js');
+                str = ' - Confirm the ADMIN password: ';
+                rl.question(str, function(pwd2) {
 
-    // PUBLIC.
-    var indexPage = loadTemplate(template, 'public/index.htm');
-    var gamePage = loadTemplate(template, 'public/game.htm');
-    var instrPage = loadTemplate(template, 'public/instructions.htm');
-    var endPage = loadTemplate(template, 'public/end.htm');
-    var indexJS = loadTemplate(template, 'public/js/index.js');
+                    if (pwd !== pwd2) {
+                        console.log('Error: passwords do not match.');
+                        process.exit();
+                        return;
+                    }
+
+                    console.log();
+                    doIt(secret, admin, pwd);
+                });
+            });
+        });
+
+    });
 
-    // VIEWS.
+    function doIt(secret, admin, pwd) {
 
+        // Loading Templates.
+        let filePath;
+        let t = template;
 
-    // WAITROOM.
-    var waitroomSettings = loadTemplate(template,
-                                        'waitroom/waitroom.settings.js');
-    var waitroom = loadTemplate(template, 'waitroom/waitroom.js');
+        // AUTH.
+        filePath = path.join('auth', 'auth.js');
+        console.log('FP :' + filePath);
+        var auth = loadTemplate(t, filePath);
+        filePath = path.join('auth', 'auth.settings.js');
+        var authSettings = loadTemplate(t, filePath);
+        filePath = path.join('auth', 'auth.codes.js');
+        var authCodes = loadTemplate(t, filePath);
 
-    // REQUIREMENTS.
-    fileName = 'requirements/requirements.settings.js';
-    var requirementsSettings = loadTemplate(template, fileName);
-    fileName = 'requirements/requirements.room.js';
-    var requirementsRoom = loadTemplate(template, fileName);
-    var requirements = loadTemplate(template, 'requirements/requirements.js');
+        // CHANNEL.
 
-    // LEVELS.
-    var levelsREADME = loadTemplate(template, 'levels/README.md');
+        filePath = path.join('channel', 'channel.settings.js');
+        var channelSettings = loadTemplate(t, filePath);
+        filePath = path.join('channel', 'channel.secret.js');
+        var channelSecret = loadTemplate(t, filePath);
+        filePath = path.join('channel', 'channel.credentials.js');
+        var channelCredentials = loadTemplate(t, filePath);
 
-    mkdir(outDir, function() {
+        // GAME.
 
-        mkdir(outDir + 'data');
+        filePath = path.join('game', 'game.stages.js');
+        var gameStages = loadTemplate(t, filePath);
+        filePath = path.join('game', 'game.setup.js');
+        var gameSetup = loadTemplate(t, filePath);
+        filePath = path.join('game', 'game.settings.js');
+        var gameSettings = loadTemplate(t, filePath);
+
+        // GAME / client_types.
+
+        filePath = path.join('game', 'client_types', 'player.js');
+        var typePlayer = loadTemplate(t, filePath);
+        filePath = path.join('game', 'client_types', 'bot.js');
+        var typeBot = loadTemplate(t, filePath);
+        filePath = path.join('game', 'client_types', 'logic.js');
+        var typeLogic = loadTemplate(t, filePath);
+        filePath = path.join('game', 'client_types', 'phantom.js');
+        var typePhantom = loadTemplate(t, filePath);
+        filePath = path.join('game', 'client_types', 'autoplay.js');
+        var typeAutoplay = loadTemplate(t, filePath);
 
-        // AUTH.
-        mkdir(outDir + 'auth', function() {
-            auth = substituteHeader(auth);
-            authSettings = substituteHeader(authSettings);
+        // PUBLIC.
 
-            auth = auth.replace('{NAME}', gameName);
+        filePath = path.join('public', 'index.htm');
+        var indexPage = loadTemplate(t, filePath);
+        filePath = path.join('public', 'game.htm');
+        var gamePage = loadTemplate(t, filePath);
+        filePath = path.join('public', 'instructions.htm');
+        var instrPage = loadTemplate(t, filePath);
+        filePath = path.join('public', 'end.htm');
+        var endPage = loadTemplate(t, filePath);
+        filePath = path.join('public', 'js', 'index.js');
+        var indexJS = loadTemplate(t, filePath);
 
-            write(outDir + 'auth/auth.js', auth);
-            write(outDir + 'auth/auth.settings.js', authSettings);
-            write(outDir + 'auth/auth.codes.js.sample', authCodes);
-            complete();
-        });
+        // VIEWS.
 
-        // CHANNEL.
-        mkdir(outDir + 'channel', function() {
 
-            // Settings.
-            channelSettings = substituteHeader(channelSettings);
-            channelSettings = channelSettings.replace(/{NAME}/g, gameName);
-            channelSettings = channelSettings.replace('{ADMIN}',
-                                                      gameName + '/admin');
-            write(outDir + 'channel/channel.settings.js', channelSettings);
+        // WAITROOM.
 
-            // Credentials.
-            channelCredentials = substituteHeader(channelCredentials);
-            write(outDir + 'channel/channel.credentials.js.sample',
-                  channelCredentials);
+        filePath = path.join('waitroom', 'waitroom.settings.js');
+        var waitroomSettings = loadTemplate(t, filePath);
+        filePath = path.join('waitroom', 'waitroom.js');
+        var waitroom = loadTemplate(t, 'waitroom/waitroom.js');
 
-            // Secret.
-            channelSecret = substituteHeader(channelSecret);
-            write(outDir + 'channel/channel.secret.js.sample', channelSecret);
+        // REQUIREMENTS.
 
-            complete();
-        });
+        filePath = path.join('requirements', 'requirements.settings.js');
+        var requirementsSettings = loadTemplate(t, filePath);
+        filePath = path.join('requirements', 'requirements.room.js');
+        var requirementsRoom = loadTemplate(t, filePath);
+        filePath = path.join('requirements', 'requirements.js');
+        var requirements = loadTemplate(t, filePath);
 
-        // GAME.
-        mkdir(outDir + 'game', function() {
-
-            gameStages = substituteHeader(gameStages);
-            gameSetup = substituteHeader(gameSetup);
-            gameSettings = substituteHeader(gameSettings);
-
-            write(outDir + 'game/game.stages.js', gameStages);
-            write(outDir + 'game/game.setup.js', gameSetup);
-            write(outDir + 'game/game.settings.js', gameSettings);
-
-            mkdir(outDir + 'game/client_types', function() {
-                typePlayer = substituteHeader(typePlayer);
-                typeBot = substituteHeader(typeBot);
-                typeAutoplay = substituteHeader(typeAutoplay);
-                typeLogic = substituteHeader(typeLogic);
-                typePhantom = substituteHeader(typePhantom);
-
-                write(outDir + 'game/client_types/autoplay.js', typeAutoplay);
-                write(outDir + 'game/client_types/player.js', typePlayer);
-                write(outDir + 'game/client_types/bot.js', typeBot);
-                write(outDir + 'game/client_types/logic.js', typeLogic);
-                write(outDir + 'game/client_types/phantom.js', typePhantom);
-                complete();
-            });
-        });
+        // LEVELS.
 
-        // PUBLIC.
-        mkdir(outDir + 'public', function() {
-            write(outDir + 'public/index.htm', indexPage);
-            indexJS = substituteHeader(indexJS);
-            // TODO: one command to replace all instances.
-            indexJS = indexJS.replace('{NAME}', gameName);
-            indexJS = indexJS.replace('{NAME}', gameName);
+        filePath = path.join('levels', 'README.md');
+        var levelsREADME = loadTemplate(t, filePath);
 
-            instrPage = instrPage.replace('{NAME}', gameName);
-            write(outDir + 'public/instructions.htm', instrPage);
+        mkdir(outDir, function() {
 
-            write(outDir + 'public/game.htm', gamePage);
-            write(outDir + 'public/end.htm', endPage);
+            mkdir(path.resolve(outDir, 'data'));
 
-            // Copying favicon over.
-            fs.copySync(ngt.resolve('public/favicon.ico'),
-                        outDir + 'public/favicon.ico');
+            // AUTH.
+            mkdir(path.resolve(outDir, 'auth'), function() {
+                auth = substituteHeader(auth);
+                authCodes = substituteHeader(authCodes);
+                authSettings = substituteHeader(authSettings);
 
-            mkdir(outDir + 'public/js', function() {
-                write(outDir + 'public/js/index.js', indexJS);
+                auth = auth.replace('{NAME}', gameName);
+                let filePath = path.resolve(outDir, 'auth', 'auth.js');
+                write(filePath, auth);
+                filePath = path.resolve(outDir, 'auth', 'auth.settings.js');
+                write(filePath, authSettings);
+                filePath = path.resolve(outDir, 'auth', 'auth.codes.js.sample');
+                write(filePath, authCodes);
+                complete();
+            });
+
+            // CHANNEL.
+            mkdir(path.resolve(outDir, 'channel'), function() {
+
+                // Settings.
+                channelSettings = substituteHeader(channelSettings);
+                channelSettings = channelSettings.replace(/{NAME}/g, gameName);
+                channelSettings = channelSettings.replace('{ADMIN}',
+                                                          gameName + '/admin');
+                let filePath = path.resolve(outDir,
+                                            'channel', 'channel.settings.js');
+                write(filePath, channelSettings);
+
+                // Credentials.
+                channelCredentials = channelCredentials.replace(/{ADMIN}/, admin);
+                channelCredentials = channelCredentials.replace(/{PWD}/, pwd);
+                channelCredentials = substituteHeader(channelCredentials);
+                filePath = path.resolve(outDir,
+                                        'channel', 'channel.credentials.js');
+                write(filePath, channelCredentials);
+
+                // Secret.
+                channelSecret = substituteHeader(channelSecret);
+                channelSecret = channelSecret.replace(/{SECRET}/g, secret);
+                filePath = path.resolve(outDir, 'channel', 'channel.secret.js');
+                write(filePath, channelSecret);
+
+                complete();
+            });
 
-                mkdir(outDir + 'public/css', function() {
+            // GAME.
+            mkdir(path.resolve(outDir, 'game'), function() {
+
+                gameStages = substituteHeader(gameStages);
+                gameSetup = substituteHeader(gameSetup);
+                gameSettings = substituteHeader(gameSettings);
+
+                let filePath = path.resolve(outDir, 'game', 'game.stages.js');
+                write(filePath, gameStages);
+                filePath = path.resolve(outDir, 'game', 'game.setup.js');
+                write(filePath, gameSetup);
+                filePath = path.resolve(outDir, 'game', 'game.settings.js');
+                write(filePath, gameSettings);
+
+                mkdir(path.resolve(outDir, 'game', 'client_types'), function() {
+                    typePlayer = substituteHeader(typePlayer);
+                    typeBot = substituteHeader(typeBot);
+                    typeAutoplay = substituteHeader(typeAutoplay);
+                    typeLogic = substituteHeader(typeLogic);
+                    typePhantom = substituteHeader(typePhantom);
+
+                    let ctPath = path.resolve(outDir, 'game', 'client_types');
+
+                    let filePath = path.join(ctPath, 'autoplay.js');
+                    write(filePath, typeAutoplay);
+                    filePath = path.join(ctPath, 'player.js');
+                    write(filePath, typePlayer);
+                    filePath = path.join(ctPath, 'bot.js');
+                    write(filePath, typeBot);
+                    filePath = path.join(ctPath, 'logic.js');
+                    write(filePath, typeLogic);
+                    filePath = path.join(ctPath, 'phantom.js');
+                    write(filePath, typePhantom);
                     complete();
                 });
             });
-        });
 
-        // VIEWS.
-        mkdir(outDir + 'views', function() {
-            mkdir(outDir + 'views/contexts', function() {
-                // Something.
-                mkdir(outDir + 'views/templates', function() {
+            // PUBLIC.
+            mkdir(path.resolve(outDir, 'public'), function() {
+                indexJS = substituteHeader(indexJS);
+                instrPage = instrPage.replace('{NAME}', gameName);
+
+                let filePath = path.resolve(outDir, 'public', 'index.htm');
+                write(filePath, indexPage);
+                filePath = path.resolve(outDir, 'public', 'instructions.htm');
+                write(filePath, instrPage);
+                filePath = path.resolve(outDir, 'public', 'game.htm');
+                write(filePath, gamePage);
+                filePath = path.resolve(outDir, 'public', 'end.htm');
+                write(filePath, endPage);
+
+                // Copying favicon over.
+                fs.copySync(ngt.resolve(path.join('public', 'favicon.ico')),
+                            path.resolve(outDir, 'public', 'favicon.ico'));
+
+                mkdir(path.resolve(outDir, 'public', 'js'), function() {
+                    write(path.resolve(outDir, 'public', 'js', 'index.js'),
+                          indexJS);
+
+                    mkdir(path.resolve(outDir, 'public', 'css'), function() {
+                        complete();
+                    });
+                });
+            });
+
+            // VIEWS.
+            mkdir(path.resolve(outDir, 'views'), function() {
+                mkdir(path.resolve(outDir, 'views', 'contexts'), function() {
                     // Something.
-                    complete();
+                    mkdir(path.resolve(outDir, 'views', 'templates'),
+
+                          function() {
+                              // Something.
+                              complete();
+                          });
                 });
             });
-        });
 
-        // WAITROOM.
-        mkdir(outDir + 'waitroom', function() {
+            // WAITROOM.
+            mkdir(path.resolve(outDir, 'waitroom'), function() {
 
-            waitroom = substituteHeader(waitroom);
-            waitroomSettings = substituteHeader(waitroomSettings);
+                waitroom = substituteHeader(waitroom);
+                waitroomSettings = substituteHeader(waitroomSettings);
 
-            write(outDir + 'waitroom/waitroom.js.sample', waitroom);
-            write(outDir + 'waitroom/waitroom.settings.js', waitroomSettings);
+                let filePath = path.resolve(outDir, 'waitroom',
+                                            'waitroom.js.sample');
+                write(filePath, waitroom);
+                filePath = path.resolve(outDir, 'waitroom',
+                                        'waitroom.settings.js');
+                write(filePath, waitroomSettings);
 
-            complete();
-        });
+                complete();
+            });
 
-        // REQUIREMENTS.
-        mkdir(outDir + 'requirements', function() {
+            // REQUIREMENTS.
+            mkdir(path.resolve(outDir, 'requirements'), function() {
 
-            requirements = substituteHeader(requirements);
-            requirementsSettings = substituteHeader(requirementsSettings);
-            requirementsRoom = substituteHeader(requirementsRoom);
+                requirements = substituteHeader(requirements);
+                requirementsSettings = substituteHeader(requirementsSettings);
+                requirementsRoom = substituteHeader(requirementsRoom);
 
-            write(outDir + 'requirements/requirements.js.sample', requirements);
-            write(outDir + 'requirements/requirements.settings.js',
-                  requirementsSettings);
-            write(outDir + 'requirements/requirements.room.js.sample',
-                  requirementsRoom);
+                let filePath = path.resolve(outDir, 'requirements',
+                                            'requirements.js.sample');
+                write(filePath, requirements);
+                filePath = path.resolve(outDir, 'requirements',
+                                        'requirements.settings.js');
+                write(filePath, requirementsSettings);
+                filePath = path.resolve(outDir, 'requirements',
+                                        'requirements.room.js.sample');
+                write(filePath, requirementsRoom);
 
-            complete();
-        });
+                complete();
+            });
 
-        // LEVELS.
-        mkdir(outDir + 'levels', function() {
-            write(outDir + 'levels/README.md', levelsREADME);
-            complete();
-        });
+            // LEVELS.
+            mkdir(path.resolve(outDir, 'levels'), function() {
+                write(path.resolve(outDir, 'levels', 'README.md'),
+                                   levelsREADME);
+                complete();
+            });
 
-        // Package.json
-        var pkg = {
-            name: gameName
-            , version: '0.0.1'
-            , description: 'This is a nodeGame game based on ' + template
-            , author: author + ' ' + '<' + authorEmail + '>'
-            , license: "MIT/X11"
-            , homepage: 'http://nodegame.org'
-            //             , private: true
-        }
+            // Package.json
+            let pkg = {
+                name: gameName
+                , version: '0.0.1'
+                , description: 'This is a nodeGame game based on ' + template
+                , author: author + ' ' + '<' + authorEmail + '>'
+                , license: "MIT/X11"
+                , homepage: 'http://nodegame.org'
+                //             , private: true
+            };
 
 
-        // sort dependencies like npm(1)
-        // pkg.dependencies = sortedObject(pkg.dependencies);
+            // sort dependencies like npm(1)
+            // pkg.dependencies = sortedObject(pkg.dependencies);
 
-        // write files
-        write(outDir + 'package.json', JSON.stringify(pkg, null, 4));
-        write(outDir + '.gitignore',
-              fs.readFileSync(path.resolve(root, '.gitignore'), 'utf-8'));
+            // write files
+            
+            write(path.resolve(outDir, 'package.json'),
+                  JSON.stringify(pkg, null, 4));
+            write(path.resolve(outDir, '.gitignore'),
+                  fs.readFileSync(path.resolve(root, '.gitignore'), 'utf-8'));
 
-        complete();
-    });
+            complete();
+        });
+    }
 }
 
 /**
@@ -713,12 +832,7 @@ function createGame(options) {
  */
 function createConfFile(cb) {
 
-    var rl, str;
-
-    rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-    });
+    var str;
 
     console.log('');
     str = 'Path to nodeGame installation folder: ';

From ef571cc5369809c69a32413f0d8e2095ac5323c1 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 13 Sep 2018 05:24:31 -0400
Subject: [PATCH 12/68] beautified

---
 bin/nodegame | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index dce57c4..cb65ec2 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -273,8 +273,7 @@ function createGameDir(template, gameName, outDir,
     if (outDir.charAt(outDir.length) !== path.sep) outDir = outDir += path.sep;
 
     console.log();
-    colorWrite('Creating Game');
-    console.log();
+    colorWrite('Creating Game', true);
 
     function substituteHeader(str) {
         // Backward compatible.
@@ -311,29 +310,21 @@ function createGameDir(template, gameName, outDir,
         prompt = launchedFromCmd() ? '>' : '$';
         if (verbose) console.log();
 
-        colorWrite('Copyright string');
+        colorWrite('Copyright string', true);
         console.log(' ' + fullCopyright);
         console.log();
 
-        colorWrite('Template');
+        colorWrite('Template', true);
         console.log(' ' + template);
         console.log();
 
-        colorWrite('Game created');
+        colorWrite('Game created', true);
         console.log(' ' + outDir.substr(0, outDir.length-1));
         console.log();
 
-        // Not needed now.
-        // let channel = 'channel' + path.sep;
-        // tmp = '        ' + channel + 'channel.secret.js.sample      -> ' +
-        //     channel + 'channel.secret.js';
-        // console.log('   \x1b[36mEdit and rename\x1b[0m:');
-        // console.log(tmp);
-        // tmp = '        ' + channel +
-        //     'channel.credentials.js.sample -> ' +
-        //     channel + 'channel.credentials.js';
-        // console.log(tmp);
-        // console.log();
+        colorWrite('Admin Configuration stored in: ', true);
+        tmp = ' ' + 'channel' + path.sep + 'channel.credentials.js';
+        console.log(tmp);
 
         console.log();
         rl.close();
@@ -381,7 +372,6 @@ function createGameDir(template, gameName, outDir,
 
         // AUTH.
         filePath = path.join('auth', 'auth.js');
-        console.log('FP :' + filePath);
         var auth = loadTemplate(t, filePath);
         filePath = path.join('auth', 'auth.settings.js');
         var authSettings = loadTemplate(t, filePath);
@@ -803,8 +793,7 @@ function createGame(options) {
                           opts);
         }
         else {
-            colorWrite('Warning!');
-            console.log('');
+            colorWrite('Warning!', true);
             str = destinationPath + ' is not empty, do '
                 + 'you want to continue? [y/N] ';
             confirm(str, function(ok) {
@@ -925,8 +914,7 @@ function loadTemplates() {
 function showConf(localConf) {
     localConf = localConf || conf;
     console.log('');
-    colorWrite('Configuration: ');
-    console.log('');
+    colorWrite('Configuration: ', true);
     console.log("    Games folder path: ", conf.ngGamesAvailDir);
     console.log("          Author name: ", conf.author);
     console.log("         Author email: ", conf.email);
@@ -975,8 +963,9 @@ function loadConfFile(cb, force) {
     }
 }
 
-function colorWrite(str) {
+function colorWrite(str, br) {
     console.log('\x1b[36m' + str + '\x1b[0m');
+    if (br) console.log('');
 }
 
 function makeLink(from, to, type) {

From bd02ef1e72f4331fd506d5e0a08568e7769a2cf9 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 13 Sep 2018 06:41:24 -0400
Subject: [PATCH 13/68] eslinted

---
 .eslintrc.json |  68 +++++++++++++++++
 bin/nodegame   | 196 ++++++++++++++++++++-----------------------------
 package.json   |  10 ++-
 3 files changed, 152 insertions(+), 122 deletions(-)
 create mode 100644 .eslintrc.json

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..da2d19d
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,68 @@
+{
+    "root": true,
+    "extends": [
+        "eslint:recommended"
+    ],
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "globalReturn": true,
+            "impliedStrict": true
+        }
+    },
+    "env": {
+        "es6": true,
+        "node": true
+    },
+    "rules": {
+        "no-trailing-spaces": [2],
+        "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 0}],
+        "eol-last": [2],
+        "indent": [0],
+        "indent-legacy": [2, 4, {"SwitchCase": 1}],
+        "max-len": [0, 80],
+        "brace-style": [0, "stroustrup", {"allowSingleLine": true}],
+        "curly": [2, "multi-line"],
+        "camelcase": [0, {"properties": "never"}],
+        "comma-spacing": [2, {"before": false, "after": true}],
+        "comma-style": [2, "last"],
+        "semi": [2],
+        "semi-spacing": [2, {"before": false, "after": true}],
+        "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
+        "keyword-spacing": [2, {"overrides": {
+            "if": {"after": false},
+            "for": {"after": false},
+            "while": {"after": false},
+            "switch": {"after": false},
+            "catch": {"after": false}
+        }}],
+        "no-spaced-func": [2],
+        "space-in-parens": [2, "never"],
+        "space-before-function-paren": [2, "never"],
+        "space-before-blocks": [2],
+        "spaced-comment": [2, "always"],
+        "no-tabs": [2],
+        "no-multi-spaces": [2, {"ignoreEOLComments": true}],
+        "no-whitespace-before-property": [2],
+        "no-unexpected-multiline": [2],
+        "no-floating-decimal": [2],
+        "space-infix-ops": [2, {"int32Hint": true}],
+        "quotes": [2, "single"],
+        "dot-notation": [2],
+        "dot-location": [2, "property"],
+        "operator-linebreak": [2, "after"],
+        "eqeqeq": [2],
+        "new-cap": [2, { "capIsNewExceptionPattern": "^MathJax\\.." }],
+        "no-redeclare": [2, {"builtinGlobals": true}],
+        "no-shadow": [0, {"builtinGlobals": true}],
+        "block-scoped-var": [2],
+        "no-unused-vars": [2],
+        "no-undef-init": [2],
+        "no-use-before-define": [2, "nofunc"],
+        "no-loop-func": [2],
+        "no-console": [0],
+        "no-unused-labels": [2],
+        "no-useless-escape": [0]
+    }
+}
diff --git a/bin/nodegame b/bin/nodegame
index cb65ec2..e172689 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -1,17 +1,15 @@
-#!/usr/bin/env node
+#!/usrng/bin/env node
 
 const program = require('commander');
 const mkdirp = require('mkdirp');
-const os = require('os');
 const fs = require('fs-extra');
 const path = require('path');
 const readline = require('readline');
-const sortedObject = require('sorted-object');
+// const sortedObject = require('sorted-object');
 
 const J = require('JSUS').JSUS;
 const ngt = require('nodegame-game-template');
 
-const _exit = process.exit;
 const pkg = require('../package.json');
 const version = pkg.version;
 
@@ -27,9 +25,6 @@ let rl = readline.createInterface({
     output: process.stdout
 });
 
-// Re-assign process.exit because of commander
-process.exit = exit
-
 // Mock configuration. Will be overwritten.
 var conf = {
     author: 'author',
@@ -47,21 +42,17 @@ var templates = {
 };
 
 // TODO: make templates actually loading from games_available.
-var templatesDir = 'TO_BE_DEFINED';
+// var templatesDir = 'TO_BE_DEFINED';
 
 // Chosen template. Default dictator.
 const DEFAULT_TEMPLATE = 'dictator';
 
-
 // Full copyright string. Will be overwritten.
 var fullCopyright;
 
-// Flag if a command is passed at all.
-var cmdValue;
-
 // CLI
 
-before(program, 'outputHelp', function () {
+before(program, 'outputHelp', function() {
     this.allowUnknownOption();
 });
 
@@ -88,11 +79,11 @@ program
     .command('update-conf')
     .description('Updates stored configuration (author, games dir, etc.)')
     .allowUnknownOption()
-    .action(function(options){
+    .action(function(options) {
 
         // This is a commander bug, get around it.
         let c = options.parent.rawArgs[3];
-        if (c == '--help' || c == '--h') return
+        if (c === '--help' || c === '--h') return;
 
         loadConfFile(function() {
             // Nothing.
@@ -107,7 +98,7 @@ program
 
         // This is a commander bug, get around it.
         let c = options.parent.rawArgs[3];
-        if (c == '--help' || c == '--h') return
+        if (c === '--help' || c === '--h') return;
 
         loadConfFile(function() {
             showConf();
@@ -125,7 +116,7 @@ program
 
         // This is a commander bug, get around it.
         let c = options.parent.rawArgs[3];
-        if (c == '--help' || c == '--h') return;
+        if (c === '--help' || c === '--h') return;
 
         loadConfFile(function() {
             createGame({
@@ -158,9 +149,11 @@ function detectNodeGameInstallation() {
     }
     if (!ngPkg) {
         try {
-            let ngPkg = require(path.resolve(ngDir, 'package.json'));
+            ngPkg = require(path.resolve(ngDir, 'package.json'));
+        }
+        catch(e) {
+            // Nothing.
         }
-        catch(e) {}
     }
     if (ngPkg.name === 'nodegame') {
 
@@ -216,7 +209,7 @@ function checkGameDirs(ngDir) {
 function before(obj, method, fn) {
     var old = obj[method];
 
-    obj[method] = function () {
+    obj[method] = function() {
         fn.call(this);
         old.apply(this, arguments);
     };
@@ -259,7 +252,7 @@ function createGameDir(template, gameName, outDir,
     var d = new Date();
     var year = d.getFullYear();
     var nodegameCopyright;
-    var fileName, str;
+    var str;
 
     nodegameCopyright = 'Copyright(c) ' + year +
         ' Stefano Balietti <ste@nodegame.org>';
@@ -275,6 +268,11 @@ function createGameDir(template, gameName, outDir,
     console.log();
     colorWrite('Creating Game', true);
 
+    function write(filePath, str) {
+        fs.writeFileSync(filePath, str);
+        if (verbose) colorWrite('   create : ' + filePath);
+    }
+
     function substituteHeader(str) {
         // Backward compatible.
         str = str.replace('{AUTHOR}', author);
@@ -285,29 +283,21 @@ function createGameDir(template, gameName, outDir,
         return str;
     }
 
-
-    function write(filePath, str, mode) {
-        fs.writeFileSync(filePath, str, { mode: mode || 0666 });
-        if (verbose) console.log('   \x1b[36mcreate\x1b[0m : ' + filePath);
-    }
-
     function mkdir(dir, fn) {
-        mkdirp(dir, 0755, function(err){
+        mkdirp(dir, function(err) {
             if (err) throw err;
-            if (verbose) console.log('   \033[36mcreate\033[0m : ' + dir);
-            fn && fn();
+            if (verbose) colorWrite('   create : ' + dir);
+            if (fn) fn();
         });
     }
 
     function complete() {
-        if (--wait) return
-        let prompt, tmp;
+        if (--wait) return;
+        let tmp;
 
         // Enable by making a link in games/.
         makeLink(outDir, path.resolve(conf.ngGamesEnabledDir, gameName));
 
-
-        prompt = launchedFromCmd() ? '>' : '$';
         if (verbose) console.log();
 
         colorWrite('Copyright string', true);
@@ -319,7 +309,7 @@ function createGameDir(template, gameName, outDir,
         console.log();
 
         colorWrite('Game created', true);
-        console.log(' ' + outDir.substr(0, outDir.length-1));
+        console.log(' ' + outDir.substr(0, outDir.length - 1));
         console.log();
 
         colorWrite('Admin Configuration stored in: ', true);
@@ -618,13 +608,12 @@ function createGameDir(template, gameName, outDir,
 
             // Package.json
             let pkg = {
-                name: gameName
-                , version: '0.0.1'
-                , description: 'This is a nodeGame game based on ' + template
-                , author: author + ' ' + '<' + authorEmail + '>'
-                , license: "MIT/X11"
-                , homepage: 'http://nodegame.org'
-                //             , private: true
+                name: gameName,
+                version: '0.0.1',
+                description: 'This is a nodeGame game based on ' + template,
+                author: author + ' ' + '<' + authorEmail + '>',
+                license: 'MIT/X11',
+                homepage: 'http://nodegame.org'
             };
 
 
@@ -632,7 +621,7 @@ function createGameDir(template, gameName, outDir,
             // pkg.dependencies = sortedObject(pkg.dependencies);
 
             // write files
-            
+
             write(path.resolve(outDir, 'package.json'),
                   JSON.stringify(pkg, null, 4));
             write(path.resolve(outDir, '.gitignore'),
@@ -643,16 +632,14 @@ function createGameDir(template, gameName, outDir,
     }
 }
 
-/**
- * Copies a file to a destination
- *
- *
- *
- */
-function copyTemplate(from, to) {
-    from = path.join(__dirname, '..', 'templates', from);
-    write(to, fs.readFileSync(from, 'utf-8'));
-}
+// /**
+//  * Copies a file to a destination
+//  *
+//  */
+// function copyTemplate(from, to) {
+//     from = path.join(__dirname, '..', 'templates', from);
+//     write(to, fs.readFileSync(from, 'utf-8'));
+// }
 
 /**
  * Check if the given directory `path` is empty.
@@ -661,43 +648,17 @@ function copyTemplate(from, to) {
  * @param {Function} fn
  */
 function emptyDirectory(dir, fn) {
-    fs.readdir(dir, function(err, files){
-        if (err && 'ENOENT' != err.code) throw err;
+    fs.readdir(dir, function(err, files) {
+        if (err && 'ENOENT' !== err.code) throw err;
         fn(!files || !files.length);
     });
 }
 
-/**
- * Graceful exit for async STDIO
- */
-function exit(code) {
-    // flush output for Node.js Windows pipe bug
-    // https://github.com/joyent/node/issues/6247 is just one bug example
-    // https://github.com/visionmedia/mocha/issues/333 has a good discussion
-    function done() {
-        if (!(draining--)) _exit(code);
-    }
-
-    var draining = 0;
-    var streams = [process.stdout, process.stderr];
-
-    exit.exited = true;
-
-    streams.forEach(function(stream){
-        // submit empty write request and wait for completion
-        draining += 1;
-        stream.write('', done);
-    });
-
-    done();
-}
-
 /**
  * Determine if launched from cmd.exe
  */
 function launchedFromCmd() {
-    return process.platform === 'win32'
-        && process.env._ === undefined;
+    return process.platform === 'win32' && process.env._ === undefined;
 }
 
 /**
@@ -794,8 +755,8 @@ function createGame(options) {
         }
         else {
             colorWrite('Warning!', true);
-            str = destinationPath + ' is not empty, do '
-                + 'you want to continue? [y/N] ';
+            str = destinationPath + ' is not empty, do you want to ' +
+                'continue? [y/N] ';
             confirm(str, function(ok) {
                 if (ok) {
                     process.stdin.destroy();
@@ -808,7 +769,7 @@ function createGame(options) {
                 }
                 else {
                     console.error('aborting');
-                    exit(1);
+                    process.exit(1);
                 }
             });
         }
@@ -853,24 +814,28 @@ function createConfFile(cb) {
 
         // Add trailing slashes.
         if (launchedFromCmd()) {
-            if (answer.substring(answer.length-2)!== '\\') answer += '\\';
+            if (answer.substring(answer.length - 2) !== '\\') {
+                answer += '\\';
+            }
         }
         else {
-            if (answer.charAt(answer.length-1) !== path.sep) answer += path.sep;
+            if (answer.charAt(answer.length - 1) !== path.sep) {
+                answer += path.sep;
+            }
         }
 
         // Set nodeGame dir.
         conf.ngDir = answer;
 
         str = 'Default author name: ';
-        if (conf.author) str += '[' + conf.author +'] ';
+        if (conf.author) str += '[' + conf.author + '] ';
 
         rl.question(str, function(answer) {
 
             if (answer) conf.author = answer;
 
             str = 'Default author email: ';
-            if (conf.email) str += '[' + conf.email +'] ';
+            if (conf.email) str += '[' + conf.email + '] ';
             rl.question(str, function(answer) {
 
                 if (answer) conf.email = answer;
@@ -883,41 +848,36 @@ function createConfFile(cb) {
             });
         });
     });
-
-//     // Normalize to absolute if not already.
-//     if (!path.isAbsolute(conf.ngGamesAvailDir)) {
-//         conf.ngGamesAvailDir = path.normalize(root, confFile.ngGamesAvailDir);
-//     }
 }
 
-function loadTemplates() {
-    let dir = conf.ngGamesAvailDir;
-
-    fs.readdirSync(dir).forEach(function(file, index){
-        let curPath = path.join(dir, file);
-        //  Recurse.
-        if (fs.lstatSync(curPath).isDirectory()) {
-            var name;
-            try {
-                let packageJson = require(path.join(curPath, 'package.json'));
-                name = packageJson.name;
-                if (name) templates[name] = curPath;
-            }
-            catch(e) {
-                // Ignore errors for now.
-            }
-        }
-
-    });
-}
+// function loadTemplates() {
+//     let dir = conf.ngGamesAvailDir;
+//
+//     fs.readdirSync(dir).forEach(function(file, index) {
+//         let curPath = path.join(dir, file);
+//         //  Recurse.
+//         if (fs.lstatSync(curPath).isDirectory()) {
+//             var name;
+//             try {
+//                let packageJson = require(path.join(curPath, 'package.json'));
+//                 name = packageJson.name;
+//                 if (name) templates[name] = curPath;
+//             }
+//             catch(e) {
+//                 // Ignore errors for now.
+//             }
+//         }
+//
+//     });
+// }
 
 function showConf(localConf) {
     localConf = localConf || conf;
     console.log('');
     colorWrite('Configuration: ', true);
-    console.log("    Games folder path: ", conf.ngGamesAvailDir);
-    console.log("          Author name: ", conf.author);
-    console.log("         Author email: ", conf.email);
+    console.log('    Games folder path: ', localConf.ngGamesAvailDir);
+    console.log('          Author name: ', localConf.author);
+    console.log('         Author email: ', localConf.email);
     console.log('');
     console.log('To change run nodegame update-conf');
     console.log('');
@@ -981,7 +941,7 @@ function makeLink(from, to, type) {
 // Parsing options.
 program.parse(process.argv);
 
-let firstCommand = program.rawArgs[2]
+let firstCommand = program.rawArgs[2];
 if (!program.args.length) {
     if (firstCommand !== '--help' && firstCommand !== '-h' &&
         firstCommand !== '--version' && firstCommand !== '-V'
diff --git a/package.json b/package.json
index ee3af63..a545135 100644
--- a/package.json
+++ b/package.json
@@ -14,18 +14,20 @@
   "repository": "nodeGame/generator",
   "license": "MIT",
   "dependencies": {
-    "commander": "2.6.0",
-    "mkdirp": "0.5.0",
-    "sorted-object": "1.0.0",
     "JSUS": "*",
+    "commander": "2.6.0",
+    "dictator": "*",
     "fs-extra": "*",
+    "mkdirp": "0.5.0",
     "nodegame-game-template": "*",
-    "dictator": "*",
+    "sorted-object": "1.0.0",
     "ultimatum-game": "*"
   },
   "main": "bin/nodegame",
   "preferGlobal": true,
   "devDependencies": {
+    "eslint": "^5.5.0",
+    "jshint": "^2.9.6",
     "mocha": "~2.1.0",
     "should": "4.4.1"
   },

From 6dfe3821d9566534e389a2819085ba244ceddc2e Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 13 Sep 2018 07:21:45 -0400
Subject: [PATCH 14/68] updated lint file

---
 .eslintrc.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index da2d19d..75c9eb4 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -31,9 +31,9 @@
         "semi-spacing": [2, {"before": false, "after": true}],
         "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
         "keyword-spacing": [2, {"overrides": {
-            "if": {"after": false},
-            "for": {"after": false},
-            "while": {"after": false},
+            "if": {"after": true},
+            "for": {"after": true},
+            "while": {"after": true},
             "switch": {"after": false},
             "catch": {"after": false}
         }}],

From 314678a06e2f3d10e91a08f58e9a8413c8b6ce72 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 13 Sep 2018 15:18:15 -0400
Subject: [PATCH 15/68] minor

---
 package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index a545135..c83f7b4 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,9 @@
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",
-    "framework",
-    "web",
+    "boilerplate",
+    "template",
+    "cli",
     "game",
     "multiplayer",
     "realtime"
@@ -32,6 +33,6 @@
     "should": "4.4.1"
   },
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 6.0.0"
   }
 }

From 5fcc204287fa90665e92848632748328d395c56a Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 13 Sep 2018 15:30:01 -0400
Subject: [PATCH 16/68] mods

---
 bin/nodegame | 97 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 73 insertions(+), 24 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index e172689..9864e5f 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -5,6 +5,9 @@ const mkdirp = require('mkdirp');
 const fs = require('fs-extra');
 const path = require('path');
 const readline = require('readline');
+const Writable = require('stream').Writable;
+const Prompt = require('prompt-password');
+
 // const sortedObject = require('sorted-object');
 
 const J = require('JSUS').JSUS;
@@ -20,11 +23,57 @@ const isWin = /^win/.test(process.platform);
 const root = J.resolveModuleDir('nodegame-generator');
 const confFile = path.resolve(root, 'conf', 'generator.conf.json');
 
+// let mutableStdout = new Writable({
+//     write: function(chunk, encoding, cb) {
+//         if (!this.muted) process.stdout.write(chunk, encoding);
+//         if (cb) cb();
+//     }
+// });
+// mutableStdout.muted = false;
+
 let rl = readline.createInterface({
     input: process.stdin,
-    output: process.stdout
+    output: process.stdout,
+    terminal: true
+});
+
+rl.on('SIGINT', function() {
+    rl.close()
+    console.log();
+    console.log();
+    console.log('canceled')
+});
+
+let prompt = new Prompt({
+    type: 'password',
+    message: 'Enter your password (hidden):',
+    name: 'pwd'
 });
 
+// rl.myprompt = '';
+// rl.willBeMuted = false;
+// rl.stdoutMuted = false;
+// rl._writeToOutput = function _writeToOutput(str) {
+//     console.log('length ', str, str.length);
+//     if (rl.stdoutMuted) {
+//         console.log(str);
+//         if (str.match(/^\u001b/)) {
+//             console.log('MATCHED');
+//             str = str.replace(/./g, rl.myprompt);
+//             str = rl.myprompt + str;
+//         }
+//         rl.output.write('*');
+//     }
+//     else {
+//         rl.output.write(str);
+//     }
+//     if (rl.willBeMuted) {
+//         rl.willBeMuted = false;
+//         rl.stdoutMuted = true;
+//     }
+// };
+
+
 // Mock configuration. Will be overwritten.
 var conf = {
     author: 'author',
@@ -50,12 +99,6 @@ const DEFAULT_TEMPLATE = 'dictator';
 // Full copyright string. Will be overwritten.
 var fullCopyright;
 
-// CLI
-
-before(program, 'outputHelp', function() {
-    this.allowUnknownOption();
-});
-
 
 // program
 //     .command('list-templates')
@@ -203,18 +246,6 @@ function checkGameDirs(ngDir) {
     return false;
 }
 
-/**
- * Install a before function; AOP.
- */
-function before(obj, method, fn) {
-    var old = obj[method];
-
-    obj[method] = function() {
-        fn.call(this);
-        old.apply(this, arguments);
-    };
-}
-
 /**
  * Prompt for confirmation on STDOUT/STDIN
  */
@@ -323,7 +354,7 @@ function createGameDir(template, gameName, outDir,
     str = ' - Type a secret passphrase or leave blank to generate a ' +
         'random one\n' +
         '   (Hint: it is used to sign auth tokens, it won\'t be asked again): ';
-
+debugger
     rl.question(str, function(secret) {
 
         if ('undefined' === typeof secret || secret.trim() === '') {
@@ -334,11 +365,28 @@ function createGameDir(template, gameName, outDir,
         str = ' - Enter the ADMIN username: ';
         questionNoBlank(str, function(admin) {
 
-            str = ' - Enter the ADMIN password: ';
-            questionNoBlank(str, function(pwd) {
+            str = ' - Enter the ADMIN password (hidden): ';
+
 
-                str = ' - Confirm the ADMIN password: ';
+            prompt.run()
+                .then(function(answers) {
+                    console.log(answers)
+                });
+
+            return;
+            
+            rl.myprompt = str;
+            rl.willBeMuted = true;
+            questionNoBlank(str, function(pwd) {
+                str = ' - Confirm the ADMIN password (hidden): ';
+                rl.stdoutMuted = false;
+                rl.willBeMuted = true;
+                rl.myprompt = str;
+                console.log();
                 rl.question(str, function(pwd2) {
+                    rl.stdoutMuted = false;
+                    rl.willBeMuted = true;
+                    console.log();
 
                     if (pwd !== pwd2) {
                         console.log('Error: passwords do not match.');
@@ -349,7 +397,7 @@ function createGameDir(template, gameName, outDir,
                     console.log();
                     doIt(secret, admin, pwd);
                 });
-            });
+            }, true);
         });
 
     });
@@ -938,6 +986,7 @@ function makeLink(from, to, type) {
     }
 }
 
+
 // Parsing options.
 program.parse(process.argv);
 

From c6d54064e349ad14ae586a18c4e0b3ac0c107993 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 13 Sep 2018 15:30:17 -0400
Subject: [PATCH 17/68] 4.2.0 but not yet published

---
 CHANGELOG    | 4 ++++
 package.json | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 182703d..26ce6ca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 4.2.0
+- Auto generate secret and credentials files.
+- Eslinted nodegame.
+
 ## 4.1.1
 - Improved parameter checking, display of help.
 - Fixed bug update-conf not loading the latest author and email parameters.
diff --git a/package.json b/package.json
index c83f7b4..97f8d7f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",
@@ -21,6 +21,7 @@
     "fs-extra": "*",
     "mkdirp": "0.5.0",
     "nodegame-game-template": "*",
+    "prompt-password": "^1.2.0",
     "sorted-object": "1.0.0",
     "ultimatum-game": "*"
   },

From d83b4d9d11dc9db8a1ed7028df294de2bf29fb68 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 04:13:22 -0400
Subject: [PATCH 18/68] kind of works

---
 bin/nodegame | 145 +++++++++++++++++++++++++--------------------------
 package.json |   3 +-
 2 files changed, 73 insertions(+), 75 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 9864e5f..a7b4ae4 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -5,10 +5,6 @@ const mkdirp = require('mkdirp');
 const fs = require('fs-extra');
 const path = require('path');
 const readline = require('readline');
-const Writable = require('stream').Writable;
-const Prompt = require('prompt-password');
-
-// const sortedObject = require('sorted-object');
 
 const J = require('JSUS').JSUS;
 const ngt = require('nodegame-game-template');
@@ -23,14 +19,6 @@ const isWin = /^win/.test(process.platform);
 const root = J.resolveModuleDir('nodegame-generator');
 const confFile = path.resolve(root, 'conf', 'generator.conf.json');
 
-// let mutableStdout = new Writable({
-//     write: function(chunk, encoding, cb) {
-//         if (!this.muted) process.stdout.write(chunk, encoding);
-//         if (cb) cb();
-//     }
-// });
-// mutableStdout.muted = false;
-
 let rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -38,40 +26,69 @@ let rl = readline.createInterface({
 });
 
 rl.on('SIGINT', function() {
-    rl.close()
+    rl.close();
     console.log();
     console.log();
-    console.log('canceled')
+    console.log('canceled');
 });
 
-let prompt = new Prompt({
-    type: 'password',
-    message: 'Enter your password (hidden):',
-    name: 'pwd'
-});
+var stdoutConf = {
+    willBeMuted: false,
+    muted: false,
+    lastPrompt: '',
+    origPrompt: ''
+};
+unmute();
 
-// rl.myprompt = '';
-// rl.willBeMuted = false;
-// rl.stdoutMuted = false;
-// rl._writeToOutput = function _writeToOutput(str) {
-//     console.log('length ', str, str.length);
-//     if (rl.stdoutMuted) {
-//         console.log(str);
-//         if (str.match(/^\u001b/)) {
-//             console.log('MATCHED');
-//             str = str.replace(/./g, rl.myprompt);
-//             str = rl.myprompt + str;
-//         }
-//         rl.output.write('*');
-//     }
-//     else {
-//         rl.output.write(str);
-//     }
-//     if (rl.willBeMuted) {
-//         rl.willBeMuted = false;
-//         rl.stdoutMuted = true;
-//     }
-// };
+
+function muteNext() {
+    if (stdoutConf.muted) unmute();
+    stdoutConf.willBeMuted = true;
+}
+
+function unmute() {
+    stdoutConf.willBeMuted = false;
+    stdoutConf.muted = false;
+    stdoutConf.lastPrompt = '';
+    stdoutConf.origPrompt = '';
+}
+
+function mute() {
+    stdoutConf.willBeMuted = false;
+    stdoutConf.muted = true;
+}
+
+
+rl._writeToOutput = function _writeToOutput(str) {
+    // console.log('INPUT ', str, str.length);
+    if (stdoutConf.muted) {
+        if (str.length > 2) {
+            // console.log('LEN : ', str.length);
+            // console.log('1');
+            let len = stdoutConf.lastPrompt.length;
+            let lenOrig = stdoutConf.origPrompt.length;
+            str = stdoutConf.lastPrompt.substr(0, Math.max(lenOrig, len - 1));
+            stdoutConf.lastPrompt = str;
+            rl.output.write(str);
+        }
+        else if (str.length === 2) {
+            rl.output.write(str);
+        }
+        else {
+            // console.log('2');
+            rl.output.write('*');
+            stdoutConf.lastPrompt += '*';
+        }
+    }
+    else {
+        // console.log('3');
+        rl.output.write(str);
+    }
+    if (stdoutConf.willBeMuted) {
+        stdoutConf.lastPrompt = stdoutConf.origPrompt = str;
+        mute();
+    }
+};
 
 
 // Mock configuration. Will be overwritten.
@@ -258,7 +275,7 @@ function confirm(msg, cb) {
 
 function questionNoBlank(msg, cb) {
     rl.question(msg, function(answer) {
-        // console.log('ANSWER WAS: ' + answer);
+        console.log('ANSWER WAS: ' + answer);
         if ('undefined' === typeof answer || answer.trim() === '') {
             questionNoBlank(msg, cb);
             // Needed return otherwise it continues.
@@ -268,7 +285,6 @@ function questionNoBlank(msg, cb) {
     });
 }
 
-
 /**
  * Create application at the given directory `path`.
  *
@@ -326,8 +342,9 @@ function createGameDir(template, gameName, outDir,
         if (--wait) return;
         let tmp;
 
-        // Enable by making a link in games/.
-        makeLink(outDir, path.resolve(conf.ngGamesEnabledDir, gameName));
+        // Enable by making a link in games/, if not there already.
+        tmp = path.resolve(conf.ngGamesEnabledDir, gameName);
+        if (!fs.existsSync(tmp)) makeLink(outDir, tmp);
 
         if (verbose) console.log();
 
@@ -343,7 +360,7 @@ function createGameDir(template, gameName, outDir,
         console.log(' ' + outDir.substr(0, outDir.length - 1));
         console.log();
 
-        colorWrite('Admin Configuration stored in: ', true);
+        colorWrite('Admin configuration stored in: ', true);
         tmp = ' ' + 'channel' + path.sep + 'channel.credentials.js';
         console.log(tmp);
 
@@ -354,38 +371,24 @@ function createGameDir(template, gameName, outDir,
     str = ' - Type a secret passphrase or leave blank to generate a ' +
         'random one\n' +
         '   (Hint: it is used to sign auth tokens, it won\'t be asked again): ';
-debugger
+
     rl.question(str, function(secret) {
 
         if ('undefined' === typeof secret || secret.trim() === '') {
-            secret = J.randomString(15, 'aA!_1');
+            secret = J.randomString(15, 'aA_1');
         }
 
         console.log();
         str = ' - Enter the ADMIN username: ';
         questionNoBlank(str, function(admin) {
-
             str = ' - Enter the ADMIN password (hidden): ';
-
-
-            prompt.run()
-                .then(function(answers) {
-                    console.log(answers)
-                });
-
-            return;
-            
-            rl.myprompt = str;
-            rl.willBeMuted = true;
+            muteNext();
             questionNoBlank(str, function(pwd) {
+                muteNext();
                 str = ' - Confirm the ADMIN password (hidden): ';
-                rl.stdoutMuted = false;
-                rl.willBeMuted = true;
-                rl.myprompt = str;
                 console.log();
                 rl.question(str, function(pwd2) {
-                    rl.stdoutMuted = false;
-                    rl.willBeMuted = true;
+                    mute();
                     console.log();
 
                     if (pwd !== pwd2) {
@@ -398,7 +401,7 @@ debugger
                     doIt(secret, admin, pwd);
                 });
             }, true);
-        });
+        }, true);
 
     });
 
@@ -654,7 +657,7 @@ debugger
                 complete();
             });
 
-            // Package.json
+            // Package.json.
             let pkg = {
                 name: gameName,
                 version: '0.0.1',
@@ -664,11 +667,7 @@ debugger
                 homepage: 'http://nodegame.org'
             };
 
-
-            // sort dependencies like npm(1)
-            // pkg.dependencies = sortedObject(pkg.dependencies);
-
-            // write files
+            // Write files.
 
             write(path.resolve(outDir, 'package.json'),
                   JSON.stringify(pkg, null, 4));
@@ -807,7 +806,7 @@ function createGame(options) {
                 'continue? [y/N] ';
             confirm(str, function(ok) {
                 if (ok) {
-                    process.stdin.destroy();
+                    // process.stdin.destroy();
                     createGameDir(template,
                                   appName,
                                   destinationPath,
diff --git a/package.json b/package.json
index 97f8d7f..82e41af 100644
--- a/package.json
+++ b/package.json
@@ -16,13 +16,12 @@
   "license": "MIT",
   "dependencies": {
     "JSUS": "*",
+    "ansi-escapes": "^3.1.0",
     "commander": "2.6.0",
     "dictator": "*",
     "fs-extra": "*",
     "mkdirp": "0.5.0",
     "nodegame-game-template": "*",
-    "prompt-password": "^1.2.0",
-    "sorted-object": "1.0.0",
     "ultimatum-game": "*"
   },
   "main": "bin/nodegame",

From a596c3f9d358ce9b6617c651dababda4037815a3 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 04:16:18 -0400
Subject: [PATCH 19/68] minor

---
 bin/nodegame | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index a7b4ae4..d85820f 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -19,12 +19,12 @@ const isWin = /^win/.test(process.platform);
 const root = J.resolveModuleDir('nodegame-generator');
 const confFile = path.resolve(root, 'conf', 'generator.conf.json');
 
+// Setup readline.
 let rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
     terminal: true
 });
-
 rl.on('SIGINT', function() {
     rl.close();
     console.log();
@@ -40,7 +40,6 @@ var stdoutConf = {
 };
 unmute();
 
-
 function muteNext() {
     if (stdoutConf.muted) unmute();
     stdoutConf.willBeMuted = true;
@@ -58,7 +57,6 @@ function mute() {
     stdoutConf.muted = true;
 }
 
-
 rl._writeToOutput = function _writeToOutput(str) {
     // console.log('INPUT ', str, str.length);
     if (stdoutConf.muted) {
@@ -90,13 +88,13 @@ rl._writeToOutput = function _writeToOutput(str) {
     }
 };
 
+// Game-creation configuration.
 
-// Mock configuration. Will be overwritten.
+// Will be overwritten.
 var conf = {
     author: 'author',
     email: 'email',
     ngDir: undefined,
-    // Properties below won't be saved in conf file.
     ngVersion: undefined,
     ngGamesAvailDir: undefined,
     ngGamesEnabledDir: undefined,
@@ -113,10 +111,6 @@ var templates = {
 // Chosen template. Default dictator.
 const DEFAULT_TEMPLATE = 'dictator';
 
-// Full copyright string. Will be overwritten.
-var fullCopyright;
-
-
 // program
 //     .command('list-templates')
 //     .description('List all available game templates')
@@ -299,7 +293,8 @@ function createGameDir(template, gameName, outDir,
     var d = new Date();
     var year = d.getFullYear();
     var nodegameCopyright;
-    var str;
+    var str, fullCopyright;
+
 
     nodegameCopyright = 'Copyright(c) ' + year +
         ' Stefano Balietti <ste@nodegame.org>';

From 36004311fee46500c2274eb2ebd55e19d0e0a5f8 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 04:18:29 -0400
Subject: [PATCH 20/68] fixed

---
 bin/nodegame | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/nodegame b/bin/nodegame
index d85820f..0fac8d9 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -269,7 +269,7 @@ function confirm(msg, cb) {
 
 function questionNoBlank(msg, cb) {
     rl.question(msg, function(answer) {
-        console.log('ANSWER WAS: ' + answer);
+        // console.log('ANSWER WAS: ' + answer);
         if ('undefined' === typeof answer || answer.trim() === '') {
             questionNoBlank(msg, cb);
             // Needed return otherwise it continues.

From a35089a8664114fa62a16fa92b434fd805480340 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 04:28:28 -0400
Subject: [PATCH 21/68] description

---
 bin/nodegame | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 0fac8d9..6064500 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -376,6 +376,7 @@ function createGameDir(template, gameName, outDir,
         console.log();
         str = ' - Enter the ADMIN username: ';
         questionNoBlank(str, function(admin) {
+            console.log();
             str = ' - Enter the ADMIN password (hidden): ';
             muteNext();
             questionNoBlank(str, function(pwd) {
@@ -383,7 +384,7 @@ function createGameDir(template, gameName, outDir,
                 str = ' - Confirm the ADMIN password (hidden): ';
                 console.log();
                 rl.question(str, function(pwd2) {
-                    mute();
+                    unmute();
                     console.log();
 
                     if (pwd !== pwd2) {
@@ -392,15 +393,21 @@ function createGameDir(template, gameName, outDir,
                         return;
                     }
 
-                    console.log();
-                    doIt(secret, admin, pwd);
+                    str = ' - Enter a description ' + '(Default: A nodeGame ' +
+                        'game based on ' + template + '): ';
+                    rl.question(str, function(descr) {
+                        descr = descr || 'A nodeGame game based on ' +
+                            template;
+                        console.log();
+                        doIt(secret, admin, pwd, descr);
+                    });
                 });
-            }, true);
-        }, true);
+            });
+        });
 
     });
 
-    function doIt(secret, admin, pwd) {
+    function doIt(secret, admin, pwd, descr) {
 
         // Loading Templates.
         let filePath;
@@ -656,7 +663,7 @@ function createGameDir(template, gameName, outDir,
             let pkg = {
                 name: gameName,
                 version: '0.0.1',
-                description: 'This is a nodeGame game based on ' + template,
+                description: descr,
                 author: author + ' ' + '<' + authorEmail + '>',
                 license: 'MIT/X11',
                 homepage: 'http://nodegame.org'

From 4abd3bdc077067aa9e9371bcdd49285aae0460de Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 04:36:56 -0400
Subject: [PATCH 22/68] README.md

---
 bin/nodegame | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bin/nodegame b/bin/nodegame
index 6064500..8d2fb9b 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -489,6 +489,10 @@ function createGameDir(template, gameName, outDir,
         filePath = path.join('levels', 'README.md');
         var levelsREADME = loadTemplate(t, filePath);
 
+        // README.
+
+        var rootREADME = loadTemplate(t, 'README.template.md');
+        
         mkdir(outDir, function() {
 
             mkdir(path.resolve(outDir, 'data'));
@@ -659,6 +663,14 @@ function createGameDir(template, gameName, outDir,
                 complete();
             });
 
+            // README.
+
+            rootREADME = rootREADME.replace(/{NAME}/g, gameName);
+            rootREADME = rootREADME.replace(/{DESCR}/g, descr);
+            rootREADME = rootREADME.replace(/{AUTHOR}/g, author);
+            rootREADME = rootREADME.replace(/{EMAIL}/g, authorEmail);
+            write(path.resolve(outDir, 'README.md'), rootREADME);
+                
             // Package.json.
             let pkg = {
                 name: gameName,

From f243b32875147f7fe68ebf7bcedb20ef5f93645e Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 06:20:04 -0400
Subject: [PATCH 23/68] writing license

---
 bin/nodegame | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 8d2fb9b..28f598f 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -492,7 +492,12 @@ function createGameDir(template, gameName, outDir,
         // README.
 
         var rootREADME = loadTemplate(t, 'README.template.md');
-        
+
+        // LICENSE.
+
+        var license = loadTemplate(t, 'LICENSE.template');
+
+
         mkdir(outDir, function() {
 
             mkdir(path.resolve(outDir, 'data'));
@@ -670,7 +675,13 @@ function createGameDir(template, gameName, outDir,
             rootREADME = rootREADME.replace(/{AUTHOR}/g, author);
             rootREADME = rootREADME.replace(/{EMAIL}/g, authorEmail);
             write(path.resolve(outDir, 'README.md'), rootREADME);
-                
+
+            // README.
+
+            license = license.replace(/{AUTHOR}/g, author);
+            license = license.replace(/{YEAR}/g, year);
+            write(path.resolve(outDir, 'LICENSE'), license);
+
             // Package.json.
             let pkg = {
                 name: gameName,

From 21e4722011feeaf41923d1aefc63895777a32c32 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 06:28:36 -0400
Subject: [PATCH 24/68] fixed

---
 bin/nodegame | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 28f598f..097e091 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -343,20 +343,26 @@ function createGameDir(template, gameName, outDir,
 
         if (verbose) console.log();
 
-        colorWrite('Copyright string', true);
-        console.log(' ' + fullCopyright);
+        colorWrite('Well done! Game created!', true);
+
+        colorWrite('Copyright string:');
+        console.log('   ' + fullCopyright);
+        console.log();
+
+        colorWrite('Template:');
+        console.log('   ' + template);
         console.log();
 
-        colorWrite('Template', true);
-        console.log(' ' + template);
+        colorWrite('License:');
+        console.log('   MIT');
         console.log();
 
-        colorWrite('Game created', true);
-        console.log(' ' + outDir.substr(0, outDir.length - 1));
+        colorWrite('Game directory:');
+        console.log('   ' + outDir.substr(0, outDir.length - 1));
         console.log();
 
-        colorWrite('Admin configuration stored in: ', true);
-        tmp = ' ' + 'channel' + path.sep + 'channel.credentials.js';
+        colorWrite('Admin configuration stored in:');
+        tmp = '   ' + 'channel' + path.sep + 'channel.credentials.js';
         console.log(tmp);
 
         console.log();

From 4e6bb488df91d668337bb705012e78b65d47142b Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 06:46:02 -0400
Subject: [PATCH 25/68] fixed first install problem

---
 bin/nodegame | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 097e091..af99b41 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -141,6 +141,7 @@ program
 
         loadConfFile(function() {
             // Nothing.
+            rl.close();
         }, true);
     });
 
@@ -156,6 +157,7 @@ program
 
         loadConfFile(function() {
             showConf();
+            rl.close();
         });
     });
 
@@ -179,6 +181,7 @@ program
                 email: email,
                 options: options
             });
+            // rl.close in complete();
         });
 
     });
@@ -262,7 +265,6 @@ function checkGameDirs(ngDir) {
  */
 function confirm(msg, cb) {
     rl.question(msg, function(input) {
-        // rl.close();
         cb(/^y|yes|ok|true$/i.test(input));
     });
 }
@@ -366,6 +368,7 @@ function createGameDir(template, gameName, outDir,
         console.log(tmp);
 
         console.log();
+
         rl.close();
     }
 
@@ -920,8 +923,6 @@ function createConfFile(cb) {
 
                 showConf(conf);
 
-                rl.close();
-
                 writeConfFile(conf, cb);
             });
         });

From bddb585329c3a2b9a3025276451b10cc10550dd2 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 06:46:56 -0400
Subject: [PATCH 26/68] changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 26ce6ca..d5e760b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ## 4.2.0
 - Auto generate secret and credentials files.
 - Eslinted nodegame.
+- Added README and LICENSE
 
 ## 4.1.1
 - Improved parameter checking, display of help.

From 314210784e640297259298d56812d5a6ad915d62 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Fri, 14 Sep 2018 11:49:49 -0400
Subject: [PATCH 27/68] minor

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d5e760b..31b8624 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,8 @@
 ## 4.2.0
 - Auto generate secret and credentials files.
 - Eslinted nodegame.
-- Added README and LICENSE
+- Added README and LICENSE.
+- Description included.
 
 ## 4.1.1
 - Improved parameter checking, display of help.

From af72fdc6b00c4ff0a09a14a3ae61da25b9e0fa0b Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Mon, 17 Sep 2018 06:32:07 -0400
Subject: [PATCH 28/68] CSS file copied

---
 CHANGELOG    | 3 +++
 bin/nodegame | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 31b8624..fddb638 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 4.2.1 (current)
+- CSS file copied
+
 ## 4.2.0
 - Auto generate secret and credentials files.
 - Eslinted nodegame.
diff --git a/bin/nodegame b/bin/nodegame
index af99b41..d3da23a 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -473,6 +473,8 @@ function createGameDir(template, gameName, outDir,
         var endPage = loadTemplate(t, filePath);
         filePath = path.join('public', 'js', 'index.js');
         var indexJS = loadTemplate(t, filePath);
+        filePath = path.join('public', 'css', 'style.css');
+        var styleCSS = loadTemplate(t, filePath);
 
         // VIEWS.
 
@@ -616,6 +618,9 @@ function createGameDir(template, gameName, outDir,
                           indexJS);
 
                     mkdir(path.resolve(outDir, 'public', 'css'), function() {
+                        write(path.resolve(outDir,
+                                           'public', 'css', 'style.css'),
+                              styleCSS);
                         complete();
                     });
                 });

From e152f1e8726f3302efd1233e4f2f18f8b2c74386 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Sat, 1 Dec 2018 18:28:18 -0500
Subject: [PATCH 29/68] .gitignore

---
 bin/nodegame | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/nodegame b/bin/nodegame
index d3da23a..2f33707 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -711,7 +711,7 @@ function createGameDir(template, gameName, outDir,
             write(path.resolve(outDir, 'package.json'),
                   JSON.stringify(pkg, null, 4));
             write(path.resolve(outDir, '.gitignore'),
-                  fs.readFileSync(path.resolve(root, '.gitignore'), 'utf-8'));
+                  loadTemplate(t, '.gitignore'));
 
             complete();
         });

From e5028f2ce726d6930a0d54e186004679c77f9383 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Sat, 1 Dec 2018 18:29:17 -0500
Subject: [PATCH 30/68] 4.2.1

---
 CHANGELOG    | 3 ++-
 package.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fddb638..f35e191 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
 # CHANGELOG
 
-## 4.2.1 (current)
+## 4.2.1
 - CSS file copied
+- .gitignore is correctly handled also in non-dev version.
 
 ## 4.2.0
 - Auto generate secret and credentials files.
diff --git a/package.json b/package.json
index 82e41af..cf87a92 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From 4696f70e2d0f1e3ab131675da1eece14742aba7d Mon Sep 17 00:00:00 2001
From: Stefano Balietti <stbaliet@microsoft.com>
Date: Thu, 7 Mar 2019 14:12:54 -0500
Subject: [PATCH 31/68] 5.0.0

---
 CHANGELOG    | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f35e191..fa0938b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 5.0.0
+- No changes
+
 ## 4.2.1
 - CSS file copied
 - .gitignore is correctly handled also in non-dev version.
diff --git a/package.json b/package.json
index cf87a92..14467e3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "4.2.1",
+  "version": "5.0.0",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From b29fd4f341e815f81dd708abcc46f14bd3495ccb Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Mon, 11 Mar 2019 16:13:48 -0400
Subject: [PATCH 32/68] relative links for games enabled

---
 bin/nodegame | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/nodegame b/bin/nodegame
index 2f33707..0b94099 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -341,7 +341,9 @@ function createGameDir(template, gameName, outDir,
 
         // Enable by making a link in games/, if not there already.
         tmp = path.resolve(conf.ngGamesEnabledDir, gameName);
-        if (!fs.existsSync(tmp)) makeLink(outDir, tmp);
+        if (!fs.existsSync(tmp)) {
+            makeLink(path.join('..', 'games_available', gameName), tmp);
+        }
 
         if (verbose) console.log();
 

From d490e1b6bff19aaa5a5df47b1c640556bdadde6b Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Mon, 11 Mar 2019 16:14:14 -0400
Subject: [PATCH 33/68] changelog

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fa0938b..661c623 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 # CHANGELOG
 
 ## 5.0.0
-- No changes
+- Relative links for games enabled.
 
 ## 4.2.1
 - CSS file copied

From 88a426f71138f1da0252aea123d2f23fc5164a6e Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 14 Mar 2019 14:43:49 -0400
Subject: [PATCH 34/68] games cannot start with a dot

---
 bin/nodegame | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bin/nodegame b/bin/nodegame
index 0b94099..8a33689 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -170,6 +170,14 @@ program
     .allowUnknownOption()
     .action(function(gameName, author, email, options) {
 
+        // Do not generate confusion with hidden folders, e.g. .git.
+        if (gameName.charAt(0) === '.') {
+            console.log('Error: game names cannot start with a dot. ' +
+                        'Please correct the name and try again.');
+            rl.close();
+            return;
+        }
+        
         // This is a commander bug, get around it.
         let c = options.parent.rawArgs[3];
         if (c === '--help' || c === '--h') return;

From 08995e40968b948db192d97975ec8ead81c67cf4 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 14 Mar 2019 14:44:19 -0400
Subject: [PATCH 35/68] changelog

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 661c623..85d7138 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## current
+- Game names cannot start with a dot.
+
 ## 5.0.0
 - Relative links for games enabled.
 

From 22afddec9ddc8a56128da4962c3923cd39bac37e Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 15 Mar 2019 11:55:38 -0400
Subject: [PATCH 36/68] 5.0.1

---
 CHANGELOG    | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 85d7138..cbcc173 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-## current
+## 5.0.1
 - Game names cannot start with a dot.
 
 ## 5.0.0
diff --git a/package.json b/package.json
index 14467e3..b7db818 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From 0d05a88973d137b1227d862db485077f6b664d74 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Mon, 16 Dec 2019 15:21:06 +0100
Subject: [PATCH 37/68] creating private dir

---
 bin/nodegame                     | 18 +++++++++++++++---
 games/dictator/private/.gitkeep  |  0
 games/dictator/private/README.md |  3 +++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 games/dictator/private/.gitkeep
 create mode 100644 games/dictator/private/README.md

diff --git a/bin/nodegame b/bin/nodegame
index 8a33689..4130c91 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -177,7 +177,7 @@ program
             rl.close();
             return;
         }
-        
+
         // This is a commander bug, get around it.
         let c = options.parent.rawArgs[3];
         if (c === '--help' || c === '--h') return;
@@ -298,7 +298,8 @@ function createGameDir(template, gameName, outDir,
                        author, authorEmail, options) {
 
     // Number of synchronous / asynchronous operations.
-    var wait = 9;
+    var wait = 10;
+
     var verbose = !!options.verbose;
     var d = new Date();
     var year = d.getFullYear();
@@ -518,7 +519,6 @@ function createGameDir(template, gameName, outDir,
 
         var license = loadTemplate(t, 'LICENSE.template');
 
-
         mkdir(outDir, function() {
 
             mkdir(path.resolve(outDir, 'data'));
@@ -692,6 +692,18 @@ function createGameDir(template, gameName, outDir,
                 complete();
             });
 
+            // PRIVATE
+            mkdir(path.resolve(outDir, 'private'), () => {
+
+                fs.copySync(ngt.resolve(path.join('private', '.gitkeep')),
+                            path.resolve(outDir, 'private', '.gitkeep'));
+
+                fs.copySync(ngt.resolve(path.join('private', 'README.md')),
+                            path.resolve(outDir, 'private', 'README.md'));
+
+                complete();
+            });
+
             // README.
 
             rootREADME = rootREADME.replace(/{NAME}/g, gameName);
diff --git a/games/dictator/private/.gitkeep b/games/dictator/private/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/games/dictator/private/README.md b/games/dictator/private/README.md
new file mode 100644
index 0000000..3dc7c8c
--- /dev/null
+++ b/games/dictator/private/README.md
@@ -0,0 +1,3 @@
+## private folder
+Store here private files that need to be loaded, such as databases, but not shared.
+This folder is not accessible from outside and it is added to .gitignore.

From 652a560bb631ee646289423abf5ff18ffdf83b64 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Mon, 16 Dec 2019 15:21:38 +0100
Subject: [PATCH 38/68] private-dir

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cbcc173..7bc99ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 5.1.0
+- The private directory is created.
+
 ## 5.0.1
 - Game names cannot start with a dot.
 

From 166781ea73bf9847eaeeac043e70114a6f44e77c Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Wed, 7 Oct 2020 17:06:50 +0200
Subject: [PATCH 39/68] eslint

---
 bin/nodegame | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 4130c91..bef8e92 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -731,9 +731,11 @@ function createGameDir(template, gameName, outDir,
             // Write files.
 
             write(path.resolve(outDir, 'package.json'),
-                  JSON.stringify(pkg, null, 4));
+                JSON.stringify(pkg, null, 4));
             write(path.resolve(outDir, '.gitignore'),
-                  loadTemplate(t, '.gitignore'));
+                loadTemplate(t, '.gitignore'));
+            write(path.resolve(outDir, '.eslintrc.js'),
+                loadTemplate(t, '.eslintrc.js'));
 
             complete();
         });

From 93958b850ff4d6e591377049cabbfb7ad9f48b50 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Tue, 20 Oct 2020 00:15:32 +0200
Subject: [PATCH 40/68] single-player

---
 bin/nodegame | 215 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 145 insertions(+), 70 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index bef8e92..61f6baf 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -383,51 +383,75 @@ function createGameDir(template, gameName, outDir,
         rl.close();
     }
 
-    str = ' - Type a secret passphrase or leave blank to generate a ' +
-        'random one\n' +
-        '   (Hint: it is used to sign auth tokens, it won\'t be asked again): ';
+    str = ' - Is the game single-player? [y/N]\n' +
+          '   (Hint: single-player: labeling task, cognitive task, etc. ' +
+          'Default: No) ';
 
-    rl.question(str, function(secret) {
+    confirm(str, function(singlePlayer, oneRoom) {
 
-        if ('undefined' === typeof secret || secret.trim() === '') {
-            secret = J.randomString(15, 'aA_1');
+        console.log();
+        console.log('   Choice: ' +
+                    (singlePlayer ? 'single' : 'multi') + '-player');
+        console.log();
+
+        if (singlePlayer) {
+            template = 'guessing game';
+            // Setting always to true for now.
+            oneRoom = true;
         }
 
-        console.log();
-        str = ' - Enter the ADMIN username: ';
-        questionNoBlank(str, function(admin) {
+        str = ' - Type a secret passphrase or leave blank to generate a ' +
+            'random one\n' +
+            '   (Hint: it is used to sign auth tokens, ' +
+            'it won\'t be asked again): ';
+
+        rl.question(str, function(secret) {
+
+            if ('undefined' === typeof secret || secret.trim() === '') {
+                secret = J.randomString(15, 'aA_1');
+            }
+
             console.log();
-            str = ' - Enter the ADMIN password (hidden): ';
-            muteNext();
-            questionNoBlank(str, function(pwd) {
-                muteNext();
-                str = ' - Confirm the ADMIN password (hidden): ';
+            str = ' - Enter the ADMIN username: ';
+            questionNoBlank(str, function(admin) {
                 console.log();
-                rl.question(str, function(pwd2) {
-                    unmute();
+                str = ' - Enter the ADMIN password (hidden): ';
+                muteNext();
+                questionNoBlank(str, function(pwd) {
+                    muteNext();
+                    str = ' - Confirm the ADMIN password (hidden): ';
                     console.log();
+                    rl.question(str, function(pwd2) {
+                        unmute();
+                        console.log();
 
-                    if (pwd !== pwd2) {
-                        console.log('Error: passwords do not match.');
-                        process.exit();
-                        return;
-                    }
-
-                    str = ' - Enter a description ' + '(Default: A nodeGame ' +
-                        'game based on ' + template + '): ';
-                    rl.question(str, function(descr) {
-                        descr = descr || 'A nodeGame game based on ' +
+                        if (pwd !== pwd2) {
+                            console.log('Error: passwords do not match.');
+                            process.exit();
+                            return;
+                        }
+
+                        // Description.
+                        let descr = ' A ';
+                        if (singlePlayer) descr += 'single-player ';
+                        descr += 'nodeGame game based on a ' + template;
+                        str = ' - Enter a description (Default:' +
+                              descr + '): ';
+                        rl.question(str, function(descr) {
+                            descr = descr || 'A nodeGame game based on ' +
                             template;
-                        console.log();
-                        doIt(secret, admin, pwd, descr);
+                            console.log();
+                            doIt(secret, admin, pwd, descr,
+                                 singlePlayer, oneRoom);
+                        });
                     });
                 });
             });
-        });
 
+        });
     });
 
-    function doIt(secret, admin, pwd, descr) {
+    function doIt(secret, admin, pwd, descr, singlePlayer, oneRoom) {
 
         // Loading Templates.
         let filePath;
@@ -435,89 +459,136 @@ function createGameDir(template, gameName, outDir,
 
         // AUTH.
         filePath = path.join('auth', 'auth.js');
-        var auth = loadTemplate(t, filePath);
+        let auth = loadTemplate(t, filePath);
         filePath = path.join('auth', 'auth.settings.js');
-        var authSettings = loadTemplate(t, filePath);
+        let authSettings = loadTemplate(t, filePath);
         filePath = path.join('auth', 'auth.codes.js');
-        var authCodes = loadTemplate(t, filePath);
+        let authCodes = loadTemplate(t, filePath);
 
         // CHANNEL.
 
         filePath = path.join('channel', 'channel.settings.js');
-        var channelSettings = loadTemplate(t, filePath);
+        let channelSettings = loadTemplate(t, filePath);
         filePath = path.join('channel', 'channel.secret.js');
-        var channelSecret = loadTemplate(t, filePath);
+        let channelSecret = loadTemplate(t, filePath);
         filePath = path.join('channel', 'channel.credentials.js');
-        var channelCredentials = loadTemplate(t, filePath);
+        let channelCredentials = loadTemplate(t, filePath);
 
         // GAME.
 
-        filePath = path.join('game', 'game.stages.js');
-        var gameStages = loadTemplate(t, filePath);
+        let gameStages, gameSettings;
+        if (singlePlayer) {
+            filePath = path.join('game', 'game.stages_single.js');
+            gameStages = loadTemplate(t, filePath);
+            filePath = path.join('game', 'game.settings_single.js');
+            gameSettings = loadTemplate(t, filePath);
+        }
+        else {
+            filePath = path.join('game', 'game.stages.js');
+            gameStages = loadTemplate(t, filePath);
+            filePath = path.join('game', 'game.settings.js');
+            gameSettings = loadTemplate(t, filePath);
+        }
         filePath = path.join('game', 'game.setup.js');
-        var gameSetup = loadTemplate(t, filePath);
-        filePath = path.join('game', 'game.settings.js');
-        var gameSettings = loadTemplate(t, filePath);
+        let gameSetup = loadTemplate(t, filePath);
 
         // GAME / client_types.
 
-        filePath = path.join('game', 'client_types', 'player.js');
-        var typePlayer = loadTemplate(t, filePath);
-        filePath = path.join('game', 'client_types', 'bot.js');
-        var typeBot = loadTemplate(t, filePath);
-        filePath = path.join('game', 'client_types', 'logic.js');
-        var typeLogic = loadTemplate(t, filePath);
+        let typePlayer, typeBot, typeLogic, typeAutoplay;
+
+        if (singlePlayer) {
+            filePath = path.join('game', 'client_types', 'player_single.js');
+            typePlayer = loadTemplate(t, filePath);
+            filePath = path.join('game', 'client_types', 'bot_single.js');
+            typeBot = loadTemplate(t, filePath);
+            filePath = path.join('game', 'client_types', 'logic_single.js');
+            typeLogic = loadTemplate(t, filePath);
+            filePath = path.join('game', 'client_types', 'autoplay_single.js');
+            typeAutoplay = loadTemplate(t, filePath);
+        }
+        else {
+            filePath = path.join('game', 'client_types', 'player.js');
+            typePlayer = loadTemplate(t, filePath);
+            filePath = path.join('game', 'client_types', 'bot.js');
+            typeBot = loadTemplate(t, filePath);
+            filePath = path.join('game', 'client_types', 'logic.js');
+            typeLogic = loadTemplate(t, filePath);
+            filePath = path.join('game', 'client_types', 'autoplay.js');
+            typeAutoplay = loadTemplate(t, filePath);
+        }
+
+
         filePath = path.join('game', 'client_types', 'phantom.js');
-        var typePhantom = loadTemplate(t, filePath);
-        filePath = path.join('game', 'client_types', 'autoplay.js');
-        var typeAutoplay = loadTemplate(t, filePath);
+        let typePhantom = loadTemplate(t, filePath);
 
         // PUBLIC.
 
         filePath = path.join('public', 'index.htm');
-        var indexPage = loadTemplate(t, filePath);
-        filePath = path.join('public', 'game.htm');
-        var gamePage = loadTemplate(t, filePath);
-        filePath = path.join('public', 'instructions.htm');
-        var instrPage = loadTemplate(t, filePath);
-        filePath = path.join('public', 'end.htm');
-        var endPage = loadTemplate(t, filePath);
+        let indexPage = loadTemplate(t, filePath);
+
+        let gamePage, instrPage;
+
+        if (singlePlayer) {
+            filePath = path.join('public', 'game_single.htm');
+            gamePage = loadTemplate(t, filePath);
+
+            filePath = path.join('public', 'instructions_single.htm');
+            instrPage = loadTemplate(t, filePath);
+        }
+        else {
+            filePath = path.join('public', 'game.htm');
+            gamePage = loadTemplate(t, filePath);
+
+            filePath = path.join('public', 'instructions.htm');
+            instrPage = loadTemplate(t, filePath);
+        }
+
+
+        // filePath = path.join('public', 'end.htm');
+        // let endPage = loadTemplate(t, filePath);
         filePath = path.join('public', 'js', 'index.js');
-        var indexJS = loadTemplate(t, filePath);
+        let indexJS = loadTemplate(t, filePath);
         filePath = path.join('public', 'css', 'style.css');
-        var styleCSS = loadTemplate(t, filePath);
+        let styleCSS = loadTemplate(t, filePath);
 
         // VIEWS.
 
 
         // WAITROOM.
+        let waitroomSettings;
+        if (singlePlayer) {
+            filePath = path.join('waitroom', 'waitroom.settings_single.js');
+            waitroomSettings = loadTemplate(t, filePath);
+        }
+        else {
+            filePath = path.join('waitroom', 'waitroom.settings.js');
+            waitroomSettings = loadTemplate(t, filePath);
 
-        filePath = path.join('waitroom', 'waitroom.settings.js');
-        var waitroomSettings = loadTemplate(t, filePath);
+        }
         filePath = path.join('waitroom', 'waitroom.js');
-        var waitroom = loadTemplate(t, 'waitroom/waitroom.js');
+        let waitroom = loadTemplate(t, 'waitroom/waitroom.js');
 
         // REQUIREMENTS.
 
         filePath = path.join('requirements', 'requirements.settings.js');
-        var requirementsSettings = loadTemplate(t, filePath);
+        let requirementsSettings = loadTemplate(t, filePath);
         filePath = path.join('requirements', 'requirements.room.js');
-        var requirementsRoom = loadTemplate(t, filePath);
+        let requirementsRoom = loadTemplate(t, filePath);
         filePath = path.join('requirements', 'requirements.js');
-        var requirements = loadTemplate(t, filePath);
+        let requirements = loadTemplate(t, filePath);
 
         // LEVELS.
 
         filePath = path.join('levels', 'README.md');
-        var levelsREADME = loadTemplate(t, filePath);
+        let levelsREADME = loadTemplate(t, filePath);
 
         // README.
 
-        var rootREADME = loadTemplate(t, 'README.template.md');
+        let rootREADME = loadTemplate(t, 'README.template.md');
 
         // LICENSE.
 
-        var license = loadTemplate(t, 'LICENSE.template');
+        let license = loadTemplate(t, 'LICENSE.template');
 
         mkdir(outDir, function() {
 
@@ -616,8 +687,8 @@ function createGameDir(template, gameName, outDir,
                 write(filePath, instrPage);
                 filePath = path.resolve(outDir, 'public', 'game.htm');
                 write(filePath, gamePage);
-                filePath = path.resolve(outDir, 'public', 'end.htm');
-                write(filePath, endPage);
+                // filePath = path.resolve(outDir, 'public', 'end.htm');
+                // write(filePath, endPage);
 
                 // Copying favicon over.
                 fs.copySync(ngt.resolve(path.join('public', 'favicon.ico')),
@@ -652,6 +723,10 @@ function createGameDir(template, gameName, outDir,
             // WAITROOM.
             mkdir(path.resolve(outDir, 'waitroom'), function() {
 
+                let value = oneRoom ? 'true' : 'false';
+                waitroomSettings = waitroomSettings
+                                       .replace(/{SAME_ROOM_VALUE}/g, value);
+
                 waitroom = substituteHeader(waitroom);
                 waitroomSettings = substituteHeader(waitroomSettings);
 

From 58b40053929bb2237c45c6f20b0b8f03c18908d1 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Tue, 20 Oct 2020 17:16:28 +0200
Subject: [PATCH 41/68] single-player game

---
 bin/nodegame | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 61f6baf..979c057 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -384,7 +384,7 @@ function createGameDir(template, gameName, outDir,
     }
 
     str = ' - Is the game single-player? [y/N]\n' +
-          '   (Hint: single-player: labeling task, cognitive task, etc. ' +
+          '   (Hint: single-player: labeling task, survey, etc. ' +
           'Default: No) ';
 
     confirm(str, function(singlePlayer, oneRoom) {
@@ -679,7 +679,7 @@ function createGameDir(template, gameName, outDir,
             // PUBLIC.
             mkdir(path.resolve(outDir, 'public'), function() {
                 indexJS = substituteHeader(indexJS);
-                instrPage = instrPage.replace('{NAME}', gameName);
+                // instrPage = instrPage.replace('{NAME}', gameName);
 
                 let filePath = path.resolve(outDir, 'public', 'index.htm');
                 write(filePath, indexPage);

From 9c78ef73f13b7addaa62e7b74d62e9c3069f8960 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Tue, 20 Oct 2020 17:17:27 +0200
Subject: [PATCH 42/68] changelog

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7bc99ed..48500a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 6.0.0
+- Single-player game.
+
 ## 5.1.0
 - The private directory is created.
 

From a943ddc81dafa78aeb506eca5dbe3cbf507a3194 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Tue, 20 Oct 2020 17:17:48 +0200
Subject: [PATCH 43/68] 6.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b7db818..4e88c3a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "5.0.1",
+  "version": "6.0.0",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From b1e78159df9e64a08abd3d0e914291e72319e7b7 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 22 Oct 2020 15:32:55 +0200
Subject: [PATCH 44/68] better error handling; adding endpoint into index.js

---
 bin/nodegame | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 979c057..1e31211 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -19,6 +19,9 @@ const isWin = /^win/.test(process.platform);
 const root = J.resolveModuleDir('nodegame-generator');
 const confFile = path.resolve(root, 'conf', 'generator.conf.json');
 
+const NODEGAME_MODULE = 'nodegame';
+// const NODEGAME_MODULE = 'nodegame-test';
+
 // Setup readline.
 let rl = readline.createInterface({
     input: process.stdin,
@@ -170,6 +173,12 @@ program
     .allowUnknownOption()
     .action(function(gameName, author, email, options) {
 
+        if (!gameName) {
+            console.log('Error: game name is missing.');
+            rl.close();
+            return;
+        }
+
         // Do not generate confusion with hidden folders, e.g. .git.
         if (gameName.charAt(0) === '.') {
             console.log('Error: game names cannot start with a dot. ' +
@@ -220,7 +229,7 @@ function detectNodeGameInstallation() {
             // Nothing.
         }
     }
-    if (ngPkg.name === 'nodegame') {
+    if (ngPkg.name === NODEGAME_MODULE) {
 
         console.log('NodeGame v' + ngPkg.version +
                     ' installation detected in: ');
@@ -679,6 +688,7 @@ function createGameDir(template, gameName, outDir,
             // PUBLIC.
             mkdir(path.resolve(outDir, 'public'), function() {
                 indexJS = substituteHeader(indexJS);
+                indexJS = indexJS.replace('{ENDPOINT}', ('/' + gameName));
                 // instrPage = instrPage.replace('{NAME}', gameName);
 
                 let filePath = path.resolve(outDir, 'public', 'index.htm');
@@ -897,9 +907,10 @@ function createGame(options) {
     else {
         // Is there a default game folder?
         if (!conf.ngGamesAvailDir) {
-            console.log('Error: no default game folder found. Please ' +
-                        'provide an absolute path for the game, or ' +
-                        'set the default game folder');
+            console.log('Error: no default games folder found. Please ' +
+                        'provide an absolute path for the game, or set the ' +
+                        'default games folder with command "update-conf"');
+            rl.close();
             return;
         }
         destinationPath = path.resolve(conf.ngGamesAvailDir, options.game);

From cfba84d7e34d8612f82d55f6f4b64a15f0292a0e Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 29 Oct 2020 10:21:38 +0100
Subject: [PATCH 45/68] minor

---
 bin/nodegame | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/nodegame b/bin/nodegame
index 1e31211..3e3b00a 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -447,7 +447,7 @@ function createGameDir(template, gameName, outDir,
                         str = ' - Enter a description (Default:' +
                               descr + '): ';
                         rl.question(str, function(descr) {
-                            descr = descr || 'A nodeGame game based on ' +
+                            descr = descr || 'A nodeGame game based on a ' +
                             template;
                             console.log();
                             doIt(secret, admin, pwd, descr,

From cc97f51d741694b53e63d16a4720753e89af82b3 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 29 Oct 2020 10:22:06 +0100
Subject: [PATCH 46/68] 6.0.1

---
 CHANGELOG    | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 48500a1..bd9f212 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 6.0.1
+- Minor text.
+
 ## 6.0.0
 - Single-player game.
 
diff --git a/package.json b/package.json
index 4e88c3a..be6c196 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From b2712bd6f9925f93e613f3814e64c226f68daac5 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Wed, 4 Nov 2020 22:20:58 +0100
Subject: [PATCH 47/68] generator update-conf also sets the games directories

---
 bin/nodegame | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bin/nodegame b/bin/nodegame
index 3e3b00a..51c150a 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -1023,6 +1023,16 @@ function createConfFile(cb) {
         // Set nodeGame dir.
         conf.ngDir = answer;
 
+        // Add game directories to conf.
+        let gameDirs = checkGameDirs(answer);
+        if (!gameDirs) {
+            console.log('Err: Folders games and/or games_available ' +
+                        'could not be found');
+            return;
+        }
+        conf.ngGamesAvailDir = gameDirs.ngGamesAvailDir;
+        conf.ngGamesEnabledDir = gameDirs.ngGamesEnabledDir;
+
         str = 'Default author name: ';
         if (conf.author) str += '[' + conf.author + '] ';
 
@@ -1124,6 +1134,8 @@ function colorWrite(str, br) {
 
 function makeLink(from, to, type) {
     if (isWin) {
+        // console.log(from);
+        // console.log(to);
         if (type === 'file') fs.linkSync(from, to, 'file');
         else fs.symlinkSync(from, to, 'junction');
     }

From 349afdc20a916f7a59d7d9dafedd621426c62759 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Wed, 4 Nov 2020 22:22:14 +0100
Subject: [PATCH 48/68] update-conf updated

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index bd9f212..7a51452 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 6.0.2 current
+- Games directories are always set by update-conf.
+
 ## 6.0.1
 - Minor text.
 

From 268b04bb423d70fe666a5cc7adc94a5f991ca42a Mon Sep 17 00:00:00 2001
From: Stefano Balieti <futur.dorko@gmail.com>
Date: Fri, 26 Feb 2021 14:13:06 +0100
Subject: [PATCH 49/68] fixed errors with new version of commander

---
 bin/nodegame | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 51c150a..f5d813a 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -138,10 +138,6 @@ program
     .allowUnknownOption()
     .action(function(options) {
 
-        // This is a commander bug, get around it.
-        let c = options.parent.rawArgs[3];
-        if (c === '--help' || c === '--h') return;
-
         loadConfFile(function() {
             // Nothing.
             rl.close();
@@ -154,10 +150,6 @@ program
     .allowUnknownOption()
     .action(function(options) {
 
-        // This is a commander bug, get around it.
-        let c = options.parent.rawArgs[3];
-        if (c === '--help' || c === '--h') return;
-
         loadConfFile(function() {
             showConf();
             rl.close();
@@ -187,10 +179,6 @@ program
             return;
         }
 
-        // This is a commander bug, get around it.
-        let c = options.parent.rawArgs[3];
-        if (c === '--help' || c === '--h') return;
-
         loadConfFile(function() {
             createGame({
                 game: gameName,

From 0e58c1d4cf1a490f1f2ec01c9f2e7322063280dd Mon Sep 17 00:00:00 2001
From: Stefano Balieti <futur.dorko@gmail.com>
Date: Thu, 8 Apr 2021 09:58:53 +0200
Subject: [PATCH 50/68] 6.0.2

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7a51452..92ba846 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
 # CHANGELOG
 
-## 6.0.2 current
+## 6.0.2
 - Games directories are always set by update-conf.
+- Updated to newer version of commander.
 
 ## 6.0.1
 - Minor text.

From 9351df90c77c55df33e6174213cd60ee1b647574 Mon Sep 17 00:00:00 2001
From: Stefano Balieti <futur.dorko@gmail.com>
Date: Thu, 8 Apr 2021 09:59:20 +0200
Subject: [PATCH 51/68] 6.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be6c196..b9541a5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From 0e5aec6d5f0b6ce35f316cad618e053f233a0c1f Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 13 Aug 2021 14:15:45 +0200
Subject: [PATCH 52/68] working on export

---
 bin/nodegame  |  60 +++++++-
 lib/export.js | 387 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 445 insertions(+), 2 deletions(-)
 create mode 100644 lib/export.js

diff --git a/bin/nodegame b/bin/nodegame
index f5d813a..f1c064f 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -19,6 +19,8 @@ const isWin = /^win/.test(process.platform);
 const root = J.resolveModuleDir('nodegame-generator');
 const confFile = path.resolve(root, 'conf', 'generator.conf.json');
 
+const exp = require(path.resolve(root, 'lib', 'export.js'));
+
 const NODEGAME_MODULE = 'nodegame';
 // const NODEGAME_MODULE = 'nodegame-test';
 
@@ -191,6 +193,57 @@ program
 
     });
 
+program
+    .command('export-data [game_name]')
+    .description('Exports data from a game.')
+    .option('-d, --export-dir', 'path to export directory')
+    .option('-r, --room', 'room/s to export')
+    .option('-v, --verbose', 'verbose output')
+    .allowUnknownOption()
+    .action(function(gameName, options) {
+
+        if (!gameName) {
+            console.log('Error: game name is missing.');
+            rl.close();
+            return;
+        }
+
+
+        loadConfFile(() => {
+            console.log();
+            console.log(' *** Exporting data from game: ' + gameName);
+            console.log();
+            exp.data(conf, gameName, options, () => {
+                console.log();
+                console.log(' *** Export finished.');
+                console.log();
+                process.exit();
+            });
+        });
+
+    });
+
+program
+    .command('export-logs [type]')
+    .description('Exports logs from nodeGame server')
+// .option('-t, --template <template>', 'set the template for game')
+    .option('-f, --force', 'force on non-empty directory')
+    .option('-v, --verbose', 'verbose output')
+    .allowUnknownOption()
+    .action(function(gameName, options) {
+
+        if (!gameName) {
+            console.log('Error: game name is missing.');
+            rl.close();
+            return;
+        }
+
+        loadConfFile(() => exp.logs(conf, gameName, options, () => {
+            process.exit();
+        }));
+
+    });
+
 /**
  * ## detectNodeGameInstallation
  *
@@ -976,7 +1029,7 @@ function createConfFile(cb) {
     }
     if (conf.ngDir) str += '[' + conf.ngDir + '] ';
 
-    colorWrite('Input missing information, enter to keep default');
+    colorWrite('Please add missing info or press enter to keep default');
 
     rl.question(str, function(answer) {
 
@@ -1148,7 +1201,10 @@ else {
 
     if (firstCommand !== 'create-game' &&
         firstCommand !== 'show-conf' &&
-        firstCommand !== 'update-conf') {
+        firstCommand !== 'update-conf' &&
+        firstCommand !== 'export-data' &&
+        firstCommand !== 'export-logs'
+    ) {
 
         console.log('Error: invalid command: ' + firstCommand);
     }
diff --git a/lib/export.js b/lib/export.js
new file mode 100644
index 0000000..0c5b95b
--- /dev/null
+++ b/lib/export.js
@@ -0,0 +1,387 @@
+const path = require('path');
+const fs = require('fs');
+const NDDB = require('NDDB');
+const J = require('JSUS').JSUS;
+
+
+
+const getDefaultExportDir = conf => {
+    return path.join(conf.ngDir, 'export');
+};
+
+/**
+* ### getExtension
+*
+* Extracts the extension from a file name
+*
+*
+* @param {string} file The filename
+*
+* @return {string} The extension or NULL if not found
+*/
+const getExtension = (file) => {
+    let format = file.lastIndexOf('.');
+    return format < 0 ? null : file.substr(format + 1);
+};
+
+/**
+* ### getExtension
+*
+* Extracts the extension from a file name
+*
+*
+* @param {string} file The filename
+*
+* @return {string} The extension or NULL if not found
+*/
+const incrementFileIdx = (file, idx = 0) => {
+    let format = file.lastIndexOf('.');
+    return `${file.substr(0, format)}_${++idx}${file.substr(format)}`;
+};
+
+// Keeps track of open saving operations
+let saving = 0;
+
+const exportLogs = (serverConf, opts, cb) => {
+
+    // Data directory.
+    const DATADIR = path.resolve(serverConf.ngDir, 'logs');
+
+    // Output directory.
+    const OUTDIR = opts.exportDir ?? getDefaultExportDir(serverConf);
+
+    // Limit to room numbers.
+
+    const minLog = opts.minLog || false;
+    const maxLog = opts.maxLog || false;
+
+    const dirFilter = (dir) => {
+        // Filter room number.
+        if (minLog || maxLog) {
+            let roomNum = dir.split('room')[1];
+            roomNum = J.isInt(roomNum);
+            // Skip directories not like rooom0000X.
+            if (!roomNum) return false;
+            if (minLog && roomNum < minLog) return false;
+            if (maxLog && roomNum > maxLog) return false;
+        }
+        return true;
+    };
+
+    // Convert to CSV.
+    const CONVERT_JSON_TO_CSV = opts.json2csv ?? true;
+
+    // Create a sub-directory within export directory.
+    const CREATE_EXPORT_SUBDIR = opts.exportSubdir ?? false;
+
+    // 'err' | 'append' ;
+    const ON_DUPLICATED_NAMES = opts.onDuplicatedNames ?? 'rename';
+
+    // TODO: implement it.
+    const VERBOSE = opts.verbose ?? true;
+
+    const INCOMING = opts.incoming ?? true;
+
+    const OUTGOING = opts.outgoing ?? false;
+
+    if (!INCOMING && !OUTGOING) {
+        console.log(' - Err: export logs messages must specify either ' +
+                    ' incoming outgoing');
+        return;
+    }
+
+    // Load all files.
+
+    let checkUnique = {};
+
+    if (!fs.existsSync(OUTDIR)) {
+        fs.mkdirSync(OUTDIR);
+        console.log('- created ' + OUTDIR);
+    }
+
+    let OUTDIR_EXPORT = OUTDIR;
+
+    if (CREATE_EXPORT_SUBDIR) {
+        // Create dir name based on time.
+        let t = new Date().toISOString().replaceAll(':', '-').replace('T', '_');
+        t = t.substr(0, t.lastIndexOf('.'));
+
+        OUTDIR_EXPORT = path.join(OUTDIR, t);
+        if (!fs.existsSync(OUTDIR_EXPORT)) {
+            fs.mkdirSync(OUTDIR_EXPORT);
+            console.log('- created ' + OUTDIR_EXPORT);
+        }
+    }
+
+    // Array of files that will be loaded (if found).
+    const FILES = [
+        'messages'
+    ];
+
+    FILES.forEach((file) => {
+        if (checkUnique[file]) {
+            console.log(`- skipping duplicated file: ${file}`);
+            return;
+        }
+        console.log('- searching for files with pattern: ' + file);
+
+        checkUnique[file] = true;
+
+        let db = NDDB.db();
+        let db2;
+
+        db2 = NDDB.db();
+        db.on('insert', (item) => {
+            if (item.type === 'out-ID') {
+                if (!OUTGOING) return false;
+            }
+            else {
+                if (!INCOMING) return false;
+            }
+
+            let i = J.parse(item.message);
+            // console.log(i);
+            // console.log(i.sid);
+            if (!i.sid || !~i.sid.indexOf('explorer1')) return false;
+
+            if (DONE_ONLY) {
+                if (!i.data || !i.data.done) return false;
+            }
+
+            // Session is the server session (not the room number).
+            if (SESSION && i.session !== SESSION) return false;
+
+            i.player = i.from;
+
+            delete i.from;
+            delete i.id;
+            delete i.sid;
+
+            db2.insert(i);
+        });
+
+
+        // Load files.
+        let opts = {
+            recursive: false,
+            filter: file,
+            // dirFilter: dirFilter
+            // Alternative filters:
+            // filter: file => file === 'bonus_prolific.csv',
+            // format: 'csv',
+        };
+
+        db.loadDirSync(DATADIR, opts);
+
+        // Check size.
+        console.log(' items loaded: ' + db.size());
+        if (!db.size()) return;
+
+        // Save out file.
+        opts = {};
+
+
+        if (CONVERT_JSON_TO_CSV) {
+            let ext = getExtension(file);
+            if (ext !== 'csv') {
+                file = file += '.csv';
+                opts.header = 'all';
+                opts.flatten = true;
+                opts.flattenByGroup = 'player';
+            }
+        }
+
+        let outFile = path.resolve(OUTDIR_EXPORT, file);
+
+        // If file with same name already exists in out directory take action.
+        if (fs.existsSync(outFile)) {
+            if (ON_DUPLICATED_NAMES === 'err') {
+                throw new Error(`out file already existing: ${outFile}`);
+            }
+            else if (ON_DUPLICATED_NAMES === 'rename') {
+                let idx = -1;
+                for (; ++idx < 100;) {
+                    outFile = incrementFileIdx(file, idx);
+                    outFile = path.resolve(OUTDIR_EXPORT, outFile);
+                    if (!fs.existsSync(outFile)) break;
+                }
+                if (idx === 100) {
+                    throw new Error(
+                        `max number of files with same suffix in directory` +
+                        `reached: ${file}`
+                    );
+                }
+            } else {
+                opts.append = true;
+            }
+        }
+
+        saving++;
+        db2.save(outFile, opts, () => {
+            if (--saving <= 0) cb();
+        });
+    });
+};
+
+
+const exportData = (serverConf, gameName, opts, cb) => {
+
+
+
+    // Data directory.
+    const DATADIR = path.resolve(serverConf.ngGamesEnabledDir, gameName,'data');
+
+    // Output directory.
+    const OUTDIR = opts.exportDir ?? getDefaultExportDir(serverConf);
+
+    // Limit to room numbers.
+
+    const minRoom = opts.minRoom || false;
+    const maxRoom = opts.maxRoom || false;
+
+    const dirFilter = (dir) => {
+        // Filter room number.
+        if (minRoom || maxRoom) {
+            let roomNum = dir.split('room')[1];
+            roomNum = J.isInt(roomNum);
+            // Skip directories not like rooom0000X.
+            if (!roomNum) return false;
+            if (minRoom && roomNum < minRoom) return false;
+            if (maxRoom && roomNum > maxRoom) return false;
+        }
+        return true;
+    };
+
+    // Convert to CSV.
+    const CONVERT_JSON_TO_CSV = opts.json2csv ?? true;
+
+    // Create a sub-directory within export directory.
+    const CREATE_EXPORT_SUBDIR = opts.exportSubdir ?? false;
+
+    // 'err' | 'append' ;
+    const ON_DUPLICATED_NAMES = opts.onDuplicatedNames ?? 'rename';
+
+    // TODO: implement it.
+    const VERBOSE = opts.verbose ?? true;
+
+    // Load all files.
+
+    let checkUnique = {};
+
+    // TODO make own method.
+    if (!fs.existsSync(OUTDIR)) {
+        fs.mkdirSync(OUTDIR);
+        console.log('- created ' + OUTDIR);
+    }
+
+    let OUTDIR_EXPORT = OUTDIR;
+
+    if (CREATE_EXPORT_SUBDIR) {
+        // Create dir name based on time.
+        let t = new Date().toISOString().replaceAll(':', '-').replace('T', '_');
+        t = t.substr(0, t.lastIndexOf('.'));
+
+        OUTDIR_EXPORT = path.join(OUTDIR, t);
+        if (!fs.existsSync(OUTDIR_EXPORT)) {
+            fs.mkdirSync(OUTDIR_EXPORT);
+            console.log('- created ' + OUTDIR_EXPORT);
+        }
+    }
+
+    // Array of files that will be loaded (if found).
+    const FILES = [
+        'bonus_prolific.csv',
+        'bonus.csv',
+        'memory.json',
+        // 'messages'
+        'memory.csv',
+        'data.json',
+        'data.csv',
+        'times.csv',
+        'times_json',
+        'player_data.csv',
+        'player_data.json'
+    ];
+
+    console.log()
+
+    FILES.forEach((file) => {
+        if (checkUnique[file]) {
+            console.log(`- skipping duplicated file: ${file}`);
+            return;
+        }
+        console.log('- searching for files with pattern: ' + file);
+
+        checkUnique[file] = true;
+
+        let db = NDDB.db();
+
+        // Load files.
+        let opts = {
+            recursive: true,
+            filter: file,
+            dirFilter: dirFilter
+            // Alternative filters:
+            // filter: file => file === 'bonus_prolific.csv',
+            // format: 'csv',
+        };
+        if (file === 'bonus_prolific.csv') opts.header = false;
+        db.loadDirSync(DATADIR, opts);
+
+        // Check size.
+        console.log(' items loaded: ' + db.size());
+        if (!db.size()) return;
+
+        // Save out file.
+        opts = {};
+        if (file === 'bonus_prolific.csv') {
+            opts = {
+                header: false,
+                quote: '',
+            };
+        }
+
+        if (CONVERT_JSON_TO_CSV) {
+            let ext = getExtension(file);
+            if (ext !== 'csv') {
+                file = file += '.csv';
+                opts.header = 'all';
+                opts.flatten = true;
+                opts.flattenByGroup = 'player';
+            }
+        }
+
+        let outFile = path.resolve(OUTDIR_EXPORT, file);
+
+        // If file with same name already exists in out directory take action.
+        if (fs.existsSync(outFile)) {
+            if (ON_DUPLICATED_NAMES === 'err') {
+                throw new Error(`out file already existing: ${outFile}`);
+            }
+            else if (ON_DUPLICATED_NAMES === 'rename') {
+                let idx = -1;
+                for (; ++idx < 100;) {
+                    outFile = incrementFileIdx(file, idx);
+                    outFile = path.resolve(OUTDIR_EXPORT, outFile);
+                    if (!fs.existsSync(outFile)) break;
+                }
+                if (idx === 100) {
+                    throw new Error(
+                        `max number of files with same suffix in directory` +
+                        `reached: ${file}`
+                    );
+                }
+            } else {
+                opts.append = true;
+            }
+        }
+
+        db.save(outFile, opts, () => {
+            if (--saving <= 0) cb();
+        });
+    });
+};
+
+
+
+module.exports = { logs: exportLogs, data: exportData };

From 28f72835dba2db66ce1f101bdbe2856716ac51fa Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 13 Aug 2021 16:42:02 +0200
Subject: [PATCH 53/68] more export...

---
 bin/nodegame  |  28 +++++++++--
 lib/export.js | 130 ++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 128 insertions(+), 30 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index f1c064f..959debd 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -196,11 +196,15 @@ program
 program
     .command('export-data [game_name]')
     .description('Exports data from a game.')
-    .option('-d, --export-dir', 'path to export directory')
-    .option('-r, --room', 'room/s to export')
+    .option('-d, --export-dir <dir>', 'path to export directory')
+    .option('-r, --rooms <rooms>', 'room/s to export')
+    .option('-f, --from-room <room>', 'export from room (included)')
+    .option('-t, --to-room <room>', 'export up to room (included)')
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
-    .action(function(gameName, options) {
+    .action(function(gameName, opts) {
+
+        debugger
 
         if (!gameName) {
             console.log('Error: game name is missing.');
@@ -210,10 +214,25 @@ program
 
 
         loadConfFile(() => {
+
+            debugger
+
+            exp.setDefaults(conf, 'data', opts);
+
             console.log();
             console.log(' *** Exporting data from game: ' + gameName);
+            console.log(' *** Export folder: ' + opts.exportDir);
+            if (opts.minRoom) console.log(' *** Min Room: ' + opts.minRoom);
+            if (opts.maxRoom) console.log(' *** Max Room: ' + opts.maxRoom);
+            if (opts.fromRoom) console.log(' *** From room: ' + opts.fromRoom);
+            if (opts.toRoom) console.log(' *** From room: ' + opts.toRoom);
+            if (opts.rooms) console.log(' *** Rooms: ' + opts.roomsOrig);
+
             console.log();
-            exp.data(conf, gameName, options, () => {
+
+            console.log(opts)
+
+            exp.data(conf, gameName, opts, () => {
                 console.log();
                 console.log(' *** Export finished.');
                 console.log();
@@ -1161,6 +1180,7 @@ function loadConfFile(cb, force) {
         }
     }
     catch(e) {
+        console.log(e);
         console.log('');
         colorWrite('Warning!');
         console.log('nodegame-generator conf file not found or not readable');
diff --git a/lib/export.js b/lib/export.js
index 0c5b95b..5c87a74 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -4,11 +4,6 @@ const NDDB = require('NDDB');
 const J = require('JSUS').JSUS;
 
 
-
-const getDefaultExportDir = conf => {
-    return path.join(conf.ngDir, 'export');
-};
-
 /**
 * ### getExtension
 *
@@ -39,8 +34,8 @@ const incrementFileIdx = (file, idx = 0) => {
     return `${file.substr(0, format)}_${++idx}${file.substr(format)}`;
 };
 
-// Keeps track of open saving operations
-let saving = 0;
+// Keeps track of open processing operations
+let processing = 0;
 
 const exportLogs = (serverConf, opts, cb) => {
 
@@ -123,7 +118,7 @@ const exportLogs = (serverConf, opts, cb) => {
             console.log(`- skipping duplicated file: ${file}`);
             return;
         }
-        console.log('- searching for files with pattern: ' + file);
+        console.log('- Pattern: ' + file);
 
         checkUnique[file] = true;
 
@@ -172,10 +167,13 @@ const exportLogs = (serverConf, opts, cb) => {
         };
 
         db.loadDirSync(DATADIR, opts);
+        processing++;
 
         // Check size.
-        console.log(' items loaded: ' + db.size());
-        if (!db.size()) return;
+        console.log('    items loaded: ' + db.size());
+
+        // No items exit here.
+        if (!db.size()) return checkProcessing(cb);
 
         // Save out file.
         opts = {};
@@ -216,10 +214,7 @@ const exportLogs = (serverConf, opts, cb) => {
             }
         }
 
-        saving++;
-        db2.save(outFile, opts, () => {
-            if (--saving <= 0) cb();
-        });
+        db2.save(outFile, opts, () => checkProcessing(cb) );
     });
 };
 
@@ -236,18 +231,20 @@ const exportData = (serverConf, gameName, opts, cb) => {
 
     // Limit to room numbers.
 
-    const minRoom = opts.minRoom || false;
-    const maxRoom = opts.maxRoom || false;
+    const fromRoom = opts.fromRoom || false;
+    const toRoom = opts.toRoom || false;
+    const rooms = opts.rooms || [];
 
     const dirFilter = (dir) => {
         // Filter room number.
-        if (minRoom || maxRoom) {
+        if (rooms || fromRoom || toRoom) {
             let roomNum = dir.split('room')[1];
             roomNum = J.isInt(roomNum);
             // Skip directories not like rooom0000X.
             if (!roomNum) return false;
-            if (minRoom && roomNum < minRoom) return false;
-            if (maxRoom && roomNum > maxRoom) return false;
+            if (fromRoom && roomNum < fromRoom) return false;
+            if (toRoom && roomNum > toRoom) return false;
+            if (rooms && !~rooms.indexOf(roomNum)) return false;
         }
         return true;
     };
@@ -310,7 +307,7 @@ const exportData = (serverConf, gameName, opts, cb) => {
             console.log(`- skipping duplicated file: ${file}`);
             return;
         }
-        console.log('- searching for files with pattern: ' + file);
+        console.log('- Pattern: ' + file);
 
         checkUnique[file] = true;
 
@@ -329,8 +326,11 @@ const exportData = (serverConf, gameName, opts, cb) => {
         db.loadDirSync(DATADIR, opts);
 
         // Check size.
-        console.log(' items loaded: ' + db.size());
-        if (!db.size()) return;
+        console.log('    items loaded: ' + db.size());
+
+        // No items exit here.
+        if (!db.size()) return checkProcessing(cb);
+
 
         // Save out file.
         opts = {};
@@ -376,12 +376,90 @@ const exportData = (serverConf, gameName, opts, cb) => {
             }
         }
 
-        db.save(outFile, opts, () => {
-            if (--saving <= 0) cb();
-        });
+        db.save(outFile, opts, () => checkProcessing(cb) );
     });
 };
 
 
+const getDefaultExportDir = conf => {
+    return path.join(conf.ngDir, 'export');
+};
+
+const setDefaults = (conf, type, opts) => {
+
+    opts.exportDir = opts.exportDir ?? getDefaultExportDir(conf);
+
+    // Converts non-csv formats to csv.
+    opts.toCsv = opts.toCsv ?? true;
+    // Create a sub-directory within export directory.
+    opts.createExportSubdir = opts.createExportSubdir ?? false;
+    // Create a sub-directory within export directory.
+    opts.createExportSubdir = opts.createExportSubdir ?? false;
+    // If a file with same name exists inside the export dir.
+    // Other values: 'err' | 'append' ;
+    opts.onDuplicatedNames = opts.onDuplicatedNames ?? 'rename';
+
+    opts.verbose = opts.verbos ?? true;
+
+
+    if (opts.rooms) {
+        let tokens = opts.rooms.split(',')
+        let out = [];
+        tokens.forEach(token => {
+            let idx = token.indexOf('-');
+            if (!~idx) return out.push(token);
+            let l = token.substring(0, idx);
+            l = J.isInt(l);
+            if (false === l) {
+                console.log('err: invalid room parameter: ' + opts.rooms);
+                return;
+            }
+
+            let r = token.substring(idx+1);
+            r = J.isInt(r);
+            if (false === r) {
+                console.log('err: invalid room parameter: ' + opts.rooms);
+                return;
+            }
+
+            J.seq(l, r, 1, t => out.push(t));
+
+        });
+        opts.roomsOrig = J.clone(opts.rooms);
+        opts.rooms = out;
+    }
+
+    if (opts.fromRoom) {
+        let f = J.isInt(opts.fromRoom);
+        if (false === f) {
+            console.log('err: invalid from-room parameter: ' + opts.fromRoom);
+            return;
+        }
+        opts.fromRoom = f;
+    }
+
+    if (opts.toRoom) {
+        let t = J.isInt(opts.toRoom);
+        if (false === t) {
+            console.log('err: invalid to-room parameter: ' + opts.toRoom);
+            return;
+        }
+        opts.toRoom = t;
+    }
+
+};
+
+const checkProcessing = cb => {
+    setTimeout(() => {
+        if (--processing <= 0) cb();
+    }, 1000);
+};
+
 
-module.exports = { logs: exportLogs, data: exportData };
+
+module.exports = {
+    logs: exportLogs,
+    data: exportData,
+    getDefaultExportDir: getDefaultExportDir,
+    setDefaults: setDefaults
+};

From 189414036d45c1328e42e2dbcf8af8bf72a694dc Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 19 Aug 2021 23:11:16 +0200
Subject: [PATCH 54/68] in-progress

---
 bin/nodegame  | 183 +++++++++-----
 lib/export.js | 653 +++++++++++++++++++++++---------------------------
 2 files changed, 420 insertions(+), 416 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 959debd..cecd775 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -194,72 +194,73 @@ program
     });
 
 program
-    .command('export-data [game_name]')
+    .command('export-data <game>')
     .description('Exports data from a game.')
-    .option('-d, --export-dir <dir>', 'path to export directory')
+    // Input/Output
+    .option('-g, --games-dir <dir>, log directory (default log)')
+    .option('-e, --export-dir <dir>, export directory (default export)')
+    .option('-E, --create-export-sub-dir, create sub-directory inside export directory')
+    .option('-r, --recursive, recursively search for files')
+    .option('-f, --files <files>', 'comma separated list of files/patterns')
+    .option('-F, --files-add <files>', 'comma separated list of ' +
+    'files/patterns to add to defaults')
+    .option('-o, --out-format <format>', 'the export format (json,ndjson,csv)')
+    .option('-i, --in-format <format>', 'the import format (json,ndjson,csv)')
+    // Handle errors.
+    .option('-d, --on-duplicated-names <action>', 'action to take if a file ' +
+    'with same name exists in export directory (rename|append|err)')
+    .option('-t, --throw', 'throws errors (default continues to next file)')
+    // Filters.
     .option('-r, --rooms <rooms>', 'room/s to export')
     .option('-f, --from-room <room>', 'export from room (included)')
     .option('-t, --to-room <room>', 'export up to room (included)')
+    // CSV TODO: in progress
+    // .option(' , --csv-flatten', 'room/s to export')
+    // .option(' , --csv-header <header>', 'comma separeted values')
+    // .option(' , --csv-no-header <header>', 'removes header in csv')
+    // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
-    .action(function(gameName, opts) {
+    .action(function(game, opts) {
 
-        debugger
+        opts.game = game;
+        processExportOptions(opts);
 
-        if (!gameName) {
-            console.log('Error: game name is missing.');
-            rl.close();
-            return;
-        }
-
-
-        loadConfFile(() => {
-
-            debugger
-
-            exp.setDefaults(conf, 'data', opts);
-
-            console.log();
-            console.log(' *** Exporting data from game: ' + gameName);
-            console.log(' *** Export folder: ' + opts.exportDir);
-            if (opts.minRoom) console.log(' *** Min Room: ' + opts.minRoom);
-            if (opts.maxRoom) console.log(' *** Max Room: ' + opts.maxRoom);
-            if (opts.fromRoom) console.log(' *** From room: ' + opts.fromRoom);
-            if (opts.toRoom) console.log(' *** From room: ' + opts.toRoom);
-            if (opts.rooms) console.log(' *** Rooms: ' + opts.roomsOrig);
-
-            console.log();
-
-            console.log(opts)
-
-            exp.data(conf, gameName, opts, () => {
-                console.log();
-                console.log(' *** Export finished.');
-                console.log();
-                process.exit();
-            });
-        });
+        loadConfFile(() => exp.data(conf, opts, terminateExport));
 
     });
 
 program
-    .command('export-logs [type]')
+    .command('export-logs')
     .description('Exports logs from nodeGame server')
-// .option('-t, --template <template>', 'set the template for game')
-    .option('-f, --force', 'force on non-empty directory')
+     // Input/Output
+    .option('-l, --log-dir <dir>, log directory (default log)')
+    .option('-e, --export-dir <dir>, export directory (default export)')
+    .option('-E, --create-export-sub-dir, create sub-directory inside export directory')
+    .option('-r, --recursive, recursively search for files')
+    .option('-f, --files <files>', 'comma separated list of files/patterns')
+    .option('-F, --files-add <files>', 'comma separated list of ' +
+            'files/patterns to add to defaults')
+    .option('-o, --out-format <format>', 'the export format (json,ndjson,csv)')
+    .option('-i, --in-format <format>', 'the import format (json,ndjson,csv)')
+    // Handle errors.
+    .option('-d, --on-duplicated-names <action>', 'action to take if a file ' +
+            'with same name exists in export directory (rename|append|err)')
+    .option('-t, --throw', 'throws errors (default continues to next file)')
+    // Filters.
+    .option('-g, --game <game>, game to export')
+    .option('-d, --done-only', 'exports only "done" messages')
+    .option('-c, --clean-up', 'cleanup logs before export')
+    .option('-m , --msg-type <type>', 'messages to export (incoming|outgoing|all)')
+    // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
-    .action(function(gameName, options) {
+    .action(function(opts) {
 
-        if (!gameName) {
-            console.log('Error: game name is missing.');
-            rl.close();
-            return;
-        }
+        processExportOptions(opts);
 
-        loadConfFile(() => exp.logs(conf, gameName, options, () => {
-            process.exit();
-        }));
+
+        loadConfFile(() => exp.logs(conf, opts, terminateExport));
 
     });
 
@@ -313,6 +314,49 @@ function detectNodeGameInstallation() {
     return false;
 }
 
+/**
+ * ## processExportOptions
+ *
+ * Calls process.exit otherwise the process hangs
+ */
+const processExportOptions = opts => {
+    if (opts.throw) {
+        opts.onError = 'throw';
+        delete opts.throw;
+    }
+
+    if (opts.logDir) {
+        opts.dataDir = opts.logDir;
+        delete opts.logDir;
+    }
+
+    if (opts.gamesDir) {
+        opts.dataDir = opts.gamesDir;
+        delete opts.gamesDir;
+    }
+
+    if (opts.msgType) {
+        let m = opts.msgType;
+        if (m === 'incoming' || m === 'all') opts.incoming = true;
+        if (m === 'outgoing' || m === 'all') opts.outgoing = true;
+        delete opts.msgType;
+    }
+
+    if (opts.files) opts.files = opts.files.split(',');
+    if (opts.filesAdd) opts.filesAdd = opts.filesAdd.split(',');
+};
+
+/**
+ * ## terminateExport
+ *
+ * Calls process.exit otherwise the process hangs
+ */
+const terminateExport = () => {
+   console.log();
+   console.log(' *** Export finished.');
+   console.log();
+   process.exit();
+};
 
 /**
  * ## checkGameDirs
@@ -1161,23 +1205,24 @@ function writeConfFile(conf, cb) {
             console.log('');
         }
 
-        if (cb) cb();
+        if (cb) {
+            try {
+                cb();
+            }
+            catch(e) {
+                console.log(e);
+                colorWrite('An error occurred. Aborted.');
+                process.exit();
+            }
+        }
     });
 }
 
 function loadConfFile(cb, force) {
+    let res = true;
     // Try to load configuration. If not found start utility to create it.
     try {
         conf = require(confFile);
-        if (force || !conf.author || !conf.email || !conf.ngDir) {
-            if (!force) {
-                console.log('Missing or incomple conf. Trying to recover it.');
-            }
-            createConfFile(cb);
-        }
-        else {
-            cb();
-        }
     }
     catch(e) {
         console.log(e);
@@ -1185,6 +1230,26 @@ function loadConfFile(cb, force) {
         colorWrite('Warning!');
         console.log('nodegame-generator conf file not found or not readable');
         createConfFile(cb);
+        res = false;
+    }
+
+    if (!res) return;
+
+    if (force || !conf.author || !conf.email || !conf.ngDir) {
+        if (!force) {
+            console.log('Missing or incomple conf. Trying to recover it.');
+        }
+        createConfFile(cb);
+    }
+    else {
+        try {
+            cb();
+        }
+        catch(e) {
+            console.log(e);
+            colorWrite('An error occurred. Aborted.')
+            process.exit();
+        }
     }
 }
 
diff --git a/lib/export.js b/lib/export.js
index 5c87a74..fd9700c 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -3,459 +3,398 @@ const fs = require('fs');
 const NDDB = require('NDDB');
 const J = require('JSUS').JSUS;
 
-
-/**
-* ### getExtension
-*
-* Extracts the extension from a file name
-*
-*
-* @param {string} file The filename
-*
-* @return {string} The extension or NULL if not found
-*/
-const getExtension = (file) => {
-    let format = file.lastIndexOf('.');
-    return format < 0 ? null : file.substr(format + 1);
-};
-
-/**
-* ### getExtension
-*
-* Extracts the extension from a file name
-*
-*
-* @param {string} file The filename
-*
-* @return {string} The extension or NULL if not found
-*/
-const incrementFileIdx = (file, idx = 0) => {
-    let format = file.lastIndexOf('.');
-    return `${file.substr(0, format)}_${++idx}${file.substr(format)}`;
-};
-
 // Keeps track of open processing operations
 let processing = 0;
 
 const exportLogs = (serverConf, opts, cb) => {
+    _export('logs', serverConf, opts, cb);
+};
 
-    // Data directory.
-    const DATADIR = path.resolve(serverConf.ngDir, 'logs');
-
-    // Output directory.
-    const OUTDIR = opts.exportDir ?? getDefaultExportDir(serverConf);
-
-    // Limit to room numbers.
-
-    const minLog = opts.minLog || false;
-    const maxLog = opts.maxLog || false;
-
-    const dirFilter = (dir) => {
-        // Filter room number.
-        if (minLog || maxLog) {
-            let roomNum = dir.split('room')[1];
-            roomNum = J.isInt(roomNum);
-            // Skip directories not like rooom0000X.
-            if (!roomNum) return false;
-            if (minLog && roomNum < minLog) return false;
-            if (maxLog && roomNum > maxLog) return false;
-        }
-        return true;
-    };
-
-    // Convert to CSV.
-    const CONVERT_JSON_TO_CSV = opts.json2csv ?? true;
-
-    // Create a sub-directory within export directory.
-    const CREATE_EXPORT_SUBDIR = opts.exportSubdir ?? false;
+const exportData = (serverConf, opts, cb) => {
+    _export('data', serverConf, opts, cb);
+};
 
-    // 'err' | 'append' ;
-    const ON_DUPLICATED_NAMES = opts.onDuplicatedNames ?? 'rename';
+// Generic export for data or logs.
+const _export = (type, serverConf, opts, cb) => {
 
-    // TODO: implement it.
-    const VERBOSE = opts.verbose ?? true;
+    const LOGS = type === 'logs';
 
-    const INCOMING = opts.incoming ?? true;
+    setDefaults(LOGS, serverConf, opts);
 
-    const OUTGOING = opts.outgoing ?? false;
+    // We will clone it later.
+    let optsOrig = opts;
 
-    if (!INCOMING && !OUTGOING) {
-        console.log(' - Err: export logs messages must specify either ' +
-                    ' incoming outgoing');
-        return;
-    }
+    // Data directory.
+    const DATADIR = opts.dataDir;
+    // Output directory.
+    const OUTDIR = opts.exportDir;
+    // Verbose.
+    const V = opts.verbose;
 
     // Load all files.
-
     let checkUnique = {};
-
-    if (!fs.existsSync(OUTDIR)) {
-        fs.mkdirSync(OUTDIR);
-        console.log('- created ' + OUTDIR);
-    }
-
-    let OUTDIR_EXPORT = OUTDIR;
-
-    if (CREATE_EXPORT_SUBDIR) {
-        // Create dir name based on time.
-        let t = new Date().toISOString().replaceAll(':', '-').replace('T', '_');
-        t = t.substr(0, t.lastIndexOf('.'));
-
-        OUTDIR_EXPORT = path.join(OUTDIR, t);
-        if (!fs.existsSync(OUTDIR_EXPORT)) {
-            fs.mkdirSync(OUTDIR_EXPORT);
-            console.log('- created ' + OUTDIR_EXPORT);
-        }
-    }
-
-    // Array of files that will be loaded (if found).
-    const FILES = [
-        'messages'
-    ];
-
-    FILES.forEach((file) => {
+    opts.files.forEach((file) => {
         if (checkUnique[file]) {
-            console.log(`- skipping duplicated file: ${file}`);
+            if (V) console.log(`- skipping duplicated file: ${file}`);
             return;
         }
-        console.log('- Pattern: ' + file);
+
+        let opts = J.clone(optsOrig);
+
+        if (V) console.log('- Pattern: ' + file);
 
         checkUnique[file] = true;
 
         let db = NDDB.db();
         let db2;
 
-        db2 = NDDB.db();
-        db.on('insert', (item) => {
-            if (item.type === 'out-ID') {
-                if (!OUTGOING) return false;
-            }
-            else {
-                if (!INCOMING) return false;
-            }
+        // Logs.
+        if (LOGS) {
+            db2 = NDDB.db();
+            db.on('insert', (item) => {
+                if (item.type === 'out-ID') {
+                    if (!opts.outgoing) return false;
+                }
+                else {
+                    if (!opts.incoming) return false;
+                }
 
-            let i = J.parse(item.message);
-            // console.log(i);
-            // console.log(i.sid);
-            if (!i.sid || !~i.sid.indexOf('explorer1')) return false;
+                let i = J.parse(item.message);
+                // console.log(i);
+                // console.log(i.sid);
+                if (opts.game) {
+                    if (!i.sid || !~i.sid.indexOf(opts.game)) return false;
+                }
 
-            if (DONE_ONLY) {
-                if (!i.data || !i.data.done) return false;
-            }
+                if (opts.doneOnly) {
+                    if (!i.data || !i.data.done) return false;
+                }
+
+                // Session is the server session (not the room number).
+                if (opts.session && i.session !== opts.session) return false;
 
-            // Session is the server session (not the room number).
-            if (SESSION && i.session !== SESSION) return false;
+                // if (opts.cleanUp) {
+                //     i.player = i.from;
+                //     delete i.from;
+                //     delete i.id;
+                //     delete i.sid;
+                // }
 
-            i.player = i.from;
+                if (opts.onInsert) {
+                    let res = opts.onInsert(item);
+                    if (res === false) return;
+                }
 
-            delete i.from;
-            delete i.id;
-            delete i.sid;
+                db2.insert(i);
+            });
+        }
+        // Data.
+        else {
+            if (file === 'bonus_prolific.csv') {
 
-            db2.insert(i);
-        });
+                opts.header = false;
+                opts.quote =  '';
+            }
 
+            if (opts.onInsert) db.on('insert', opts.onInsert);
+        }
 
         // Load files.
-        let opts = {
-            recursive: false,
-            filter: file,
-            // dirFilter: dirFilter
-            // Alternative filters:
-            // filter: file => file === 'bonus_prolific.csv',
-            // format: 'csv',
-        };
-
+        opts.filter = file;
+        opts.file = file;
+        if (opts.inFormat) opts.format = opts.inFormat;
+        else if (LOGS) opts.format = 'ndjson';
         db.loadDirSync(DATADIR, opts);
         processing++;
 
         // Check size.
-        console.log('    items loaded: ' + db.size());
+        if (V) console.log('    items loaded: ' + db.size());
 
         // No items exit here.
         if (!db.size()) return checkProcessing(cb);
+        let outFile = getExportFilename(serverConf, opts, V);
 
-        // Save out file.
-        opts = {};
-
-
-        if (CONVERT_JSON_TO_CSV) {
-            let ext = getExtension(file);
-            if (ext !== 'csv') {
-                file = file += '.csv';
-                opts.header = 'all';
-                opts.flatten = true;
-                opts.flattenByGroup = 'player';
-            }
-        }
-
-        let outFile = path.resolve(OUTDIR_EXPORT, file);
-
-        // If file with same name already exists in out directory take action.
-        if (fs.existsSync(outFile)) {
-            if (ON_DUPLICATED_NAMES === 'err') {
-                throw new Error(`out file already existing: ${outFile}`);
-            }
-            else if (ON_DUPLICATED_NAMES === 'rename') {
-                let idx = -1;
-                for (; ++idx < 100;) {
-                    outFile = incrementFileIdx(file, idx);
-                    outFile = path.resolve(OUTDIR_EXPORT, outFile);
-                    if (!fs.existsSync(outFile)) break;
-                }
-                if (idx === 100) {
-                    throw new Error(
-                        `max number of files with same suffix in directory` +
-                        `reached: ${file}`
-                    );
-                }
-            } else {
-                opts.append = true;
-            }
-        }
+        // We set the in-format before, now we make sure out-format is correct.
+        if (opts.outFormat) opts.format = opts.outFormat;
+        else delete opts.format;
 
-        db2.save(outFile, opts, () => checkProcessing(cb) );
+        // Save it.
+        if (LOGS) db2.save(outFile, opts, () => checkProcessing(cb));
+        else db.save(outFile, opts, () => checkProcessing(cb));
     });
 };
 
 
-const exportData = (serverConf, gameName, opts, cb) => {
+const setDefaults = (LOGS, serverConf, opts, game) => {
 
+    opts.exportDir = opts.exportDir ?? getDefaultExportDir(serverConf);
 
+    opts.recursive = opts.recursive ?? false;
 
-    // Data directory.
-    const DATADIR = path.resolve(serverConf.ngGamesEnabledDir, gameName,'data');
+    // Converts non-csv formats to csv.
+    opts.toCsv = opts.toCsv ?? true;
+    // Create a sub-directory within export directory.
+    opts.createExportSubDir = opts.createExportSubDir ?? false;
 
-    // Output directory.
-    const OUTDIR = opts.exportDir ?? getDefaultExportDir(serverConf);
-
-    // Limit to room numbers.
-
-    const fromRoom = opts.fromRoom || false;
-    const toRoom = opts.toRoom || false;
-    const rooms = opts.rooms || [];
-
-    const dirFilter = (dir) => {
-        // Filter room number.
-        if (rooms || fromRoom || toRoom) {
-            let roomNum = dir.split('room')[1];
-            roomNum = J.isInt(roomNum);
-            // Skip directories not like rooom0000X.
-            if (!roomNum) return false;
-            if (fromRoom && roomNum < fromRoom) return false;
-            if (toRoom && roomNum > toRoom) return false;
-            if (rooms && !~rooms.indexOf(roomNum)) return false;
-        }
-        return true;
-    };
+    // If a file with same name exists inside the export dir.
+    // Other values: 'err' | 'append' ;
+    opts.onDuplicatedNames = opts.onDuplicatedNames ?? 'rename';
 
-    // Convert to CSV.
-    const CONVERT_JSON_TO_CSV = opts.json2csv ?? true;
+    // If an error occurs with one file, what to do.
+    opts.onError = opts.onError ?? 'continue'; // 'throw'
 
-    // Create a sub-directory within export directory.
-    const CREATE_EXPORT_SUBDIR = opts.exportSubdir ?? false;
+    opts.verbose = opts.verbose ?? true;
 
-    // 'err' | 'append' ;
-    const ON_DUPLICATED_NAMES = opts.onDuplicatedNames ?? 'rename';
+    opts.header = opts.header ?? 'all';
+    opts.flatten = true;
+    opts.flattenByGroup = 'player';
 
-    // TODO: implement it.
-    const VERBOSE = opts.verbose ?? true;
 
-    // Load all files.
+    // Filled-in below.
+    let defautlFiles;
 
-    let checkUnique = {};
+    // Type-specific settings.
 
-    // TODO make own method.
-    if (!fs.existsSync(OUTDIR)) {
-        fs.mkdirSync(OUTDIR);
-        console.log('- created ' + OUTDIR);
-    }
+    if (LOGS) {
+        opts.minLog = opts.minLog ?? false;
+        opts.maxLog = opts.maxLog ?? false;
+        opts.dataDir = opts.dataDir || path.resolve(serverConf.ngDir, 'log');
 
-    let OUTDIR_EXPORT = OUTDIR;
+        defaultFiles = [ 'messages' ];
 
-    if (CREATE_EXPORT_SUBDIR) {
-        // Create dir name based on time.
-        let t = new Date().toISOString().replaceAll(':', '-').replace('T', '_');
-        t = t.substr(0, t.lastIndexOf('.'));
+        opts.incoming = opts.incoming ?? true;
+        opts.outgoing = opts.outgoing ?? false;
 
-        OUTDIR_EXPORT = path.join(OUTDIR, t);
-        if (!fs.existsSync(OUTDIR_EXPORT)) {
-            fs.mkdirSync(OUTDIR_EXPORT);
-            console.log('- created ' + OUTDIR_EXPORT);
+        if (!opts.incoming && !opts.outgoing) {
+            throw new Error(' - err: exports-logs: either incoming or ' +
+                            'outgoing must be selected.')
         }
-    }
+        opts.doneOnly = opts.doneOnly ?? true;
 
-    // Array of files that will be loaded (if found).
-    const FILES = [
-        'bonus_prolific.csv',
-        'bonus.csv',
-        'memory.json',
-        // 'messages'
-        'memory.csv',
-        'data.json',
-        'data.csv',
-        'times.csv',
-        'times_json',
-        'player_data.csv',
-        'player_data.json'
-    ];
-
-    console.log()
-
-    FILES.forEach((file) => {
-        if (checkUnique[file]) {
-            console.log(`- skipping duplicated file: ${file}`);
-            return;
+        opts.cleanUp = opts.cleanUp ?? true;
+    }
+    else {
+        opts.dataDir = opts.dataDir ||
+                       path.resolve(serverConf.ngGamesEnabledDir,
+                                    opts.game, 'data');
+
+        opts.fromRoom = opts.fromRoom ?? false;
+        opts.toRoom = opts.toRoom ?? false;
+        opts.rooms = opts.rooms ?? [];
+
+        if (opts.fromRoom || opts.toRoom || opts.rooms.length) {
+
+            opts.dirFilter = (dir) => {
+                // Filter room number.
+                let roomNum = dir.split('room')[1];
+                roomNum = J.isInt(roomNum);
+                // Skip directories not like rooom0000X.
+                if (!roomNum) return false;
+                if (fromRoom && roomNum < fromRoom) return false;
+                if (toRoom && roomNum > toRoom) return false;
+                if (opts.rooms && !~rooms.indexOf(roomNum)) return false;
+                return true;
+            };
         }
-        console.log('- Pattern: ' + file);
 
-        checkUnique[file] = true;
-
-        let db = NDDB.db();
-
-        // Load files.
-        let opts = {
-            recursive: true,
-            filter: file,
-            dirFilter: dirFilter
-            // Alternative filters:
-            // filter: file => file === 'bonus_prolific.csv',
-            // format: 'csv',
-        };
-        if (file === 'bonus_prolific.csv') opts.header = false;
-        db.loadDirSync(DATADIR, opts);
+        defautlFiles = [
+            'bonus_prolific.csv',
+            'bonus.csv',
+            'memory.json',
+            'memory.csv',
+            'data.json',
+            'data.csv',
+            'times.csv',
+            'times_json',
+            'player_data.csv',
+            'player_data.json'
+        ];
+
+        if (opts.rooms) {
+            let tokens = opts.rooms.split(',')
+            let out = [];
+            tokens.forEach(token => {
+                let idx = token.indexOf('-');
+                if (!~idx) return out.push(token);
+                let l = token.substring(0, idx);
+                l = J.isInt(l);
+                if (false === l) {
+                    console.log('err: invalid room parameter: ' + opts.rooms);
+                    return;
+                }
 
-        // Check size.
-        console.log('    items loaded: ' + db.size());
+                let r = token.substring(idx+1);
+                r = J.isInt(r);
+                if (false === r) {
+                    console.log('err: invalid room parameter: ' + opts.rooms);
+                    return;
+                }
 
-        // No items exit here.
-        if (!db.size()) return checkProcessing(cb);
+                J.seq(l, r, 1, t => out.push(t));
 
+            });
+            opts.roomsOrig = J.clone(opts.rooms);
+            opts.rooms = out;
+        }
 
-        // Save out file.
-        opts = {};
-        if (file === 'bonus_prolific.csv') {
-            opts = {
-                header: false,
-                quote: '',
-            };
+        if (opts.fromRoom) {
+            let f = J.isInt(opts.fromRoom);
+            if (false === f) {
+                console.log('err: invalid from-room parameter: ' +
+                            opts.fromRoom);
+                return;
+            }
+            opts.fromRoom = f;
         }
 
-        if (CONVERT_JSON_TO_CSV) {
-            let ext = getExtension(file);
-            if (ext !== 'csv') {
-                file = file += '.csv';
-                opts.header = 'all';
-                opts.flatten = true;
-                opts.flattenByGroup = 'player';
+        if (opts.toRoom) {
+            let t = J.isInt(opts.toRoom);
+            if (false === t) {
+                console.log('err: invalid to-room parameter: ' + opts.toRoom);
+                return;
             }
+            opts.toRoom = t;
         }
+    }
+
 
-        let outFile = path.resolve(OUTDIR_EXPORT, file);
+    opts.files = opts.files || defaultFiles;
+    if (!Array.isArray(opts.files)) opts.files = [ opts.files ];
+    if (opts.filesAdd) opts.files = [ ...opts.files, ... opts.filesAdd ];
+};
+
+/**
+ * getExportFilename
+ *
+ * Returns a file name for the exports
+ *
+ * @param {object} opts Configuration options
+ *
+ * @return {string} outFile The full path including the filename for the export
+ */
+const getExportFilename = (serverConf, opts, V) => {
+
+    const OUTDIR_EXPORT = createExportDir(serverConf, opts, V);
+
+    let file = opts.file;
+
+    if (opts.outFormat) {
+        let ext = getExtension(file);
+        if (ext !== opts.outFormat) file = file += '.' + opts.outFormat;
+    }
+
+    let outFile = path.resolve(OUTDIR_EXPORT, file);
 
-        // If file with same name already exists in out directory take action.
-        if (fs.existsSync(outFile)) {
-            if (ON_DUPLICATED_NAMES === 'err') {
-                throw new Error(`out file already existing: ${outFile}`);
+    // If file with same name already exists in out directory take action.
+    if (fs.existsSync(outFile)) {
+        let d = opts.onDuplicatedNames;
+        if (d === 'err') {
+            throw new Error(`out file already existing: ${outFile}`);
+        }
+        else if (d === 'rename') {
+            let idx = -1;
+            for (; ++idx < 100;) {
+                outFile = incrementFileIdx(file, idx);
+                outFile = path.resolve(OUTDIR_EXPORT, outFile);
+                if (!fs.existsSync(outFile)) break;
             }
-            else if (ON_DUPLICATED_NAMES === 'rename') {
-                let idx = -1;
-                for (; ++idx < 100;) {
-                    outFile = incrementFileIdx(file, idx);
-                    outFile = path.resolve(OUTDIR_EXPORT, outFile);
-                    if (!fs.existsSync(outFile)) break;
-                }
-                if (idx === 100) {
-                    throw new Error(
-                        `max number of files with same suffix in directory` +
-                        `reached: ${file}`
-                    );
-                }
-            } else {
-                opts.append = true;
+            if (idx === 100) {
+                throw new Error(
+                    `max number of files with same suffix in directory` +
+                    `reached: ${file}`
+                );
             }
         }
+        else {
+            opts.append = true;
+        }
+    }
 
-        db.save(outFile, opts, () => checkProcessing(cb) );
-    });
+    return outFile;
 };
 
+const printOptions = (type, opts) => {
+    console.log();
+    if (type === 'data') {
+        console.log(' *** Exporting data from game: ' + opts.game);
+    }
+    else {
+        // console.log(' *** Exporting logs from : ' + opts.game);
+    }
+    console.log(' *** Export folder: ' + opts.exportDir);
+    if (opts.minRoom) console.log(' *** Min Room: ' + opts.minRoom);
+    if (opts.maxRoom) console.log(' *** Max Room: ' + opts.maxRoom);
+    if (opts.fromRoom) console.log(' *** From room: ' + opts.fromRoom);
+    if (opts.toRoom) console.log(' *** From room: ' + opts.toRoom);
+    if (opts.rooms) console.log(' *** Rooms: ' + opts.roomsOrig);
+
+    console.log();
+
+};
 
 const getDefaultExportDir = conf => {
     return path.join(conf.ngDir, 'export');
 };
 
-const setDefaults = (conf, type, opts) => {
-
-    opts.exportDir = opts.exportDir ?? getDefaultExportDir(conf);
-
-    // Converts non-csv formats to csv.
-    opts.toCsv = opts.toCsv ?? true;
-    // Create a sub-directory within export directory.
-    opts.createExportSubdir = opts.createExportSubdir ?? false;
-    // Create a sub-directory within export directory.
-    opts.createExportSubdir = opts.createExportSubdir ?? false;
-    // If a file with same name exists inside the export dir.
-    // Other values: 'err' | 'append' ;
-    opts.onDuplicatedNames = opts.onDuplicatedNames ?? 'rename';
-
-    opts.verbose = opts.verbos ?? true;
-
-
-    if (opts.rooms) {
-        let tokens = opts.rooms.split(',')
-        let out = [];
-        tokens.forEach(token => {
-            let idx = token.indexOf('-');
-            if (!~idx) return out.push(token);
-            let l = token.substring(0, idx);
-            l = J.isInt(l);
-            if (false === l) {
-                console.log('err: invalid room parameter: ' + opts.rooms);
-                return;
-            }
+const checkProcessing = cb => {
+    setTimeout(() => {
+        if (--processing <= 0) cb();
+    }, 1000);
+};
 
-            let r = token.substring(idx+1);
-            r = J.isInt(r);
-            if (false === r) {
-                console.log('err: invalid room parameter: ' + opts.rooms);
-                return;
-            }
+const createExportDir = (serverConf, opts, V) => {
 
-            J.seq(l, r, 1, t => out.push(t));
+    let outDir = opts.exportDir ?? getDefaultExportDir(serverConf);
 
-        });
-        opts.roomsOrig = J.clone(opts.rooms);
-        opts.rooms = out;
+    if (!fs.existsSync(outDir)) {
+        fs.mkdirSync(outDir);
+        if (V) console.log('- created ' + outDir);
     }
 
-    if (opts.fromRoom) {
-        let f = J.isInt(opts.fromRoom);
-        if (false === f) {
-            console.log('err: invalid from-room parameter: ' + opts.fromRoom);
-            return;
-        }
-        opts.fromRoom = f;
-    }
+    if (opts.createExportSubDir) {
+        // Create dir name based on time.
+        let t = new Date().toISOString().replaceAll(':', '-').replace('T', '_');
+        t = t.substr(0, t.lastIndexOf('.'));
 
-    if (opts.toRoom) {
-        let t = J.isInt(opts.toRoom);
-        if (false === t) {
-            console.log('err: invalid to-room parameter: ' + opts.toRoom);
-            return;
+        outDir = path.join(outDir, t);
+        if (!fs.existsSync(outDir)) {
+            fs.mkdirSync(outDir);
+            if (V) console.log('- created ' + outDir);
         }
-        opts.toRoom = t;
     }
 
+    return outDir;
 };
 
-const checkProcessing = cb => {
-    setTimeout(() => {
-        if (--processing <= 0) cb();
-    }, 1000);
+/**
+* ### getExtension
+*
+* Extracts the extension from a file name
+*
+*
+* @param {string} file The filename
+*
+* @return {string} The extension or NULL if not found
+*/
+const getExtension = (file) => {
+    let format = file.lastIndexOf('.');
+    return format < 0 ? null : file.substr(format + 1);
 };
 
-
+/**
+* ### incrementFileIdx
+*
+* Incrementaly adds a suffix to a file name before the extension
+*
+* @param {string} file The filename
+* @param {number} idx Optional. The initial number to increment. Default: 0.
+*
+* @return {string} The incremented file name.
+*/
+const incrementFileIdx = (file, idx = 0) => {
+    let format = file.lastIndexOf('.');
+    return `${file.substr(0, format)}_${++idx}${file.substr(format)}`;
+};
 
 module.exports = {
     logs: exportLogs,

From b985d04cf7eaae60e6815933c908aeac725a2aac Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Tue, 24 Aug 2021 00:04:33 +0200
Subject: [PATCH 55/68] export

---
 lib/export.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/export.js b/lib/export.js
index fd9700c..cd90e63 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -38,9 +38,14 @@ const _export = (type, serverConf, opts, cb) => {
             if (V) console.log(`- skipping duplicated file: ${file}`);
             return;
         }
-
-        let opts = J.clone(optsOrig);
-
+        // console.log(optsOrig)
+        let opts;
+        try {
+            opts = J.clone(optsOrig);
+        }
+        catch(e) {
+            opts = optsOrig;
+        }
         if (V) console.log('- Pattern: ' + file);
 
         checkUnique[file] = true;
@@ -151,7 +156,7 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
 
 
     // Filled-in below.
-    let defautlFiles;
+    let defaultFiles;
 
     // Type-specific settings.
 
@@ -197,7 +202,7 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
             };
         }
 
-        defautlFiles = [
+        defaultFiles = [
             'bonus_prolific.csv',
             'bonus.csv',
             'memory.json',
@@ -210,7 +215,7 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
             'player_data.json'
         ];
 
-        if (opts.rooms) {
+        if ('string' === typeof opts.rooms) {
             let tokens = opts.rooms.split(',')
             let out = [];
             tokens.forEach(token => {
@@ -338,7 +343,7 @@ const getDefaultExportDir = conf => {
 
 const checkProcessing = cb => {
     setTimeout(() => {
-        if (--processing <= 0) cb();
+        if (--processing <= 0 && cb) cb();
     }, 1000);
 };
 

From adf0965db8da574463bd7823d4cd92004f8ca883 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Wed, 25 Aug 2021 16:43:02 +0200
Subject: [PATCH 56/68] fixes

---
 bin/nodegame  | 24 +++++++++++++++---------
 lib/export.js | 31 ++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index cecd775..5eca9a2 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -214,10 +214,10 @@ program
     .option('-r, --rooms <rooms>', 'room/s to export')
     .option('-f, --from-room <room>', 'export from room (included)')
     .option('-t, --to-room <room>', 'export up to room (included)')
-    // CSV TODO: in progress
-    // .option(' , --csv-flatten', 'room/s to export')
-    // .option(' , --csv-header <header>', 'comma separeted values')
-    // .option(' , --csv-no-header <header>', 'removes header in csv')
+    // CSV
+    .option(' , --csv-flatten [group]', 'merges all items [by group] before export')
+    .option(' , --csv-header <header>', 'header in comma separeted values')
+    .option(' , --csv-no-header', 'removes header in exported csv')
     // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
@@ -252,6 +252,10 @@ program
     .option('-d, --done-only', 'exports only "done" messages')
     .option('-c, --clean-up', 'cleanup logs before export')
     .option('-m , --msg-type <type>', 'messages to export (incoming|outgoing|all)')
+     // CSV
+     .option(' , --csv-flatten [group]', 'merges all items [by group] before export')
+     .option(' , --csv-header <header>', 'header in comma separeted values')
+     .option(' , --csv-no-header', 'removes header in exported csv')
     // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
@@ -259,7 +263,6 @@ program
 
         processExportOptions(opts);
 
-
         loadConfFile(() => exp.logs(conf, opts, terminateExport));
 
     });
@@ -344,6 +347,9 @@ const processExportOptions = opts => {
 
     if (opts.files) opts.files = opts.files.split(',');
     if (opts.filesAdd) opts.filesAdd = opts.filesAdd.split(',');
+
+    if (opts.csvHeader) opts.csvHeader = opts.csvHeader.split(',');
+    if (opts.csvNoHeader) opts.csvHeader = false;
 };
 
 /**
@@ -352,10 +358,10 @@ const processExportOptions = opts => {
  * Calls process.exit otherwise the process hangs
  */
 const terminateExport = () => {
-   console.log();
-   console.log(' *** Export finished.');
-   console.log();
-   process.exit();
+    console.log();
+    console.log(' *** Export finished.');
+    console.log();
+    process.exit();
 };
 
 /**
diff --git a/lib/export.js b/lib/export.js
index cd90e63..580d6b1 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -17,6 +17,11 @@ const exportData = (serverConf, opts, cb) => {
 // Generic export for data or logs.
 const _export = (type, serverConf, opts, cb) => {
 
+    // console.log(type)
+    // console.log(serverConf)
+    // console.log(opts)
+    // console.log(cb);
+
     const LOGS = type === 'logs';
 
     setDefaults(LOGS, serverConf, opts);
@@ -60,11 +65,16 @@ const _export = (type, serverConf, opts, cb) => {
                 if (item.type === 'out-ID') {
                     if (!opts.outgoing) return false;
                 }
-                else {
+                else if (item.type === 'in') {
                     if (!opts.incoming) return false;
                 }
-
-                let i = J.parse(item.message);
+                let i;
+                try {
+                    i = J.parse(item.message);
+                }
+                catch(e) {
+                    i = item;
+                }
                 // console.log(i);
                 // console.log(i.sid);
                 if (opts.game) {
@@ -109,6 +119,7 @@ const _export = (type, serverConf, opts, cb) => {
         opts.file = file;
         if (opts.inFormat) opts.format = opts.inFormat;
         else if (LOGS) opts.format = 'ndjson';
+
         db.loadDirSync(DATADIR, opts);
         processing++;
 
@@ -122,7 +133,6 @@ const _export = (type, serverConf, opts, cb) => {
         // We set the in-format before, now we make sure out-format is correct.
         if (opts.outFormat) opts.format = opts.outFormat;
         else delete opts.format;
-
         // Save it.
         if (LOGS) db2.save(outFile, opts, () => checkProcessing(cb));
         else db.save(outFile, opts, () => checkProcessing(cb));
@@ -150,9 +160,11 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
 
     opts.verbose = opts.verbose ?? true;
 
-    opts.header = opts.header ?? 'all';
-    opts.flatten = true;
-    opts.flattenByGroup = 'player';
+    opts.header = opts.csvHeader ?? 'all';
+    opts.flatten = !!opts.csvFlatten;
+    if ('string' === typeof opts.csvFlatten) {
+        opts.flattenByGroup = opts.csvFlatten;
+    }
 
 
     // Filled-in below.
@@ -174,9 +186,9 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
             throw new Error(' - err: exports-logs: either incoming or ' +
                             'outgoing must be selected.')
         }
-        opts.doneOnly = opts.doneOnly ?? true;
+        opts.doneOnly = !!opts.doneOnly;
 
-        opts.cleanUp = opts.cleanUp ?? true;
+        opts.cleanUp = !!opts.cleanUp;
     }
     else {
         opts.dataDir = opts.dataDir ||
@@ -398,6 +410,7 @@ const getExtension = (file) => {
 */
 const incrementFileIdx = (file, idx = 0) => {
     let format = file.lastIndexOf('.');
+    if (!~format) return `${file}_${++idx}`;
     return `${file.substr(0, format)}_${++idx}${file.substr(format)}`;
 };
 

From 9367d1e6a8bb1db1d1c64493301fbd46d7b1e048 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Wed, 25 Aug 2021 18:06:13 +0200
Subject: [PATCH 57/68] improved-csv-options

---
 bin/nodegame  | 23 +++++++++++++++--------
 lib/export.js | 26 ++++++++++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 5eca9a2..9d4c84f 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -215,9 +215,11 @@ program
     .option('-f, --from-room <room>', 'export from room (included)')
     .option('-t, --to-room <room>', 'export up to room (included)')
     // CSV
-    .option(' , --csv-flatten [group]', 'merges all items [by group] before export')
-    .option(' , --csv-header <header>', 'header in comma separeted values')
-    .option(' , --csv-no-header', 'removes header in exported csv')
+    .option(' , --out-csv-flatten [group]', 'merges all items [by group] before export')
+    .option(' , --out-csv-header <header>', 'header for export csv files (comma separeted values)')
+    .option(' , --out-csv-no-header', 'no header in export csv files')
+    .option(' , --in-csv-header <header>', 'header for import csv files (comma separeted values)')
+    .option(' , --in-csv-no-header', 'no header in import csv files')
     // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
@@ -253,9 +255,11 @@ program
     .option('-c, --clean-up', 'cleanup logs before export')
     .option('-m , --msg-type <type>', 'messages to export (incoming|outgoing|all)')
      // CSV
-     .option(' , --csv-flatten [group]', 'merges all items [by group] before export')
-     .option(' , --csv-header <header>', 'header in comma separeted values')
-     .option(' , --csv-no-header', 'removes header in exported csv')
+     .option(' , --out-csv-flatten [group]', 'merges all items [by group] before export')
+     .option(' , --out-csv-header <header>', 'header for export csv files (comma separeted values)')
+     .option(' , --out-csv-no-header', 'no header in export csv files')
+     .option(' , --in-csv-header <header>', 'header for import csv files (comma separeted values)')
+     .option(' , --in-csv-no-header', 'no header in import csv files')
     // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
@@ -348,8 +352,11 @@ const processExportOptions = opts => {
     if (opts.files) opts.files = opts.files.split(',');
     if (opts.filesAdd) opts.filesAdd = opts.filesAdd.split(',');
 
-    if (opts.csvHeader) opts.csvHeader = opts.csvHeader.split(',');
-    if (opts.csvNoHeader) opts.csvHeader = false;
+    if (opts.outCsvHeader) opts.outCsvHeader = opts.outCsvHeader.split(',');
+    if (opts.outCsvNoHeader) opts.outCsvHeader = false;
+
+    if (opts.inCsvHeader) opts.inCsvHeader = opts.inCsvHeader.split(',');
+    if (opts.inCsvNoHeader) opts.inCsvHeader = false;
 };
 
 /**
diff --git a/lib/export.js b/lib/export.js
index 580d6b1..546d584 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -58,6 +58,8 @@ const _export = (type, serverConf, opts, cb) => {
         let db = NDDB.db();
         let db2;
 
+        if (opts.inCsvHeader) opts.header = opts.inCsvHeader;
+
         // Logs.
         if (LOGS) {
             db2 = NDDB.db();
@@ -107,7 +109,7 @@ const _export = (type, serverConf, opts, cb) => {
         else {
             if (file === 'bonus_prolific.csv') {
 
-                opts.header = false;
+                if ('undefined' === typeof opts.header) opts.header = false;
                 opts.quote =  '';
             }
 
@@ -133,6 +135,13 @@ const _export = (type, serverConf, opts, cb) => {
         // We set the in-format before, now we make sure out-format is correct.
         if (opts.outFormat) opts.format = opts.outFormat;
         else delete opts.format;
+
+        if (opts.outCsvHeader) opts.header = opts.outCsvHeader;
+        if (opts.outCsvFlatten) opts.flatten = opts.outCsvFlatten;
+        if (opts.outCsvFlattenByGroup) {
+            opts.flattenByGroup = opts.outCsvFlattenByGroup;
+        }
+
         // Save it.
         if (LOGS) db2.save(outFile, opts, () => checkProcessing(cb));
         else db.save(outFile, opts, () => checkProcessing(cb));
@@ -160,10 +169,14 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
 
     opts.verbose = opts.verbose ?? true;
 
-    opts.header = opts.csvHeader ?? 'all';
-    opts.flatten = !!opts.csvFlatten;
-    if ('string' === typeof opts.csvFlatten) {
-        opts.flattenByGroup = opts.csvFlatten;
+    opts.inCsvHeader = opts.inCsvHeader ?? 'all';
+    opts.inCsvFlatten = !!opts.inCsvFlatten;
+
+    opts.ouCsvtHeader = opts.outCsvHeader ?? 'all';
+    opts.outCsvFlatten = !!opts.outCsvFlatten;
+
+    if ('string' === typeof opts.outCsvFlatten) {
+        opts.outCsvFlattenByGroup = opts.outCsvFlatten;
     }
 
 
@@ -186,8 +199,9 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
             throw new Error(' - err: exports-logs: either incoming or ' +
                             'outgoing must be selected.')
         }
-        opts.doneOnly = !!opts.doneOnly;
 
+        // Filters.
+        opts.doneOnly = !!opts.doneOnly;
         opts.cleanUp = !!opts.cleanUp;
     }
     else {

From 9b47382997d8a7165c1f413db87471a7c329f2f1 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 27 Aug 2021 10:26:53 +0200
Subject: [PATCH 58/68] fixing options and filtering game name

---
 bin/nodegame  | 80 +++++++++++++++++++++++++++------------------------
 lib/export.js | 60 ++++++++++++++++++++++++--------------
 2 files changed, 81 insertions(+), 59 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 9d4c84f..ccbef0f 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -197,34 +197,35 @@ program
     .command('export-data <game>')
     .description('Exports data from a game.')
     // Input/Output
-    .option('-g, --games-dir <dir>, log directory (default log)')
-    .option('-e, --export-dir <dir>, export directory (default export)')
-    .option('-E, --create-export-sub-dir, create sub-directory inside export directory')
-    .option('-r, --recursive, recursively search for files')
-    .option('-f, --files <files>', 'comma separated list of files/patterns')
-    .option('-F, --files-add <files>', 'comma separated list of ' +
-    'files/patterns to add to defaults')
-    .option('-o, --out-format <format>', 'the export format (json,ndjson,csv)')
-    .option('-i, --in-format <format>', 'the import format (json,ndjson,csv)')
+   .option('    --games-dir <dir>', 'log directory (default log)')
+   .option('    --export-dir <dir>', 'export directory (default export)')
+   .option('    --create-export-sub-dir', 'create sub-directory inside export directory')
+   .option('-r, --recursive', 'recursively search for files')
+   .option('    --files <files>', 'comma separated list of files/patterns')
+   .option('    --files-add <files>', 'comma separated list of ' +
+           'files/patterns to add to defaults')
+   .option('    --out-format <format>', 'the export format (json,ndjson,csv)')
+   .option('    --in-format <format>', 'the import format (json,ndjson,csv)')
     // Handle errors.
-    .option('-d, --on-duplicated-names <action>', 'action to take if a file ' +
-    'with same name exists in export directory (rename|append|err)')
+    .option('    --on-duplicated-names <action>', 'action to take if a file ' +
+           'with same name exists in export directory (rename|append|err)')
     .option('-t, --throw', 'throws errors (default continues to next file)')
     // Filters.
-    .option('-r, --rooms <rooms>', 'room/s to export')
-    .option('-f, --from-room <room>', 'export from room (included)')
-    .option('-t, --to-room <room>', 'export up to room (included)')
+    .option('    --rooms <rooms>', 'room/s to export')
+    .option('    --from-room <room>', 'export from room (included)')
+    .option('    --to-room <room>', 'export up to room (included)')
     // CSV
-    .option(' , --out-csv-flatten [group]', 'merges all items [by group] before export')
-    .option(' , --out-csv-header <header>', 'header for export csv files (comma separeted values)')
-    .option(' , --out-csv-no-header', 'no header in export csv files')
-    .option(' , --in-csv-header <header>', 'header for import csv files (comma separeted values)')
-    .option(' , --in-csv-no-header', 'no header in import csv files')
+    .option('    --out-csv-flatten [group]', 'merges all items [by group] before export')
+    .option('    --out-csv-header <header>', 'header for export csv files (comma separeted values)')
+    .option('    --out-csv-no-header', 'no header in export csv files')
+    .option('    --out-csv-obj-level <level>', 'level of nested objects to expand before export')
+    .option('    --in-csv-header <header>', 'header for import csv files (comma separeted values)')
+    .option('    --in-csv-no-header', 'no header in import csv files')
     // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
     .action(function(game, opts) {
-
+        // console.log(arguments);
         opts.game = game;
         processExportOptions(opts);
 
@@ -236,30 +237,31 @@ program
     .command('export-logs')
     .description('Exports logs from nodeGame server')
      // Input/Output
-    .option('-l, --log-dir <dir>, log directory (default log)')
-    .option('-e, --export-dir <dir>, export directory (default export)')
-    .option('-E, --create-export-sub-dir, create sub-directory inside export directory')
-    .option('-r, --recursive, recursively search for files')
-    .option('-f, --files <files>', 'comma separated list of files/patterns')
-    .option('-F, --files-add <files>', 'comma separated list of ' +
+    .option('    --games-dir <dir>', 'log directory (default log)')
+    .option('    --export-dir <dir>', 'export directory (default export)')
+    .option('    --create-export-sub-dir', 'create sub-directory inside export directory')
+    .option('-r, --recursive', 'recursively search for files')
+    .option('    --files <files>', 'comma separated list of files/patterns')
+    .option('    --files-add <files>', 'comma separated list of ' +
             'files/patterns to add to defaults')
-    .option('-o, --out-format <format>', 'the export format (json,ndjson,csv)')
-    .option('-i, --in-format <format>', 'the import format (json,ndjson,csv)')
+    .option('    --out-format <format>', 'the export format (json,ndjson,csv)')
+    .option('    --in-format <format>', 'the import format (json,ndjson,csv)')
     // Handle errors.
-    .option('-d, --on-duplicated-names <action>', 'action to take if a file ' +
+    .option('    --on-duplicated-names <action>', 'action to take if a file ' +
             'with same name exists in export directory (rename|append|err)')
     .option('-t, --throw', 'throws errors (default continues to next file)')
     // Filters.
-    .option('-g, --game <game>, game to export')
-    .option('-d, --done-only', 'exports only "done" messages')
-    .option('-c, --clean-up', 'cleanup logs before export')
-    .option('-m , --msg-type <type>', 'messages to export (incoming|outgoing|all)')
+    .option('    --game <game>', 'export logs only for this game')
+    .option('    --set-msg-only', 'exports only "set" messages (e.g., "done" msgs)')
+    .option('    --clean-up', 'cleanup logs before export')
+    .option('    --msg-type <type>', 'messages to export (incoming|outgoing|all)')
      // CSV
-     .option(' , --out-csv-flatten [group]', 'merges all items [by group] before export')
-     .option(' , --out-csv-header <header>', 'header for export csv files (comma separeted values)')
-     .option(' , --out-csv-no-header', 'no header in export csv files')
-     .option(' , --in-csv-header <header>', 'header for import csv files (comma separeted values)')
-     .option(' , --in-csv-no-header', 'no header in import csv files')
+    .option('    --out-csv-flatten [group]', 'merges all items [by group] before export')
+    .option('    --out-csv-header <header>', 'header for export csv files (comma separeted values)')
+    .option('    --out-csv-no-header', 'no header in export csv files')
+    .option('    --out-csv-obj-level <level>', 'level of nested objects to expand before export')
+    .option('    --in-csv-header <header>', 'header for import csv files (comma separeted values)')
+    .option('    --in-csv-no-header', 'no header in import csv files')
     // Verbose.
     .option('-v, --verbose', 'verbose output')
     .allowUnknownOption()
@@ -357,6 +359,8 @@ const processExportOptions = opts => {
 
     if (opts.inCsvHeader) opts.inCsvHeader = opts.inCsvHeader.split(',');
     if (opts.inCsvNoHeader) opts.inCsvHeader = false;
+
+    if (opts.outCSvObjLevel) opts.outCSvObjLevel = J.isInt(opts.outCSvObjLevel);
 };
 
 /**
diff --git a/lib/export.js b/lib/export.js
index 546d584..80e5b57 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -44,13 +44,12 @@ const _export = (type, serverConf, opts, cb) => {
             return;
         }
         // console.log(optsOrig)
-        let opts;
+        let opts = optsOrig;
         try {
             opts = J.clone(optsOrig);
         }
-        catch(e) {
-            opts = optsOrig;
-        }
+        catch {};
+
         if (V) console.log('- Pattern: ' + file);
 
         checkUnique[file] = true;
@@ -70,32 +69,48 @@ const _export = (type, serverConf, opts, cb) => {
                 else if (item.type === 'in') {
                     if (!opts.incoming) return false;
                 }
-                let i;
-                try {
-                    i = J.parse(item.message);
-                }
-                catch(e) {
-                    i = item;
-                }
+
+                let  i = item;
                 // console.log(i);
                 // console.log(i.sid);
                 if (opts.game) {
-                    if (!i.sid || !~i.sid.indexOf(opts.game)) return false;
+
+                    // messages logs
+                    if (i.channel) {
+                        if (i.channel !== opts.game) return false;
+                    }
+
+                    // channel logs
+                    else if (i.name) {
+                        if (i.name !== opts.game) return false;
+                    }
+                    // servernode logs.
+                    else if (i.message) {
+                        if (!~i.message.indexOf(opts.game)) return false;
+                    }
                 }
 
-                if (opts.doneOnly) {
-                    if (!i.data || !i.data.done) return false;
+                try {
+                    i = J.parse(item.message);
+                    i.type = item.type === 'in' ? 'in' : 'out';
+                    i.channel = item.channel || item.name || 'NA';
+                }
+                catch {};
+
+
+                if (opts.setMsgOnly) {
+                    if (!i.action || i.action !== "set") return false;
                 }
 
                 // Session is the server session (not the room number).
                 if (opts.session && i.session !== opts.session) return false;
 
-                // if (opts.cleanUp) {
-                //     i.player = i.from;
-                //     delete i.from;
-                //     delete i.id;
-                //     delete i.sid;
-                // }
+                if (opts.cleanUp) {
+                    // i.player = i.from;
+                    // delete i.from;
+                    delete i.id;
+                    delete i.sid;
+                }
 
                 if (opts.onInsert) {
                     let res = opts.onInsert(item);
@@ -142,6 +157,8 @@ const _export = (type, serverConf, opts, cb) => {
             opts.flattenByGroup = opts.outCsvFlattenByGroup;
         }
 
+        opts.objectLevel = opts.outCsvObjLevel;
+
         // Save it.
         if (LOGS) db2.save(outFile, opts, () => checkProcessing(cb));
         else db.save(outFile, opts, () => checkProcessing(cb));
@@ -179,6 +196,7 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
         opts.outCsvFlattenByGroup = opts.outCsvFlatten;
     }
 
+    opts.outCsvObjLevel = opts.outCsvObjLevel || 2;
 
     // Filled-in below.
     let defaultFiles;
@@ -201,7 +219,7 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
         }
 
         // Filters.
-        opts.doneOnly = !!opts.doneOnly;
+        opts.setMsgOnly = !!opts.setMsgOnly;
         opts.cleanUp = !!opts.cleanUp;
     }
     else {

From 8266aa2a3e8028f962dffdc6e36909cd0ef0f5fa Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Wed, 20 Oct 2021 10:43:10 +0200
Subject: [PATCH 59/68] changelog

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 92ba846..3d23f45 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 7.0.0
+- Export functions added for logs and data.
+
 ## 6.0.2
 - Games directories are always set by update-conf.
 - Updated to newer version of commander.

From 73d1287e40f8585d7414eb74f735fdb2f4a289a4 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Wed, 20 Oct 2021 10:59:31 +0200
Subject: [PATCH 60/68] 7.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b9541a5..4ee012d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nodegame-generator",
   "description": "NodeGame' game generator",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "author": "Stefano Balietti <futur.dorko@gmail.com>",
   "keywords": [
     "nodegame",

From 62eeba2f7dfe27f3372e9ab4f77bc916a20e8c9c Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 25 Nov 2021 15:51:28 +0100
Subject: [PATCH 61/68] typos

---
 bin/nodegame | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index ccbef0f..4d20222 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -197,7 +197,7 @@ program
     .command('export-data <game>')
     .description('Exports data from a game.')
     // Input/Output
-   .option('    --games-dir <dir>', 'log directory (default log)')
+   .option('    --games-dir <dir>', 'games directory (default games/)')
    .option('    --export-dir <dir>', 'export directory (default export)')
    .option('    --create-export-sub-dir', 'create sub-directory inside export directory')
    .option('-r, --recursive', 'recursively search for files')
@@ -237,7 +237,7 @@ program
     .command('export-logs')
     .description('Exports logs from nodeGame server')
      // Input/Output
-    .option('    --games-dir <dir>', 'log directory (default log)')
+    .option('    --log-dir <dir>', 'log directory (default log/)')
     .option('    --export-dir <dir>', 'export directory (default export)')
     .option('    --create-export-sub-dir', 'create sub-directory inside export directory')
     .option('-r, --recursive', 'recursively search for files')

From c0662c8241746b663073344b1c28fe248e8cdf07 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 25 Nov 2021 15:54:13 +0100
Subject: [PATCH 62/68] fixed bugs when exporting from interface csv header

---
 bin/nodegame | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 4d20222..2d7b56f 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -351,13 +351,17 @@ const processExportOptions = opts => {
         delete opts.msgType;
     }
 
-    if (opts.files) opts.files = opts.files.split(',');
+    if ('string' === typeof opts.files) opts.files = opts.files.split(',');
     if (opts.filesAdd) opts.filesAdd = opts.filesAdd.split(',');
 
-    if (opts.outCsvHeader) opts.outCsvHeader = opts.outCsvHeader.split(',');
+    if ('string' === typeof opts.outCsvHeader) {
+        opts.outCsvHeader = opts.outCsvHeader.split(',');
+    }
     if (opts.outCsvNoHeader) opts.outCsvHeader = false;
 
-    if (opts.inCsvHeader) opts.inCsvHeader = opts.inCsvHeader.split(',');
+    if ('string' === typeof opts.inCsvHeader) {
+        opts.inCsvHeader = opts.inCsvHeader.split(',');
+    }
     if (opts.inCsvNoHeader) opts.inCsvHeader = false;
 
     if (opts.outCSvObjLevel) opts.outCSvObjLevel = J.isInt(opts.outCSvObjLevel);

From c08f3e57daaa1947142c142f036e2faeab276754 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Thu, 25 Nov 2021 15:54:54 +0100
Subject: [PATCH 63/68] changelog

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3d23f45..dd7e645 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 7.0.1 ## current
+- Fixed bugs and typos for export.
+
 ## 7.0.0
 - Export functions added for logs and data.
 

From d037013f12062c19784496254bc4a757647eee7d Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 21 Jul 2023 23:41:00 +0200
Subject: [PATCH 64/68] fixed export outCsvObjLevel and outCsvFlatten

---
 bin/nodegame | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bin/nodegame b/bin/nodegame
index 2d7b56f..18b18ce 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -364,7 +364,14 @@ const processExportOptions = opts => {
     }
     if (opts.inCsvNoHeader) opts.inCsvHeader = false;
 
-    if (opts.outCSvObjLevel) opts.outCSvObjLevel = J.isInt(opts.outCSvObjLevel);
+    if (opts.outCsvObjLevel) opts.outCsvObjLevel = J.isInt(opts.outCsvObjLevel);
+
+    if (opts.outCsvFlatten) {
+        if ('string' === typeof opts.outCsvFlatten) {
+            opts.outCsvFlattenByGroup = opts.outCsvFlatten;
+            opts.outCsvFlatten = true;
+        }
+    }
 };
 
 /**
@@ -829,6 +836,9 @@ function createGameDir(template, gameName, outDir,
                 fs.copySync(ngt.resolve(path.join('public', 'favicon.ico')),
                             path.resolve(outDir, 'public', 'favicon.ico'));
 
+                fs.copySync(ngt.resolve(path.join('public', '404.htm')),
+                            path.resolve(outDir, 'public', '404.htm'));
+
                 mkdir(path.resolve(outDir, 'public', 'js'), function() {
                     write(path.resolve(outDir, 'public', 'js', 'index.js'),
                           indexJS);

From 26bfcd309d8ee54579762c0008d322ac56de8631 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 21 Jul 2023 23:41:20 +0200
Subject: [PATCH 65/68] fixed export fromRoom toRoom options

---
 lib/export.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/export.js b/lib/export.js
index 80e5b57..db20002 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -233,15 +233,19 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
 
         if (opts.fromRoom || opts.toRoom || opts.rooms.length) {
 
+            // console.log(opts.fromRoom, opts.toRoom, opts.rooms);
+
             opts.dirFilter = (dir) => {
                 // Filter room number.
                 let roomNum = dir.split('room')[1];
                 roomNum = J.isInt(roomNum);
                 // Skip directories not like rooom0000X.
                 if (!roomNum) return false;
-                if (fromRoom && roomNum < fromRoom) return false;
-                if (toRoom && roomNum > toRoom) return false;
-                if (opts.rooms && !~rooms.indexOf(roomNum)) return false;
+                if (opts.fromRoom && (roomNum < opts.fromRoom)) return false;
+                if (opts.toRoom && (roomNum > opts.toRoom)) return false;
+                if (opts.rooms.length && !~opts.rooms.indexOf(roomNum)) {
+                    return false;
+                }
                 return true;
             };
         }

From 91356d28f26ebbd4ea1b37acc70db2d4f2aee6a6 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Tue, 25 Jul 2023 20:35:54 +0200
Subject: [PATCH 66/68] preprocess option in nodegame; onInsert -> preprocess

---
 bin/nodegame  | 25 +++++++++++++++++++++++++
 lib/export.js |  6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index 18b18ce..f4d5ac8 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -214,6 +214,8 @@ program
     .option('    --rooms <rooms>', 'room/s to export')
     .option('    --from-room <room>', 'export from room (included)')
     .option('    --to-room <room>', 'export up to room (included)')
+    // Process.
+    .option('    --preprocess <file.js>', 'path to file exporting a function to modify items')
     // CSV
     .option('    --out-csv-flatten [group]', 'merges all items [by group] before export')
     .option('    --out-csv-header <header>', 'header for export csv files (comma separeted values)')
@@ -372,6 +374,29 @@ const processExportOptions = opts => {
             opts.outCsvFlatten = true;
         }
     }
+
+    if (opts.preprocess) {
+        try {
+            let p = opts.preprocess;
+            // console.log(p);
+            if (!path.isAbsolute(p) && !p.substring(0,2) === "./") {
+                p = "./" + p;
+            }
+            p = require(p);
+            if ('function' !== typeof p) {
+                console.log('Error: preprocess did not return a function');
+                opts.preprocess = null;    
+            }
+            else {
+                opts.preprocess = p;
+            }
+        }
+        catch(e) {
+            // console.log(e);
+            console.log('Error: could not load preprocess function');
+            opts.preprocess = null;
+        }
+    }
 };
 
 /**
diff --git a/lib/export.js b/lib/export.js
index db20002..a84e38d 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -112,8 +112,8 @@ const _export = (type, serverConf, opts, cb) => {
                     delete i.sid;
                 }
 
-                if (opts.onInsert) {
-                    let res = opts.onInsert(item);
+                if (opts.preprocess) {
+                    let res = opts.preprocess(item);
                     if (res === false) return;
                 }
 
@@ -128,7 +128,7 @@ const _export = (type, serverConf, opts, cb) => {
                 opts.quote =  '';
             }
 
-            if (opts.onInsert) db.on('insert', opts.onInsert);
+            if (opts.preprocess) db.on('insert', opts.preprocess);
         }
 
         // Load files.

From 107f62866d6e5948b72727d407ce1106094ce899 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 28 Jul 2023 14:18:12 +0200
Subject: [PATCH 67/68] preprocess -> onInsert because it conflicts with NDDB

---
 bin/nodegame | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/bin/nodegame b/bin/nodegame
index f4d5ac8..2e7101c 100755
--- a/bin/nodegame
+++ b/bin/nodegame
@@ -215,7 +215,7 @@ program
     .option('    --from-room <room>', 'export from room (included)')
     .option('    --to-room <room>', 'export up to room (included)')
     // Process.
-    .option('    --preprocess <file.js>', 'path to file exporting a function to modify items')
+    .option('    --on-insert <file.js>', 'path to file exporting a function to modify items')
     // CSV
     .option('    --out-csv-flatten [group]', 'merges all items [by group] before export')
     .option('    --out-csv-header <header>', 'header for export csv files (comma separeted values)')
@@ -375,26 +375,27 @@ const processExportOptions = opts => {
         }
     }
 
-    if (opts.preprocess) {
+    if (opts.onInsert) {
+        let p = opts.onInsert;
+        // console.log(p);
+        if (!path.isAbsolute(p) && !p.substring(0,2) === "./") {
+            p = "./" + p;
+        }
+
         try {
-            let p = opts.preprocess;
-            // console.log(p);
-            if (!path.isAbsolute(p) && !p.substring(0,2) === "./") {
-                p = "./" + p;
-            }
             p = require(p);
             if ('function' !== typeof p) {
-                console.log('Error: preprocess did not return a function');
-                opts.preprocess = null;    
+                console.log('Error: on-insert did not return a function');
+                opts.onInsert = null;    
             }
             else {
-                opts.preprocess = p;
+                opts.onInsert = p;
             }
         }
         catch(e) {
-            // console.log(e);
-            console.log('Error: could not load preprocess function');
-            opts.preprocess = null;
+            if (opts.verbose) console.log(e);
+            console.log('Error: could not load on-insert function');
+            opts.onInsert = null;
         }
     }
 };

From 7939e473bbd06f7f266513120dc6e32038d3a502 Mon Sep 17 00:00:00 2001
From: Stefano Balietti <futur.dorko@gmail.com>
Date: Fri, 28 Jul 2023 14:18:42 +0200
Subject: [PATCH 68/68] preproces -> onInsert and inCsvHeader def =True

---
 lib/export.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/export.js b/lib/export.js
index a84e38d..08b4989 100644
--- a/lib/export.js
+++ b/lib/export.js
@@ -112,8 +112,8 @@ const _export = (type, serverConf, opts, cb) => {
                     delete i.sid;
                 }
 
-                if (opts.preprocess) {
-                    let res = opts.preprocess(item);
+                if (opts.onInsert) {
+                    let res = opts.onInsert(item);
                     if (res === false) return;
                 }
 
@@ -128,7 +128,7 @@ const _export = (type, serverConf, opts, cb) => {
                 opts.quote =  '';
             }
 
-            if (opts.preprocess) db.on('insert', opts.preprocess);
+            if (opts.onInsert) db.on('insert', opts.onInsert);
         }
 
         // Load files.
@@ -186,7 +186,7 @@ const setDefaults = (LOGS, serverConf, opts, game) => {
 
     opts.verbose = opts.verbose ?? true;
 
-    opts.inCsvHeader = opts.inCsvHeader ?? 'all';
+    opts.inCsvHeader = opts.inCsvHeader ?? true;
     opts.inCsvFlatten = !!opts.inCsvFlatten;
 
     opts.ouCsvtHeader = opts.outCsvHeader ?? 'all';