better log

fix issue of ctrl c not work
fix iframe scrollbar

Author: ITJesse

helper.js

@@ -0,0 +1,66 @@
+import fs from 'fs-extra';
+import request from 'request';
+import inquirer from 'inquirer';
+
+import * as logger from './logger';
+
+export function download(apiPath, dest) {
+  logger.Assets.info('DOWNLOAD', apiPath);
+  request
+    .get(apiPath)
+    .on('error', (err) => {
+      logger.Assets.error('DOWNLOAD', apiPath, err);
+    })
+    .pipe(fs.createWriteStream(dest));
+}
+
+export function writeJSON(dest, data) {
+  fs.writeFile(dest, JSON.stringify(data), (err) => {
+    if (err) {
+      logger.WriteJSON.error('CREATE', dest, err);
+    } else {
+      logger.WriteJSON.info('CREATE', dest);
+    }
+  });
+}
+
+export function defaultSkin(uuid) {
+  // great thanks to Minecrell for research into Minecraft and Java's UUID hashing!
+  // https://git.io/xJpV
+  // MC uses `uuid.hashCode() & 1` for alex
+  // that can be compacted to counting the LSBs of every 4th byte in the UUID
+  // an odd sum means alex, an even sum means steve
+  // XOR-ing all the LSBs gives us 1 for alex and 0 for steve
+  const isEven = (c) => {
+    if (c >= '0' && c <= '9') {
+      return (c & 1) === 0; // eslint-disable-line
+    } else if (c >= 'a' && c <= 'f') {
+      return (c & 1) === 1; // eslint-disable-line
+    }
+    console.log('Invalid digit', c);
+    return null;
+  };
+  const lsbsEven =
+    (isEven(uuid[7]) !== isEven(uuid[23])) !== (isEven(uuid[15]) !== isEven(uuid[31]));
+  return lsbsEven ? 'Alex' : 'Steve';
+}
+
+export async function confirm(message, _default = true) {
+  const prompt = inquirer.createPromptModule();
+  try {
+    const res = await prompt({
+      type: 'confirm',
+      name: 'confirm',
+      default: _default,
+      message,
+    });
+    return res.confirm;
+  } catch (error) {
+    logger.Default.error('Cannot get user input.');
+    return false;
+  }
+}
+
+export function delay(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}

ns.js renamed to index.js

@@ -1,40 +1,42 @@
 import fs from 'fs-extra';
 import path from 'path';
-import ProgressBar from 'ascii-progress';
-import Confirm from 'prompt-confirm';
 
 import Utils from './utils';
+import { writeJSON, confirm } from './helper';
+import * as logger from './logger';
 
-const utils = new Utils();
-const config = utils.getConfig();
+process.on('SIGINT', () => {
+  process.exit();
+});
 
-// Clear the terminal
 process.stdout.write('\x1Bc');
 
+const utils = new Utils();
+const config = utils.getConfig();
+
 let playerlist = [];
 if (config.render.whitelist) {
   playerlist = utils.getWhitelistedPlayers();
 } else {
   playerlist = utils.getAllPlayers();
 }
-console.log('[INFO] Players found:', playerlist.length);
+logger.Default.info('Players found', playerlist.length);
 
 if (config.render.advancements) {
-  console.log('[INFO] Advancements is set: Render mode set to 1.12+');
+  logger.Default.info('Advancements is set: Render mode set to 1.12+');
   if (!config['advancements-progress']) {
-    console.log('[WARN] You do not have advancements progresses defined. Please visit github.com/NyaaCat/NyaaStats for a new version of config file.');
+    logger.Default.warn('You do not have advancements progresses defined. Please visit github.com/NyaaCat/NyaaStats for a new version of config file.');
   }
 } else {
-  console.log('[INFO] Advancements not set: Render mode set to 1.11');
+  logger.Default.info('Advancements not set: Render mode set to 1.11');
 }
 
 const output = path.join(config.BASEPATH, config.render.output);
-console.log('[INFO] CREATE OUTPUT DIR:', output);
+logger.Default.info('CREATE OUTPUT DIR', output);
 
 (async () => {
-  const prompt = new Confirm('Do you want to clean the output folder?');
-
-  if (await prompt.run()) {
+  const prompt = await confirm('Do you want to clean the output folder?');
+  if (prompt) {
     try {
       fs.emptyDirSync(output);
     } catch (err) {
@@ -48,18 +50,10 @@ console.log('[INFO] CREATE OUTPUT DIR:', output);
     banlist = utils.getBannedPlayers();
   }
   if (!config.render['render-banned']) {
-    console.log(playerlist, banlist);
     playerlist = playerlist.filter(uuid => !banlist.some(ban => ban === uuid));
   }
   playerlist = playerlist.sort(() => 0.5 - Math.random());
 
-  const totalTasks = playerlist.length;
-  const bar = new ProgressBar({
-    schema: '[:bar] :current/:total :percent :etas',
-    width: 0.95,
-    total: totalTasks,
-  });
-
   for (const uuid of playerlist) {
     let banned = false;
     if (config.render['render-banned']) {
@@ -69,7 +63,6 @@ console.log('[INFO] CREATE OUTPUT DIR:', output);
     try {
       data = await utils.createPlayerData(uuid, banned); // eslint-disable-line
     } catch (error) {
-      bar.tick();
       continue;
     }
     if (!data.data) {
@@ -81,11 +74,10 @@ console.log('[INFO] CREATE OUTPUT DIR:', output);
       names: data.data.names,
       seen: data.data.seen,
     });
-    bar.tick();
   }
 
   players.sort((a, b) => b.seen - a.seen); // eslint-disable-line
-  Utils.writeJSON(
+  writeJSON(
     path.join(config.BASEPATH, config.render.output, 'players.json'),
     players,
   );
@@ -96,7 +88,7 @@ console.log('[INFO] CREATE OUTPUT DIR:', output);
   } catch (error) {
     throw new Error(error);
   }
-  Utils.writeJSON(
+  writeJSON(
     path.join(config.BASEPATH, config.render.output, 'info.json'),
     {
       worldTime,

logger.js

@@ -0,0 +1,26 @@
+import log4js from 'log4js';
+
+log4js.configure({
+  level: 'info',
+  appenders: {
+    Default: { type: 'stdout' },
+    Config: { type: 'stdout' },
+    PlayerData: { type: 'stdout' },
+    MojangAPI: { type: 'stdout' },
+    Assets: { type: 'stdout' },
+    WriteJSON: { type: 'stdout' },
+  },
+  categories: {
+    default: {
+      appenders: ['Default'],
+      level: 'info',
+    },
+  },
+});
+
+export const Default = log4js.getLogger('Default');
+export const Config = log4js.getLogger('Config');
+export const PlayerData = log4js.getLogger('PlayerData');
+export const MojangAPI = log4js.getLogger('MojangAPI');
+export const Assets = log4js.getLogger('Assets');
+export const WriteJSON = log4js.getLogger('WriteJSON');