@awesomeness-js/server 1.0.2 → 1.1.1

package/example-site/example.awesomenessjs.com/pages/start/css/intro.css

@@ -0,0 +1,67 @@
+.introPage{
+  background-image: url('/tools/images/awesomeness.webp');
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-position: 50% 50%;
+}
+
+.landing-area {
+  overflow: auto;
+  position: relative;
+  width: 40%;
+  text-align: center;
+  color: #fff;
+}
+
+.app-size-xl .landing-area { width: 60%; }
+.app-size-d .landing-area { width: 60%; }
+.app-size-t .landing-area { width: 70%; }
+.app-size-p .landing-area { width: 95%; }
+
+.landing-area h1{
+  color: #fff;
+  text-transform: uppercase;
+  font-weight: 700;
+}
+
+.landing-area h2{
+  margin-bottom: 10px;
+  font-weight: 300;
+  font-size: 1.4em;
+  text-transform: capitalize;
+  color: #fff;
+}
+
+.landing-area button {
+  width: 46%;
+  margin: 2%;
+}
+
+.landing-area button i{
+  text-align: center;
+  font-size: 2em;
+  position: relative;
+  display: block;
+  width: 100%;
+  padding-bottom: 23px;
+  right:auto;
+}
+
+.landing-area .a-button {
+  background-color: #fff;
+  color: #13408d;
+}
+
+.landing-area .b-button {
+  background-color: #13408d;
+  color: #fff;
+}
+
+.divider{
+  width: 50%;
+  height: 1px;
+  display: block;
+  margin-left: 25%;
+  background-color: #fff;
+  margin: 19px 25%;
+}

package/example-site/example.awesomenessjs.com/pages/start/css/nav.css

