homegames-common 0.1.3 → 0.1.6

package/index.js

@@ -9,6 +9,7 @@ const unzipper = require('unzipper');
 const crypto = require('crypto');
 const { Readable } = require('stream');
 const os = require('os');
+const process = require('process');
 
 const getUserHash = (username) => {
     return crypto.createHash('md5').update(username).digest('hex');
@@ -111,21 +112,22 @@ const guaranteeDir = (dir) => new Promise((resolve, reject) => {
 });
 
 const guaranteeCertFiles = (dir) => new Promise((resolve, reject) => {
+
     let certPath, keyPath;
 
     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) {
@@ -141,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()
+//        });
+//    });
 
 });
 
@@ -224,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 => {
             });
@@ -341,13 +345,15 @@ const getLoginInfo = (authPath) => new Promise((resolve, reject) => {
 
 const getCertData = (username, accessToken) => new Promise((resolve, reject) => {
 
-    getUrl('https://certifier.homegames.link/get-certs', {
+    getUrl('https://certifier.homegames.io/get-cert', {
 
         'hg-username': username,
-        'hg-access-token': accessToken
+        'hg-token': accessToken
     }).then(data => {
         resolve(data);
     }).catch(err => {
+	    console.log(err.toString());
+	    console.log('that was an error');
     });
 });
 
@@ -364,9 +370,10 @@ const bufToStream = (buf) => {
 const storeCertData = (certBundle, path) => new Promise((resolve, reject) => {
     const certStream = bufToStream(certBundle);
 
-    certStream.pipe(unzipper.Extract({ path }));
+    const unzip = unzipper.Extract({ path });
+    certStream.pipe(unzip);
 
-    resolve();
+    unzip.on('close', resolve);
 });
 
 const storeTokens = (path, username, tokens) => new Promise((resolve, reject) => {
@@ -397,11 +404,20 @@ const storeTokens = (path, username, tokens) => new Promise((resolve, reject) =>
 
 const guaranteeCerts = (authPath, certPath) => new Promise((resolve, reject) => {
 
-    getLoginInfo(authPath).then(info => {
-        validateExistingCerts(certPath, info.username, info.tokens.accessToken).then(() => {
-            resolve({
-                certPath: certPath + '/fullchain.pem',
-                keyPath: certPath + '/privkey.pem'
+    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) {
+                    storeCertData(certData, certPath).then(() => {
+                        resolve({
+                            certPath: `${certPath}/cert.pem`,
+                            keyPath: `${certPath}/key.pem`,
+                        }); 
+                    });
+                } else {
+                    reject(data);
+                }
             });
         }).catch(err => {
             reject({message: err});
@@ -445,40 +461,61 @@ const promptLogin = () => new Promise((resolve, reject) => {
 });
 
 const lockFile = (path) => new Promise((resolve, reject) => {
-    const pid = process.getuid();
+    
     let _interval;
 
     const acquireLock = () => {
         const lockPath = `${path}.hglock`;
         fs.exists(lockPath, (exists) => {
             if (!exists) {
-                fs.writeFile(lockPath, '' + pid, 'utf-8', () => {
+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) => {
                         if (err) {
                             console.log(err);
                             reject(err);
-                        } else if (data.toString() === ''+ pid) {
-                                resolve();
                         } else {
-                            reject('Mismatched PID');
+                                resolve();
                         }
                     });
                 });
+    });
+            } else {
+		    console.log('waiting for lock');
+                const { birthtime } = fs.statSync(lockPath);
+                const fiveMinsAgo = Date.now() - ( 1000 * 60 * 5 );
+                console.log(birthtime);
+                if (new Date(birthtime).getTime() < fiveMinsAgo) {
+                    fs.unlink(lockPath, (err) => {
+                        console.log(err);
+                        console.log('deleted');
+                    });
+                }
             }
         });
         
     };
 
-    _interval = setInterval(acquireLock, 50);
+    _interval = setInterval(acquireLock, 1000);
 });
 
 const unlockFile = (path) => new Promise((resolve, reject) => {
-    const pid = process.getuid();
     const lockPath = `${path}.hglock`;
 
     fs.readFile(lockPath, (err, data) => {
-        if (data.toString() === '' + pid) {
             fs.unlink(lockPath, (err) => {
                 if (!err) {
                     resolve();
@@ -486,9 +523,6 @@ const unlockFile = (path) => new Promise((resolve, reject) => {
                     reject('Could not delete lock');
                 }
             });
-        } else {
-            reject('Tried to remove lock that wasnt ours');
-        }
     });
 });
 
@@ -497,36 +531,45 @@ const authWorkflow = (authPath) => new Promise((resolve, reject) => {
         reject(`No authPath provided`);
     }
 
+    const _doLogin = () => {
+        promptLogin().then((loginInfo) => {
+            login(loginInfo.username, loginInfo.password).then(tokens => {
+                storeTokens(authPath, loginInfo.username, tokens).then(() => {
+                    verifyAccessToken(loginInfo.username, tokens.accessToken).then(() => {
+                        unlockFile(authPath).then(() => {
+                            resolve({
+                                username: loginInfo.username,
+                                tokens
+                            });
+                        });
+    
+                    });
+                }).catch(err => {
+                    console.log('Failed to store auth tokens');
+                    reject(err);
+                });
+            }).catch(err => {
+                console.log('Failed to login');
+                reject(err);
+            });
+        });
+    };
+
+	console.log('about to lock ' + authPath);
     lockFile(authPath).then(() => {
         getLoginInfo(authPath).then((loginInfo) => {
             verifyAccessToken(loginInfo.username, loginInfo.tokens.accessToken).then(() => {
                 unlockFile(authPath).then(() => {
                     resolve(loginInfo);
                 });
+            }).catch(err => {
+                console.log('failed to verify access token');
+                _doLogin();
             });
         }).catch((err) => {
+            console.log(err);
             if (err.type === 'DATA_NOT_FOUND') {
-                promptLogin().then((loginInfo) => {
-                    login(loginInfo.username, loginInfo.password).then(tokens => {
-                        storeTokens(authPath, loginInfo.username, tokens).then(() => {
-                            verifyAccessToken(loginInfo.username, tokens.accessToken).then(() => {
-                                unlockFile(authPath).then(() => {
-                                    resolve({
-                                        username: loginInfo.username,
-                                        tokens
-                                    });
-                                });
-    
-                            });
-                        }).catch(err => {
-                            console.log('Failed to store auth tokens');
-                            reject(err);
-                        });
-                    }).catch(err => {
-                        console.log('Failed to login');
-                        reject(err);
-                    });
-                });
+                _doLogin(); 
             }
         });
     }).catch(err => {
@@ -535,6 +578,53 @@ 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;
+    }
+    try {
+        if (config[key] === undefined) {
+            throw new Error(`No value for ${key} found in config`);
+        }
+        console.log(`Found value ${config[key]} in config`);
+        return config[key];
+    } catch(err) {
+        console.log(err);
+        if (_default === undefined) {
+            throw new Error(`No config value found for ${key}`);
+        } else {
+            console.log(`Could not find config for key ${key}. Using default: ${_default}`);
+            return _default;
+        }
+    }
+};
+
+
+const getConfig = () => {
+
+    const options = [process.cwd(), require.main.filename, process.mainModule.filename, __dirname]
+    let baseDir = process.cwd();
+    let _config = {};
+    
+    for (let i = 0; i < options.length; i++) {
+        if (fs.existsSync(`${options[i]}/config.js`)) {//src/util/config.js`)) {
+            console.log(`Using config at ${options[i]}`);
+            _config = require(`${options[i]}/config.js`);
+        }
+    }
+
+    return _config;
+}
+
 
 module.exports = {
     guaranteeCerts,
@@ -553,5 +643,8 @@ module.exports = {
     promptLogin,
     getUserHash,
     authWorkflow,
-    guaranteeDir
+    guaranteeDir,
+    getUrl,
+    getConfigValue
 };
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homegames-common",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "Homegames common tools",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,6 @@
   "dependencies": {
     "aws-sdk": "^2.809.0",
     "unzipper": "^0.10.11",
-    "ws": "^7.4.1"
+    "ws": "^7.5.4"
   }
 }