app cleanup

peeriodproject · Jun 6, 2014 · 885d16a · 885d16a
1 parent 6885535
commit 885d16a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 139 deletions.
diff --git a/src/core/app.js b/src/core/app.js
diff --git a/src/core/app.js.map b/src/core/app.js.map
diff --git a/src/core/app.ts b/src/core/app.ts
@@ -1,95 +1,44 @@
+import crypto = require('crypto');
 import path = require('path');
 
+var logger = require('./utils/logger/LoggerFactory').create();
+
+import BucketFactory = require('./topology/BucketFactory');
+import BucketStore = require('./topology/BucketStore');
+import ContactNode = require('./topology/ContactNode');
+import ContactNodeAddress = require('./topology/ContactNodeAddress');
+import ContactNodeAddressFactory = require('./topology/ContactNodeAddressFactory');
+import ContactNodeFactory = require('./topology/ContactNodeFactory');
+import GeneralWritableMessageFactory = require('./protocol/messages/GeneralWritableMessageFactory');
+import Id = require('./topology/Id');
 import JSONConfig = require('./config/JSONConfig');
-import TCPSocketHandlerFactory = require('./net/tcp/TCPSocketHandlerFactory');
-import NetworkBootstrapper = require('./net/NetworkBootstrapper');
+import JSONStateHandlerFactory = require('./utils/JSONStateHandlerFactory');
 import JSONWebIp = require('./net/ip/JSONWebIp');
-import Id = require('./topology/Id');
 import MyNode = require('./topology/MyNode');
-import ContactNodeAddressFactory = require('./topology/ContactNodeAddressFactory');
-import ContactNodeAddress = require('./topology/ContactNodeAddress');
-import ContactNode = require('./topology/ContactNode');
+import NetworkBootstrapper = require('./net/NetworkBootstrapper');
 import ProtocolConnectionManager = require('./protocol/net/ProtocolConnectionManager');
-import GeneralWritableMessageFactory = require('./protocol/messages/GeneralWritableMessageFactory');
-import BucketFactory = require('./topology/BucketFactory');
-import BucketStore = require('./topology/BucketStore');
-import ContactNodeFactory = require('./topology/ContactNodeFactory');
-import RoutingTable = require('./topology/RoutingTable');
-import ReadableMessage = require('./protocol/messages/ReadableMessage');
-import crypto = require('crypto');
 import ProtocolGateway = require('./protocol/ProtocolGateway');
-
-import JSONStateHandlerFactory = require('./utils/JSONStateHandlerFactory');
-
-var stackTrace = require('stack-trace');
-var logger = require('./utils/logger/LoggerFactory').create();
-//require('longjohn');
-
-console.log('foo');
+import ReadableMessage = require('./protocol/messages/ReadableMessage');
+import RoutingTable = require('./topology/RoutingTable');
+import TCPSocketHandlerFactory = require('./net/tcp/TCPSocketHandlerFactory');
 
 var App = {
 
 	start: function (dataPath, win) {
+		this.startTopology(dataPath, win);
+	},
+
+	startTopology: function (dataPath, win) {
 		var appConfig = new JSONConfig('../../config/mainConfig.json', ['app']);
 		var netConfig = new JSONConfig('../../config/mainConfig.json', ['net']);
 		var protocolConfig = new JSONConfig('../../config/mainConfig.json', ['protocol']);
 		var topologyConfig = new JSONConfig('../../config/mainConfig.json', ['topology']);
-
 		var tcpSocketHandlerFactory = new TCPSocketHandlerFactory();
 		var jsonWebIp = new JSONWebIp();
-
 		var nodeAddressFactory = new ContactNodeAddressFactory();
-
 		var networkBootstrapper = new NetworkBootstrapper(tcpSocketHandlerFactory, netConfig, [jsonWebIp]);
-
 		var protocolGateway = null;
 
-		/*process.on('uncaughtException', function (err) {
-			var trace = stackTrace.parse(err);
-
-			for (var i in err.stack) {
-				logger.warn('error stack ' + i, {
-					typeName: err.stack[i].getTypeName(),
-					fnName  : err.stack[i].getFunctionName(),
-					fileName: err.stack[i].getFileName(),
-					line    : err.stack[i].getLineNumber()
-				});
-			}
-
-			logger.error({
-				code: err.message, stack: err.stack, trace: {
-					typeName: trace.getTypeName(),
-					fnName  : trace.getFunctionName(),
-					fileName: trace.getFileName(),
-					line    : trace.getLineNumber()
-				}
-			});
-
-			/*return process.nextTick(function () {
-				console.log(err);
-				win.showDevTools();
-				debugger;
-			});*/
-			/*;
-			logger.error({
-				code: err.message, stack: err.stack, trace: {
-					typeName: trace.getTypeName(),
-					fnName  : trace.getFunctionName(),
-					fileName: trace.getFileName(),
-					line    : trace.getLineNumber()
-				}
-			});
-			logger.info('Catched uncaughtException!');
-
-			setTimeout(function () {
-				process.exit(1);
-			}, 100);* /
-		});*/
-
-		/*process.on('exit', function () {
-			logger.info('Exiting...');
-		});*/
-
 		networkBootstrapper.bootstrap(function (err) {
 			if (err) {
 				logger.error('Network Bootstrapper: ERROR', {
@@ -118,9 +67,9 @@ var App = {
 				addressList.push(nodeAddressFactory.create(myIp, myOpenPorts[i]));
 			}
 
-
 			var handlerFactory = new JSONStateHandlerFactory();
 			var idState = handlerFactory.create(path.resolve(dataPath, 'myId.json'));
+
 			idState.load((err:Error, state:any) => {
 
 				var myId = null;
@@ -152,8 +101,6 @@ var App = {
 
 				protocolGateway.start();
 			});
-
-
 		});
 	}
 }