@blaasvaer/frmwrk 0.3.1 → 0.3.3

package/controllers.js

@@ -23,6 +23,7 @@ function installControllers ( config ) {
 				if ( controller ) {
 					if ( typeof controller.install === 'function' ) {
 						// Add controller if it exports install
+						this.controllers = {};
 						this.controllers[ file.split('.')[0] ] = controller;
 
 						// Trigger install script for controller

package/index.js

@@ -10,8 +10,11 @@
  * Native modules
  */
 const http = require('http');
+const { Server } = require('socket.io');
 
 let port;
+let _config;
+let _io;
 
 /**
  * Custom modules
@@ -22,8 +25,7 @@ const Utils = require('./utils');
 /**
  * Define variables
  */
-let hostname,
-server;
+let hostname;
 
 /**
  * If port number is passed in as first (custom) parameter, set port
@@ -46,13 +48,10 @@ if ( process.env.NODE_ENV !== 'production') {
  * @return {Node}        Node
  */
 FW = function ( config ) {
-	let _this = this;
+	_config = config || {};
 
 	hostname = config.hostname ? config.hostname : '0.0.0.0';
 
-	controllers = {};
-	models = {};
-
 	/**
 	 * Set the Controller
 	 * @param {string} name The name of the controller
@@ -114,6 +113,10 @@ console.log("Authorize - check credentials:", credentials);
 		// return true;
 	}
 
+	getSocketIO = () => {
+		return _io;
+	}
+
 	/**
 	 * Install framework components and start the server
 	 */
@@ -130,10 +133,16 @@ console.log("Authorize - check credentials:", credentials);
 		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;
 };
 
 /**
@@ -142,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/models.js

@@ -24,6 +24,7 @@ function installModels ( config ) {
 						/**
 						 * Add model if it exports install
 						 */
+						this.models = {};
 						this.models[ file.split('.')[0] ] = model;
 
 						/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaasvaer/frmwrk",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "My personal Node framework",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,7 @@
   },
   "homepage": "https://bitbucket.org/blaasvaer/frmwrk#readme",
   "dependencies": {
-    "serve-handler": "^6.1.3"
+    "serve-handler": "^6.1.3",
+    "socket.io": "^4.8.1"
   }
 }