@@ -0,0 +1,221 @@
+.main-nav {
+  background-color: #010816;
+  overflow: auto;
+  z-index: 3;
+  position: absolute;
+  width: 100%;
+  top: 62px;
+}
+
+.main{
+    padding-top: 137px;
+}
+
+.nav-container {
+  background-color: #010816;
+  color: #fff;
+  opacity: 1;
+  position: fixed;
+  right: 0;
+  top: -63px;
+  transition: all 420ms;
+  width: 100%;
+  z-index: 3;
+}
+
+.nav-container.showExtra{
+  top:0px;
+}
+
+.nav-logo {
+  cursor: pointer;
+  float: left;
+  font-size: 2em;
+  font-weight: 600;
+  height: 75px;
+  padding-top: 15px;
+  text-align: center;
+  width: 300px;
+}
+
+.nav-list {
+  float: right;
+  height: 75px;
+  margin: 0px;
+  padding: 25px 45px 25px 0px;
+}
+
+.app-size-p .nav-list,
+.app-size-t .nav-list{
+  width: 100%;
+  height: inherit;
+  padding-top: 0px;
+  display: none;
+}
+.app-size-p .nav-list.active,
+.app-size-t .nav-list.active{
+  display: block;
+}
+
+
+.app-size-p .nav-list li,
+.app-size-t .nav-list li{
+  width: 100%;
+  height: inherit;
+  text-align: right;
+  padding: 10px;
+}
+
+
+.nav-list li {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border-bottom: solid 1px #00000000;
+  cursor: pointer;
+  display: block;
+  float: left;
+  font-size: 1.3em;
+  font-weight: 300;
+  margin-left: 30px;
+  padding-bottom: 3px;
+  transition: all 420ms;
+  position: relative;
+}
+
+.nav-list li:hover,
+.nav-sub-list li:hover,
+.nav-button:hover,
+.nav-logo:hover{
+  color:#ffab55;
+}
+
+.app-size-xl .nav-list li.active,
+.app-size-d .nav-list li.active{
+  border-bottom: solid 1px #0858e1;
+}
+
+.app-size-t .nav-list li,
+.app-size-p .nav-list li{
+  padding-right:45px;
+}
+
+.nav-button {
+  cursor: pointer;
+  float: right;
+  height: 75px;
+  padding: 19px 12px 19px 0px;
+  text-align: center;
+  width: 60px;
+  display: none;
+  font-size: 2.3em;
+}
+
+.app-size-p .nav-button,
+.app-size-t .nav-button{
+  display: block;
+}
+
+
+.nav-top {
+  position: absolute;
+  z-index: 3;
+  top: 0px;
+  width:100%;
+  display: block;
+  overflow: auto;
+  font-size: .85em;
+  padding: 13px 32px 13px 0px;
+  background-color: #0858e1;
+}
+
+.app-size-p .nav-top,
+.app-size-p .nav-call-to-action {
+  padding-right: 15px;
+}
+.app-size-p .nav-action{
+  padding-left: 15px;
+}
+
+
+.nav-action{
+  float: right;
+  background-color: #d92c2c;
+  padding: 10px 40px 10px 25px;
+  position: relative;
+  cursor: pointer;
+  transition: all 420ms;
+}
+.nav-action:hover{
+  background-color:#053587;
+}
+
+.nav-action i {
+    font-size: 1em;
+    float: right;
+    position: absolute;
+    top: 12px;
+    right: 13px;
+}
+.nav-call-to-action{
+  float: right;
+  padding: 10px 25px 10px 0px;
+}
+
+.nav-sub-list{
+  transition: all 420ms;
+  display: block;
+  width: 100%;
+  overflow: auto;
+  background-color:#182a4d;
+  margin-bottom: 0px;
+  top: 0px;
+  position: absolute;
+  padding-right: 10px;
+}
+
+.nav-sub-list li{
+  cursor: pointer;
+  z-index: 0;
+  transition: all 420ms;
+  display: inline-block;
+  overflow: auto;
+  background-color: #182a4d;
+  float: left;
+  padding: 20px 22px;
+}
+
+.nav-sub-list.active{
+  top: 120px;
+}
+
+.app-size-t .nav-sub-list,
+.app-size-p .nav-sub-list{
+  top: -235px;
+}
+
+.app-size-t .nav-sub-list li,
+.app-size-p .nav-sub-list li{
+  padding-right: 50px;
+  text-align: right;
+  width: 100%;
+}
+
+.app-size-p .nav-sub-list.active,
+.app-size-t .nav-sub-list.active{
+  top: 415px;
+}
+
+.app-size-p .nav-list li i,
+.app-size-t .nav-list li i {
+  position: absolute;
+  right: 4px;
+  top: 14px;
+}
+
+.nav-list li i {
+  position: relative;
+}

package/example-site/example.awesomenessjs.com/pages/start/getData.js

@@ -0,0 +1,8 @@
+export default async function start(awesomenessRequest){
+	
+	return {
+		yup: 'were here',
+		v2: true
+	};
+
+}

package/example-site/example.awesomenessjs.com/pages/start/js/init.js

@@ -0,0 +1,30 @@
+import ui from '#ui';
+
+app.pages.start.init = function(data, options){
+
+	app.pages.start.updateState();
+	
+	// create HTML first
+	// could be done in parts broken down in the scripts folder
+	var $body = $('body');
+
+	// good idea to keep everything #app
+	// css that gets updated dynamically will be in the body via the #css div
+	// so replacing the whole body is generally not good idea
+	var $app = $('<div id="app"></div>').appendTo($body);
+
+	// Do whatever you want
+	$(`<div style="padding-top: 40vh; text-align: center;">
+		<div class="text-xl">Awesomeness</div>
+		<div class="text-xs">Build something awesome</div>
+	</div>`)
+		.appendTo($app);
+
+	ui._example();
+	ui.notCommonExample();
+
+
+	window.dispatchEvent(new Event('resize'));
+
+
+};

package/example-site/example.awesomenessjs.com/pages/start/js/updateState.js

