Merge pull request #38 from euforic/errorHandling

[TIMOB-14262] LiveView: Does not trigger code errors
tidev · Jul 16, 2013 · 88c1c9a · 88c1c9a
2 parents a4e0d6d + 18ed035
commit 88c1c9a
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 58 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 
-SRC = lib/platform/_head.js lib/platform/events.js lib/platform/socket.js lib/platform/process.js lib/platform/require.js lib/platform/_tail.js
+SRC = lib/platform/_head.js lib/platform/process.js lib/platform/events.js lib/platform/socket.js lib/platform/require.js lib/platform/_tail.js
 BASE_DIR = $(CURDIR)/bin/liveview
 # TODO kill only process make started
 #`ps -ef | grep 'fserver\|bin\/ti' | awk "{print $2}"` > /dev/null

diff --git a/build/liveview.js b/build/liveview.js
@@ -3,7 +3,27 @@
  * liveview Titanium CommonJS require with some Node.js love and dirty hacks
  * Copyright (c) 2013 Appcelerator
  */
+(function(globalScope) {
+/**
+ * Initialize a new `Process`.
+ *
+ * @api public
+ */
+
+function Process() {
+  if (!(this instanceof Process)) return new Process();
+  this.title = 'titanium';
+  this.version = '';
+  this.moduleLoadList = [];
+  this.versions = {};
+  this.arch = Ti.Platform.architecture;
+  this.platform = Ti.Platform.name;
+  this.hardware = Ti.Platform.model;
+}
 
+// inherit from EventEmitter
+
+Process.prototype.__proto__ = Emitter.prototype;
 /*!
  * Event Emitters
  */
@@ -293,41 +313,12 @@ Socket.prototype.setKeepAlive = function(enable, initialDelay) {
   },initialDelay || 300000);
 };
 
-/**
- * Initialize a new `Process`.
- *
- * @api public
- */
-
-function Process() {
-  if (!(this instanceof Process)){ return new Process(); }
-  this.title = 'titanium';
-  this.version = '';
-  this.moduleLoadList = [];
-  this.versions = {};
-  this.arch = Ti.Platform.architecture;
-  this.platform = Ti.Platform.name;
-  this.hardware = Ti.Platform.model;
-}
-
-// inherit from EventEmitter
-
-Process.prototype.__proto__ = Emitter.prototype;
 /**
  * Initialize a new `Module`.
  *
  * @api public
  */
 
-if (typeof module !== 'undefined') {
-  module.exports = Module;
-}
-
-/**
- * [Module description]
- * @param {[type]} id [description]
- */
-
 function Module(id) {
   this.filename = id + '.js';
   this.id = id;
@@ -601,7 +592,7 @@ Module._wrap = function(source) {
 
 Module._errWrapper = [
   'try {',
-  '} catch (err) { process.emit("uncaughtException", {module: __filename, error: err})}'
+  '} catch (err) { lvGlobal.process.emit("uncaughtException", {module: __filename, error: err})}'
 ];
 
 /**
@@ -618,8 +609,14 @@ Module.prototype._compile = function() {
     return;
   }
   var source = Module._wrap(src);
-  var fn = Function('exports, require, module, __filename, __dirname',source);
-  fn(this.exports, Module.require, this, this.filename, this.__dirname);
+
+  try{
+    var fn = Function('exports, require, module, __filename, __dirname, lvGlobal',source);
+    fn(this.exports, Module.require, this, this.filename, this.__dirname, global);
+  } catch(err) {
+    process.emit("uncaughtException", {module: this.filename, error: err});
+  }
+
   this.loaded = true;
 };
 
@@ -640,11 +637,15 @@ Module.prototype.cache = function() {
  * @return {[type]} [description]
  */
 
-(function(globalCtx) {
-
-  Module.patch(globalCtx);
-  Module.global.process.on('uncaughtException', function (err) {
-    console.error('[LiveView]', err);
+  process.on('uncaughtException', function (err) {
+    console.log('[LiveView] Error Evaluating', err.module, '@ Line:', err.error.line);
+    console.error('' + err.error);
+    console.error('File:', err.module);
+    console.error('Line:', err.error.line);
+    console.error('SourceId:', err.error.sourceId);
+    console.error('Backtrace:\n', err.error.backtrace.replace(/'\n'/g, '\n'));
   });
 
+  Module.patch(globalScope);
+
 })(this);
diff --git a/build/liveview.min.js b/build/liveview.min.js
diff --git a/lib/platform/_head.js b/lib/platform/_head.js
@@ -3,3 +3,4 @@
  * liveview Titanium CommonJS require with some Node.js love and dirty hacks
  * Copyright (c) 2013 Appcelerator
  */
+(function(globalScope) {
diff --git a/lib/platform/_tail.js b/lib/platform/_tail.js
@@ -5,11 +5,15 @@
  * @return {[type]} [description]
  */
 
-(function(globalCtx) {
-
-  Module.patch(globalCtx);
-  Module.global.process.on('uncaughtException', function (err) {
-    console.error('[LiveView]', err);
+  process.on('uncaughtException', function (err) {
+    console.log('[LiveView] Error Evaluating', err.module, '@ Line:', err.error.line);
+    console.error('' + err.error);
+    console.error('File:', err.module);
+    console.error('Line:', err.error.line);
+    console.error('SourceId:', err.error.sourceId);
+    console.error('Backtrace:\n', err.error.backtrace.replace(/'\n'/g, '\n'));
   });
 
+  Module.patch(globalScope);
+
 })(this);
diff --git a/lib/platform/process.js b/lib/platform/process.js
@@ -6,7 +6,7 @@
  */
 
 function Process() {
-  if (!(this instanceof Process)){ return new Process(); }
+  if (!(this instanceof Process)) return new Process();
   this.title = 'titanium';
   this.version = '';
   this.moduleLoadList = [];

diff --git a/lib/platform/require.js b/lib/platform/require.js
@@ -5,15 +5,6 @@
  * @api public
  */
 
-if (typeof module !== 'undefined') {
-  module.exports = Module;
-}
-
-/**
- * [Module description]
- * @param {[type]} id [description]
- */
-
 function Module(id) {
   this.filename = id + '.js';
   this.id = id;
@@ -287,7 +278,7 @@ Module._wrap = function(source) {
 
 Module._errWrapper = [
   'try {',
-  '} catch (err) { process.emit("uncaughtException", {module: __filename, error: err})}'
+  '} catch (err) { lvGlobal.process.emit("uncaughtException", {module: __filename, error: err})}'
 ];
 
 /**
@@ -304,8 +295,14 @@ Module.prototype._compile = function() {
     return;
   }
   var source = Module._wrap(src);
-  var fn = Function('exports, require, module, __filename, __dirname',source);
-  fn(this.exports, Module.require, this, this.filename, this.__dirname);
+
+  try{
+    var fn = Function('exports, require, module, __filename, __dirname, lvGlobal',source);
+    fn(this.exports, Module.require, this, this.filename, this.__dirname, global);
+  } catch(err) {
+    process.emit("uncaughtException", {module: this.filename, error: err});
+  }
+
   this.loaded = true;
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liveview",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "Titanium Live Realtime App Development",
   "main": "index.js",
   "private": true,