@blaasvaer/frmwrk 0.2.6 → 0.3.0

package/index.js

@@ -10,6 +10,12 @@
  * Native modules
  */
 const http = require('http');
+const { Server } = require('socket.io');
+
+let port;
+let _config;
+let _io;
+
 /**
  * Custom modules
  */
@@ -19,15 +25,18 @@ const Utils = require('./utils');
 /**
  * Define variables
  */
-let hostname,
-server;
+let hostname;
 
 /**
  * If port number is passed in as first (custom) parameter, set port
  * otherwise use default 3000
  * @type {Number}
  */
-const port = ( process.argv.length > 2 ) ? parseInt( process.argv[ process.argv.length - 1 ] ) : 3000;
+if ( ! process.env.NODE_PORT ) {
+	port = ( process.argv.length > 2 ) ? parseInt( process.argv[ process.argv.length - 1 ] ) : 3000;
+} else {
+	port = process.env.NODE_PORT;
+}
 
 if ( process.env.NODE_ENV !== 'production') {
 	// console.log("ENV file", process.env.PGHOST);
@@ -39,12 +48,9 @@ if ( process.env.NODE_ENV !== 'production') {
  * @return {Node}        Node
  */
 FW = function ( config ) {
-	let _this = this;
+	_config = config || {};
 
-	hostname = config.hostname ? config.hostname : '127.0.0.1';
-
-	controllers = {};
-	models = {};
+	hostname = _config.hostname ? _config.hostname : '0.0.0.0';
 
 	/**
 	 * Set the Controller
@@ -107,6 +113,10 @@ console.log("Authorize - check credentials:", credentials);
 		// return true;
 	}
 
+	getSocketIO = () => {
+		return _io;
+	}
+
 	/**
 	 * Install framework components and start the server
 	 */
@@ -120,13 +130,19 @@ console.log("Authorize - check credentials:", credentials);
 		 * Create and start the server
 		 * @return {function} Server instance
 		 */
-		http.createServer( handleRequest ).listen(port, hostname, () => {
+		const server = http.createServer( handleRequest ).listen(port, hostname, () => {
 			console.log(`Server running at http://${hostname}:${port}`);
 		});
+
+		if ( config.enable_socket_io ) {
+			_io = new Server( server );
+		}
 	})
 	.catch(function( err ) {
 console.log("Install Error:", err);
-	});;
+	});
+
+	return this;
 };
 
 /**
@@ -135,19 +151,18 @@ console.log("Install Error:", err);
  * Installs the components of the framework like; controllers, models, views, users etc.
  * @param {Object} config Config object
  */
-global.Install = function Install ( config ) {
-	// global.publicPath = config.root + '/themes/' + config.theme + '/' + 'public/';
-	global.publicPath = config.root + '/themes/' + config.theme;
+global.Install = () => {
+	global.publicPath = _config.root + '/themes/' + _config.theme;
 
 	/**
 	 * Installation processes to run
 	 * @type {Array}
 	 */
 	let install_processes = [
-		require('./controllers')( config ),
-		require('./models')( config ),
-		require('./views')( config ),
-		require('./connections')( config ),
+		require('./controllers')( _config ),
+		require('./models')( _config ),
+		require('./views')( _config ),
+		require('./connections')( _config ),
 		// require('./users')( config )
 	];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaasvaer/frmwrk",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "description": "My personal Node framework",
   "main": "index.js",
   "scripts": {

package/package 2.json

@@ -1,30 +0,0 @@
-{
-  "name": "@blaasvaer/frmwrk",
-  "version": "0.1.14",
-  "description": "My personal Node framework",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "patch": "npm version patch --force && npm publish",
-    "major": "npm version major --force && npm publish",
-    "minor": "npm version minor --force && npm publish"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@bitbucket.org/blaasvaer/frmwrk.git"
-  },
-  "keywords": [
-    "Node",
-    "Framework",
-    "Homebrew"
-  ],
-  "author": "Sam Blåsvær",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://bitbucket.org/blaasvaer/frmwrk/issues"
-  },
-  "homepage": "https://bitbucket.org/blaasvaer/frmwrk#readme",
-  "dependencies": {
-    "serve-handler": "^6.1.3"
-  }
-}