refactor config into service and expose full implementation

Author: viperguynaz

README.md

@@ -15,8 +15,8 @@ $ npm i -S @markpieszak/ng-application-insights
 and then add the library to your Angular Root `AppModule`:
 
 ```typescript
-// Import the Application Insights library
-import { ApplicationInsightsModule } from '@markpieszak/ng-application-insights';
+// Import the Application Insights module and the service provider
+import { ApplicationInsightsModule, AppInsightsService } from '@markpieszak/ng-application-insights';
 
 @NgModule({
   imports: [
@@ -28,10 +28,19 @@ import { ApplicationInsightsModule } from '@markpieszak/ng-application-insights'
     })
   ],
   // ... providers / etc
+  providers: [ ..., AppInsightsService ],
 })
 export class YourRootModule { }
 ```
 
+and in you app component, import the Application Insights service and inject it in the constructor:
+```typescript
+import { AppInsightsService } from './app-insights.module';
+
+  constructor(..., private appInsightsService: AppInsightsService) {...}
+```
+
+
 ## Usage: 
 
 Through out your application you can now use the AppInsightsService class to fire off AppInsights functionality.
@@ -53,7 +62,7 @@ export class ShoppingCartComponent {
 
 You can see a list of the API here: https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#class-appinsights
 
-```ts
+```typescript
 AppInsightsService.trackEvent()
 AppInsightsService.startTrackEvent()
 AppInsightsService.stopTrackEvent()
@@ -66,6 +75,25 @@ AppInsightsService.trackTrace()
 AppInsightsService.trackDependency()
 AppInsightsService.flush()
 AppInsightsService.setAuthenticatedUserContext()
+AppInsightsService.clearAuthenticatedUserContext()
+```
+
+## If using SystemJS:
+
+Modify systemjs.config.js...
+
+In System.Config.map, add:
+
+```typescript
+      'applicationinsights-js': 'npm:applicationinsights-js/JavaScript/JavaScriptSDK.Module/AppInsightsModule.js'
+```
+
+and in System.Config.packages, add:
+
+```typescript
+      'applicationinsights-js': {
+         defaultExtension: 'js'
+      }
 ```
 
 ---

index.ts

@@ -1,28 +1,33 @@
-import { NgModule, ModuleWithProviders } from '@angular/core';
+import { NgModule, ModuleWithProviders, Optional, SkipSelf } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { AppInsightsService } from './src/app-insight.service';
-import { provideConfig } from './src/app-insight.config';
+import {AppInsightsConfig, AppInsightsService} from './src/app-insight.service';
 
 export * from './src/app-insight.service';
 
 @NgModule({
-  imports: [
-    CommonModule
-  ],
+  imports: [ CommonModule ],
   declarations: [],
-  exports: []
+  exports: [],
+  providers: [ AppInsightsService ]
 })
 
 export class ApplicationInsightsModule {
 
-  static forRoot(config: Microsoft.ApplicationInsights.IConfig): ModuleWithProviders {
+  constructor (@Optional() @SkipSelf() parentModule: ApplicationInsightsModule) {
+    if (parentModule) {
+      throw new Error(
+          'ApplicationInsightsModule is already loaded. Import it in the AppModule only');
+    }
+  }
+
+  static forRoot(config: AppInsightsConfig): ModuleWithProviders {
     return {
       ngModule: ApplicationInsightsModule,
       providers: [
-        AppInsightsService,
-        provideConfig(config)
+        { provide: AppInsightsConfig, useValue: config }
       ]
     };
   }
 }
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markpieszak/ng-application-insights",
-  "version": "1.0.0-rc.0",
+  "version": "1.0.0-rc.1",
   "scripts": {
     "lint": "tslint src/**/*.ts",
     "test": "tsc && karma start",
@@ -23,23 +23,24 @@
   "main": "./dist/index.js",
   "dependencies": {
     "@angular/router": "^3.4.5",
-    "@types/applicationinsights-js": "^1.0.1",
     "applicationinsights-js": "^1.0.8",
     "rxjs": "^5.0.3"
   },
   "devDependencies": {
-    "@angular/core": "^2.0.0",
-    "@angular/common": "^2.0.0",
+    "@angular/cli": "^1.0.0",
+    "@angular/common": "^2.4.0",
+    "@angular/core": "^2.4.10",
     "@angular/platform-browser": "^2.4.10",
+    "@types/applicationinsights-js": "^1.0.1",
+    "@types/es6-shim": "^0.31.32",
+    "@types/jasmine": "^2.5.40",
+    "@types/protractor": "^4.0.0",
+    "@types/selenium-webdriver": "^2.53.39",
     "codelyzer": "^0.0.28",
+    "rimraf": "^2.5.4",
     "tslint": "^3.15.1",
     "typescript": "^2.1",
-    "zone.js": "0.7.2",
-    "rimraf": "^2.5.4",
-    "@types/es6-shim": "^0.31.32",
-    "@types/protractor": "^4.0.0",
-    "@types/jasmine": "^2.5.40",
-    "@types/selenium-webdriver": "^2.53.39"
+    "zone.js": "0.8.4"
   },
   "engines": {
     "node": ">=0.8.0"

src/app-insight.config.ts

@@ -1,19 +1,49 @@
-import { Injectable, Inject } from '@angular/core';
+import { Injectable, Optional } from '@angular/core';
 import { Router, NavigationStart, NavigationEnd } from '@angular/router';
 import { AppInsights } from 'applicationinsights-js';
-import { APP_INSIGHTS_CONFIG } from './app-insight.config';
 import 'rxjs/add/operator/filter';
 import IAppInsights = Microsoft.ApplicationInsights.IAppInsights;
 
+export class AppInsightsConfig implements Microsoft.ApplicationInsights.IConfig {
+  instrumentationKey?: string;
+  endpointUrl?: string;
+  emitLineDelimitedJson?: boolean;
+  accountId?: string;
+  sessionRenewalMs?: number;
+  sessionExpirationMs?: number;
+  maxBatchSizeInBytes?: number;
+  maxBatchInterval?: number;
+  enableDebug?: boolean;
+  disableExceptionTracking?: boolean;
+  disableTelemetry?: boolean;
+  verboseLogging?: boolean;
+  diagnosticLogInterval?: number;
+  samplingPercentage?: number;
+  autoTrackPageVisitTime?: boolean;
+  disableAjaxTracking?: boolean;
+  overridePageViewDuration?: boolean;
+  maxAjaxCallsPerView?: number;
+  disableDataLossAnalysis?: boolean;
+  disableCorrelationHeaders?: boolean;
+  disableFlushOnBeforeUnload?: boolean;
+  enableSessionStorageBuffer?: boolean;
+  isCookieUseDisabled?: boolean;
+  cookieDomain?: string;
+  isRetryDisabled?: boolean;
+  isPerfAnalyzerEnabled?: boolean;
+  url?: string;
+  isStorageUseDisabled?: boolean;
+}
+
 @Injectable()
 export class AppInsightsService implements IAppInsights {
   context: Microsoft.ApplicationInsights.ITelemetryContext;
   queue: Array<() => void>;
-
-  constructor(
-      @Inject(APP_INSIGHTS_CONFIG) public config: Microsoft.ApplicationInsights.IConfig,
-      public router: Router
-  ) { }
+  config: Microsoft.ApplicationInsights.IConfig;
+  constructor(@Optional() _config: AppInsightsConfig, public router: Router) {
+    this.config = _config;
+    this.init();
+  }
 
   // https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#trackevent
   // trackEvent(name: string, properties?: {[string]:string}, measurements?: {[string]:number})
@@ -55,8 +85,8 @@ export class AppInsightsService implements IAppInsights {
 
   // https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#starttrackpage
   // startTrackPage(name?: string)
-  // Starts the timer for tracking a page view. Use this instead of trackPageView if you want to control when the 
-  // page view timer starts and stops, but don't want to calculate the duration yourself. This method doesn't send any 
+  // Starts the timer for tracking a page view. Use this instead of trackPageView if you want to control when the
+  // page view timer starts and stops, but don't want to calculate the duration yourself. This method doesn't send any
   // telemetry. Call stopTrackPage to log the end of the page view and send the event.
   startTrackPage(name?: string) {
     try {
@@ -68,7 +98,7 @@ export class AppInsightsService implements IAppInsights {
 
   // https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#stoptrackpage
   // stopTrackPage(name?: string, url?: string, properties?: Object, measurements?: Object)
-  // Stops the timer that was started by calling startTrackPage and sends the page view telemetry with the 
+  // Stops the timer that was started by calling startTrackPage and sends the page view telemetry with the
   // specified properties and measurements. The duration of the page view will be the time between calling startTrackPage and stopTrackPage.
   stopTrackPage(name?: string, url?: string, properties?: {[name: string]: string}, measurements?: {[name: string]: number}) {
     try {
@@ -80,7 +110,7 @@ export class AppInsightsService implements IAppInsights {
 
   // https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#trackmetric
   // trackMetric(name: string, average: number, sampleCount?: number, min?: number, max?: number, properties?: {[string]:string})
-  // Log a positive numeric value that is not associated with a specific event. 
+  // Log a positive numeric value that is not associated with a specific event.
   // Typically used to send regular reports of performance indicators.
   trackMetric(name: string, average: number, sampleCount?: number, min?: number, max?: number, properties?: {[name: string]: string}) {
     try {
@@ -94,7 +124,7 @@ export class AppInsightsService implements IAppInsights {
   // trackException(exception: Error, handledAt?: string, properties?: {[string]:string}, measurements?: {[string]:number}, severityLevel?: AI.SeverityLevel)
   // Log an exception you have caught. (Exceptions caught by the browser are also logged.)
   trackException(exception: Error, handledAt?: string, properties?: {[name: string]: string},
-                        measurements?: {[name: string]: number}, severityLevel?: AI.SeverityLevel) {
+                 measurements?: {[name: string]: number}, severityLevel?: AI.SeverityLevel) {
     try {
       AppInsights.trackException(exception, handledAt, properties, measurements, severityLevel);
     } catch (ex) {
@@ -139,7 +169,7 @@ export class AppInsightsService implements IAppInsights {
 
   // https://github.com/Microsoft/ApplicationInsights-JS/blob/master/API-reference.md#setauthenticatedusercontext
   // setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string)
-  // Set the authenticated user id and the account id in this session. Use this when you have identified a specific 
+  // Set the authenticated user id and the account id in this session. Use this when you have identified a specific
   // signed-in user. Parameters must not contain spaces or ,;=|
   setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string) {
     try {
@@ -166,17 +196,19 @@ export class AppInsightsService implements IAppInsights {
 
   public init(): void {
     try {
+      console.warn('in AppInsights.init');
       AppInsights.downloadAndSetup(this.config);
+      console.warn('in AppInsights.init: calling downloadAndSetup');
 
       this.router.events.filter(event => event instanceof NavigationStart)
-      .subscribe((event: NavigationStart) => {
-        this.startTrackPage(event.url);
-      });
+          .subscribe((event: NavigationStart) => {
+            this.startTrackPage(event.url);
+          });
 
       this.router.events.filter(event => event instanceof NavigationEnd)
-      .subscribe((event: NavigationEnd) => {
-        this.stopTrackPage(event.url);
-      });
+          .subscribe((event: NavigationEnd) => {
+            this.stopTrackPage(event.url);
+          });
     } catch (ex) {
       console.warn('Angular application insights Error [downloadAndSetup]: ', ex);
     }