@@ -0,0 +1,14 @@
+app.pages.start.updateState = function(){
+
+	// set initial
+	history.replaceState(0,'Awesomeness PWA', '/');
+	document.title = 'Awesomeness | Vanilla JS to build PWAs';
+
+	var startData = {};
+
+	startData.title = 'Awesomeness | Vanilla JS to build PWA';
+	startData.url = '/';
+
+	app.state.state[0] = startData;
+
+};

package/example-site/example.awesomenessjs.com/public/manifest.webmanifest.json

@@ -0,0 +1,8 @@
+{
+	"name": "Awesomeness PWA",
+	"short_name": "Awesomeness PWA",
+	"start_url": "https://demo.awesomenessjs.com",
+	"display": "standalone",
+	"background_color": "#000000",
+	"description": "Awesomeness PWA"
+}

package/example-site/example.awesomenessjs.com/specialRoutes.js

@@ -0,0 +1,14 @@
+export default [
+	{
+		pattern: '/blog/:tag',
+		handler: async (awesomenessRequest, params) => {
+				
+			// test by returning json 200
+			awesomenessRequest.data.tag = params.tag;
+			awesomenessRequest.pageRoute = 'blog';
+			
+			awesomenessRequest.pageInit = 'blog';
+
+		}
+	}
+];

package/index.js

