From ea656e51195b139c1ece9ee56afac88cd8eed111 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sun, 29 Sep 2024 00:15:26 -0400
Subject: [PATCH 01/34] Issue notice

---
 .../notificationPopup/notificationPopup.jsx   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
index aa45bbb8e..e223e5012 100644
--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
@@ -4,7 +4,7 @@ const _     = require('lodash');
 
 import Dialog from '../../../components/dialog.jsx';
 
-const DISMISS_KEY = 'dismiss_notification04-09-24';
+const DISMISS_KEY = 'dismiss_notification28-09-24';
 const DISMISS_BUTTON = <i className='fas fa-times dismiss' />;
 
 const NotificationPopup = ()=>{
@@ -15,6 +15,31 @@ const NotificationPopup = ()=>{
 			<small>This website is always improving and we are still adding new features and squashing bugs. Keep the following in mind:</small>
 		</div>
 		<ul>
+			<li key='ThrottlingError' style={{
+					backgroundColor: '#910000',
+					margin: '-10px -10px -10px -20px',
+					padding: '10px 10px 10px 20px',
+					fontSize: '1.0em'
+				}}>
+				<em>Known issue with saving/creating Google Drive files</em><br />
+				We are aware of <a href="https://github.com/naturalcrit/homebrewery/issues/3770">
+				an issue with saving to Google Drive</a> as of Sept 29 2024 01:50 UTC and are working on a fix.
+				This appears to be an intermittent error with Google in the last few days and may
+				take some time to resolve.
+				<br></br><br></br>
+				Brews saved to Google Drive are <em>not lost</em> and can still be viewed, just not updated.
+				You can also access them via your Google Drive interface in the <code>/Hombrewery</code> folder.
+				<br></br><br></br>
+				If you need to urgently edit documents, you can detatch them from your Google Drive
+				by transferring them to our Homebrewery storage. To do this, click the colored Google Drive
+				icon next to the save button when on an edit page; you can transfer them back later,
+				but this should allow you to edit while this issue is ongoing.
+				<br></br><br></br>
+				If you are experiencing errors creating new documents, you can similarly change your
+				account settings to create new brews by default in the Homebrewery storage. Click
+				your username and then "account", then change the "default save location".
+			</li>
+
 			<li key='Vault'>
 				<em>Search brews with our new page!</em><br />
 				We have been working very hard in making this possible, now you can share your work and look at it in the new <a href="/vault">Vault</a> page!

From 8ab6a8599d49e94f3fc94bcc00cfb19db640af8d Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sun, 29 Sep 2024 21:47:45 -0400
Subject: [PATCH 02/34] Use personal auth if logged in via google.

---
 server/googleActions.js |  6 ++++--
 server/homebrew.api.js  | 11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/googleActions.js b/server/googleActions.js
index 09e51b0bd..b042a00e6 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -147,8 +147,10 @@ const GoogleActions = {
 	  return brews;
 	},
 
-	updateGoogleBrew : async (brew)=>{
-		const drive = googleDrive.drive({ version: 'v3', auth: defaultAuth });
+	updateGoogleBrew : async (brew, auth = defaultAuth)=>{
+		const drive = googleDrive.drive({ version: 'v3', auth: auth });
+
+		console.log(auth == defaultAuth ? 'UPDATE w SERVICEACC' : 'UPDATE w USERACC')
 
 		await drive.files.update({
 			fileId   : brew.googleId,
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 22e2cee7b..0f2283c2b 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -353,7 +353,7 @@ const api = {
 			if(!brew.googleId) return;
 		} else if(brew.googleId) {
 			// If the google id exists and no other actions are being performed, update the google brew
-			const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew));
+			const updated = await api.updateGoogleBrew(req.account, api.excludeGoogleProps(brew), res);
 
 			if(!updated) return;
 		}
@@ -397,6 +397,15 @@ const api = {
 
 		res.status(200).send(saved);
 	},
+
+	updateGoogleBrew : async (account, brew, res)=>{
+		let oAuth2Client;
+		if(account.googleId)
+			oAuth2Client = GoogleActions.authCheck(account, res);
+
+		return await GoogleActions.updateGoogleBrew(brew, oAuth2Client);
+	},
+
 	deleteGoogleBrew : async (account, id, editId, res)=>{
 		const auth = await GoogleActions.authCheck(account, res);
 		await GoogleActions.deleteGoogleBrew(auth, id, editId);

From 68895bdca2baa09b7c21572ebfd6aa6a8e34d303 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sun, 29 Sep 2024 23:37:26 -0400
Subject: [PATCH 03/34] Rate limit `/api` requests from each IP address

100 requests each 5 minutes.
---
 client/homebrew/navbar/error-navitem.jsx | 11 +++++++++++
 package-lock.json                        | 16 ++++++++++++++++
 package.json                             |  1 +
 server/homebrew.api.js                   | 12 ++++++++++++
 4 files changed, 40 insertions(+)

diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx
index 5dd5c1eb9..264d528ef 100644
--- a/client/homebrew/navbar/error-navitem.jsx
+++ b/client/homebrew/navbar/error-navitem.jsx
@@ -116,6 +116,17 @@ const ErrorNavItem = createClass({
 			</Nav.item>;
 		}
 
+		if(HBErrorCode === '55') {
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+				Oops!
+				<div className='errorContainer' onClick={clearError}>
+					Looks like there are too many requests
+					from this IP address in a short time.
+					Please try again after a few minutes.
+				</div>
+			</Nav.item>;
+		}
+
 		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 			Oops!
 			<div className='errorContainer'>
diff --git a/package-lock.json b/package-lock.json
index ed0cbf1f1..701592890 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,6 +25,7 @@
         "expr-eval": "^2.0.2",
         "express": "^4.19.2",
         "express-async-handler": "^1.2.0",
+        "express-rate-limit": "^7.4.0",
         "express-static-gzip": "2.1.7",
         "fs-extra": "11.2.0",
         "js-yaml": "^4.1.0",
@@ -6352,6 +6353,21 @@
       "integrity": "sha512-rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w==",
       "license": "MIT"
     },
+    "node_modules/express-rate-limit": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.4.0.tgz",
+      "integrity": "sha512-v1204w3cXu5gCDmAvgvzI6qjzZzoMWKnyVDk3ACgfswTQLYiGen+r8w0VnXnGMmzEN/g8fwIQ4JrFFd4ZP6ssg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/express-rate-limit"
+      },
+      "peerDependencies": {
+        "express": "4 || 5 || ^5.0.0-beta.1"
+      }
+    },
     "node_modules/express-static-gzip": {
       "version": "2.1.7",
       "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.7.tgz",
diff --git a/package.json b/package.json
index 8248f4304..6926097a9 100644
--- a/package.json
+++ b/package.json
@@ -100,6 +100,7 @@
     "expr-eval": "^2.0.2",
     "express": "^4.19.2",
     "express-async-handler": "^1.2.0",
+    "express-rate-limit": "^7.4.0",
     "express-static-gzip": "2.1.7",
     "fs-extra": "11.2.0",
     "js-yaml": "^4.1.0",
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 0f2283c2b..1891e2791 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -9,6 +9,7 @@ const yaml = require('js-yaml');
 const asyncHandler = require('express-async-handler');
 const { nanoid } = require('nanoid');
 const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
+const rateLimit = require('express-rate-limit');
 
 const { DEFAULT_BREW, DEFAULT_BREW_LOAD } = require('./brewDefaults.js');
 
@@ -24,6 +25,16 @@ const isStaticTheme = (renderer, themeName)=>{
 // 	});
 // };
 
+// Define rate limiter options
+const rateLimiter = rateLimit({
+	timeWindow : 5 * 60 * 1000, // 5 minutes window
+	max        : 100, // limit each IP to 100 requests per timeWindow
+	handler: (req, res, next) => {
+		console.log(`Rate limiting user ${req.account?.username}`);
+		throw { HBErrorCode: '55', status: 429, message: 'Too many requests from this IP, please try again after 5 minutes'};
+	}
+});
+
 const MAX_TITLE_LENGTH = 100;
 
 const api = {
@@ -473,6 +484,7 @@ const api = {
 	}
 };
 
+router.use('/api', rateLimiter);
 router.use('/api', require('./middleware/check-client-version.js'));
 router.post('/api', asyncHandler(api.newBrew));
 router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));

From 32fa2729470f27b10532c24af3bcb2d6546eb280 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 30 Sep 2024 00:03:27 -0400
Subject: [PATCH 04/34] reduce rate limit to 60 requests in 5 minutes

---
 server/homebrew.api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 1891e2791..9eb97c601 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -28,7 +28,7 @@ const isStaticTheme = (renderer, themeName)=>{
 // Define rate limiter options
 const rateLimiter = rateLimit({
 	timeWindow : 5 * 60 * 1000, // 5 minutes window
-	max        : 100, // limit each IP to 100 requests per timeWindow
+	max        : 60, // limit each IP to 100 requests per timeWindow
 	handler: (req, res, next) => {
 		console.log(`Rate limiting user ${req.account?.username}`);
 		throw { HBErrorCode: '55', status: 429, message: 'Too many requests from this IP, please try again after 5 minutes'};

From a7361f8450512830b7ef67f524d79fcd0b10f445 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 30 Sep 2024 00:14:37 -0400
Subject: [PATCH 05/34] add delay between get and update

---
 server/homebrew.api.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 9eb97c601..cfd6dd2e2 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -35,6 +35,15 @@ const rateLimiter = rateLimit({
 	}
 });
 
+// Define the delay middleware function
+const delayMiddleware = (delay) => {
+  return (req, res, next) => {
+    setTimeout(() => {
+      next();
+    }, delay);
+  };
+};
+
 const MAX_TITLE_LENGTH = 100;
 
 const api = {
@@ -488,7 +497,7 @@ router.use('/api', rateLimiter);
 router.use('/api', require('./middleware/check-client-version.js'));
 router.post('/api', asyncHandler(api.newBrew));
 router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
-router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
+router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), delayMiddleware(1000), asyncHandler(api.updateBrew));
 router.delete('/api/:id', asyncHandler(api.deleteBrew));
 router.get('/api/remove/:id', asyncHandler(api.deleteBrew));
 router.get('/api/theme/:renderer/:id', asyncHandler(api.getThemeBundle));

From 3a6750613bbe628f3a28f5ec42b5074ca78e4ee3 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 30 Sep 2024 00:31:58 -0400
Subject: [PATCH 06/34] express proxy settings

---
 server/app.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/app.js b/server/app.js
index c922f0ff7..fef433d59 100644
--- a/server/app.js
+++ b/server/app.js
@@ -30,6 +30,10 @@ const sanitizeBrew = (brew, accessType)=>{
 	return brew;
 };
 
+app.set('trust proxy', 1 /* number of proxies between user and server */)
+app.get('/ip', (request, response) => response.send(request.ip))
+
+
 app.use('/', serveCompressedStaticAssets(`build`));
 app.use(require('./middleware/content-negotiation.js'));
 app.use(require('body-parser').json({ limit: '25mb' }));

From 66433d9e7721fd3d0c231b62fdeef0b5c25b0f8c Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 30 Sep 2024 00:45:10 -0400
Subject: [PATCH 07/34] 5 requests

---
 server/homebrew.api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index cfd6dd2e2..e1fa0e089 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -28,7 +28,7 @@ const isStaticTheme = (renderer, themeName)=>{
 // Define rate limiter options
 const rateLimiter = rateLimit({
 	timeWindow : 5 * 60 * 1000, // 5 minutes window
-	max        : 60, // limit each IP to 100 requests per timeWindow
+	max        : 5, // limit each IP to 100 requests per timeWindow
 	handler: (req, res, next) => {
 		console.log(`Rate limiting user ${req.account?.username}`);
 		throw { HBErrorCode: '55', status: 429, message: 'Too many requests from this IP, please try again after 5 minutes'};

From 40925253bdcb23945b3dff6445467cc44ae3e92e Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 30 Sep 2024 00:59:30 -0400
Subject: [PATCH 08/34] autosave to 16 seconds

---
 client/homebrew/pages/editPage/editPage.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 792b1971e..4d7741000 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -29,7 +29,7 @@ const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpe
 
 const googleDriveIcon = require('../../googleDrive.svg');
 
-const SAVE_TIMEOUT = 10000;
+const SAVE_TIMEOUT = 16000;
 
 const EditPage = createClass({
 	displayName     : 'EditPage',

From e9c45b216cb26cb34d11948442cc03d30b601a3e Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 30 Sep 2024 08:31:39 -0400
Subject: [PATCH 09/34] Add retryconfig and forward user ip

---
 server/googleActions.js | 18 +++++++++++++++---
 server/homebrew.api.js  |  6 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/server/googleActions.js b/server/googleActions.js
index b042a00e6..4cba4d8ca 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -25,6 +25,15 @@ if(!config.get('service_account')){
 
 const defaultAuth = serviceAuth || config.get('google_api_key');
 
+const retryConfig = {
+  retry: 3, // Number of retry attempts
+  retryDelay: 100, // Initial delay in milliseconds
+  retryDelayMultiplier: 2, // Multiplier for exponential backoff
+  maxRetryDelay: 32000, // Maximum delay in milliseconds
+  httpMethodsToRetry: ['PATCH'], // Only retry PATCH requests
+  statusCodesToRetry: [[429, 429]], // Only retry on 429 status code
+};
+
 const GoogleActions = {
 
 	authCheck : (account, res, updateTokens=true)=>{
@@ -147,9 +156,8 @@ const GoogleActions = {
 	  return brews;
 	},
 
-	updateGoogleBrew : async (brew, auth = defaultAuth)=>{
+	updateGoogleBrew : async (brew, auth = defaultAuth, userIp)=>{
 		const drive = googleDrive.drive({ version: 'v3', auth: auth });
-
 		console.log(auth == defaultAuth ? 'UPDATE w SERVICEACC' : 'UPDATE w USERACC')
 
 		await drive.files.update({
@@ -170,7 +178,11 @@ const GoogleActions = {
 			media : {
 				mimeType : 'text/plain',
 				body     : brew.text
-			}
+			},
+			headers: {
+				'X-Forwarded-For': userIp, // Set the X-Forwarded-For header
+			},
+			retryConfig
 		})
 		.catch((err)=>{
 			console.log('Error saving to google');
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index e1fa0e089..9546e8266 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -373,7 +373,7 @@ const api = {
 			if(!brew.googleId) return;
 		} else if(brew.googleId) {
 			// If the google id exists and no other actions are being performed, update the google brew
-			const updated = await api.updateGoogleBrew(req.account, api.excludeGoogleProps(brew), res);
+			const updated = await api.updateGoogleBrew(req.account, api.excludeGoogleProps(brew), res, req);
 
 			if(!updated) return;
 		}
@@ -418,12 +418,12 @@ const api = {
 		res.status(200).send(saved);
 	},
 
-	updateGoogleBrew : async (account, brew, res)=>{
+	updateGoogleBrew : async (account, brew, res, req)=>{
 		let oAuth2Client;
 		if(account.googleId)
 			oAuth2Client = GoogleActions.authCheck(account, res);
 
-		return await GoogleActions.updateGoogleBrew(brew, oAuth2Client);
+		return await GoogleActions.updateGoogleBrew(brew, oAuth2Client, req.ip);
 	},
 
 	deleteGoogleBrew : async (account, id, editId, res)=>{

From e7e35294c6f162664866bbfdb1436b65c482f044 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 30 Sep 2024 10:59:43 -0400
Subject: [PATCH 10/34] disable rate limiter

---
 server/homebrew.api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 9546e8266..5adbc40cf 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -493,7 +493,7 @@ const api = {
 	}
 };
 
-router.use('/api', rateLimiter);
+// router.use('/api', rateLimiter);
 router.use('/api', require('./middleware/check-client-version.js'));
 router.post('/api', asyncHandler(api.newBrew));
 router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));

From c33b44855a29979fdeab05cd102767eb45f3097f Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 1 Oct 2024 12:17:30 -0400
Subject: [PATCH 11/34] Go back to service account for brew updates

---
 server/homebrew.api.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 5adbc40cf..b231dd0cc 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -419,11 +419,11 @@ const api = {
 	},
 
 	updateGoogleBrew : async (account, brew, res, req)=>{
-		let oAuth2Client;
-		if(account.googleId)
-			oAuth2Client = GoogleActions.authCheck(account, res);
+		//let oAuth2Client;
+		//if(account.googleId)
+		//	oAuth2Client = GoogleActions.authCheck(account, res);
 
-		return await GoogleActions.updateGoogleBrew(brew, oAuth2Client, req.ip);
+		return await GoogleActions.updateGoogleBrew(brew, undefined, req.ip);
 	},
 
 	deleteGoogleBrew : async (account, id, editId, res)=>{

From 0e2962071098c9955da3b56a8237cef9726e12bb Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 1 Oct 2024 14:13:15 -0400
Subject: [PATCH 12/34] Remove delayMiddleware and ratelimiter

---
 server/homebrew.api.js | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index b231dd0cc..601fe8758 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -25,25 +25,6 @@ const isStaticTheme = (renderer, themeName)=>{
 // 	});
 // };
 
-// Define rate limiter options
-const rateLimiter = rateLimit({
-	timeWindow : 5 * 60 * 1000, // 5 minutes window
-	max        : 5, // limit each IP to 100 requests per timeWindow
-	handler: (req, res, next) => {
-		console.log(`Rate limiting user ${req.account?.username}`);
-		throw { HBErrorCode: '55', status: 429, message: 'Too many requests from this IP, please try again after 5 minutes'};
-	}
-});
-
-// Define the delay middleware function
-const delayMiddleware = (delay) => {
-  return (req, res, next) => {
-    setTimeout(() => {
-      next();
-    }, delay);
-  };
-};
-
 const MAX_TITLE_LENGTH = 100;
 
 const api = {
@@ -493,11 +474,10 @@ const api = {
 	}
 };
 
-// router.use('/api', rateLimiter);
 router.use('/api', require('./middleware/check-client-version.js'));
 router.post('/api', asyncHandler(api.newBrew));
 router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
-router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), delayMiddleware(1000), asyncHandler(api.updateBrew));
+router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
 router.delete('/api/:id', asyncHandler(api.deleteBrew));
 router.get('/api/remove/:id', asyncHandler(api.deleteBrew));
 router.get('/api/theme/:renderer/:id', asyncHandler(api.getThemeBundle));

From 0110c6afed4b62e3afd7ef42d49c3fd016cb6af9 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 1 Oct 2024 15:06:11 -0400
Subject: [PATCH 13/34] Remove duplicate error log for googleActions.list

---
 server/app.js           | 24 +++++++-----------------
 server/googleActions.js |  2 --
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/server/app.js b/server/app.js
index fef433d59..04b3c3486 100644
--- a/server/app.js
+++ b/server/app.js
@@ -379,22 +379,12 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
 	let googleCount = [];
 	if(req.account) {
 		if(req.account.googleId) {
-			try {
-				auth = await GoogleActions.authCheck(req.account, res, false);
-			} catch (e) {
-				auth = undefined;
-				console.log('Google auth check failed!');
-				console.log(e);
-			}
-			if(auth.credentials.access_token) {
-				try {
-					googleCount = await GoogleActions.listGoogleBrews(auth);
-				} catch (e) {
-					googleCount = undefined;
-					console.log('List Google files failed!');
-					console.log(e);
-				}
-			}
+			auth = await GoogleActions.authCheck(req.account, res, false)
+
+			googleCount = await GoogleActions.listGoogleBrews(auth)
+				.catch((err)=>{
+					console.error(err);
+				});
 		}
 
 		const query = { authors: req.account.username, googleId: { $exists: false } };
@@ -408,7 +398,7 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
 			username    : req.account.username,
 			issued      : req.account.issued,
 			googleId    : Boolean(req.account.googleId),
-			authCheck   : Boolean(req.account.googleId && auth.credentials.access_token),
+			authCheck   : Boolean(req.account.googleId && auth?.credentials.access_token),
 			mongoCount  : mongoCount,
 			googleCount : googleCount?.length
 		};
diff --git a/server/googleActions.js b/server/googleActions.js
index 4cba4d8ca..953ae27fb 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -121,9 +121,7 @@ const GoogleActions = {
 			})
 			.catch((err)=>{
 				console.log(`Error Listing Google Brews`);
-				console.error(err);
 				throw (err);
-				//TODO: Should break out here, but continues on for some reason.
 			});
 			fileList.push(...obj.data.files);
 			NextPageToken = obj.data.nextPageToken;

From 1a325fb3c5bd7723d2611fe9e9b775191d6135f6 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 1 Oct 2024 22:25:17 -0400
Subject: [PATCH 14/34] New notification

---
 .../notificationPopup/notificationPopup.jsx         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
index e223e5012..9cdaf2ff6 100644
--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
@@ -4,7 +4,7 @@ const _     = require('lodash');
 
 import Dialog from '../../../components/dialog.jsx';
 
-const DISMISS_KEY = 'dismiss_notification28-09-24';
+const DISMISS_KEY = 'dismiss_notification01-10-24';
 const DISMISS_BUTTON = <i className='fas fa-times dismiss' />;
 
 const NotificationPopup = ()=>{
@@ -22,10 +22,13 @@ const NotificationPopup = ()=>{
 					fontSize: '1.0em'
 				}}>
 				<em>Known issue with saving/creating Google Drive files</em><br />
-				We are aware of <a href="https://github.com/naturalcrit/homebrewery/issues/3770">
-				an issue with saving to Google Drive</a> as of Sept 29 2024 01:50 UTC and are working on a fix.
-				This appears to be an intermittent error with Google in the last few days and may
-				take some time to resolve.
+				Dear users. The <a href="https://github.com/naturalcrit/homebrewery/issues/3770">
+				issue with saving to Google Drive</a> has resurfaced as of Oct 1, 2024 22:00 UTC.
+				<br></br><br></br>
+				Earlier we submitted a bug report to Google and have all but confirmed the issue
+				lies on Google's end and the disruption has been affecting multiple other
+				organizations besides us. Unfortunately, it means reliable interaction with
+				Google remains out of our control until they can resolve their issue.
 				<br></br><br></br>
 				Brews saved to Google Drive are <em>not lost</em> and can still be viewed, just not updated.
 				You can also access them via your Google Drive interface in the <code>/Hombrewery</code> folder.

From 487a574f50a41c1ebbcd46f337699142e1690c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?=
 <losada.hernandez.victor@gmail.com>
Date: Fri, 4 Oct 2024 22:18:11 +0200
Subject: [PATCH 15/34] initital fix

---
 client/homebrew/navbar/recent.navitem.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx
index 431bdd8df..a6cbbf406 100644
--- a/client/homebrew/navbar/recent.navitem.jsx
+++ b/client/homebrew/navbar/recent.navitem.jsx
@@ -36,7 +36,7 @@ const RecentItems = createClass({
 		//== Add current brew to appropriate recent items list (depending on storageKey) ==//
 		if(this.props.storageKey == 'edit'){
 			let editId = this.props.brew.editId;
-			if(this.props.brew.googleId){
+			if(this.props.brew.googleId && !this.props.brew.stubbed){
 				editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
 			}
 			edited = _.filter(edited, (brew)=>{
@@ -51,7 +51,7 @@ const RecentItems = createClass({
 		}
 		if(this.props.storageKey == 'view'){
 			let shareId = this.props.brew.shareId;
-			if(this.props.brew.googleId){
+			if(this.props.brew.googleId && !this.props.brew.stubbed){
 				shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`;
 			}
 			viewed = _.filter(viewed, (brew)=>{
@@ -83,7 +83,7 @@ const RecentItems = createClass({
 	 		let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
 			if(this.props.storageKey == 'edit') {
 				let prevEditId = prevProps.brew.editId;
-				if(prevProps.brew.googleId){
+				if(prevProps.brew.googleId && !this.props.brew.stubbed){
 					prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`;
 				}
 
@@ -91,7 +91,7 @@ const RecentItems = createClass({
 					return brew.id !== prevEditId;
 				});
 				let editId = this.props.brew.editId;
-				if(this.props.brew.googleId){
+				if(this.props.brew.googleId && !this.props.brew.stubbed){
 					editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
 				}
 				edited.unshift({

From 2a523c4955d8d6b6dc30e811326fb16a0ba59cc7 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sun, 6 Oct 2024 15:48:10 -0400
Subject: [PATCH 16/34] Fix links to google drive files in user page

User page was not marking Google Brews as "stubbed" if the brew belongs   to another users' Google Drive or your own credentials are expired (it searches the current user drive for google files and checks if those are stubbed)

This now sets *every* file found on Mongo as "Stubbed", whether the Drive file belongs to the current user or not.
---
 server/app.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/app.js b/server/app.js
index 04b3c3486..40ab193d9 100644
--- a/server/app.js
+++ b/server/app.js
@@ -242,6 +242,8 @@ app.get('/user/:username', async (req, res, next)=>{
 		console.log(err);
 	});
 
+	brews.forEach(brew => brew.stubbed = true); //All brews from MongoDB are "stubbed"
+
 	if(ownAccount && req?.account?.googleId){
 		const auth = await GoogleActions.authCheck(req.account, res);
 		let googleBrews = await GoogleActions.listGoogleBrews(auth)
@@ -249,12 +251,12 @@ app.get('/user/:username', async (req, res, next)=>{
 				console.error(err);
 			});
 
+		// If stub matches file from Google, use Google metadata over stub metadata
 		if(googleBrews && googleBrews.length > 0) {
 			for (const brew of brews.filter((brew)=>brew.googleId)) {
 				const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
 				if(match !== -1) {
 					brew.googleId = googleBrews[match].googleId;
-					brew.stubbed = true;
 					brew.pageCount = googleBrews[match].pageCount;
 					brew.renderer = googleBrews[match].renderer;
 					brew.version = googleBrews[match].version;
@@ -263,6 +265,7 @@ app.get('/user/:username', async (req, res, next)=>{
 				}
 			}
 
+			//Remaining unstubbed google brews display current user as author
 			googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] }));
 			brews = _.concat(brews, googleBrews);
 		}

From fa78d04e89ef0ba6b3d878a494b73be26595c59a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2024 03:50:24 +0000
Subject: [PATCH 17/34] Bump @babel/core from 7.25.7 to 7.25.8

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.25.7 to 7.25.8.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.8/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 26 +++++++++++++-------------
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e076609e..2eee9fb2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.25.7",
+        "@babel/core": "^7.25.8",
         "@babel/plugin-transform-runtime": "^7.25.7",
         "@babel/preset-env": "^7.25.7",
         "@babel/preset-react": "^7.25.7",
@@ -103,9 +103,9 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz",
-      "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz",
+      "integrity": "sha512-Oixnb+DzmRT30qu9d3tJSQkxuygWm32DFykT4bRoORPa9hZ/L4KhVB/XiRm6KG+roIEM7DBQlmg27kw2HZkdZg==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.25.7",
@@ -113,10 +113,10 @@
         "@babel/helper-compilation-targets": "^7.25.7",
         "@babel/helper-module-transforms": "^7.25.7",
         "@babel/helpers": "^7.25.7",
-        "@babel/parser": "^7.25.7",
+        "@babel/parser": "^7.25.8",
         "@babel/template": "^7.25.7",
         "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7",
+        "@babel/types": "^7.25.8",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -415,11 +415,11 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz",
-      "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
+      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.8"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1790,9 +1790,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz",
-      "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
+      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.7",
         "@babel/helper-validator-identifier": "^7.25.7",
diff --git a/package.json b/package.json
index f8007c608..c8f96e1c0 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.25.7",
+    "@babel/core": "^7.25.8",
     "@babel/plugin-transform-runtime": "^7.25.7",
     "@babel/preset-env": "^7.25.7",
     "@babel/preset-react": "^7.25.7",

From 7cad7fd319937ab6ce04abbfa1221b2b85434087 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2024 16:07:18 +0000
Subject: [PATCH 18/34] Bump @babel/preset-env from 7.25.7 to 7.25.8

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.25.7 to 7.25.8.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.8/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 220 ++++++++++++++++------------------------------
 package.json      |   2 +-
 2 files changed, 78 insertions(+), 144 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2eee9fb2c..02db16114 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
       "dependencies": {
         "@babel/core": "^7.25.8",
         "@babel/plugin-transform-runtime": "^7.25.7",
-        "@babel/preset-env": "^7.25.7",
+        "@babel/preset-env": "^7.25.8",
         "@babel/preset-react": "^7.25.7",
         "@googleapis/drive": "^8.14.0",
         "body-parser": "^1.20.2",
@@ -95,9 +95,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.7.tgz",
-      "integrity": "sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
+      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -518,6 +518,7 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -543,6 +544,7 @@
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
@@ -551,42 +553,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
       "version": "7.25.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
@@ -619,6 +585,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -631,6 +598,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -657,6 +625,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -669,6 +638,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -681,6 +651,7 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -693,6 +664,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -705,6 +677,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -717,6 +690,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -725,24 +699,11 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -801,13 +762,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.7.tgz",
-      "integrity": "sha512-4B6OhTrwYKHYYgcwErvZjbmH9X5TxQBsaBHdzEIB4l71gR5jh/tuHGlb9in47udL2+wVUcOz5XXhhfhVJwEpEg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.8.tgz",
+      "integrity": "sha512-9ypqkozyzpG+HxlH4o4gdctalFGIjjdufzo7I2XPda0iBnZ6a+FO0rIEQcdSPXp02CkvGsII1exJhmROPQd5oA==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.7",
         "@babel/helper-remap-async-to-generator": "^7.25.7",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/traverse": "^7.25.7"
       },
       "engines": {
@@ -877,13 +837,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.7.tgz",
-      "integrity": "sha512-rvUUtoVlkDWtDWxGAiiQj0aNktTPn3eFynBcMC2IhsXweehwgdI9ODe+XjWw515kEmv22sSOTp/rxIRuTiB7zg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz",
+      "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -993,12 +952,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.7.tgz",
-      "integrity": "sha512-UvcLuual4h7/GfylKm2IAA3aph9rwvAM2XBA0uPKU3lca+Maai4jBjjEVUS568ld6kJcgbouuumCBhMd/Yz17w==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz",
+      "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1023,12 +981,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.7.tgz",
-      "integrity": "sha512-h3MDAP5l34NQkkNulsTNyjdaR+OiB0Im67VU//sFupouP8Q6m9Spy7l66DcaAQxtmCqGdanPByLsnwFttxKISQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz",
+      "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1069,12 +1026,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.7.tgz",
-      "integrity": "sha512-Ot43PrL9TEAiCe8C/2erAjXMeVSnE/BLEx6eyrKLNFCCw5jvhTHKyHxdI1pA0kz5njZRYAnMO2KObGqOCRDYSA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz",
+      "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1098,12 +1054,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.7.tgz",
-      "integrity": "sha512-iImzbA55BjiovLyG2bggWS+V+OLkaBorNvc/yJoeeDQGztknRnDdYfp2d/UPmunZYEnZi6Lg8QcTmNMHOB0lGA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz",
+      "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1219,12 +1174,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.7.tgz",
-      "integrity": "sha512-FbuJ63/4LEL32mIxrxwYaqjJxpbzxPVQj5a+Ebrc8JICV6YX8nE53jY+K0RZT3um56GoNWgkS2BQ/uLGTjtwfw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
+      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1234,12 +1188,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.7.tgz",
-      "integrity": "sha512-8CbutzSSh4hmD+jJHIA8vdTNk15kAzOnFLVVgBSMGr28rt85ouT01/rezMecks9pkU939wDInImwCKv4ahU4IA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz",
+      "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1249,13 +1202,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.7.tgz",
-      "integrity": "sha512-1JdVKPhD7Y5PvgfFy0Mv2brdrolzpzSoUq2pr6xsR+m+3viGGeHEokFKsCgOkbeFOQxfB1Vt2F0cPJLRpFI4Zg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz",
+      "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.25.7",
         "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-transform-parameters": "^7.25.7"
       },
       "engines": {
@@ -1281,12 +1233,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.7.tgz",
-      "integrity": "sha512-m9obYBA39mDPN7lJzD5WkGGb0GO54PPLXsbcnj1Hyeu8mSRz7Gb4b1A6zxNX32ZuUySDK4G6it8SDFWD1nCnqg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz",
+      "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1296,13 +1247,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.7.tgz",
-      "integrity": "sha512-h39agClImgPWg4H8mYVAbD1qP9vClFbEjqoJmt87Zen8pjqK8FTPUwrOXAvqu5soytwxrLMd2fx2KSCp2CHcNg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
+      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1341,14 +1291,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.7.tgz",
-      "integrity": "sha512-LzA5ESzBy7tqj00Yjey9yWfs3FKy4EmJyKOSWld144OxkTji81WWnUT8nkLUn+imN/zHL8ZQlOu/MTUAhHaX3g==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz",
+      "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.25.7",
         "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1611,11 +1560,11 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.7.tgz",
-      "integrity": "sha512-Gibz4OUdyNqqLj+7OAvBZxOD7CklCtMA5/j0JgUEwOnaRULsPDXmic2iKxL2DX2vQduPR5wH2hjZas/Vr/Oc0g==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.8.tgz",
+      "integrity": "sha512-58T2yulDHMN8YMUxiLq5YmWUnlDCyY1FsHM+v12VMx+1/FlrUj5tY50iDCpofFQEM8fMYOaY9YRvym2jcjn1Dg==",
       "dependencies": {
-        "@babel/compat-data": "^7.25.7",
+        "@babel/compat-data": "^7.25.8",
         "@babel/helper-compilation-targets": "^7.25.7",
         "@babel/helper-plugin-utils": "^7.25.7",
         "@babel/helper-validator-option": "^7.25.7",
@@ -1625,45 +1574,30 @@
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.7",
         "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.7",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-import-assertions": "^7.25.7",
         "@babel/plugin-syntax-import-attributes": "^7.25.7",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.25.7",
-        "@babel/plugin-transform-async-generator-functions": "^7.25.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.8",
         "@babel/plugin-transform-async-to-generator": "^7.25.7",
         "@babel/plugin-transform-block-scoped-functions": "^7.25.7",
         "@babel/plugin-transform-block-scoping": "^7.25.7",
         "@babel/plugin-transform-class-properties": "^7.25.7",
-        "@babel/plugin-transform-class-static-block": "^7.25.7",
+        "@babel/plugin-transform-class-static-block": "^7.25.8",
         "@babel/plugin-transform-classes": "^7.25.7",
         "@babel/plugin-transform-computed-properties": "^7.25.7",
         "@babel/plugin-transform-destructuring": "^7.25.7",
         "@babel/plugin-transform-dotall-regex": "^7.25.7",
         "@babel/plugin-transform-duplicate-keys": "^7.25.7",
         "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.7",
-        "@babel/plugin-transform-dynamic-import": "^7.25.7",
+        "@babel/plugin-transform-dynamic-import": "^7.25.8",
         "@babel/plugin-transform-exponentiation-operator": "^7.25.7",
-        "@babel/plugin-transform-export-namespace-from": "^7.25.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.25.8",
         "@babel/plugin-transform-for-of": "^7.25.7",
         "@babel/plugin-transform-function-name": "^7.25.7",
-        "@babel/plugin-transform-json-strings": "^7.25.7",
+        "@babel/plugin-transform-json-strings": "^7.25.8",
         "@babel/plugin-transform-literals": "^7.25.7",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.25.7",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.25.8",
         "@babel/plugin-transform-member-expression-literals": "^7.25.7",
         "@babel/plugin-transform-modules-amd": "^7.25.7",
         "@babel/plugin-transform-modules-commonjs": "^7.25.7",
@@ -1671,15 +1605,15 @@
         "@babel/plugin-transform-modules-umd": "^7.25.7",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.7",
         "@babel/plugin-transform-new-target": "^7.25.7",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.7",
-        "@babel/plugin-transform-numeric-separator": "^7.25.7",
-        "@babel/plugin-transform-object-rest-spread": "^7.25.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.8",
+        "@babel/plugin-transform-numeric-separator": "^7.25.8",
+        "@babel/plugin-transform-object-rest-spread": "^7.25.8",
         "@babel/plugin-transform-object-super": "^7.25.7",
-        "@babel/plugin-transform-optional-catch-binding": "^7.25.7",
-        "@babel/plugin-transform-optional-chaining": "^7.25.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.25.8",
+        "@babel/plugin-transform-optional-chaining": "^7.25.8",
         "@babel/plugin-transform-parameters": "^7.25.7",
         "@babel/plugin-transform-private-methods": "^7.25.7",
-        "@babel/plugin-transform-private-property-in-object": "^7.25.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.25.8",
         "@babel/plugin-transform-property-literals": "^7.25.7",
         "@babel/plugin-transform-regenerator": "^7.25.7",
         "@babel/plugin-transform-reserved-words": "^7.25.7",
diff --git a/package.json b/package.json
index c8f96e1c0..5d0be26ef 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
   "dependencies": {
     "@babel/core": "^7.25.8",
     "@babel/plugin-transform-runtime": "^7.25.7",
-    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-env": "^7.25.8",
     "@babel/preset-react": "^7.25.7",
     "@googleapis/drive": "^8.14.0",
     "body-parser": "^1.20.2",

From 836dfbade231a4aeb229feaf9ce0fd6c7a838c22 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:15:03 -0400
Subject: [PATCH 19/34] SetSaveDelayTo10s

---
 client/homebrew/pages/editPage/editPage.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 548c26ec5..fcc43e81a 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -32,7 +32,7 @@ import { updateHistory, versionHistoryGarbageCollection } from '../../utils/vers
 
 const googleDriveIcon = require('../../googleDrive.svg');
 
-const SAVE_TIMEOUT = 16000;
+const SAVE_TIMEOUT = 10000;
 
 const EditPage = createClass({
 	displayName     : 'EditPage',

From 134fe7d3722d4e61501a9dc0c95cd9c4ba36bb28 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:15:56 -0400
Subject: [PATCH 20/34] Remove /ip path

---
 server/app.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/app.js b/server/app.js
index 40ab193d9..a84970e2a 100644
--- a/server/app.js
+++ b/server/app.js
@@ -31,8 +31,6 @@ const sanitizeBrew = (brew, accessType)=>{
 };
 
 app.set('trust proxy', 1 /* number of proxies between user and server */)
-app.get('/ip', (request, response) => response.send(request.ip))
-
 
 app.use('/', serveCompressedStaticAssets(`build`));
 app.use(require('./middleware/content-negotiation.js'));

From 086d85c08bf5418dc5e6ad326f350ed03ef4259f Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:18:03 -0400
Subject: [PATCH 21/34] Remove Error 55

---
 client/homebrew/navbar/error-navitem.jsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx
index a6b98af11..f6788e6d5 100644
--- a/client/homebrew/navbar/error-navitem.jsx
+++ b/client/homebrew/navbar/error-navitem.jsx
@@ -116,17 +116,6 @@ const ErrorNavItem = createClass({
 			</Nav.item>;
 		}
 
-		if(HBErrorCode === '55') {
-			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-				Oops!
-				<div className='errorContainer' onClick={clearError}>
-					Looks like there are too many requests
-					from this IP address in a short time.
-					Please try again after a few minutes.
-				</div>
-			</Nav.item>;
-		}
-
 		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 			Oops!
 			<div className='errorContainer'>

From 1aaa146412af98be158fab19f1136e58181cb286 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:19:17 -0400
Subject: [PATCH 22/34] Update package-lock.json

---
 package-lock.json | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5b77d44d3..02db16114 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,6 @@
         "expr-eval": "^2.0.2",
         "express": "^4.21.1",
         "express-async-handler": "^1.2.0",
-        "express-rate-limit": "^7.4.0",
         "express-static-gzip": "2.1.8",
         "fs-extra": "11.2.0",
         "idb-keyval": "^6.2.1",
@@ -6234,21 +6233,6 @@
       "integrity": "sha512-rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w==",
       "license": "MIT"
     },
-    "node_modules/express-rate-limit": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.4.0.tgz",
-      "integrity": "sha512-v1204w3cXu5gCDmAvgvzI6qjzZzoMWKnyVDk3ACgfswTQLYiGen+r8w0VnXnGMmzEN/g8fwIQ4JrFFd4ZP6ssg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/express-rate-limit"
-      },
-      "peerDependencies": {
-        "express": "4 || 5 || ^5.0.0-beta.1"
-      }
-    },
     "node_modules/express-static-gzip": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",

From bfbbbe9e86ced55128e4212979b58e676f9d1288 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:19:44 -0400
Subject: [PATCH 23/34] Update package.json

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

diff --git a/package.json b/package.json
index bf1af0be3..5d0be26ef 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,6 @@
     "expr-eval": "^2.0.2",
     "express": "^4.21.1",
     "express-async-handler": "^1.2.0",
-    "express-rate-limit": "^7.4.0",
     "express-static-gzip": "2.1.8",
     "fs-extra": "11.2.0",
     "idb-keyval": "^6.2.1",

From 1c47d743d6d9c606710e37125ca25a93375e9680 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:20:32 -0400
Subject: [PATCH 24/34] Remove 429 error

---
 .../notificationPopup/notificationPopup.jsx   | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
index ebeb2ca5f..f4e0b1c95 100644
--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
@@ -15,34 +15,6 @@ const NotificationPopup = ()=>{
 			<small>This website is always improving and we are still adding new features and squashing bugs. Keep the following in mind:</small>
 		</div>
 		<ul>
-			<li key='ThrottlingError' style={{
-					backgroundColor: '#910000',
-					margin: '-10px -10px -10px -20px',
-					padding: '10px 10px 10px 20px',
-					fontSize: '1.0em'
-				}}>
-				<em>Known issue with saving/creating Google Drive files</em><br />
-				Dear users. The <a href="https://github.com/naturalcrit/homebrewery/issues/3770">
-				issue with saving to Google Drive</a> has resurfaced as of Oct 1, 2024 22:00 UTC.
-				<br></br><br></br>
-				Earlier we submitted a bug report to Google and have all but confirmed the issue
-				lies on Google's end and the disruption has been affecting multiple other
-				organizations besides us. Unfortunately, it means reliable interaction with
-				Google remains out of our control until they can resolve their issue.
-				<br></br><br></br>
-				Brews saved to Google Drive are <em>not lost</em> and can still be viewed, just not updated.
-				You can also access them via your Google Drive interface in the <code>/Hombrewery</code> folder.
-				<br></br><br></br>
-				If you need to urgently edit documents, you can detatch them from your Google Drive
-				by transferring them to our Homebrewery storage. To do this, click the colored Google Drive
-				icon next to the save button when on an edit page; you can transfer them back later,
-				but this should allow you to edit while this issue is ongoing.
-				<br></br><br></br>
-				If you are experiencing errors creating new documents, you can similarly change your
-				account settings to create new brews by default in the Homebrewery storage. Click
-				your username and then "account", then change the "default save location".
-			</li>
-
 			<li key='Vault'>
 				<em>Search brews with our new page!</em><br />
 				We have been working very hard in making this possible, now you can share your work and look at it in the new <a href='/vault'>Vault</a> page!

From 4859756ef87b02dfde642a09cda47a9d12e83372 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:23:56 -0400
Subject: [PATCH 25/34] Update homebrew.api.js

---
 server/homebrew.api.js | 66 +-----------------------------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 601fe8758..8450d58cb 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -9,30 +9,24 @@ const yaml = require('js-yaml');
 const asyncHandler = require('express-async-handler');
 const { nanoid } = require('nanoid');
 const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
-const rateLimit = require('express-rate-limit');
 
 const { DEFAULT_BREW, DEFAULT_BREW_LOAD } = require('./brewDefaults.js');
 
 const Themes = require('../themes/themes.json');
-
 const isStaticTheme = (renderer, themeName)=>{
 	return Themes[renderer]?.[themeName] !== undefined;
 };
-
 // const getTopBrews = (cb) => {
 // 	HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
 // 		cb(brews);
 // 	});
 // };
-
 const MAX_TITLE_LENGTH = 100;
-
 const api = {
 	homebrewApi : router,
 	getId       : (req)=>{
 		// Set the id and initial potential google id, where the google id is present on the existing brew.
 		let id = req.params.id, googleId = req.body?.googleId;
-
 		// If the id is longer than 12, then it's a google id + the edit id. This splits the longer id up.
 		if(id.length > 12) {
 			if(id.length >= (33 + 12)) {    // googleId is minimum 33 chars (may increase)
@@ -49,7 +43,6 @@ const api = {
 	getUsersBrewThemes : async (username)=>{
 		if(!username)
 			return {};
-
 		const fields = [
 			'title',
 			'tags',
@@ -60,11 +53,8 @@ const api = {
 			'authors',
 			'renderer'
 		];
-
 		const userThemes = {};
-
 		const brews = await HomebrewModel.getByUser(username, true, fields, { tags: { $in: ['meta:theme', 'meta:Theme'] } });
-
 		if(brews) {
 			for (const brew of brews) {
 				userThemes[brew.renderer] ??= {};
@@ -79,7 +69,6 @@ const api = {
 				};
 			}
 		}
-
 		return userThemes;
 	},
 	getBrew : (accessType, stubOnly = false)=>{
@@ -87,7 +76,6 @@ const api = {
 		return async (req, res, next)=>{
 			// Get relevant IDs for the brew
 			const { id, googleId } = api.getId(req);
-
 			// Try to find the document in the Homebrewery database -- if it doesn't exist, that's fine.
 			let stub = await HomebrewModel.get(accessType === 'edit' ? { editId: id } : { shareId: id })
 				.catch((err)=>{
@@ -98,11 +86,9 @@ const api = {
 					}
 				});
 			stub = stub?.toObject();
-
 			if(stub?.lock?.locked && accessType != 'edit') {
 				throw { HBErrorCode: '51', code: stub.lock.code, message: stub.lock.shareMessage, brewId: stub.shareId, brewTitle: stub.title };
 			}
-
 			// If there is a google id, try to find the google brew
 			if(!stubOnly && (googleId || stub?.googleId)) {
 				let googleError;
@@ -132,37 +118,31 @@ const api = {
 				}
 				throw { ...accessError, message: 'User is not logged in', HBErrorCode: '04', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId };
 			}
-
 			// If after all of that we still don't have a brew, throw an exception
 			if(!stub && !stubOnly) {
 				throw { name: 'BrewLoad Error', message: 'Brew not found', status: 404, HBErrorCode: '05', accessType: accessType, brewId: id };
 			}
-
 			// Clean up brew: fill in missing fields with defaults / fix old invalid values
 			if(stub) {
 				stub.tags     = stub.tags     || undefined; // Clear empty strings
 				stub.renderer = stub.renderer || undefined; // Clear empty strings
 				stub = _.defaults(stub, DEFAULT_BREW_LOAD); // Fill in blank fields
 			}
-
 			req.brew = stub ?? {};
 			next();
 		};
 	},
-
 	getCSS : async (req, res)=>{
 		const { brew } = req;
 		if(!brew) return res.status(404).send('');
 		splitTextStyleAndMetadata(brew);
 		if(!brew.style) return res.status(404).send('');
-
 		res.set({
 			'Cache-Control' : 'no-cache',
 			'Content-Type'  : 'text/css'
 		});
 		return res.status(200).send(brew.style);
 	},
-
 	mergeBrewText : (brew)=>{
 		let text = brew.text;
 		if(brew.style !== undefined) {
@@ -211,40 +191,30 @@ const api = {
 		if(!brew.title) {
 			brew.title = api.getGoodBrewTitle(brew.text);
 		}
-
 		brew.authors = (account) ? [account.username] : [];
 		brew.text = api.mergeBrewText(brew);
-
 		_.defaults(brew, DEFAULT_BREW);
-
 		brew.title = brew.title.trim();
 		brew.description = brew.description.trim();
 	},
 	newGoogleBrew : async (account, brew, res)=>{
 		const oAuth2Client = GoogleActions.authCheck(account, res);
-
 		const newBrew = api.excludeGoogleProps(brew);
-
 		return await GoogleActions.newGoogleBrew(oAuth2Client, newBrew);
 	},
 	newBrew : async (req, res)=>{
 		const brew = req.body;
 		const { saveToGoogle } = req.query;
-
 		delete brew.editId;
 		delete brew.shareId;
 		delete brew.googleId;
-
 		api.beforeNewSave(req.account, brew);
-
 		const newHomebrew = new HomebrewModel(brew);
 		newHomebrew.editId = nanoid(12);
 		newHomebrew.shareId = nanoid(12);
-
 		let googleId, saved;
 		if(saveToGoogle) {
 			googleId = await api.newGoogleBrew(req.account, newHomebrew, res);
-
 			if(!googleId) return;
 			api.excludeStubProps(newHomebrew);
 			newHomebrew.googleId = googleId;
@@ -254,7 +224,6 @@ const api = {
 			// Delete the non-binary text field since it's not needed anymore
 			newHomebrew.text = undefined;
 		}
-
 		saved = await newHomebrew.save()
 			.catch((err)=>{
 				console.error(err, err.toString(), err.stack);
@@ -262,21 +231,17 @@ const api = {
 			});
 		if(!saved) return;
 		saved = saved.toObject();
-
 		res.status(200).send(saved);
 	},
 	getThemeBundle : async(req, res)=>{
 		/*	getThemeBundle: Collects the theme and all parent themes
 				returns an object containing an array of css, and an array of snippets, in render order
-
 				req.params.id       : The shareId ( User theme ) or name ( static theme )
 				req.params.renderer : The Markdown renderer used for this theme */
-
 		req.params.renderer = _.upperFirst(req.params.renderer);
 		let currentTheme;
 		const completeStyles   = [];
 		const completeSnippets = [];
-
 		while (req.params.id) {
 			//=== User Themes ===//
 			if(!isStaticTheme(req.params.renderer, req.params.id)) {
@@ -286,14 +251,11 @@ const api = {
 							err = { ...err, name: 'ThemeLoad Error', message: 'Theme Not Found', HBErrorCode: '09' };
 						throw err;
 					});
-
 				currentTheme = req.brew;
 				splitTextStyleAndMetadata(currentTheme);
-
 				// If there is anything in the snippets or style members, append them to the appropriate array
 				if(currentTheme?.snippets) completeSnippets.push(JSON.parse(currentTheme.snippets));
 				if(currentTheme?.style) completeStyles.push(`/* From Brew: ${req.protocol}://${req.get('host')}/share/${req.params.id} */\n\n${currentTheme.style}`);
-
 				req.params.id       = currentTheme.theme;
 				req.params.renderer = currentTheme.renderer;
 			}
@@ -303,17 +265,14 @@ const api = {
 				const localStyle    = `@import url(\"/themes/${req.params.renderer}/${req.params.id}/style.css\");`;
 				completeSnippets.push(localSnippets);
 				completeStyles.push(`/* From Theme ${req.params.id} */\n\n${localStyle}`);
-
 				req.params.id = Themes[req.params.renderer][req.params.id].baseTheme;
 			}
 		}
-
 		const returnObj = {
 			// Reverse the order of the arrays so they are listed oldest parent to youngest child.
 			styles   : completeStyles.reverse(),
 			snippets : completeSnippets.reverse()
 		};
-
 		res.setHeader('Content-Type', 'application/json');
 		return res.status(200).send(returnObj);
 	},
@@ -326,16 +285,13 @@ const api = {
 			res.setHeader('Content-Type', 'application/json');
 			return res.status(409).send(JSON.stringify({ message: `The brew has been changed on a different device. Please save your changes elsewhere, refresh, and try again.` }));
 		}
-
 		let brew = _.assign(brewFromServer, brewFromClient);
 		const googleId = brew.googleId;
 		const { saveToGoogle, removeFromGoogle } = req.query;
 		let afterSave = async ()=>true;
-
 		brew.title = brew.title.trim();
 		brew.description = brew.description.trim() || '';
 		brew.text = api.mergeBrewText(brew);
-
 		if(brew.googleId && removeFromGoogle) {
 			// If the google id exists and we're removing it from google, set afterSave to delete the google brew and mark the brew's google id as undefined
 			afterSave = async ()=>{
@@ -345,20 +301,17 @@ const api = {
 						res.status(err?.status || err?.response?.status || 500).send(err.message || err);
 					});
 			};
-
 			brew.googleId = undefined;
 		} else if(!brew.googleId && saveToGoogle) {
 			// If we don't have a google id and the user wants to save to google, create the google brew and set the google id on the brew
 			brew.googleId = await api.newGoogleBrew(req.account, api.excludeGoogleProps(brew), res);
-
 			if(!brew.googleId) return;
 		} else if(brew.googleId) {
 			// If the google id exists and no other actions are being performed, update the google brew
-			const updated = await api.updateGoogleBrew(req.account, api.excludeGoogleProps(brew), res, req);
+			const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew));
 
 			if(!updated) return;
 		}
-
 		if(brew.googleId) {
 			// If the google id exists after all those actions, exclude the props that are stored in google and aren't needed for rendering the brew items
 			api.excludeStubProps(brew);
@@ -370,12 +323,10 @@ const api = {
 		}
 		brew.updatedAt = new Date();
 		brew.version = (brew.version || 1) + 1;
-
 		if(req.account) {
 			brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
 			brew.invitedAuthors = _.uniq(_.filter(brew.invitedAuthors, (a)=>req.account.username !== a));
 		}
-
 		// define a function to catch our save errors
 		const saveError = (err)=>{
 			console.error(err);
@@ -398,15 +349,6 @@ const api = {
 
 		res.status(200).send(saved);
 	},
-
-	updateGoogleBrew : async (account, brew, res, req)=>{
-		//let oAuth2Client;
-		//if(account.googleId)
-		//	oAuth2Client = GoogleActions.authCheck(account, res);
-
-		return await GoogleActions.updateGoogleBrew(brew, undefined, req.ip);
-	},
-
 	deleteGoogleBrew : async (account, id, editId, res)=>{
 		const auth = await GoogleActions.authCheck(account, res);
 		await GoogleActions.deleteGoogleBrew(auth, id, editId);
@@ -425,21 +367,18 @@ const api = {
 				return next();
 			}
 		}
-
 		let brew = req.brew;
 		const { googleId, editId } = brew;
 		const account = req.account;
 		const isOwner = account && (brew.authors.length === 0 || brew.authors[0] === account.username);
 		// If the user is the owner and the file is saved to google, mark the google brew for deletion
 		const shouldDeleteGoogleBrew = googleId && isOwner;
-
 		if(brew._id) {
 			brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
 			if(account) {
 				// Remove current user as author
 				brew.authors = _.pull(brew.authors, account.username);
 			}
-
 			if(brew.authors.length === 0) {
 				// Delete brew if there are no authors left
 				await HomebrewModel.deleteOne({ _id: brew._id })
@@ -469,11 +408,9 @@ const api = {
 				});
 			if(!deleted) return;
 		}
-
 		res.status(204).send();
 	}
 };
-
 router.use('/api', require('./middleware/check-client-version.js'));
 router.post('/api', asyncHandler(api.newBrew));
 router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
@@ -481,5 +418,4 @@ router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), asyncHand
 router.delete('/api/:id', asyncHandler(api.deleteBrew));
 router.get('/api/remove/:id', asyncHandler(api.deleteBrew));
 router.get('/api/theme/:renderer/:id', asyncHandler(api.getThemeBundle));
-
 module.exports = api;

From c3173d2e1411fd7ab2b969a1299fe845b21b15ee Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:25:55 -0400
Subject: [PATCH 26/34] Update homebrew.api.js

---
 server/homebrew.api.js | 55 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 8450d58cb..59f23021f 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -9,24 +9,28 @@ const yaml = require('js-yaml');
 const asyncHandler = require('express-async-handler');
 const { nanoid } = require('nanoid');
 const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
-
 const { DEFAULT_BREW, DEFAULT_BREW_LOAD } = require('./brewDefaults.js');
 
 const Themes = require('../themes/themes.json');
+
 const isStaticTheme = (renderer, themeName)=>{
 	return Themes[renderer]?.[themeName] !== undefined;
 };
+
 // const getTopBrews = (cb) => {
 // 	HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
 // 		cb(brews);
 // 	});
 // };
+
 const MAX_TITLE_LENGTH = 100;
+
 const api = {
 	homebrewApi : router,
 	getId       : (req)=>{
 		// Set the id and initial potential google id, where the google id is present on the existing brew.
 		let id = req.params.id, googleId = req.body?.googleId;
+
 		// If the id is longer than 12, then it's a google id + the edit id. This splits the longer id up.
 		if(id.length > 12) {
 			if(id.length >= (33 + 12)) {    // googleId is minimum 33 chars (may increase)
@@ -43,6 +47,7 @@ const api = {
 	getUsersBrewThemes : async (username)=>{
 		if(!username)
 			return {};
+
 		const fields = [
 			'title',
 			'tags',
@@ -53,8 +58,11 @@ const api = {
 			'authors',
 			'renderer'
 		];
+
 		const userThemes = {};
+
 		const brews = await HomebrewModel.getByUser(username, true, fields, { tags: { $in: ['meta:theme', 'meta:Theme'] } });
+
 		if(brews) {
 			for (const brew of brews) {
 				userThemes[brew.renderer] ??= {};
@@ -69,6 +77,7 @@ const api = {
 				};
 			}
 		}
+
 		return userThemes;
 	},
 	getBrew : (accessType, stubOnly = false)=>{
@@ -76,6 +85,7 @@ const api = {
 		return async (req, res, next)=>{
 			// Get relevant IDs for the brew
 			const { id, googleId } = api.getId(req);
+
 			// Try to find the document in the Homebrewery database -- if it doesn't exist, that's fine.
 			let stub = await HomebrewModel.get(accessType === 'edit' ? { editId: id } : { shareId: id })
 				.catch((err)=>{
@@ -86,9 +96,11 @@ const api = {
 					}
 				});
 			stub = stub?.toObject();
+
 			if(stub?.lock?.locked && accessType != 'edit') {
 				throw { HBErrorCode: '51', code: stub.lock.code, message: stub.lock.shareMessage, brewId: stub.shareId, brewTitle: stub.title };
 			}
+
 			// If there is a google id, try to find the google brew
 			if(!stubOnly && (googleId || stub?.googleId)) {
 				let googleError;
@@ -118,31 +130,37 @@ const api = {
 				}
 				throw { ...accessError, message: 'User is not logged in', HBErrorCode: '04', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId };
 			}
+
 			// If after all of that we still don't have a brew, throw an exception
 			if(!stub && !stubOnly) {
 				throw { name: 'BrewLoad Error', message: 'Brew not found', status: 404, HBErrorCode: '05', accessType: accessType, brewId: id };
 			}
+
 			// Clean up brew: fill in missing fields with defaults / fix old invalid values
 			if(stub) {
 				stub.tags     = stub.tags     || undefined; // Clear empty strings
 				stub.renderer = stub.renderer || undefined; // Clear empty strings
 				stub = _.defaults(stub, DEFAULT_BREW_LOAD); // Fill in blank fields
 			}
+
 			req.brew = stub ?? {};
 			next();
 		};
 	},
+
 	getCSS : async (req, res)=>{
 		const { brew } = req;
 		if(!brew) return res.status(404).send('');
 		splitTextStyleAndMetadata(brew);
 		if(!brew.style) return res.status(404).send('');
+
 		res.set({
 			'Cache-Control' : 'no-cache',
 			'Content-Type'  : 'text/css'
 		});
 		return res.status(200).send(brew.style);
 	},
+
 	mergeBrewText : (brew)=>{
 		let text = brew.text;
 		if(brew.style !== undefined) {
@@ -191,30 +209,40 @@ const api = {
 		if(!brew.title) {
 			brew.title = api.getGoodBrewTitle(brew.text);
 		}
+
 		brew.authors = (account) ? [account.username] : [];
 		brew.text = api.mergeBrewText(brew);
+
 		_.defaults(brew, DEFAULT_BREW);
+
 		brew.title = brew.title.trim();
 		brew.description = brew.description.trim();
 	},
 	newGoogleBrew : async (account, brew, res)=>{
 		const oAuth2Client = GoogleActions.authCheck(account, res);
+
 		const newBrew = api.excludeGoogleProps(brew);
+
 		return await GoogleActions.newGoogleBrew(oAuth2Client, newBrew);
 	},
 	newBrew : async (req, res)=>{
 		const brew = req.body;
 		const { saveToGoogle } = req.query;
+
 		delete brew.editId;
 		delete brew.shareId;
 		delete brew.googleId;
+
 		api.beforeNewSave(req.account, brew);
+
 		const newHomebrew = new HomebrewModel(brew);
 		newHomebrew.editId = nanoid(12);
 		newHomebrew.shareId = nanoid(12);
+
 		let googleId, saved;
 		if(saveToGoogle) {
 			googleId = await api.newGoogleBrew(req.account, newHomebrew, res);
+
 			if(!googleId) return;
 			api.excludeStubProps(newHomebrew);
 			newHomebrew.googleId = googleId;
@@ -224,6 +252,7 @@ const api = {
 			// Delete the non-binary text field since it's not needed anymore
 			newHomebrew.text = undefined;
 		}
+
 		saved = await newHomebrew.save()
 			.catch((err)=>{
 				console.error(err, err.toString(), err.stack);
@@ -231,6 +260,7 @@ const api = {
 			});
 		if(!saved) return;
 		saved = saved.toObject();
+
 		res.status(200).send(saved);
 	},
 	getThemeBundle : async(req, res)=>{
@@ -238,10 +268,12 @@ const api = {
 				returns an object containing an array of css, and an array of snippets, in render order
 				req.params.id       : The shareId ( User theme ) or name ( static theme )
 				req.params.renderer : The Markdown renderer used for this theme */
+
 		req.params.renderer = _.upperFirst(req.params.renderer);
 		let currentTheme;
 		const completeStyles   = [];
 		const completeSnippets = [];
+
 		while (req.params.id) {
 			//=== User Themes ===//
 			if(!isStaticTheme(req.params.renderer, req.params.id)) {
@@ -251,11 +283,14 @@ const api = {
 							err = { ...err, name: 'ThemeLoad Error', message: 'Theme Not Found', HBErrorCode: '09' };
 						throw err;
 					});
+
 				currentTheme = req.brew;
 				splitTextStyleAndMetadata(currentTheme);
+
 				// If there is anything in the snippets or style members, append them to the appropriate array
 				if(currentTheme?.snippets) completeSnippets.push(JSON.parse(currentTheme.snippets));
 				if(currentTheme?.style) completeStyles.push(`/* From Brew: ${req.protocol}://${req.get('host')}/share/${req.params.id} */\n\n${currentTheme.style}`);
+
 				req.params.id       = currentTheme.theme;
 				req.params.renderer = currentTheme.renderer;
 			}
@@ -265,14 +300,17 @@ const api = {
 				const localStyle    = `@import url(\"/themes/${req.params.renderer}/${req.params.id}/style.css\");`;
 				completeSnippets.push(localSnippets);
 				completeStyles.push(`/* From Theme ${req.params.id} */\n\n${localStyle}`);
+
 				req.params.id = Themes[req.params.renderer][req.params.id].baseTheme;
 			}
 		}
+
 		const returnObj = {
 			// Reverse the order of the arrays so they are listed oldest parent to youngest child.
 			styles   : completeStyles.reverse(),
 			snippets : completeSnippets.reverse()
 		};
+
 		res.setHeader('Content-Type', 'application/json');
 		return res.status(200).send(returnObj);
 	},
@@ -285,13 +323,16 @@ const api = {
 			res.setHeader('Content-Type', 'application/json');
 			return res.status(409).send(JSON.stringify({ message: `The brew has been changed on a different device. Please save your changes elsewhere, refresh, and try again.` }));
 		}
+
 		let brew = _.assign(brewFromServer, brewFromClient);
 		const googleId = brew.googleId;
 		const { saveToGoogle, removeFromGoogle } = req.query;
 		let afterSave = async ()=>true;
+
 		brew.title = brew.title.trim();
 		brew.description = brew.description.trim() || '';
 		brew.text = api.mergeBrewText(brew);
+
 		if(brew.googleId && removeFromGoogle) {
 			// If the google id exists and we're removing it from google, set afterSave to delete the google brew and mark the brew's google id as undefined
 			afterSave = async ()=>{
@@ -301,10 +342,12 @@ const api = {
 						res.status(err?.status || err?.response?.status || 500).send(err.message || err);
 					});
 			};
+
 			brew.googleId = undefined;
 		} else if(!brew.googleId && saveToGoogle) {
 			// If we don't have a google id and the user wants to save to google, create the google brew and set the google id on the brew
 			brew.googleId = await api.newGoogleBrew(req.account, api.excludeGoogleProps(brew), res);
+
 			if(!brew.googleId) return;
 		} else if(brew.googleId) {
 			// If the google id exists and no other actions are being performed, update the google brew
@@ -312,6 +355,7 @@ const api = {
 
 			if(!updated) return;
 		}
+
 		if(brew.googleId) {
 			// If the google id exists after all those actions, exclude the props that are stored in google and aren't needed for rendering the brew items
 			api.excludeStubProps(brew);
@@ -323,10 +367,12 @@ const api = {
 		}
 		brew.updatedAt = new Date();
 		brew.version = (brew.version || 1) + 1;
+
 		if(req.account) {
 			brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
 			brew.invitedAuthors = _.uniq(_.filter(brew.invitedAuthors, (a)=>req.account.username !== a));
 		}
+
 		// define a function to catch our save errors
 		const saveError = (err)=>{
 			console.error(err);
@@ -346,7 +392,6 @@ const api = {
 		// Call and wait for afterSave to complete
 		const after = await afterSave();
 		if(!after) return;
-
 		res.status(200).send(saved);
 	},
 	deleteGoogleBrew : async (account, id, editId, res)=>{
@@ -367,18 +412,21 @@ const api = {
 				return next();
 			}
 		}
+
 		let brew = req.brew;
 		const { googleId, editId } = brew;
 		const account = req.account;
 		const isOwner = account && (brew.authors.length === 0 || brew.authors[0] === account.username);
 		// If the user is the owner and the file is saved to google, mark the google brew for deletion
 		const shouldDeleteGoogleBrew = googleId && isOwner;
+
 		if(brew._id) {
 			brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
 			if(account) {
 				// Remove current user as author
 				brew.authors = _.pull(brew.authors, account.username);
 			}
+
 			if(brew.authors.length === 0) {
 				// Delete brew if there are no authors left
 				await HomebrewModel.deleteOne({ _id: brew._id })
@@ -408,9 +456,11 @@ const api = {
 				});
 			if(!deleted) return;
 		}
+
 		res.status(204).send();
 	}
 };
+
 router.use('/api', require('./middleware/check-client-version.js'));
 router.post('/api', asyncHandler(api.newBrew));
 router.put('/api/:id', asyncHandler(api.getBrew('edit', true)), asyncHandler(api.updateBrew));
@@ -418,4 +468,5 @@ router.put('/api/update/:id', asyncHandler(api.getBrew('edit', true)), asyncHand
 router.delete('/api/:id', asyncHandler(api.deleteBrew));
 router.get('/api/remove/:id', asyncHandler(api.deleteBrew));
 router.get('/api/theme/:renderer/:id', asyncHandler(api.getThemeBundle));
+
 module.exports = api;

From 7894d9fbec50673d3e9666b0a6890ad1ff6b7368 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:35:15 -0400
Subject: [PATCH 27/34] Update app.js

---
 server/app.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/server/app.js b/server/app.js
index a84970e2a..4be0c84e9 100644
--- a/server/app.js
+++ b/server/app.js
@@ -8,6 +8,7 @@ const express = require('express');
 const yaml = require('js-yaml');
 const app = express();
 const config = require('./config.js');
+const fs = require('fs-extra');
 
 const { homebrewApi, getBrew, getUsersBrewThemes, getCSS } = require('./homebrew.api.js');
 const GoogleActions = require('./googleActions.js');
@@ -204,6 +205,23 @@ app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
 	res.status(200).send(brew.text);
 });
 
+//Serve brew metadata
+app.get('/metadata/:id', asyncHandler(getBrew('share')), (req, res)=>{
+	const { brew } = req;
+	sanitizeBrew(brew, 'share');
+
+	const fields = ['title', 'pageCount', 'description', 'authors', 'lang',
+	  'published', 'views', 'shareId', 'createdAt', 'updatedAt',
+	  'lastViewed', 'thumbnail', 'tags'
+	];
+
+	const metadata = fields.reduce((acc, field)=>{
+	  if(brew[field] !== undefined) acc[field] = brew[field];
+	  return acc;
+	}, {});
+	res.status(200).json(metadata);
+});
+
 //Serve brew styling
 app.get('/css/:id', asyncHandler(getBrew('share')), (req, res)=>{getCSS(req, res);});
 
@@ -429,8 +447,16 @@ if(isLocalEnvironment){
 	});
 }
 
+// Add Static Local Paths
+app.use('/staticImages', express.static(config.get('hb_images') && fs.existsSync(config.get('hb_images')) ? config.get('hb_images') :'staticImages'));
+app.use('/staticFonts', express.static(config.get('hb_fonts')  && fs.existsSync(config.get('hb_fonts')) ? config.get('hb_fonts'):'staticFonts'));
+
 //Vault Page
 app.get('/vault', asyncHandler(async(req, res, next)=>{
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'The Vault',
+		description : 'Search for Brews'
+	};
 	return next();
 }));
 

From dfe26280d2c54ac1c5db36a264f0b877aacd3693 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:38:00 -0400
Subject: [PATCH 28/34] Update app.js

---
 server/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/app.js b/server/app.js
index 4be0c84e9..1e1b3c39c 100644
--- a/server/app.js
+++ b/server/app.js
@@ -475,7 +475,8 @@ const renderPage = async (req, res)=>{
 	const configuration = {
 		local       : isLocalEnvironment,
 		publicUrl   : config.get('publicUrl') ?? '',
-		environment : nodeEnv
+		environment : nodeEnv,
+		deployment  : config.get('heroku_app_name') ?? ''
 	};
 	const props = {
 		version       : require('./../package.json').version,

From 9037cf17508f31797d70f025f994ba0a840384f2 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:41:54 -0400
Subject: [PATCH 29/34] Update homebrew.api.js

---
 server/homebrew.api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 59f23021f..cfa609bca 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -9,6 +9,7 @@ const yaml = require('js-yaml');
 const asyncHandler = require('express-async-handler');
 const { nanoid } = require('nanoid');
 const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
+
 const { DEFAULT_BREW, DEFAULT_BREW_LOAD } = require('./brewDefaults.js');
 
 const Themes = require('../themes/themes.json');
@@ -266,6 +267,7 @@ const api = {
 	getThemeBundle : async(req, res)=>{
 		/*	getThemeBundle: Collects the theme and all parent themes
 				returns an object containing an array of css, and an array of snippets, in render order
+    
 				req.params.id       : The shareId ( User theme ) or name ( static theme )
 				req.params.renderer : The Markdown renderer used for this theme */
 
@@ -392,6 +394,7 @@ const api = {
 		// Call and wait for afterSave to complete
 		const after = await afterSave();
 		if(!after) return;
+
 		res.status(200).send(saved);
 	},
 	deleteGoogleBrew : async (account, id, editId, res)=>{

From 1fff75cc5e52c56144cd90a5f0918f3b920d8142 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:42:20 -0400
Subject: [PATCH 30/34] Update homebrew.api.js

---
 server/homebrew.api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index cfa609bca..22e2cee7b 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -267,7 +267,7 @@ const api = {
 	getThemeBundle : async(req, res)=>{
 		/*	getThemeBundle: Collects the theme and all parent themes
 				returns an object containing an array of css, and an array of snippets, in render order
-    
+
 				req.params.id       : The shareId ( User theme ) or name ( static theme )
 				req.params.renderer : The Markdown renderer used for this theme */
 

From b9e15746c3a3867b52773a41dcc1e3a4c0c99a00 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:47:45 -0400
Subject: [PATCH 31/34] Update app.js


From 76d66790020b3543569685b7473319089de86c7a Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 11 Oct 2024 23:50:08 -0400
Subject: [PATCH 32/34] Fix line endings on app.js

---
 server/app.js | 1122 ++++++++++++++++++++++++-------------------------
 1 file changed, 561 insertions(+), 561 deletions(-)

diff --git a/server/app.js b/server/app.js
index 1e1b3c39c..5f3a35150 100644
--- a/server/app.js
+++ b/server/app.js
@@ -1,561 +1,561 @@
-/*eslint max-lines: ["warn", {"max": 500, "skipBlankLines": true, "skipComments": true}]*/
-// Set working directory to project root
-process.chdir(`${__dirname}/..`);
-
-const _ = require('lodash');
-const jwt = require('jwt-simple');
-const express = require('express');
-const yaml = require('js-yaml');
-const app = express();
-const config = require('./config.js');
-const fs = require('fs-extra');
-
-const { homebrewApi, getBrew, getUsersBrewThemes, getCSS } = require('./homebrew.api.js');
-const GoogleActions = require('./googleActions.js');
-const serveCompressedStaticAssets = require('./static-assets.mv.js');
-const sanitizeFilename = require('sanitize-filename');
-const asyncHandler = require('express-async-handler');
-const templateFn = require('./../client/template.js');
-
-const { DEFAULT_BREW } = require('./brewDefaults.js');
-
-const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
-
-
-const sanitizeBrew = (brew, accessType)=>{
-	brew._id = undefined;
-	brew.__v = undefined;
-	if(accessType !== 'edit' && accessType !== 'shareAuthor') {
-		brew.editId = undefined;
-	}
-	return brew;
-};
-
-app.set('trust proxy', 1 /* number of proxies between user and server */)
-
-app.use('/', serveCompressedStaticAssets(`build`));
-app.use(require('./middleware/content-negotiation.js'));
-app.use(require('body-parser').json({ limit: '25mb' }));
-app.use(require('cookie-parser')());
-app.use(require('./forcessl.mw.js'));
-
-//Account Middleware
-app.use((req, res, next)=>{
-	if(req.cookies && req.cookies.nc_session){
-		try {
-			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
-			//console.log("Just loaded up JWT from cookie:");
-			//console.log(req.account);
-		} catch (e){}
-	}
-
-	req.config = {
-		google_client_id     : config.get('google_client_id'),
-		google_client_secret : config.get('google_client_secret')
-	};
-	return next();
-});
-
-app.use(homebrewApi);
-app.use(require('./admin.api.js'));
-app.use(require('./vault.api.js'));
-
-const HomebrewModel     = require('./homebrew.model.js').model;
-const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
-const welcomeTextLegacy = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
-const migrateText       = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
-const changelogText     = require('fs').readFileSync('changelog.md', 'utf8');
-const faqText           = require('fs').readFileSync('faq.md', 'utf8');
-
-String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
-
-const defaultMetaTags = {
-	site_name   : 'The Homebrewery - Make your Homebrew content look legit!',
-	title       : 'The Homebrewery',
-	description : 'A NaturalCrit Tool for creating authentic Homebrews using Markdown.',
-	image       : `${config.get('publicUrl')}/thumbnail.png`,
-	type        : 'website'
-};
-
-//Robots.txt
-app.get('/robots.txt', (req, res)=>{
-	return res.sendFile(`robots.txt`, { root: process.cwd() });
-});
-
-//Home page
-app.get('/', (req, res, next)=>{
-	req.brew = {
-		text     : welcomeText,
-		renderer : 'V3',
-		theme    : '5ePHB'
-	},
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'Homepage',
-		description : 'Homepage'
-	};
-
-	splitTextStyleAndMetadata(req.brew);
-	return next();
-});
-
-//Home page Legacy
-app.get('/legacy', (req, res, next)=>{
-	req.brew = {
-		text     : welcomeTextLegacy,
-		renderer : 'legacy',
-		theme    : '5ePHB'
-	},
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'Homepage (Legacy)',
-		description : 'Homepage'
-	};
-
-	splitTextStyleAndMetadata(req.brew);
-	return next();
-});
-
-//Legacy/Other Document -> v3 Migration Guide
-app.get('/migrate', (req, res, next)=>{
-	req.brew = {
-		text     : migrateText,
-		renderer : 'V3',
-		theme    : '5ePHB'
-	},
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'v3 Migration Guide',
-		description : 'A brief guide to converting Legacy documents to the v3 renderer.'
-	};
-
-	splitTextStyleAndMetadata(req.brew);
-	return next();
-});
-
-//Changelog page
-app.get('/changelog', async (req, res, next)=>{
-	req.brew = {
-		title    : 'Changelog',
-		text     : changelogText,
-		renderer : 'V3',
-		theme    : '5ePHB'
-	},
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'Changelog',
-		description : 'Development changelog.'
-	};
-
-	splitTextStyleAndMetadata(req.brew);
-	return next();
-});
-
-//FAQ page
-app.get('/faq', async (req, res, next)=>{
-	req.brew = {
-		title    : 'FAQ',
-		text     : faqText,
-		renderer : 'V3',
-		theme    : '5ePHB'
-	},
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'FAQ',
-		description : 'Frequently Asked Questions'
-	};
-
-	splitTextStyleAndMetadata(req.brew);
-	return next();
-});
-
-//Source page
-app.get('/source/:id', asyncHandler(getBrew('share')), (req, res)=>{
-	const { brew } = req;
-
-	const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
-	let text = brew.text;
-	for (const replaceStr in replaceStrings) {
-		text = text.replaceAll(replaceStr, replaceStrings[replaceStr]);
-	}
-	text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
-	res.status(200).send(text);
-});
-
-//Download brew source page
-app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
-	const { brew } = req;
-	sanitizeBrew(brew, 'share');
-	const prefix = 'HB - ';
-
-	const encodeRFC3986ValueChars = (str)=>{
-		return (
-			encodeURIComponent(str)
-				.replace(/[!'()*]/g, (char)=>{`%${char.charCodeAt(0).toString(16).toUpperCase()}`;})
-		);
-	};
-
-	let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
-	if(!fileName || !fileName.length) { fileName = `${prefix}-Untitled-Brew`; };
-	res.set({
-		'Cache-Control'       : 'no-cache',
-		'Content-Type'        : 'text/plain',
-		'Content-Disposition' : `attachment; filename*=UTF-8''${encodeRFC3986ValueChars(fileName)}.txt`
-	});
-	res.status(200).send(brew.text);
-});
-
-//Serve brew metadata
-app.get('/metadata/:id', asyncHandler(getBrew('share')), (req, res)=>{
-	const { brew } = req;
-	sanitizeBrew(brew, 'share');
-
-	const fields = ['title', 'pageCount', 'description', 'authors', 'lang',
-	  'published', 'views', 'shareId', 'createdAt', 'updatedAt',
-	  'lastViewed', 'thumbnail', 'tags'
-	];
-
-	const metadata = fields.reduce((acc, field)=>{
-	  if(brew[field] !== undefined) acc[field] = brew[field];
-	  return acc;
-	}, {});
-	res.status(200).json(metadata);
-});
-
-//Serve brew styling
-app.get('/css/:id', asyncHandler(getBrew('share')), (req, res)=>{getCSS(req, res);});
-
-//User Page
-app.get('/user/:username', async (req, res, next)=>{
-	const ownAccount = req.account && (req.account.username == req.params.username);
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : `${req.params.username}'s Collection`,
-		description : 'View my collection of homebrew on the Homebrewery.'
-		// type        :  could be 'profile'?
-	};
-
-	const fields = [
-		'googleId',
-		'title',
-		'pageCount',
-		'description',
-		'authors',
-		'lang',
-		'published',
-		'views',
-		'shareId',
-		'editId',
-		'createdAt',
-		'updatedAt',
-		'lastViewed',
-		'thumbnail',
-		'tags'
-	];
-
-	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields)
-	.catch((err)=>{
-		console.log(err);
-	});
-
-	brews.forEach(brew => brew.stubbed = true); //All brews from MongoDB are "stubbed"
-
-	if(ownAccount && req?.account?.googleId){
-		const auth = await GoogleActions.authCheck(req.account, res);
-		let googleBrews = await GoogleActions.listGoogleBrews(auth)
-			.catch((err)=>{
-				console.error(err);
-			});
-
-		// If stub matches file from Google, use Google metadata over stub metadata
-		if(googleBrews && googleBrews.length > 0) {
-			for (const brew of brews.filter((brew)=>brew.googleId)) {
-				const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
-				if(match !== -1) {
-					brew.googleId = googleBrews[match].googleId;
-					brew.pageCount = googleBrews[match].pageCount;
-					brew.renderer = googleBrews[match].renderer;
-					brew.version = googleBrews[match].version;
-					brew.webViewLink = googleBrews[match].webViewLink;
-					googleBrews.splice(match, 1);
-				}
-			}
-
-			//Remaining unstubbed google brews display current user as author
-			googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] }));
-			brews = _.concat(brews, googleBrews);
-		}
-	}
-
-	req.brews = _.map(brews, (brew)=>{
-		// Clean up brew data
-		brew.title = brew.title?.trim();
-		brew.description = brew.description?.trim();
-		return sanitizeBrew(brew, ownAccount ? 'edit' : 'share');
-	});
-
-	return next();
-});
-
-//Edit Page
-app.get('/edit/:id', asyncHandler(getBrew('edit')), asyncHandler(async(req, res, next)=>{
-	req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
-
-	req.userThemes = await(getUsersBrewThemes(req.account?.username));
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : req.brew.title || 'Untitled Brew',
-		description : req.brew.description || 'No description.',
-		image       : req.brew.thumbnail || defaultMetaTags.image,
-		type        : 'article'
-	};
-
-	sanitizeBrew(req.brew, 'edit');
-	splitTextStyleAndMetadata(req.brew);
-	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
-	return next();
-}));
-
-//New Page from ID
-app.get('/new/:id', asyncHandler(getBrew('share')), asyncHandler(async(req, res, next)=>{
-	sanitizeBrew(req.brew, 'share');
-	splitTextStyleAndMetadata(req.brew);
-	const brew = {
-		shareId  : req.brew.shareId,
-		title    : `CLONE - ${req.brew.title}`,
-		text     : req.brew.text,
-		style    : req.brew.style,
-		renderer : req.brew.renderer,
-		theme    : req.brew.theme,
-		tags     : req.brew.tags,
-	};
-	req.brew = _.defaults(brew, DEFAULT_BREW);
-
-	req.userThemes = await(getUsersBrewThemes(req.account?.username));
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'New',
-		description : 'Start crafting your homebrew on the Homebrewery!'
-	};
-
-	return next();
-}));
-
-//New Page
-app.get('/new', asyncHandler(async(req, res, next)=>{
-	req.userThemes = await(getUsersBrewThemes(req.account?.username));
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'New',
-		description : 'Start crafting your homebrew on the Homebrewery!'
-	};
-
-	return next();
-}));
-
-//Share Page
-app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
-	const { brew } = req;
-	req.ogMeta = { ...defaultMetaTags,
-		title       : req.brew.title || 'Untitled Brew',
-		description : req.brew.description || 'No description.',
-		image       : req.brew.thumbnail || defaultMetaTags.image,
-		type        : 'article'
-	};
-
-	// increase visitor view count, do not include visits by author(s)
-	if(!brew.authors.includes(req.account?.username)){
-		if(req.params.id.length > 12 && !brew._id) {
-			const googleId = brew.googleId;
-			const shareId = brew.shareId;
-			await GoogleActions.increaseView(googleId, shareId, 'share', brew)
-				.catch((err)=>{next(err);});
-		} else {
-			await HomebrewModel.increaseView({ shareId: brew.shareId });
-		}
-	};
-
-	brew.authors.includes(req.account?.username) ? sanitizeBrew(req.brew, 'shareAuthor') : sanitizeBrew(req.brew, 'share');
-	splitTextStyleAndMetadata(req.brew);
-	return next();
-}));
-
-//Account Page
-app.get('/account', asyncHandler(async (req, res, next)=>{
-	const data = {};
-	data.title = 'Account Information Page';
-	
-	if(!req.account) {
-		res.set('WWW-Authenticate', 'Bearer realm="Authorization Required"');
-		const error = new Error('No valid account');
-		error.status = 401;
-		error.HBErrorCode = '50';
-		error.page = data.title;
-		return next(error);
-	};
-
-	let auth;
-	let googleCount = [];
-	if(req.account) {
-		if(req.account.googleId) {
-			auth = await GoogleActions.authCheck(req.account, res, false)
-
-			googleCount = await GoogleActions.listGoogleBrews(auth)
-				.catch((err)=>{
-					console.error(err);
-				});
-		}
-
-		const query = { authors: req.account.username, googleId: { $exists: false } };
-		const mongoCount = await HomebrewModel.countDocuments(query)
-			.catch((err)=>{
-				mongoCount = 0;
-				console.log(err);
-			});
-
-		data.accountDetails = {
-			username    : req.account.username,
-			issued      : req.account.issued,
-			googleId    : Boolean(req.account.googleId),
-			authCheck   : Boolean(req.account.googleId && auth?.credentials.access_token),
-			mongoCount  : mongoCount,
-			googleCount : googleCount?.length
-		};
-	}
-
-	req.brew = data;
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : `Account Page`,
-		description : null
-	};
-
-	return next();
-}));
-
-const nodeEnv = config.get('node_env');
-const isLocalEnvironment = config.get('local_environments').includes(nodeEnv);
-// Local only
-if(isLocalEnvironment){
-	// Login
-	app.post('/local/login', (req, res)=>{
-		const username = req.body.username;
-		if(!username) return;
-
-		const payload = jwt.encode({ username: username, issued: new Date }, config.get('secret'));
-		return res.json(payload);
-	});
-}
-
-// Add Static Local Paths
-app.use('/staticImages', express.static(config.get('hb_images') && fs.existsSync(config.get('hb_images')) ? config.get('hb_images') :'staticImages'));
-app.use('/staticFonts', express.static(config.get('hb_fonts')  && fs.existsSync(config.get('hb_fonts')) ? config.get('hb_fonts'):'staticFonts'));
-
-//Vault Page
-app.get('/vault', asyncHandler(async(req, res, next)=>{
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'The Vault',
-		description : 'Search for Brews'
-	};
-	return next();
-}));
-
-//Send rendered page
-app.use(asyncHandler(async (req, res, next)=>{
-	if (!req.route) return res.redirect('/'); // Catch-all for invalid routes
-		
-	const page = await renderPage(req, res);
-	if(!page) return;
-	res.send(page);
-}));
-
-//Render the page
-const renderPage = async (req, res)=>{
-	// Create configuration object
-	const configuration = {
-		local       : isLocalEnvironment,
-		publicUrl   : config.get('publicUrl') ?? '',
-		environment : nodeEnv,
-		deployment  : config.get('heroku_app_name') ?? ''
-	};
-	const props = {
-		version       : require('./../package.json').version,
-		url           : req.customUrl || req.originalUrl,
-		brew          : req.brew,
-		brews         : req.brews,
-		googleBrews   : req.googleBrews,
-		account       : req.account,
-		enable_v3     : config.get('enable_v3'),
-		enable_themes : config.get('enable_themes'),
-		config        : configuration,
-		ogMeta        : req.ogMeta,
-		userThemes    : req.userThemes
-	};
-	const title = req.brew ? req.brew.title : '';
-	const page = await templateFn('homebrew', title, props)
-		.catch((err)=>{
-			console.log(err);
-		});
-	return page;
-};
-
-//v=====----- Error-Handling Middleware -----=====v//
-//Format Errors as plain objects so all fields will appear in the string sent
-const formatErrors = (key, value)=>{
-	if(value instanceof Error) {
-		const error = {};
-		Object.getOwnPropertyNames(value).forEach(function (key) {
-			error[key] = value[key];
-		});
-		return error;
-	}
-	return value;
-};
-
-const getPureError = (error)=>{
-	return JSON.parse(JSON.stringify(error, formatErrors));
-};
-
-app.use(async (err, req, res, next)=>{
-	err.originalUrl = req.originalUrl;
-	console.error(err);
-
-	if(err.originalUrl?.startsWith('/api')) {
-		// console.log('API error');
-		res.status(err.status || err.response?.status || 500).send(err);
-		return;
-	}
-
-	// console.log('non-API error');
-	const status = err.status || err.code || 500;
-
-	req.ogMeta = { ...defaultMetaTags,
-		title       : 'Error Page',
-		description : 'Something went wrong!'
-	};
-	req.brew = {
-		...err,
-		title       : 'Error - Something went wrong!',
-		text        : err.errors?.map((error)=>{return error.message;}).join('\n\n') || err.message || 'Unknown error!',
-		status      : status,
-		HBErrorCode : err.HBErrorCode ?? '00',
-		pureError   : getPureError(err)
-	};
-	req.customUrl= '/error';
-
-	const page = await renderPage(req, res);
-	if(!page) return;
-	res.send(page);
-});
-
-app.use((req, res)=>{
-	if(!res.headersSent) {
-		console.error('Headers have not been sent, responding with a server error.', req.url);
-		res.status(500).send('An error occurred and the server did not send a response. The error has been logged, please note the time this occurred and report this issue.');
-	}
-});
-//^=====--------------------------------------=====^//
-
-module.exports = {
-	app : app
-};
+/*eslint max-lines: ["warn", {"max": 500, "skipBlankLines": true, "skipComments": true}]*/
+// Set working directory to project root
+process.chdir(`${__dirname}/..`);
+
+const _ = require('lodash');
+const jwt = require('jwt-simple');
+const express = require('express');
+const yaml = require('js-yaml');
+const app = express();
+const config = require('./config.js');
+const fs = require('fs-extra');
+
+const { homebrewApi, getBrew, getUsersBrewThemes, getCSS } = require('./homebrew.api.js');
+const GoogleActions = require('./googleActions.js');
+const serveCompressedStaticAssets = require('./static-assets.mv.js');
+const sanitizeFilename = require('sanitize-filename');
+const asyncHandler = require('express-async-handler');
+const templateFn = require('./../client/template.js');
+
+const { DEFAULT_BREW } = require('./brewDefaults.js');
+
+const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
+
+
+const sanitizeBrew = (brew, accessType)=>{
+	brew._id = undefined;
+	brew.__v = undefined;
+	if(accessType !== 'edit' && accessType !== 'shareAuthor') {
+		brew.editId = undefined;
+	}
+	return brew;
+};
+
+app.set('trust proxy', 1 /* number of proxies between user and server */)
+
+app.use('/', serveCompressedStaticAssets(`build`));
+app.use(require('./middleware/content-negotiation.js'));
+app.use(require('body-parser').json({ limit: '25mb' }));
+app.use(require('cookie-parser')());
+app.use(require('./forcessl.mw.js'));
+
+//Account Middleware
+app.use((req, res, next)=>{
+	if(req.cookies && req.cookies.nc_session){
+		try {
+			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
+			//console.log("Just loaded up JWT from cookie:");
+			//console.log(req.account);
+		} catch (e){}
+	}
+
+	req.config = {
+		google_client_id     : config.get('google_client_id'),
+		google_client_secret : config.get('google_client_secret')
+	};
+	return next();
+});
+
+app.use(homebrewApi);
+app.use(require('./admin.api.js'));
+app.use(require('./vault.api.js'));
+
+const HomebrewModel     = require('./homebrew.model.js').model;
+const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
+const welcomeTextLegacy = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
+const migrateText       = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
+const changelogText     = require('fs').readFileSync('changelog.md', 'utf8');
+const faqText           = require('fs').readFileSync('faq.md', 'utf8');
+
+String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
+
+const defaultMetaTags = {
+	site_name   : 'The Homebrewery - Make your Homebrew content look legit!',
+	title       : 'The Homebrewery',
+	description : 'A NaturalCrit Tool for creating authentic Homebrews using Markdown.',
+	image       : `${config.get('publicUrl')}/thumbnail.png`,
+	type        : 'website'
+};
+
+//Robots.txt
+app.get('/robots.txt', (req, res)=>{
+	return res.sendFile(`robots.txt`, { root: process.cwd() });
+});
+
+//Home page
+app.get('/', (req, res, next)=>{
+	req.brew = {
+		text     : welcomeText,
+		renderer : 'V3',
+		theme    : '5ePHB'
+	},
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'Homepage',
+		description : 'Homepage'
+	};
+
+	splitTextStyleAndMetadata(req.brew);
+	return next();
+});
+
+//Home page Legacy
+app.get('/legacy', (req, res, next)=>{
+	req.brew = {
+		text     : welcomeTextLegacy,
+		renderer : 'legacy',
+		theme    : '5ePHB'
+	},
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'Homepage (Legacy)',
+		description : 'Homepage'
+	};
+
+	splitTextStyleAndMetadata(req.brew);
+	return next();
+});
+
+//Legacy/Other Document -> v3 Migration Guide
+app.get('/migrate', (req, res, next)=>{
+	req.brew = {
+		text     : migrateText,
+		renderer : 'V3',
+		theme    : '5ePHB'
+	},
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'v3 Migration Guide',
+		description : 'A brief guide to converting Legacy documents to the v3 renderer.'
+	};
+
+	splitTextStyleAndMetadata(req.brew);
+	return next();
+});
+
+//Changelog page
+app.get('/changelog', async (req, res, next)=>{
+	req.brew = {
+		title    : 'Changelog',
+		text     : changelogText,
+		renderer : 'V3',
+		theme    : '5ePHB'
+	},
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'Changelog',
+		description : 'Development changelog.'
+	};
+
+	splitTextStyleAndMetadata(req.brew);
+	return next();
+});
+
+//FAQ page
+app.get('/faq', async (req, res, next)=>{
+	req.brew = {
+		title    : 'FAQ',
+		text     : faqText,
+		renderer : 'V3',
+		theme    : '5ePHB'
+	},
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'FAQ',
+		description : 'Frequently Asked Questions'
+	};
+
+	splitTextStyleAndMetadata(req.brew);
+	return next();
+});
+
+//Source page
+app.get('/source/:id', asyncHandler(getBrew('share')), (req, res)=>{
+	const { brew } = req;
+
+	const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
+	let text = brew.text;
+	for (const replaceStr in replaceStrings) {
+		text = text.replaceAll(replaceStr, replaceStrings[replaceStr]);
+	}
+	text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
+	res.status(200).send(text);
+});
+
+//Download brew source page
+app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
+	const { brew } = req;
+	sanitizeBrew(brew, 'share');
+	const prefix = 'HB - ';
+
+	const encodeRFC3986ValueChars = (str)=>{
+		return (
+			encodeURIComponent(str)
+				.replace(/[!'()*]/g, (char)=>{`%${char.charCodeAt(0).toString(16).toUpperCase()}`;})
+		);
+	};
+
+	let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
+	if(!fileName || !fileName.length) { fileName = `${prefix}-Untitled-Brew`; };
+	res.set({
+		'Cache-Control'       : 'no-cache',
+		'Content-Type'        : 'text/plain',
+		'Content-Disposition' : `attachment; filename*=UTF-8''${encodeRFC3986ValueChars(fileName)}.txt`
+	});
+	res.status(200).send(brew.text);
+});
+
+//Serve brew metadata
+app.get('/metadata/:id', asyncHandler(getBrew('share')), (req, res)=>{
+	const { brew } = req;
+	sanitizeBrew(brew, 'share');
+
+	const fields = ['title', 'pageCount', 'description', 'authors', 'lang',
+	  'published', 'views', 'shareId', 'createdAt', 'updatedAt',
+	  'lastViewed', 'thumbnail', 'tags'
+	];
+
+	const metadata = fields.reduce((acc, field)=>{
+	  if(brew[field] !== undefined) acc[field] = brew[field];
+	  return acc;
+	}, {});
+	res.status(200).json(metadata);
+});
+
+//Serve brew styling
+app.get('/css/:id', asyncHandler(getBrew('share')), (req, res)=>{getCSS(req, res);});
+
+//User Page
+app.get('/user/:username', async (req, res, next)=>{
+	const ownAccount = req.account && (req.account.username == req.params.username);
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : `${req.params.username}'s Collection`,
+		description : 'View my collection of homebrew on the Homebrewery.'
+		// type        :  could be 'profile'?
+	};
+
+	const fields = [
+		'googleId',
+		'title',
+		'pageCount',
+		'description',
+		'authors',
+		'lang',
+		'published',
+		'views',
+		'shareId',
+		'editId',
+		'createdAt',
+		'updatedAt',
+		'lastViewed',
+		'thumbnail',
+		'tags'
+	];
+
+	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields)
+	.catch((err)=>{
+		console.log(err);
+	});
+
+	brews.forEach(brew => brew.stubbed = true); //All brews from MongoDB are "stubbed"
+
+	if(ownAccount && req?.account?.googleId){
+		const auth = await GoogleActions.authCheck(req.account, res);
+		let googleBrews = await GoogleActions.listGoogleBrews(auth)
+			.catch((err)=>{
+				console.error(err);
+			});
+
+		// If stub matches file from Google, use Google metadata over stub metadata
+		if(googleBrews && googleBrews.length > 0) {
+			for (const brew of brews.filter((brew)=>brew.googleId)) {
+				const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
+				if(match !== -1) {
+					brew.googleId = googleBrews[match].googleId;
+					brew.pageCount = googleBrews[match].pageCount;
+					brew.renderer = googleBrews[match].renderer;
+					brew.version = googleBrews[match].version;
+					brew.webViewLink = googleBrews[match].webViewLink;
+					googleBrews.splice(match, 1);
+				}
+			}
+
+			//Remaining unstubbed google brews display current user as author
+			googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] }));
+			brews = _.concat(brews, googleBrews);
+		}
+	}
+
+	req.brews = _.map(brews, (brew)=>{
+		// Clean up brew data
+		brew.title = brew.title?.trim();
+		brew.description = brew.description?.trim();
+		return sanitizeBrew(brew, ownAccount ? 'edit' : 'share');
+	});
+
+	return next();
+});
+
+//Edit Page
+app.get('/edit/:id', asyncHandler(getBrew('edit')), asyncHandler(async(req, res, next)=>{
+	req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
+
+	req.userThemes = await(getUsersBrewThemes(req.account?.username));
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : req.brew.title || 'Untitled Brew',
+		description : req.brew.description || 'No description.',
+		image       : req.brew.thumbnail || defaultMetaTags.image,
+		type        : 'article'
+	};
+
+	sanitizeBrew(req.brew, 'edit');
+	splitTextStyleAndMetadata(req.brew);
+	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
+	return next();
+}));
+
+//New Page from ID
+app.get('/new/:id', asyncHandler(getBrew('share')), asyncHandler(async(req, res, next)=>{
+	sanitizeBrew(req.brew, 'share');
+	splitTextStyleAndMetadata(req.brew);
+	const brew = {
+		shareId  : req.brew.shareId,
+		title    : `CLONE - ${req.brew.title}`,
+		text     : req.brew.text,
+		style    : req.brew.style,
+		renderer : req.brew.renderer,
+		theme    : req.brew.theme,
+		tags     : req.brew.tags,
+	};
+	req.brew = _.defaults(brew, DEFAULT_BREW);
+
+	req.userThemes = await(getUsersBrewThemes(req.account?.username));
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'New',
+		description : 'Start crafting your homebrew on the Homebrewery!'
+	};
+
+	return next();
+}));
+
+//New Page
+app.get('/new', asyncHandler(async(req, res, next)=>{
+	req.userThemes = await(getUsersBrewThemes(req.account?.username));
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'New',
+		description : 'Start crafting your homebrew on the Homebrewery!'
+	};
+
+	return next();
+}));
+
+//Share Page
+app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
+	const { brew } = req;
+	req.ogMeta = { ...defaultMetaTags,
+		title       : req.brew.title || 'Untitled Brew',
+		description : req.brew.description || 'No description.',
+		image       : req.brew.thumbnail || defaultMetaTags.image,
+		type        : 'article'
+	};
+
+	// increase visitor view count, do not include visits by author(s)
+	if(!brew.authors.includes(req.account?.username)){
+		if(req.params.id.length > 12 && !brew._id) {
+			const googleId = brew.googleId;
+			const shareId = brew.shareId;
+			await GoogleActions.increaseView(googleId, shareId, 'share', brew)
+				.catch((err)=>{next(err);});
+		} else {
+			await HomebrewModel.increaseView({ shareId: brew.shareId });
+		}
+	};
+
+	brew.authors.includes(req.account?.username) ? sanitizeBrew(req.brew, 'shareAuthor') : sanitizeBrew(req.brew, 'share');
+	splitTextStyleAndMetadata(req.brew);
+	return next();
+}));
+
+//Account Page
+app.get('/account', asyncHandler(async (req, res, next)=>{
+	const data = {};
+	data.title = 'Account Information Page';
+	
+	if(!req.account) {
+		res.set('WWW-Authenticate', 'Bearer realm="Authorization Required"');
+		const error = new Error('No valid account');
+		error.status = 401;
+		error.HBErrorCode = '50';
+		error.page = data.title;
+		return next(error);
+	};
+
+	let auth;
+	let googleCount = [];
+	if(req.account) {
+		if(req.account.googleId) {
+			auth = await GoogleActions.authCheck(req.account, res, false)
+
+			googleCount = await GoogleActions.listGoogleBrews(auth)
+				.catch((err)=>{
+					console.error(err);
+				});
+		}
+
+		const query = { authors: req.account.username, googleId: { $exists: false } };
+		const mongoCount = await HomebrewModel.countDocuments(query)
+			.catch((err)=>{
+				mongoCount = 0;
+				console.log(err);
+			});
+
+		data.accountDetails = {
+			username    : req.account.username,
+			issued      : req.account.issued,
+			googleId    : Boolean(req.account.googleId),
+			authCheck   : Boolean(req.account.googleId && auth?.credentials.access_token),
+			mongoCount  : mongoCount,
+			googleCount : googleCount?.length
+		};
+	}
+
+	req.brew = data;
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : `Account Page`,
+		description : null
+	};
+
+	return next();
+}));
+
+const nodeEnv = config.get('node_env');
+const isLocalEnvironment = config.get('local_environments').includes(nodeEnv);
+// Local only
+if(isLocalEnvironment){
+	// Login
+	app.post('/local/login', (req, res)=>{
+		const username = req.body.username;
+		if(!username) return;
+
+		const payload = jwt.encode({ username: username, issued: new Date }, config.get('secret'));
+		return res.json(payload);
+	});
+}
+
+// Add Static Local Paths
+app.use('/staticImages', express.static(config.get('hb_images') && fs.existsSync(config.get('hb_images')) ? config.get('hb_images') :'staticImages'));
+app.use('/staticFonts', express.static(config.get('hb_fonts')  && fs.existsSync(config.get('hb_fonts')) ? config.get('hb_fonts'):'staticFonts'));
+
+//Vault Page
+app.get('/vault', asyncHandler(async(req, res, next)=>{
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'The Vault',
+		description : 'Search for Brews'
+	};
+	return next();
+}));
+
+//Send rendered page
+app.use(asyncHandler(async (req, res, next)=>{
+	if (!req.route) return res.redirect('/'); // Catch-all for invalid routes
+		
+	const page = await renderPage(req, res);
+	if(!page) return;
+	res.send(page);
+}));
+
+//Render the page
+const renderPage = async (req, res)=>{
+	// Create configuration object
+	const configuration = {
+		local       : isLocalEnvironment,
+		publicUrl   : config.get('publicUrl') ?? '',
+		environment : nodeEnv,
+		deployment  : config.get('heroku_app_name') ?? ''
+	};
+	const props = {
+		version       : require('./../package.json').version,
+		url           : req.customUrl || req.originalUrl,
+		brew          : req.brew,
+		brews         : req.brews,
+		googleBrews   : req.googleBrews,
+		account       : req.account,
+		enable_v3     : config.get('enable_v3'),
+		enable_themes : config.get('enable_themes'),
+		config        : configuration,
+		ogMeta        : req.ogMeta,
+		userThemes    : req.userThemes
+	};
+	const title = req.brew ? req.brew.title : '';
+	const page = await templateFn('homebrew', title, props)
+		.catch((err)=>{
+			console.log(err);
+		});
+	return page;
+};
+
+//v=====----- Error-Handling Middleware -----=====v//
+//Format Errors as plain objects so all fields will appear in the string sent
+const formatErrors = (key, value)=>{
+	if(value instanceof Error) {
+		const error = {};
+		Object.getOwnPropertyNames(value).forEach(function (key) {
+			error[key] = value[key];
+		});
+		return error;
+	}
+	return value;
+};
+
+const getPureError = (error)=>{
+	return JSON.parse(JSON.stringify(error, formatErrors));
+};
+
+app.use(async (err, req, res, next)=>{
+	err.originalUrl = req.originalUrl;
+	console.error(err);
+
+	if(err.originalUrl?.startsWith('/api')) {
+		// console.log('API error');
+		res.status(err.status || err.response?.status || 500).send(err);
+		return;
+	}
+
+	// console.log('non-API error');
+	const status = err.status || err.code || 500;
+
+	req.ogMeta = { ...defaultMetaTags,
+		title       : 'Error Page',
+		description : 'Something went wrong!'
+	};
+	req.brew = {
+		...err,
+		title       : 'Error - Something went wrong!',
+		text        : err.errors?.map((error)=>{return error.message;}).join('\n\n') || err.message || 'Unknown error!',
+		status      : status,
+		HBErrorCode : err.HBErrorCode ?? '00',
+		pureError   : getPureError(err)
+	};
+	req.customUrl= '/error';
+
+	const page = await renderPage(req, res);
+	if(!page) return;
+	res.send(page);
+});
+
+app.use((req, res)=>{
+	if(!res.headersSent) {
+		console.error('Headers have not been sent, responding with a server error.', req.url);
+		res.status(500).send('An error occurred and the server did not send a response. The error has been logged, please note the time this occurred and report this issue.');
+	}
+});
+//^=====--------------------------------------=====^//
+
+module.exports = {
+	app : app
+};

From 6d4b1843ae2fffbab2ae53a7ca94e2478e553ea2 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sat, 12 Oct 2024 00:10:43 -0400
Subject: [PATCH 33/34] Fix missed lines from 3.15.2 branch

---
 server/googleActions.js | 5 ++---
 server/homebrew.api.js  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/googleActions.js b/server/googleActions.js
index e884e1515..bc97551ee 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -154,9 +154,8 @@ const GoogleActions = {
 	  return brews;
 	},
 
-	updateGoogleBrew : async (brew, auth = defaultAuth, userIp)=>{
-		const drive = googleDrive.drive({ version: 'v3', auth: auth });
-		console.log(auth == defaultAuth ? 'UPDATE w SERVICEACC' : 'UPDATE w USERACC')
+	updateGoogleBrew : async (brew, userIp)=>{
+		const drive = googleDrive.drive({ version: 'v3', auth: defaultAuth });
 
 		await drive.files.update({
 			fileId   : brew.googleId,
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 22e2cee7b..213b341ca 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -353,7 +353,7 @@ const api = {
 			if(!brew.googleId) return;
 		} else if(brew.googleId) {
 			// If the google id exists and no other actions are being performed, update the google brew
-			const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew));
+			const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew), req.ip);
 
 			if(!updated) return;
 		}

From 7dcceb983eb4a8083252d5c6d1c6a23965bb4c10 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sat, 12 Oct 2024 23:10:13 -0400
Subject: [PATCH 34/34] Update changelog to v3.16.0

---
 changelog.md      | 76 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  4 +--
 package.json      |  2 +-
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index 9d1ddf32d..1f7815d8d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -81,9 +81,85 @@ pre {
 }
 ```
 
+
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
+### Saturday 10/12/2024 - v3.16.0
+
+{{taskList
+##### 5e-Cleric
+
+* [x] Added a new API endpoint `/metadata/:shareId` to fetch metadata about individual brews
+
+Fixes issue [#2638](https://github.com/naturalcrit/homebrewery/issues/2638)
+
+* [x] Added A3, A5, and Card page size snippets under {{openSans **:fas_paintbrush: STYLE TAB :fas_arrow_right: :fas_print: PRINT**}}
+
+* [x] Adjust navbar styling for very long titles
+
+Fixes issue [#2071](https://github.com/naturalcrit/homebrewery/issues/2071)
+
+* [x] Added some sorting options to the {{openSans **VAULT** {{fas,fa-dungeon}}}} page
+
+* [x] Fix `language` property not working in share page
+
+Fixes issue [#3776](https://github.com/naturalcrit/homebrewery/issues/3776)
+
+##### abquintic
+
+* [x] New {{openSans **:fas_pencil: TEXT EDITOR :fas_arrow_right: :fas_bookmark: PAGE NUMBER :fas_arrow_right:**}}
+{{openSans **:fas_xmark: SKIP PAGE NUMBER**}} and {{openSans **:fas_arrow_rotate_left: RESTART PAGE NUMBER**}} snippets for more control over automatic page numbering.
+
+Fixes issue [#513](https://github.com/naturalcrit/homebrewery/issues/513)
+
+* [x] New Table of Contents control options via {{openSans **:fas_pencil: TEXT EDITOR :fas_arrow_right: :fas_book: TABLE OF CONTENTS**}} submenus. By default, H1-H3 is included in the ToC generation, but the new options allow marking `{{blocks}}` to include or exclude specific or ranges of contained headers. Also, a global option to increase the default range of H1-H3 to H1-H4/5/6. After applying these markers, you must regenerate the Table of Contents to see the changes.
+
+* [x] Added a ":fas_lock: SYNC VIEWS" button onto the divider bar. When locked, scrolling on either panel will sync the other panel to the same page.
+
+Fixes issue [#241](https://github.com/naturalcrit/homebrewery/issues/241)
+
+##### Gazook89
+
+* [x] Added a :fas_glasses: HIDE button to the page navigation bar
+
+##### G-Ambatte
+
+* [x] Automatic local backups of your files, in case of accidental data loss. Stores up to 5 snapshots of each brew edited in your browser, incrementing from a few minutes old to a maximum of several days. Restore a backup by clicking an entry in the new {{openSans **:fas_clock_rotate_left: HISTORY**}} button in the snippet bar.
+
+Fixes issue [#3070](https://github.com/naturalcrit/homebrewery/issues/3070)
+
+* [x] Fix issue with legacy brews breaking on Share page
+
+Fixes issue [#3764](https://github.com/naturalcrit/homebrewery/issues/3764)
+
+* [x] Fix print size when printing a zoomed document
+
+Fixes issue [#3744](https://github.com/naturalcrit/homebrewery/issues/3744)
+
+##### All
+
+* [x] Background code cleanup, security fixes, dev tool improvements, dependency updates, prep for upcoming features, etc.
+}}
+
+### Wednesday 9/25/2024 - v3.15.1
+
+{{taskList
+##### calculuschild
+
+* [x] Background fixes to handle Google Drive issues
+
+* [x] Remove duplicate error logging
+
+##### calculuschild, 5e-Cleric
+
+* [x] Fix links in {{openSans **RECENT BREWS :fas_clock_rotate_left:**}} and user {{openSans **BREWS :fas_beer_mug_empty:**}} pointing to trashed Google Drive files after transferring from Google to Homebrewery storage
+
+Fixes issue [#3776](https://github.com/naturalcrit/homebrewery/issues/3776)
+}}
+
+\page
+
 ### Wednesday 9/04/2024 - v3.15.0
 
 {{taskList
diff --git a/package-lock.json b/package-lock.json
index 02db16114..c37ddd676 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "homebrewery",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebrewery",
-      "version": "3.15.0",
+      "version": "3.16.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 5d0be26ef..5e7191353 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "engines": {
     "npm": "^10.2.x",
     "node": "^20.17.x"