diff --git a/edgio.config.js b/edgio.config.js
index 4b9911e..047fcac 100644
--- a/edgio.config.js
+++ b/edgio.config.js
@@ -1,6 +1,8 @@
// This file was automatically added by edgio init.
// You should commit this file to source control.
// Learn more about this file at https://docs.edg.io/guides/edgio_config
+require('dotenv').config();
+
module.exports = {
connector: '@edgio/next',
diff --git a/functions/database/upstash/index.js b/functions/database/upstash/index.js
new file mode 100644
index 0000000..f9e7102
--- /dev/null
+++ b/functions/database/upstash/index.js
@@ -0,0 +1,144 @@
+import createFetchForOrigin from '../../../utils/createFetchForOrigin';
+import {
+ getCookiesFromRequest,
+ setCookieToResponse,
+} from '../../../utils/cookies';
+import { setEnvFromContext } from '../../../utils/polyfills/process.env';
+import '../../../utils/polyfills/URL';
+import waitingPage from './waiting-room-capacity.html';
+import landingPage from './waiting-room-landing.html';
+
+// Constants
+const COOKIE_NAME_ID = '__booking_id';
+const COOKIE_NAME_TIME = '__booking_last_update_time';
+const TOTAL_ACTIVE_USERS = 2;
+const SESSION_DURATION_SECONDS = 15;
+
+// Setup fetch function for Upstash
+const fetch = createFetchForOrigin('upstash');
+
+/**
+ * Main handler for the edge request.
+ */
+export async function handleHttpRequest(request, context) {
+ let resp;
+
+ // Set context environment variables to process.env
+ setEnvFromContext(context);
+
+ const cookies = getCookiesFromRequest(request);
+
+ // Get user ID from cookie or generate a new one
+ const userId = cookies[COOKIE_NAME_ID] ?? generateId();
+
+ // Get the current number of active sessions and the active user
+ const size = await getRecordCount();
+ const isActiveUser = (await getRecord(userId)) === '1';
+
+ console.log('Current number of active sessions: ', size);
+
+ // Check capacity
+ if (size < TOTAL_ACTIVE_USERS || isActiveUser) {
+ resp = await getDefaultResponse(request, userId);
+ } else {
+ resp = await getWaitingRoomResponse();
+ }
+
+ return resp;
+}
+
+/**
+ * Generate a random ID
+ */
+function generateId(len = 10) {
+ return Array.from({ length: len }, () =>
+ ((Math.random() * 36) | 0).toString(36)
+ ).join('');
+}
+
+/**
+ * Handle the default response.
+ */
+async function getDefaultResponse(request, userId) {
+ const response = new Response(
+ landingPage({
+ domain: getDomainFromRequest(request),
+ maxUsers: TOTAL_ACTIVE_USERS,
+ sessionDuration: SESSION_DURATION_SECONDS,
+ })
+ );
+ response.headers.set('content-type', 'text/html;charset=UTF-8');
+
+ const cookies = getCookiesFromRequest(request);
+ const now = Date.now();
+ const lastUpdate = cookies[COOKIE_NAME_TIME];
+ let lastUpdateTime = 0;
+
+ if (lastUpdate) {
+ lastUpdateTime = parseInt(lastUpdate);
+ }
+
+ const diff = now - lastUpdateTime;
+ const updateInterval = (SESSION_DURATION_SECONDS * 1000) / 2;
+ if (diff > updateInterval) {
+ await setExpiryRecord(userId, '1', SESSION_DURATION_SECONDS);
+ setCookieToResponse(response, [[COOKIE_NAME_TIME, now.toString()]]);
+ }
+
+ setCookieToResponse(response, [[COOKIE_NAME_ID, userId]]);
+ return response;
+}
+
+/**
+ * Send a REST request to Upstash.
+ */
+async function sendUpstashRequest(cmd) {
+ cmd = Array.isArray(cmd) ? cmd.join('/') : cmd;
+
+ return (
+ await fetch(`${process.env.UPSTASH_REDIS_REST_URL}`, {
+ method: 'POST',
+ body: JSON.stringify(cmd.split('/')),
+ headers: {
+ Authorization: `Bearer ${process.env.UPSTASH_REDIS_REST_TOKEN}`,
+ },
+ })
+ ).json();
+}
+
+/**
+ * Get the current number of records.
+ */
+async function getRecordCount() {
+ const data = await sendUpstashRequest('DBSIZE');
+ return data.result;
+}
+
+/**
+ * Fetch a record from Upstash by key.
+ */
+async function getRecord(key) {
+ const data = await sendUpstashRequest(['GET', key]);
+ return data.result;
+}
+
+/**
+ * Set a record with an expiry time in Upstash.
+ */
+async function setExpiryRecord(key, value, seconds) {
+ return sendUpstashRequest(['SET', key, value, 'EX', seconds]);
+}
+
+/**
+ * Response for the waiting room.
+ */
+async function getWaitingRoomResponse() {
+ const response = new Response(waitingPage());
+ response.headers.set('content-type', 'text/html;charset=UTF-8');
+ return response;
+}
+
+function getDomainFromRequest(request) {
+ const url = new URL(request.url);
+ return url.origin;
+}
diff --git a/functions/waiting-room/waiting-room-capacity.html.js b/functions/database/upstash/waiting-room-capacity.html.js
similarity index 94%
rename from functions/waiting-room/waiting-room-capacity.html.js
rename to functions/database/upstash/waiting-room-capacity.html.js
index 1df8633..f7c2d2a 100644
--- a/functions/waiting-room/waiting-room-capacity.html.js
+++ b/functions/database/upstash/waiting-room-capacity.html.js
@@ -1,4 +1,4 @@
-const template = ({ queuePosition }) => `
+const template = () => `
@@ -70,10 +70,10 @@ const template = ({ queuePosition }) => `
Almost There!
Our site is currently at full capacity. Thanks for your patience.
- You are number ${queuePosition} in line.
You'll be redirected shortly. Please do not close your browser.
+