@@ -1,25 +1,105 @@
-import checkAccess from "./server/checkAccess.js";
-import fetchPage from "./server/fetchPage.js";
-import reRoute from "./server/reRoute.js";
-import start from "./start.js";
-import { init, getConfig } from "./config.js";
-
-export { 
-	init,
-	getConfig,
-	checkAccess,
-	reRoute,
-	fetchPage,
-	start
-};
-
-const server = {
-	checkAccess,
-	fetchPage,
-	getConfig,
-	init,
-	reRoute,
-	start
-};
-
-export default server;
+/**
+ * This file is auto-generated by the build script.
+ * It consolidates API functions for use in the application.
+ * Do not edit manually.
+ */
+import _applicationMap from './src/applicationMap.js';
+import _awesomenessNormalizeRequest from './src/awesomenessNormalizeRequest.js';
+import _brotliJsonResponse from './src/brotliJsonResponse.js';
+import _checkAccess from './src/checkAccess.js';
+import _componentDependencies from './src/componentDependencies.js';
+import _config from './src/config.js';
+import _fetchPage from './src/fetchPage.js';
+import _getConfig from './src/getConfig.js';
+import _getMD from './src/getMD.js';
+import _init from './src/init.js';
+import _koa_attachAwesomenessRequest from './src/koa/attachAwesomenessRequest.js';
+import _koa_cors from './src/koa/cors.js';
+import _koa_errorHandler from './src/koa/errorHandler.js';
+import _koa_finalFormat from './src/koa/finalFormat.js';
+import _koa_jsonBodyParser from './src/koa/jsonBodyParser.js';
+import _koa_routeRequest from './src/koa/routeRequest.js';
+import _koa_serverUp from './src/koa/serverUp.js';
+import _koa_staticFiles from './src/koa/staticFiles.js';
+import _koa_timeout from './src/koa/timeout.js';
+import _pageInfo from './src/pageInfo.js';
+import _reRoute from './src/reRoute.js';
+import _resolveRealCasePath from './src/resolveRealCasePath.js';
+import _specialPaths from './src/specialPaths.js';
+import _start from './src/start.js';
+import _validateRequest from './src/validateRequest.js';
+import _ws_handlers from './src/ws/handlers.js';
+import _ws_index from './src/ws/index.js';
+
+export { _applicationMap as applicationMap };
+export { _awesomenessNormalizeRequest as awesomenessNormalizeRequest };
+export { _brotliJsonResponse as brotliJsonResponse };
+export { _checkAccess as checkAccess };
+export { _componentDependencies as componentDependencies };
+export { _config as config };
+export { _fetchPage as fetchPage };
+export { _getConfig as getConfig };
+export { _getMD as getMD };
+export { _init as init };
+export { _pageInfo as pageInfo };
+export { _reRoute as reRoute };
+export { _resolveRealCasePath as resolveRealCasePath };
+export { _specialPaths as specialPaths };
+export { _start as start };
+export { _validateRequest as validateRequest };
+
+export const koa = {
+	attachAwesomenessRequest: _koa_attachAwesomenessRequest,
+	cors: _koa_cors,
+	errorHandler: _koa_errorHandler,
+	finalFormat: _koa_finalFormat,
+	jsonBodyParser: _koa_jsonBodyParser,
+	routeRequest: _koa_routeRequest,
+	serverUp: _koa_serverUp,
+	staticFiles: _koa_staticFiles,
+	timeout: _koa_timeout
+};
+
+export const ws = {
+	handlers: _ws_handlers,
+	index: _ws_index
+};
+
+
+export default {
+	applicationMap: _applicationMap,
+	awesomenessNormalizeRequest: _awesomenessNormalizeRequest,
+	brotliJsonResponse: _brotliJsonResponse,
+	checkAccess: _checkAccess,
+	componentDependencies: _componentDependencies,
+	config: _config,
+	fetchPage: _fetchPage,
+	getConfig: _getConfig,
+	getMD: _getMD,
+	init: _init,
+	pageInfo: _pageInfo,
+	reRoute: _reRoute,
+	/**
+	 * Case-insensitive real path resolver.
+	 * Works correctly on Windows, macOS, and Linux/Docker.
+	 */
+	resolveRealCasePath: _resolveRealCasePath,
+	specialPaths: _specialPaths,
+	start: _start,
+	validateRequest: _validateRequest,
+	koa: {
+		attachAwesomenessRequest: _koa_attachAwesomenessRequest,
+		cors: _koa_cors,
+		errorHandler: _koa_errorHandler,
+		finalFormat: _koa_finalFormat,
+		jsonBodyParser: _koa_jsonBodyParser,
+		routeRequest: _koa_routeRequest,
+		serverUp: _koa_serverUp,
+		staticFiles: _koa_staticFiles,
+		timeout: _koa_timeout,
+	},
+	ws: {
+		handlers: _ws_handlers,
+		index: _ws_index,
+	},
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@awesomeness-js/server",
-	"version": "1.0.2",
+	"version": "1.1.1",
 	"description": "Awesomeness Multi-Site Server",
 	"author": "Scott Forte",
 	"type": "module",
@@ -10,7 +10,10 @@
 		"url": "git+https://github.com/awesomeness-js/server.git"
 	},
 	"scripts": {
-		"test": "vitest"
+		"test": "vitest",
+		"prebuild": "node ./build/build.js",
+		"build": "tsc && npm run postBuild",
+		"postBuild": "node ./build/postBuild.js"
 	},
 	"exports": {
 		".": {

package/{server → src}/applicationMap.js

@@ -1,4 +1,4 @@
-import { getConfig } from "../config.js";
+import getConfig from "./getConfig.js";
 
 export default function(host){
 

package/{server → src}/awesomenessNormalizeRequest.js

@@ -1,4 +1,4 @@
-import { getConfig } from "../config.js";
+import getConfig from "./getConfig.js";
 import applicationMap from './applicationMap.js';
 import reRoute from './reRoute.js';
 
@@ -7,7 +7,6 @@ async function awesomenessNormalizeRequest({
 } = {}) {
 
 	const awesomenessConfig = getConfig();
-
 	
 	const domain = req.headers.host;
 
@@ -77,6 +76,25 @@ async function awesomenessNormalizeRequest({
 	
 	}
 
+	const startTime = performance.now();
+
+	const log = (message, data = {}) => {
+
+		const timeElapsed = performance.now() - startTime;
+
+		if(awesomenessConfig.debug){
+
+			awesomenessRequest.logData.push({
+				timestamp: new Date().toISOString(),
+				timeElapsed,
+				message,
+				data
+			});
+
+		}
+	
+	};
+
 	const awesomenessRequest = {
 
 		// request info
@@ -111,7 +129,10 @@ async function awesomenessNormalizeRequest({
 		urlParams,
 
 		// just because
-		_RAW: req
+		_RAW: req,
+		
+		log,
+		logData: []
 	};
 
 	awesomenessRequest.reRoute = (destination)=>{

package/{server → src}/componentDependencies.js

@@ -31,7 +31,7 @@ function extractUiFirstParts(str) {
 
 }
 
-function componentDependencies(allComponents, {
+export default function componentDependencies(allComponents, {
 	componentLocations = [],
 	namespace = "ui",
 	showDetails = false,
@@ -58,7 +58,6 @@ function componentDependencies(allComponents, {
 
 				// baseUrl should point at a directory; we resolve component under it
 				const componentUrl = new URL(`./${component}/`, baseUrl);
-
         
 				return path.resolve(urlToFsPath(componentUrl));
 			
@@ -66,6 +65,7 @@ function componentDependencies(allComponents, {
 
 			let allFiles;
 			let chosenRoot;
+			let lastErr;
 
 			for (const root of candidateRoots) {
 
@@ -75,21 +75,29 @@ function componentDependencies(allComponents, {
 						dir: root,
 						ignore 
 					});
+
 					chosenRoot = root;
+
 					break; // first match wins
 				
-				} catch {
+				} catch(e) {
+
 					// try next
+					lastErr = e;
+				
 				}
 			
 			}
 
+
+
 			if (!allFiles) {
 
 				throw {
 					message: "component does not exist (no location matched)",
 					component,
 					tried: candidateRoots,
+					cause: lastErr?.message ?? lastErr,
 				};
 			
 			}
@@ -297,5 +305,3 @@ function componentDependencies(allComponents, {
 	return out;
 
 }
-
-export { componentDependencies };

package/{config.js → src/config.js}

@@ -26,4 +26,9 @@ export function getConfig() {
 
 	return _config;
 
-}
+}
+
+export default {
+	init,
+	getConfig
+};

package/{server → src}/fetchPage.js

@@ -1,10 +1,10 @@
 import path from "path";
 import { fileURLToPath } from "url";
 
-import { componentDependencies } from "./componentDependencies.js";
+import componentDependencies from "./componentDependencies.js";
 import pageInfo from "./pageInfo.js";
 import { each, md5, combineFiles } from "@awesomeness-js/utils";
-import { getConfig } from "../config.js";
+import getConfig from "./getConfig.js";
 
 const componentNamespace = "ui";
 const pageNamespaceBase = `app.pages`;
@@ -23,11 +23,11 @@ export default async function fetchPage(
 
 	const awesomenessConfig = getConfig();
 
-	// normalize siteURL (expected to point at the /sites/ directory)
+	// normalize siteDir__URL (expected to point at the /sites/ directory)
 	const sitesRootPath =
-		awesomenessConfig.siteURL instanceof URL
-			? fileURLToPath(awesomenessConfig.siteURL)
-			: awesomenessConfig.siteURL;
+		awesomenessConfig.siteDir__URL instanceof URL
+			? fileURLToPath(awesomenessConfig.siteDir__URL)
+			: awesomenessConfig.siteDir__URL;
 
 	const sitePagesRoot = path.join(sitesRootPath, awesomenessRequest.site, "pages");
 

package/src/getConfig.js

@@ -0,0 +1,3 @@
+import { getConfig } from "./config.js";
+
+export default getConfig;

package/src/init.js

@@ -0,0 +1,3 @@
+import { init } from "./config.js";
+
+export default init;