WIP - Submission client refactor (tests still need to be refactored)

Author: niemyjski

package-lock.json

@@ -1,17 +1,17 @@
 import {
   IConfigurationSettings,
-  Utils,
   ExceptionlessClient,
   Configuration,
-  SettingsManager
+  SettingsManager,
+  parseQueryString
 } from "@exceptionless/core";
 
 import { DefaultErrorParser } from './services/DefaultErrorParser.js';
 import { DefaultModuleCollector } from './services/DefaultModuleCollector.js';
 import { DefaultRequestInfoCollector } from './services/DefaultRequestInfoCollector.js';
 import { BrowserStorage } from './storage/BrowserStorage.js';
 import { BrowserStorageProvider } from './storage/BrowserStorageProvider.js';
-import { DefaultSubmissionAdapter } from './submission/DefaultSubmissionAdapter.js';
+import { FetchSubmissionClient } from './submission/FetchSubmissionClient.js';
 
 function init() {
   function getDefaultsSettingsFromScriptTag(): IConfigurationSettings {
@@ -22,7 +22,7 @@ function init() {
     const scripts = document.getElementsByTagName('script');
     for (let index = 0; index < scripts.length; index++) {
       if (scripts[index].src && scripts[index].src.indexOf('/exceptionless') > -1) {
-        return Utils.parseQueryString(scripts[index].src.split('?').pop());
+        return parseQueryString(scripts[index].src.split('?').pop());
       }
     }
     return null;
@@ -82,7 +82,7 @@ function init() {
   defaults.errorParser = new DefaultErrorParser();
   defaults.moduleCollector = new DefaultModuleCollector();
   defaults.requestInfoCollector = new DefaultRequestInfoCollector();
-  defaults.submissionAdapter = new DefaultSubmissionAdapter();
+  defaults.submissionClient = new FetchSubmissionClient(ExceptionlessClient.default.config); // TODO: Figure out how to flow in the client settings.
 
   //TraceKit.report.subscribe(processUnhandledException);
   //TraceKit.extendToAsynchronousCallbacks();
@@ -100,4 +100,6 @@ function init() {
 //declare var $;
 
 init();
+
+// TODO: Export all services
 export { ExceptionlessClient };

packages/browser/src/index.ts

@@ -1,7 +1,8 @@
 import {
   IModule,
   IModuleCollector,
-  Utils
+  getHashCode,
+  parseVersion
 } from '@exceptionless/core';
 
 export class DefaultModuleCollector implements IModuleCollector {
@@ -18,13 +19,13 @@ export class DefaultModuleCollector implements IModuleCollector {
           modules.push({
             module_id: index,
             name: scripts[index].src.split('?')[0],
-            version: Utils.parseVersion(scripts[index].src)
+            version: parseVersion(scripts[index].src)
           });
         } else if (scripts[index].innerHTML) {
           modules.push({
             module_id: index,
             name: 'Script Tag',
-            version: Utils.getHashCode(scripts[index].innerHTML).toString()
+            version: getHashCode(scripts[index].innerHTML).toString()
           });
         }
       }

packages/browser/src/services/DefaultModuleCollector.ts

@@ -2,7 +2,8 @@ import {
   EventPluginContext,
   IRequestInfo,
   IRequestInfoCollector,
-  Utils
+  getCookies,
+  parseQueryString
 } from '@exceptionless/core';
 
 export class DefaultRequestInfoCollector implements IRequestInfoCollector {
@@ -23,11 +24,11 @@ export class DefaultRequestInfoCollector implements IRequestInfoCollector {
     };
 
     if (config.includeCookies) {
-      requestInfo.cookies = Utils.getCookies(document.cookie, exclusions);
+      requestInfo.cookies = getCookies(document.cookie, exclusions);
     }
 
     if (config.includeQueryString) {
-      requestInfo.query_string = Utils.parseQueryString(location.search.substring(1), exclusions);
+      requestInfo.query_string = parseQueryString(location.search.substring(1), exclusions);
     }
 
     if (document.referrer && document.referrer !== '') {

packages/browser/src/services/DefaultRequestInfoCollector.ts

@@ -0,0 +1,29 @@
+import {
+  FetchOptions,
+  Response,
+  SubmissionClientBase
+} from '@exceptionless/core';
+
+export class FetchSubmissionClient extends SubmissionClientBase {
+  protected async fetch<T>(url: string, options: FetchOptions): Promise<Response<T>> {
+    // TODO: Figure out how to set a 10000 timeout.
+    const requestOptions: RequestInit = {
+      method: options.method,
+      headers: {
+        'Accept': 'application/json',
+        'Authorization': `client:${this.config.apiKey}`,
+        'X-Exceptionless-Client': this.config.userAgent
+      },
+      body: options.body
+    };
+
+    // TODO: Can we properly calculate content size?
+    if (options.method === "POST") {
+      requestOptions.headers['Content-Type'] = 'application/json';
+    }
+
+    const response = await fetch(url, requestOptions);
+    const settingsVersion: number = parseInt(response.headers.get(this.ConfigurationVersionHeader), 10);
+    return new Response(response.status, response.statusText, settingsVersion, await response.json())
+  }
+}

packages/browser/src/submission/DefaultSubmissionAdapter.ts

@@ -5,7 +5,7 @@ import { IRequestInfo } from "./models/IRequestInfo.js";
 import { IUserInfo } from './models/IUserInfo.js';
 import { ContextData } from './plugins/ContextData.js';
 import { EventPluginContext } from './plugins/EventPluginContext.js';
-import { Utils } from './Utils.js';
+import { addRange, stringify, isEmpty } from "./Utils.js";
 
 export class EventBuilder {
   public target: IEvent;
@@ -148,6 +148,11 @@ export class EventBuilder {
     return this;
   }
 
+  /**
+   * Sets the event value.
+   * @param value The value of the event.
+   * @returns {EventBuilder}
+   */
   public setValue(value: number): EventBuilder {
     if (value) {
       this.target.value = value;
@@ -157,7 +162,7 @@ export class EventBuilder {
   }
 
   public addTags(...tags: string[]): EventBuilder {
-    this.target.tags = Utils.addRange<string>(this.target.tags, ...tags);
+    this.target.tags = addRange<string>(this.target.tags, ...tags);
     return this;
   }
 
@@ -178,8 +183,8 @@ export class EventBuilder {
       this.target.data = {};
     }
 
-    const result = JSON.parse(Utils.stringify(value, this.client.config.dataExclusions.concat(excludedPropertyNames || []), maxDepth));
-    if (!Utils.isEmpty(result)) {
+    const result = JSON.parse(stringify(value, this.client.config.dataExclusions.concat(excludedPropertyNames || []), maxDepth));
+    if (!isEmpty(result)) {
       this.target.data[name] = result;
     }