express.io.js 1.0.1611 → 1.22.1015

package/node_packages/express.js

@@ -16,26 +16,29 @@ $.express = require ("express");
 class express {
 	constructor (config) {
 		this.express = $.express ();
-		this.config = config;
+		this.config = config || express.config || {}
+		this.config.static = this.config.static || {dotfiles: "ignore"}
 		this.host = this.config.host || "0.0.0.0";
 		this.port = this.config.port || process.env.PORT || 3000;
-		this.serve = this.config.static || {dotfiles: "ignore"}
+		this.dir = {name: this.config.dir}
+		this.dir.src = $.path.join (this.dir.name, "src")
+		this.dir.db = $.path.join (this.dir.src, "db")
+		this.dir.theme = $.path.join (this.dir.src, "theme")
 		Event.proto (this);
 		}
 	static (path = "public", option) {
-		var serve = option || this.serve;
-		this.express.use ($.express.static (path, serve));
+		this.express.use ($.express.static (path, (option || this.config.static)));
 		return this;
 		}
-	setup (context) {
+	setup (setup) {
 		var io = function (app) {
 			return async function (r, respond, next) {
 				var http_d = {request: r, response: respond}
 				var {request, response} = express.io (app, http_d);
 				app.__ = {request, response}
-				await express.setup.call (app, app.__.request, app.__.response);
-				express.security.call (app, app.__.request, app.__.response);
-				context (app.__.request, app.__.response, next, http_d);
+				await new Promise (function (resolve, reject) { express.setup.call (app, app.__.request, app.__.response, resolve); });
+				await new Promise (function (resolve, reject) { setup.call (app, app.__.request, app.__.response, resolve); });
+				express.security.call (app, app.__.request, app.__.response, next);
 				}
 			}
 		this.express.use (io (this));
@@ -85,38 +88,64 @@ express.io = function (app, http_d) {
 	}
 
 express.request = function (app, http_d) {
-	var request = function () {}
+	const request = function () {}
 	request.error = [];
 	request.header = http_d.request.headers;
 	if (request.url = function () {}) {
-		var protocol = http_d.request.protocol || "http";
+		var protocol = request.header ["x-forwarded-proto"] || http_d.request.protocol || "http";
 		if (app.config.internet) protocol = "https";
 		request.base_url = `${protocol}://${http_d.request.host}`;
 		var parse_url = URL.parse (request.url.address = `${request.base_url}${http_d.request.url}`);
 		for (var i in parse_url) request.url [i] = parse_url [i];
-		}
-	request.get = function (... get) {
-		return http_d.request.get (... get);
+		request.get = function (... arg) {
+			return http_d.request.get (... arg);
+			}
 		}
 	if (request.visitor = {}) {
-		request.visitor.ip = {address: "127.0.0.1"}
+		var ip_address = request.header ["x-real-ip"] || "127.0.0.1";
+		var country_code = request.header ["x-vercel-ip-country"] || "";
+		var country_name = "";
+		var country_region = request.header ["x-vercel-ip-country-region"] || "";
+		var country_city_code = "";
+		var country_city_name = request.header ["x-vercel-ip-city"] || "";
+		var country_timezone = request.header ["x-vercel-ip-timezone"] || "";
+		var coordinate_latitude = request.header ["x-vercel-ip-latitude"] || "";
+		var coordinate_longitude = request.header ["x-vercel-ip-longitude"] || "";
+		request.visitor.ip = {address: ip_address}
+		request.visitor.country = {code: country_code, name: country_name, region: country_region, city: {name: country_city_name}, timezone: country_timezone, coordinate: {latitude: coordinate_latitude, longitude: coordinate_longitude}}
 		request.visitor.browser = request.header ["user-agent"];
 		}
+	request.db = function () {}
+	request.j_son = function () {}
+	request.theme = function () {}
 	return request;
 	}
 
 express.response = function (app, request, http_d) {
 	var response = function () {}
-	response.status = function (code) { http_d.response.status (code); return response; }
-	response.json = function (... context) { http_d.response.json (... context); return response; }
-	response.html = function (... context) {
-		http_d.response.send (... context);
-		return response;
-		}
-	response.output = new $.html ();
-	response.error = function (code = 500) { http_d.response.status (code).send (URL.header.status.code [code]); }
-	response.error.forbidden = function (code = 403) { http_d.response.status (code).send (URL.header.status.code [code]); }
-	response.error.found = function (code = 404) { http_d.response.status (code).send (URL.header.status.code [code]); }
+	if ("output") {
+		response.var = $.object.create (null);
+		response.output = new $.html ();
+		response.status = function (code) { http_d.response.status (code); return response; }
+		response.text = function () {}
+		response.css = function () {}
+		response.js = function () {}
+		response.xml = function () {}
+		response.json = function (... context) { http_d.response.json (... context); return response; }
+		response.html = function (... context) {
+			http_d.response.send (... context);
+			return response;
+			}
+		response.render = function () {}
+		}
+	if ("error") {
+		response.error = function (code = 500) { http_d.response.status (code).send (response.error.message || URL.header.status.code [code]); return response; }
+		response.error.forbidden = function (code = 403) { http_d.response.status (code).send (URL.header.status.code [code]); return response; }
+		response.error.found = function (code = 404) { http_d.response.status (code).send (URL.header.status.code [code]); return response; }
+		}
+	if ("db") {
+		response.db = function () {}
+		}
 	return response;
 	}
 
@@ -130,27 +159,36 @@ express.response = function (app, request, http_d) {
  * xxx://xxx.xxx.xxx/xxx
  */
 
-express.security = function (request, response) {
-	this.emit ("security", request, response);
-	if (request.error.length) {
-		if (request.error.includes ("forbidden")) response.error.forbidden ();
-		else if (request.error.includes ("found")) response.error.found ();
-		else response.error ();
+express.setup = async function (request, response, next) {
+	if ("db") {
+		if (this.config.db.driver === "json") {
+			request.db = new JSON.db ({dir: this.dir.db, collection: this.config.db.collection});
+			}
+		}
+	if ("app:client") {
+		request.app = (await request.db.select ("app").find ({host: request.url.host.name})).data.one ()
 		}
-	}
-
-express.setup = function (request, response) {
 	if (true) {
 		response.output.set ("language", "en");
 		response.output.set ("html:attribute", {translate: "no", prefix: "og: http://ogp.me/ns#"});
 		response.output.set ("canonical", request.url.address);
 		response.output.set ("favorite.ico", request.base_url.join ("/favicon.ico"));
 		response.output.set ("debug", JSON.pretty (request.header));
-		if (false) response.output.set ("meta", {attribute: {name: "adsterra", content: "ads"}});
+		if (false) response.output.set ("meta", {attribute: {name: "key", content: "value"}});
+		}
+	this.emit ("setup", request, response);
+	this.emit ("j_son:setup", request, response);
+	next ();
+	}
+
+express.security = function (request, response, next) {
+	this.emit ("security", request, response);
+	if (request.error.length) {
+		if (request.error.includes ("forbidden")) response.error.forbidden ();
+		else if (request.error.includes ("found")) response.error.found ();
+		else response.error ();
 		}
-	return new Promise (function (resolve, reject) {
-		resolve (true);
-		});
+	next ();
 	}
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "express.io.js",
 	"description": "Hello World",
-	"version": "1.0.1611",
+	"version": "1.022.1015",
 	"author": "Seindi Rahmat Barus <xseindi@gmail.com>",
 	"contributors": [
 		"Seindi Rahmat Barus <xseindi@gmail.com>"
@@ -22,6 +22,6 @@
 	],
 	"dependencies": {
 		"express": "^5.2.1",
-		"script.io.js": "^1.0.1611"
+		"script.io.js": "^1.022.1015"
 	}
 }