homegames-common 0.1.35 → 0.3.0

package/index.js

@@ -117,17 +117,17 @@ const guaranteeCertFiles = (dir) => new Promise((resolve, reject) => {
 
     fs.readdir(dir, (err, files) => {
         files.forEach(file => {
-            if (file === 'fullchain.pem') {
+            if (file === 'cert.pem') {
                 certPath = path.join(dir, file);
             }
 
-            if (file === 'privkey.pem') {
+            if (file === 'key.pem') {
                 keyPath = path.join(dir, file);
             }
         });
     
         if (!certPath) {
-            reject('Could not find fullchain.pem');
+            reject('Could not find cert.pem');
         }
 
         if (!keyPath) {
@@ -143,19 +143,21 @@ const guaranteeCertFiles = (dir) => new Promise((resolve, reject) => {
 });
 
 const validateCertData = (certPaths, username, accessToken) => new Promise((resolve, reject) => {
-    postUrl('https://certifier.homegames.link', '/verify', {
-        checksum: ''
-    },
-    {
-        'hg-username': username,
-        'hg-access-token': accessToken
-    }).then(data => {
-        resolve(data);
-    }).catch(err => {
-        reject({
-            message: err.toString()
-        });
-    });
+	// one day
+	resolve(JSON.stringify({success: true}));
+//    postUrl('https://certifier.homegames.io', '/verify', {
+//        checksum: ''
+//    },
+//    {
+//        'hg-username': username,
+//        'hg-access-token': accessToken
+//    }).then(data => {
+//        resolve(data);
+//    }).catch(err => {
+//        reject({
+//            message: err.toString()
+//        });
+//    });
 
 });
 
@@ -226,7 +228,7 @@ const certInit = (certPath, loginPath) => new Promise((resolve, reject) => {
     validateExistingCerts(certPath).then((certData) => {
     }).catch(err => {
         validateLoginData(loginPath).then((loginData) => {
-            getUrl('https://certifier.homegames.link/get-certs').then(data => {
+            getUrl('https://certifier.homegames.io/get-certs').then(data => {
                 resolve(data);
             }).catch(err => {
             });
@@ -342,15 +344,16 @@ const getLoginInfo = (authPath) => new Promise((resolve, reject) => {
 });
 
 const getCertData = (username, accessToken) => new Promise((resolve, reject) => {
-    getUrl('https://certifier.homegames.link/get-cert', {
+
+    getUrl('https://certifier.homegames.io/get-cert', {
 
         'hg-username': username,
         'hg-token': accessToken
     }).then(data => {
         resolve(data);
     }).catch(err => {
-        console.log(err);
-        reject();
+	    console.log(err.toString());
+	    console.log('that was an error');
     });
 });
 
@@ -403,19 +406,19 @@ const guaranteeCerts = (authPath, certPath) => new Promise((resolve, reject) =>
 
     authWorkflow(authPath).then(authInfo => {
         getCertData(authInfo.username, authInfo.tokens.accessToken).then(certData => {
-            //validateCertData(certPath, authInfo.username, authInfo.tokens.accessToken).then((response) => {
-            //    const data = JSON.parse(response);
-            //    if (data.success) {
+            validateCertData(certPath, authInfo.username, authInfo.tokens.accessToken).then((response) => {
+                const data = JSON.parse(response);
+                if (data.success) {
                     storeCertData(certData, certPath).then(() => {
                         resolve({
-                            certPath: `${certPath}/fullchain.pem`,
-                            keyPath: `${certPath}/privkey.pem`,
+                            certPath: `${certPath}/cert.pem`,
+                            keyPath: `${certPath}/key.pem`,
                         }); 
                     });
-            //    } else {
-            //        reject(data);
-            //    }
-            //});
+                } else {
+                    reject(data);
+                }
+            });
         }).catch(err => {
             reject({message: err});
         });
@@ -465,6 +468,19 @@ const lockFile = (path) => new Promise((resolve, reject) => {
         const lockPath = `${path}.hglock`;
         fs.exists(lockPath, (exists) => {
             if (!exists) {
+const pathPieces = path.split('/');
+    let pathParent = [];
+    for (let x in pathPieces) {
+        if (x == pathPieces.length - 1) {
+            break
+        } else {
+            pathParent.push(pathPieces[x]);
+        }
+    }
+
+    guaranteeDir(pathParent.join('/')).then(() => {
+	    console.log("writing lock file");
+	    console.log(lockPath);
                 fs.writeFile(lockPath, 'lock', 'utf-8', () => {
                     clearInterval(_interval);
                     fs.readFile(lockPath, (err, data) => {
@@ -476,7 +492,9 @@ const lockFile = (path) => new Promise((resolve, reject) => {
                         }
                     });
                 });
+    });
             } else {
+		    console.log('waiting for lock');
                 const { birthtime } = fs.statSync(lockPath);
                 const fiveMinsAgo = Date.now() - ( 1000 * 60 * 5 );
                 console.log(birthtime);
@@ -537,6 +555,7 @@ const authWorkflow = (authPath) => new Promise((resolve, reject) => {
         });
     };
 
+	console.log('about to lock ' + authPath);
     lockFile(authPath).then(() => {
         getLoginInfo(authPath).then((loginInfo) => {
             verifyAccessToken(loginInfo.username, loginInfo.tokens.accessToken).then(() => {
@@ -559,23 +578,136 @@ const authWorkflow = (authPath) => new Promise((resolve, reject) => {
     });
 });
 
+const getConfigValue = (key, _default = undefined) => {
+    const config = getConfig();
+
+    let envValue = process.env[key] && `${process.env[key]}`;
+    if (envValue !== undefined) {
+        if (envValue === 'true') {
+            envValue = true;
+        } else if (envValue === 'false') {
+            envValue = false;
+        }
+        console.log(`Using environment value: ${envValue} for key: ${key}`);
+        return envValue;
+    }
+        if (config[key] === undefined && _default === undefined) {
+            throw new Error(`No value for ${key} found in config`);
+        } else if (config[key] === undefined && _default !== undefined) {
+            return _default;
+        }
+        console.log(`Found value ${config[key]} in config`);
+        return config[key];
+};
+
+let cachedConfig = {};
+
+const getConfig = () => {
+
+    if (Object.keys(cachedConfig).length > 0) {
+        return cachedConfig;
+    }
+
+    const options = [process.cwd(), require.main.filename, process.mainModule.filename, __dirname]
+    let _config = {};
+    
+    for (let i = 0; i < options.length; i++) {
+        if (fs.existsSync(`${options[i]}/config.json`)) {
+            console.log(`Using config at ${options[i]}`);
+            _config = JSON.parse(fs.readFileSync(`${options[i]}/config.json`));
+            break;
+        }
+    }
+
+    cachedConfig = _config;
+
+    return _config;
+}
+
+
+const getLogLevel = (logLevel = null) => {
+    const _logLevel = logLevel || getConfigValue('LOG_LEVEL', 'INFO');
+    const levelList = ['DISABLED', 'INFO', 'DEBUG'];
+
+    return levelList.indexOf(_logLevel);
+};
+
+const msgToString = (msg) => {
+    return typeof msg === 'object' ? JSON.stringify(msg) : msg;
+};
+
+const log = {
+    info: (msg, explanation = null) => {
+        const logLevel = getLogLevel();
+        const required = getLogLevel('INFO');
+
+        if (logLevel < required) {
+            return;
+        }
+
+        const logPath = getConfigValue('LOG_PATH');
+
+        const msgString = `[HOMEGAMES-INFO][${new Date().toTimeString()}] ${msgToString(msg)}${explanation ? ':' + os.EOL + msgToString(explanation) : ''}${os.EOL}${os.EOL}`;
+        fs.appendFile(logPath, msgString, (err) => {
+            if (err) {
+                console.error('failed log');
+                console.log(err);
+            }
+        });
+    },
+    error: (msg, explanation) => {
+        const logLevel = getLogLevel();
+        const required = getLogLevel('INFO');
+
+        if (logLevel < required) {
+            return;
+        }
+
+        const logPath = getConfigValue('LOG_PATH');
+
+        const msgString = `[HOMEGAMES-ERROR][${new Date().toTimeString()}] ${msgToString(msg)}${explanation ? ':' + os.EOL + msgToString(explanation) : ''}${os.EOL}${os.EOL}`;
+        fs.appendFile(logPath, msgString, (err) => {
+            if (err) {
+                console.error('failed log');
+                console.log(err);
+            }
+        });
+    },
+    debug: (msg, explanation) => {
+        const logLevel = getLogLevel();
+        const required = getLogLevel('DEBUG');
+        const logPath = getConfigValue('LOG_PATH');
+        
+        if (logLevel < required) {
+            return;
+        }
+
+        const msgString = `[HOMEGAMES-DEBUG][${new Date().toTimeString()}] ${msgToString(msg)}${explanation ? ':' + os.EOL + msgToString(explanation) : ''}${os.EOL}${os.EOL}`;
+        fs.appendFile(logPath, msgString, (err) => {
+            if (err) {
+                console.error('failed log');
+                console.log(err);
+            }
+        });
+
+    }
+
+}
+
 
 module.exports = {
-    guaranteeCerts,
-    certInit,
-    getCertData,
     signup,
     login,
     confirmUser,
-    validateExistingCerts,
     getLoginInfo,
     verifyAccessToken,
     refreshAccessToken,
-    storeCertData,
     linkInit,
-    storeTokens,
-    promptLogin,
     getUserHash,
     authWorkflow,
-    guaranteeDir
+    guaranteeDir,
+    getUrl,
+    getConfigValue,
+    log
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homegames-common",
-  "version": "0.1.35",
+  "version": "0.3.0",
   "description": "Homegames common tools",
   "main": "index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "homepage": "https://github.com/homegamesio/homegames-common#readme",
   "dependencies": {
-    "aws-sdk": "^2.809.0",
+    "aws-sdk": "^2.1151.0",
     "unzipper": "^0.10.11",
-    "ws": "^7.4.1"
+    "ws": "^7.5.4"
   }
 }