V1.5.6

Author: Revadike

README.md

@@ -5,15 +5,15 @@
 Claim [available free game promotions](https://www.epicgames.com/store/free-games) from the Epic Games Store.
 
 ## Requirements
- * [DeviceAuthGenerator](https://github.com/xMistt/DeviceAuthGenerator/releases)
+ * [DeviceAuthGenerator](https://github.com/jackblk/DeviceAuthGenerator/releases)
  * [Git](https://git-scm.com/downloads)
  * [Node.js](https://nodejs.org/download/) (with build tools checked)
 
 ## Instructions - Quick
 0. (Optional) ☆ Star this project :)
 1. Download/clone this repository
 2. Run `npm install`
-3. Generate `data/device_auths.json` (using [DeviceAuthGenerator](https://github.com/xMistt/DeviceAuthGenerator))
+3. Generate `data/device_auths.json` (using [DeviceAuthGenerator](https://github.com/jackblk/DeviceAuthGenerator))
 4. (Optional) Copy `data/config.example.json` to `data/config.json` and edit it
 5. Run `npm start`
 
@@ -34,6 +34,7 @@ To which I will say, why not? Most of these games are actually outstanding games
 ## Changelog
 ### V1.5.6
  * Added optional Apprise notifications (#143)
+ * Improved update checking (#)
 
 ### V1.5.5
  * Fixed testing (#137)

claimer.js

@@ -1,27 +1,22 @@
 "use strict";
 
-const { "Launcher": EpicGames } = require("epicgames-client");
-const { freeGamesPromotions } = require("./src/gamePromotions");
-const Logger = require("tracer").console(`${__dirname}/logger.js`);
 const { writeFile, writeFileSync, existsSync, readFileSync } = require("fs");
-
-const Auths = require(`${__dirname}/data/device_auths.json`);
-const getLatestVersion = require("./src/checkUpdate.js");
 if (!existsSync(`${__dirname}/data/config.json`)) {
     writeFileSync(`${__dirname}/data/config.json`, readFileSync(`${__dirname}/data/config.example.json`));
 }
-const Config = require(`${__dirname}/data/config.json`);
-const Fork = require("child_process");
 if (!existsSync(`${__dirname}/data/history.json`)) {
-    try {
-        writeFileSync(`${__dirname}/data/history.json`, "{}");
-    } catch (err) {
-        Logger.error(`Failed to generate data/history.json file (${err})`);
-        process.exit(1);
-    }
+    writeFileSync(`${__dirname}/data/history.json`, "{}");
 }
+
+const { "Launcher": EpicGames } = require("epicgames-client");
+const { freeGamesPromotions } = require(`${__dirname}/src/gamePromotions`);
+const { latestVersion } = require(`${__dirname}/src/latestVersion.js`);
+const Auths = require(`${__dirname}/data/device_auths.json`);
+const Config = require(`${__dirname}/data/config.json`);
+const Fork = require("child_process");
 const History = require(`${__dirname}/data/history.json`);
-const Package = require("./package.json");
+const Logger = require("tracer").console(`${__dirname}/logger.js`);
+const Package = require(`${__dirname}/package.json`);
 
 function appriseNotify(appriseUrl, notificationMessages) {
     if (!appriseUrl || notificationMessages.length === 0) {
@@ -39,7 +34,7 @@ function appriseNotify(appriseUrl, notificationMessages) {
             appriseUrl,
         ]);
 
-        let output = s.stdout ? s.stdout.toString() : "ERROR: maybe apprise not found";
+        let output = s.stdout ? s.stdout.toString() : "ERROR: Maybe apprise not found?";
         if (output && output.includes("ERROR")) {
             Logger.error(`Failed to send push notification (${output})`);
         } else if (output) {
@@ -65,16 +60,17 @@ function sleep(delay) {
     let { options, delay, loop, appriseUrl } = Config;
 
     do {
-        Logger.info(`Epicgames Freebies Claimer ${Package.version}`);
-        let latestVersion = await getLatestVersion().catch((err) => {
+        Logger.info(`Epicgames Freebies Claimer (${Package.version}) by ${Package.author.name || Package.author}`);
+
+        let latest = await latestVersion().catch((err) => {
             Logger.error(`Failed to check for updates (${err})`);
         });
-        if (latestVersion && latestVersion !== Package.version) {
-            Logger.warn(`Latest release version ${latestVersion} available: ${Package.url}`);
+
+        if (latest && latest !== Package.version) {
+            Logger.warn(`There is a new release available (${latest}): ${Package.url}`);
         }
 
         let notificationMessages = [];
-
         for (let email in Auths) {
             let { country } = Auths[email];
             let claimedPromos = History[email] || [];
@@ -83,6 +79,7 @@ function sleep(delay) {
             let rememberDevicesPath = `${__dirname}/data/device_auths.json`;
             let clientOptions = { email, ...options, rememberDevicesPath };
             let client = new EpicGames(clientOptions);
+
             if (!await client.init()) {
                 let errMess = "Error while initialize process.";
                 notificationMessages.push(errMess);

src/checkUpdate.js src/latestVersion.jssrc/checkUpdate.js renamed to src/latestVersion.js

@@ -1,58 +1,64 @@
 "use strict";
 
-const https = require("https");
+const HTTPS = require("https");
 
 // taken & modified from https://stackoverflow.com/a/38543075/8068153
 function httpsRequest(params, postData) {
-    return new Promise((resolve, reject) => {
-        let req = https.request(params, (res) => {
+    return new Promise((res, rej) => {
+        let req = HTTPS.request(params, (response) => {
             // reject on bad status
-            if (res.statusCode < 200 || res.statusCode >= 300) {
-                reject(new Error(`statusCode=${res.statusCode}`));
+            if (response.statusCode < 200 || response.statusCode >= 300) {
+                rej(new Error(`HTTP Error ${response.statusCode}`));
             }
+
             // cumulate data
             let body = [];
-            res.on("data", (chunk) => {
+            response.on("data", (chunk) => {
                 body.push(chunk);
             });
+
             // resolve on end
-            res.on("end", () => {
+            response.on("end", () => {
                 try {
                     body = JSON.parse(Buffer.concat(body).toString());
                     // Get latest release, remove "v" prefix.
-                    return resolve(body[0].tag_name.substring(1));
+                    return res(body[0].tag_name.substring(1));
                 } catch (e) {
-                    return reject(e);
+                    return rej(e);
                 }
             });
         });
+
         // reject on request error
         req.on("error", (err) => {
             // This is not a "Second reject", just a different sort of failure
-            reject(err);
+            rej(err);
         });
+
         // Sometimes github actions network will have hiccup...
         // https://github.com/Revadike/epicgames-freebies-claimer/issues/152
         req.on("timeout", () => {
             req.destroy();
-            reject(new Error("Request timeout"));
+            rej(new Error("Request timeout"));
         });
+
         if (postData) {
             req.write(postData);
         }
+
         // IMPORTANT
         req.end();
     });
 }
 
-module.exports = function latestRelease() {
-    let options = {
+function latestVersion() {
+    return httpsRequest({
         "host":    "api.github.com",
         "path":    "/repos/Revadike/epicgames-freebies-claimer/releases",
         "method":  "GET",
         "headers": { "user-agent": "EFC" },
         "timeout": 3000,
+    });
+}
 
-    };
-    return httpsRequest(options);
-};
+module.exports = { latestVersion };