Added the ability to set the user info and many more fixes.

niemyjski · niemyjski · commit 512d8e53d9c4 · 2015-05-05T13:47:08.000-05:00
diff --git a/dist/exceptionless.es5.d.ts b/dist/exceptionless.es5.d.ts
diff --git a/dist/exceptionless.es5.js b/dist/exceptionless.es5.js
diff --git a/dist/exceptionless.es5.js.map b/dist/exceptionless.es5.js.map
diff --git a/dist/exceptionless.es5.min.js b/dist/exceptionless.es5.min.js
diff --git a/dist/exceptionless.es5.min.js.map b/dist/exceptionless.es5.min.js.map
diff --git a/example/express/app.js b/example/express/app.js
@@ -1,7 +1,7 @@
 var express = require('express');
 var app = express();
 
-var client = require('../../dist/exceptionless.es5').ExceptionlessClient.default;
+var client = require('../../dist/exceptionless').ExceptionlessClient.default;
 client.config.apiKey = 'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw';
 client.config.serverUrl = 'http://localhost:50000';
 client.config.useDebugLogger();
@@ -19,7 +19,6 @@ app.get('/boom', function (req, res) {
   throw new Error('Boom!!');
 });
 
-
 app.use(function(err, req, res, next) {
   client.createUnhandledException(err, 'express').addRequestInfo(req).submit();
   res.status(500).send('Something broke!');
diff --git a/example/express/package.json b/example/express/package.json
@@ -2,13 +2,11 @@
   "name": "exapp",
   "version": "1.0.0",
   "description": "Exceptionless Sample Node App",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
+  "main": "app.js",
+  "author": "Exceptionless",
   "license": "Apache",
   "dependencies": {
-    "express": "^4.12.3"
+    "express": "^4.12.3",
+    "stack-trace": "0.0.9"
   }
 }
diff --git a/example/index.html b/example/index.html
@@ -5,7 +5,7 @@
   <title>Exceptionless Test</title>
 </head>
 <body>
-<script type="application/javascript" src="../dist/exceptionless.es5.js?apiKey=LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw"></script>
+<script type="application/javascript" src="../dist/exceptionless.js?apiKey=LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw"></script>
 
 <script type="application/javascript" src="math.js"></script>
 <script type="application/javascript" src="index.js"></script>
diff --git a/example/index.js b/example/index.js
@@ -19,5 +19,5 @@ function throwIndexOutOfRange(indexer) {
 }
 
 function throwStringErrorImpl(message) {
-  throw message;
+  throw new Error(message);
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -17,7 +17,7 @@ gulp.task('typescript.es5', function() {
 });
 
 gulp.task('exceptionless.es5.umd', ['typescript.es5'], function() {
-  return gulp.src('dist/temp/src/exceptionless.es5.js')
+  return gulp.src('dist/temp/src/exceptionless.js')
     .pipe(sourcemaps.init({ loadMaps: true }))
     .pipe(umd({
       exports: 'exports',
@@ -30,7 +30,8 @@ gulp.task('exceptionless.es5.umd', ['typescript.es5'], function() {
 });
 
 gulp.task('exceptionless.es5', ['exceptionless.es5.umd'], function() {
-  gulp.src('dist/temp/src/exceptionless.es5.d.ts').pipe(gulp.dest('dist'));
+  gulp.src('dist/temp/src/exceptionless.d.ts')
+    .pipe(gulp.dest('dist'));
 
   var files = [
     'node_modules/es6-promise/dist/es6-promise.js',
@@ -39,19 +40,19 @@ gulp.task('exceptionless.es5', ['exceptionless.es5.umd'], function() {
     'node_modules/stack-generator/dist/stack-generator.js',
     'node_modules/stacktrace-gps/dist/stacktrace-gps.js',
     'node_modules/stacktrace-js/dist/stacktrace.js',
-    'dist/temp/exceptionless.es5.js'
+    'dist/temp/exceptionless.js'
   ];
 
   gulp.src(files)
     .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(concat('exceptionless.es5.js'))
+    .pipe(concat('exceptionless.js'))
     .pipe(replace('require(\'source-map/lib/source-map/source-map-consumer\')', 'null')) // needed for node until source maps dependency is fixed
     .pipe(sourcemaps.write('.'))
     .pipe(gulp.dest('dist'));
 
   return gulp.src(files)
     .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(concat('exceptionless.es5.min.js'))
+    .pipe(concat('exceptionless.min.js'))
     .pipe(replace('require(\'source-map/lib/source-map/source-map-consumer\')', 'null')) // needed for node until source maps dependency is fixed
     .pipe(uglify())
     .pipe(sourcemaps.write('.'))
diff --git a/src/EventBuilder.ts b/src/EventBuilder.ts
@@ -12,7 +12,7 @@ export class EventBuilder {
   constructor(event:IEvent, client:ExceptionlessClient, pluginContextData?:ContextData) {
     this.target = event;
     this.client = client;
-    this.pluginContextData = pluginContextData;
+    this.pluginContextData = pluginContextData || new ContextData();
   }
 
   public setType(type:string): EventBuilder {
diff --git a/src/bootstrap/WindowBootstrapper.ts b/src/bootstrap/WindowBootstrapper.ts
@@ -3,6 +3,7 @@ import { Configuration } from '../configuration/Configuration';
 import { IConfigurationSettings } from '../configuration/IConfigurationSettings';
 import { IError } from '../models/IError';
 import { WebErrorParser } from '../services/WebErrorParser';
+import { WebModuleCollector } from '../services/WebModuleCollector';
 import { WebRequestInfoCollector } from '../services/WebRequestInfoCollector';
 import { DefaultSubmissionClient } from '../submission/DefaultSubmissionClient';
 import { ExceptionlessClient } from '../ExceptionlessClient';
@@ -21,6 +22,7 @@ export class WindowBootstrapper implements IBootstrapper {
     }
 
     Configuration.defaults.errorParser = new WebErrorParser();
+    Configuration.defaults.moduleCollector = new WebModuleCollector();
     Configuration.defaults.requestInfoCollector = new WebRequestInfoCollector();
     Configuration.defaults.submissionClient = new DefaultSubmissionClient();
     this.handleWindowOnError();
diff --git a/src/configuration/Configuration.ts b/src/configuration/Configuration.ts
@@ -4,6 +4,7 @@ import { InMemoryLastReferenceIdManager } from '../lastReferenceIdManager/InMemo
 import { ConsoleLog } from '../logging/ConsoleLog';
 import { ILog } from '../logging/ILog';
 import { NullLog } from '../logging/NullLog';
+import { IUserInfo } from '../models/IUserInfo';
 import { IEventPlugin } from '../plugins/IEventPlugin';
 import { EventPluginContext } from '../plugins/EventPluginContext';
 import { EventPluginManager } from '../plugins/EventPluginManager';
@@ -12,6 +13,7 @@ import { IEventQueue } from '../queue/IEventQueue';
 import { DefaultEventQueue } from '../queue/DefaultEventQueue';
 import { IEnvironmentInfoCollector } from '../services/IEnvironmentInfoCollector';
 import { IErrorParser } from '../services/IErrorParser';
+import { IModuleCollector } from '../services/IModuleCollector';
 import { IRequestInfoCollector } from '../services/IRequestInfoCollector';
 import { IStorage } from '../storage/IStorage';
 import { InMemoryStorage } from '../storage/InMemoryStorage';
@@ -28,6 +30,7 @@ export class Configuration implements IConfigurationSettings {
   public errorParser:IErrorParser;
   public lastReferenceIdManager:ILastReferenceIdManager = new InMemoryLastReferenceIdManager();
   public log:ILog;
+  public moduleCollector:IModuleCollector;
   public requestInfoCollector:IRequestInfoCollector;
   public submissionBatchSize;
   public submissionClient:ISubmissionClient;
@@ -49,6 +52,7 @@ export class Configuration implements IConfigurationSettings {
     this.errorParser = inject(settings.errorParser);
     this.lastReferenceIdManager = inject(settings.lastReferenceIdManager) || new InMemoryLastReferenceIdManager();
     this.log = inject(settings.log) || new NullLog();
+    this.moduleCollector = inject(settings.moduleCollector);
     this.requestInfoCollector = inject(settings.requestInfoCollector);
     this.submissionBatchSize = inject(settings.submissionBatchSize) || 50;
     this.submissionClient = inject(settings.submissionClient);
@@ -140,6 +144,18 @@ export class Configuration implements IConfigurationSettings {
     }
   }
 
+  public setUserIdentity(userInfo:IUserInfo): void;
+  public setUserIdentity(identity:string): void;
+  public setUserIdentity(identity:string, name:string): void;
+  public setUserIdentity(userInfoOrIdentity:IUserInfo|string, name?:string): void {
+    var userInfo = typeof userInfoOrIdentity !== 'string' ? userInfoOrIdentity : { identity: userInfoOrIdentity, name: name };
+    if (!userInfo.identity && !userInfo.name) {
+      delete this.defaultData['@user'];
+    } else {
+      this.defaultData['@user'] = userInfo;
+    }
+  }
+
   public useReferenceIds(): void {
     this.addPlugin(new ReferenceIdPlugin());
   }
diff --git a/src/configuration/IConfigurationSettings.ts b/src/configuration/IConfigurationSettings.ts
@@ -3,6 +3,7 @@ import { ILog } from '../logging/ILog';
 import { IEventQueue } from '../queue/IEventQueue';
 import { IEnvironmentInfoCollector } from '../services/IEnvironmentInfoCollector';
 import { IErrorParser } from '../services/IErrorParser';
+import { IModuleCollector } from '../services/IModuleCollector';
 import { IRequestInfoCollector } from '../services/IRequestInfoCollector';
 import { IStorage } from '../storage/IStorage';
 import { ISubmissionClient } from '../submission/ISubmissionClient';
@@ -14,6 +15,7 @@ export interface IConfigurationSettings {
   errorParser?:IErrorParser;
   lastReferenceIdManager?:ILastReferenceIdManager;
   log?:ILog;
+  moduleCollector?:IModuleCollector;
   requestInfoCollector?:IRequestInfoCollector;
   submissionBatchSize?:number;
   submissionClient?:ISubmissionClient;
diff --git a/src/exceptionless.ts b/src/exceptionless.ts
@@ -26,6 +26,7 @@ import { IParameter } from './models/IParameter';
 import { IRequestInfo } from './models/IRequestInfo';
 import { IStackFrame } from './models/IStackFrame';
 import { IUserDescription } from './models/IUserDescription';
+import { IUserInfo } from './models/IUserInfo';
 import { ContextData } from './plugins/ContextData';
 import { EventPluginContext } from './plugins/EventPluginContext';
 import { EventPluginManager } from './plugins/EventPluginManager';
@@ -42,11 +43,13 @@ import { DefaultEventQueue } from './queue/DefaultEventQueue';
 import { IEventQueue } from './queue/IEventQueue';
 import { IEnvironmentInfoCollector } from './services/IEnvironmentInfoCollector';
 import { IErrorParser } from './services/IErrorParser';
+import { IModuleCollector } from './services/IModuleCollector';
 import { IRequestInfoCollector } from './services/IRequestInfoCollector';
 import { NodeEnvironmentInfoCollector } from './services/NodeEnvironmentInfoCollector';
 import { NodeErrorParser } from './services/NodeErrorParser';
 import { NodeRequestInfoCollector } from './services/NodeRequestInfoCollector';
 import { WebErrorParser } from './services/WebErrorParser';
+import { WebModuleCollector } from './services/WebModuleCollector';
 import { WebRequestInfoCollector } from './services/WebRequestInfoCollector';
 import { InMemoryStorage } from './storage/InMemoryStorage';
 import { IStorage } from './storage/IStorage';
diff --git a/src/models/IUserInfo.ts b/src/models/IUserInfo.ts
@@ -0,0 +1,5 @@
+export interface IUserInfo {
+  identity?:string;
+  name?:string;
+  data?:any;
+}
diff --git a/src/plugins/default/ErrorPlugin.ts b/src/plugins/default/ErrorPlugin.ts
@@ -26,6 +26,6 @@ export class ErrorPlugin implements IEventPlugin {
       return Promise.reject(new Error('No error parser was defined. This exception will be discarded.'))
     }
 
-    return parser.parse(context, context.event.data['@error']);
+    return parser.parse(context, exception);
   }
 }
diff --git a/src/plugins/default/ModuleInfoPlugin.ts b/src/plugins/default/ModuleInfoPlugin.ts
@@ -8,45 +8,18 @@ export class ModuleInfoPlugin implements IEventPlugin {
   public name:string = 'ModuleInfoPlugin';
 
   run(context:EventPluginContext):Promise<any> {
-    if (!context.event.data || !context.event.data['@error'] || !!context.event.data['@error'].modules) {
+    if (!context.event.data ||
+        !context.event.data['@error'] ||
+        !!context.event.data['@error'].modules ||
+        !context.client.config.moduleCollector) {
       return Promise.resolve();
     }
 
-    try {
-      if (document && document.getElementsByTagName) {
-        var modules = this.getFromDocument();
-        if (modules && modules.length > 0) {
-          context.event.data['@error'].modules = modules;
-        }
-      }
-    } catch (e) {
-      context.log.error(`Unable to get module info. Exception: ${e.message}`);
+    var modules = context.client.config.moduleCollector.getModules(context);
+    if (modules && modules.length > 0) {
+      context.event.data['@error'].modules = modules;
     }
 
     return Promise.resolve();
   }
-
-  private getFromDocument(): IModule[] {
-    var modules:IModule[] = [];
-    var scripts = document.getElementsByTagName('script');
-    if (scripts && scripts.length > 0) {
-      for (var index = 0; index < scripts.length; index++) {
-        if (scripts[index].src) {
-          modules.push({
-            module_id: index,
-            name: scripts[index].src,
-            version: Utils.parseVersion(scripts[index].src)
-          });
-        } else if (!!scripts[index].innerHTML) {
-          modules.push({
-            module_id: index,
-            name: 'Script Tag',
-            version: Utils.getHashCode(scripts[index].innerHTML)
-          });
-        }
-      }
-    }
-
-    return modules;
-  }
 }
diff --git a/src/services/IModuleCollector.ts b/src/services/IModuleCollector.ts
@@ -0,0 +1,6 @@
+import { IModule } from '../models/IModule';
+import { EventPluginContext } from '../plugins/EventPluginContext';
+
+export interface IModuleCollector {
+  getModules(context:EventPluginContext):IModule[];
+}
diff --git a/src/services/NodeErrorParser.ts b/src/services/NodeErrorParser.ts
@@ -40,7 +40,7 @@ export class NodeErrorParser implements IErrorParser {
         column: frame.getColumnNumber(),
         declaring_type: frame.getTypeName(),
         data: {
-          is_native: frame.isNative() || (frame.filename[0] !== '/' && frame.filename[0] !== '.')
+          is_native: frame.isNative() || (!!frame.filename && frame.filename[0] !== '/' && frame.filename[0] !== '.')
         }
       });
     }
diff --git a/src/services/NodeRequestInfoCollector.ts b/src/services/NodeRequestInfoCollector.ts
@@ -11,18 +11,37 @@ export class NodeRequestInfoCollector implements IRequestInfoCollector {
     var request = context.contextData['@request'];
     var ri:IRequestInfo = {
       client_ip_address: request.ip,
-      //user_agent: TODO,
+      user_agent: request.headers['user-agent'],
       is_secure: request.secure,
       http_method: request.method,
       host: request.hostname || request.host,
       //port: TODO,
       path: request.path,
       post_data: request.body,
       //referrer: TODO,
-      cookies: request.cookies,
+      cookies: this.getCookies(request),
       query_string: request.params
     };
 
     return ri;
   }
+
+  private getCookies(request): any {
+    if (!request) {
+      return null;
+    }
+
+    if (request.cookies) {
+      return request.cookies;
+    }
+
+    var result = {};
+    var cookies = (request.headers['cookie'] || '').split('; ');
+    for (var index = 0; index < cookies.length; index++) {
+      var cookie = cookies[index].split('=');
+      result[cookie[0]] = cookie[1];
+    }
+
+    return result;
+  }
 }
diff --git a/src/services/WebModuleCollector.ts b/src/services/WebModuleCollector.ts
@@ -0,0 +1,34 @@
+import { IModule } from '../models/IModule';
+import { IModuleCollector } from 'IModuleCollector';
+import { EventPluginContext } from '../plugins/EventPluginContext';
+import { Utils } from '../Utils';
+
+export class WebModuleCollector implements IModuleCollector {
+  public getModules(context:EventPluginContext): IModule[] {
+    if (document && document.getElementsByTagName) {
+      return null;
+    }
+
+    var modules:IModule[] = [];
+    var scripts = document.getElementsByTagName('script');
+    if (scripts && scripts.length > 0) {
+      for (var index = 0; index < scripts.length; index++) {
+        if (scripts[index].src) {
+          modules.push({
+            module_id: index,
+            name: scripts[index].src,
+            version: Utils.parseVersion(scripts[index].src)
+          });
+        } else if (!!scripts[index].innerHTML) {
+          modules.push({
+            module_id: index,
+            name: 'Script Tag',
+            version: Utils.getHashCode(scripts[index].innerHTML)
+          });
+        }
+      }
+    }
+
+    return modules;
+  }
+}
diff --git a/src/tsconfig.es5.json b/src/tsconfig.es5.json
@@ -31,6 +31,7 @@
     "models/IRequestInfo.ts",
     "models/IStackFrame.ts",
     "models/IUserDescription.ts",
+    "models/IUserInfo.ts",
     "plugins/ContextData.ts",
     "plugins/EventPluginContext.ts",
     "plugins/EventPluginManager.ts",
@@ -47,11 +48,13 @@
     "queue/IEventQueue.ts",
     "services/IEnvironmentInfoCollector.ts",
     "services/IErrorParser.ts",
+    "services/IModuleCollector.ts",
     "services/IRequestInfoCollector.ts",
     "services/NodeEnvironmentInfoCollector.ts",
     "services/NodeErrorParser.ts",
     "services/NodeRequestInfoCollector.ts",
     "services/WebErrorParser.ts",
+    "services/WebModuleCollector.ts",
     "services/WebRequestInfoCollector.ts",
     "storage/InMemoryStorage.ts",
     "storage/IStorage.ts",
@@ -66,7 +69,7 @@
     "Utils.ts"
   ],
   "bundles": {
-    "exceptionless.es5": {
+    "exceptionless": {
       "files": [
         "../typings/es6-promise/es6-promise.d.ts",
         "../typings/node/node.d.ts",
diff --git a/src/tsconfig.es6.json b/src/tsconfig.es6.json

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ function throwIndexOutOfRange(indexer) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`function throwStringErrorImpl(message) {`
`22`		`- throw message;`
	`22`	`+ throw new Error(message);`
`23`	`23`	`}`