Fixes #16

niemyjski · niemyjski · commit a1df68a61d82 · 2015-05-28T15:05:46.000-05:00
diff --git a/dist/exceptionless.d.ts b/dist/exceptionless.d.ts
@@ -68,12 +68,10 @@ export interface IRequestInfoCollector {
     getRequestInfo(context: EventPluginContext): IRequestInfo;
 }
 export interface IStorage<T> {
-    save<T>(path: string, value: T): boolean;
+    save(path: string, value: T): boolean;
     get(path: string): T;
-    getList(searchPattern?: string, limit?: number): {
-        path: string;
         value: T;
-    }[];
+    getList(searchPattern?: string, limit?: number): IStorageItem<T>[];
     remove(path: string): void;
 }
 export interface ISubmissionClient {
@@ -168,12 +166,11 @@ export declare class DefaultEventQueue implements IEventQueue {
 }
 export declare class InMemoryStorage<T> implements IStorage<T> {
     private _items;
-    save<T>(path: string, value: T): boolean;
+    private _maxItems;
+    constructor(maxItems?: number);
+    save(path: string, value: T): boolean;
     get(path: string): T;
-    getList(searchPattern?: string, limit?: number): {
-        path: string;
-        value: T;
-    }[];
+    getList(searchPattern?: string, limit?: number): IStorageItem<T>[];
     remove(path: string): void;
 }
 export declare class Utils {
@@ -384,6 +381,11 @@ export declare class SubmissionMethodPlugin implements IEventPlugin {
     name: string;
     run(context: EventPluginContext, next?: () => void): void;
 }
+export interface IStorageItem<T> {
+    created: number;
+    path: string;
+    value: T;
+}
 export declare class SettingsResponse {
     success: boolean;
     settings: any;
diff --git a/dist/exceptionless.js b/dist/exceptionless.js
diff --git a/dist/exceptionless.js.map b/dist/exceptionless.js.map
diff --git a/dist/exceptionless.min.js b/dist/exceptionless.min.js
diff --git a/dist/exceptionless.min.js.map b/dist/exceptionless.min.js.map
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.4.1",
   "description": "JavaScript client for Exceptionless",
   "license": "Apache",
-  "main": "dist/exceptionless.es5.js",
+  "main": "dist/exceptionless.js",
   "scripts": {
     "prepublish": "tsd reinstall -s",
     "start": "gulp",
diff --git a/src/exceptionless.ts b/src/exceptionless.ts
@@ -46,6 +46,7 @@ import { DefaultModuleCollector } from './services/DefaultModuleCollector';
 import { DefaultRequestInfoCollector } from './services/DefaultRequestInfoCollector';
 import { InMemoryStorage } from './storage/InMemoryStorage';
 import { IStorage } from './storage/IStorage';
+import { IStorageItem } from './storage/IStorageItem';
 import { DefaultSubmissionClient } from './submission/DefaultSubmissionClient';
 import { ISubmissionClient } from './submission/ISubmissionClient';
 import { NodeSubmissionClient } from './submission/NodeSubmissionClient';
diff --git a/src/queue/DefaultEventQueue-spec.ts b/src/queue/DefaultEventQueue-spec.ts
@@ -2,17 +2,25 @@ import { Configuration } from '../configuration/Configuration';
 import { IEvent } from '../models/IEvent';
 
 describe('DefaultEventQueue', () => {
-  it('should enqueue event', () => {
-    var config = new Configuration({ apiKey:'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw', serverUrl:'http://localhost:50000'});
+  function getConfiguration(): Configuration {
+    var config:Configuration = new Configuration({
+      apiKey:'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw',
+      serverUrl:'http://localhost:50000'
+    });
+
     expect(config.storage.getList().length).toBe(0);
+    return config;
+  }
+
+  it('should enqueue event', () => {
+    var config:Configuration = getConfiguration();
     var event:IEvent = { type: 'log', reference_id: '123454321' };
     config.queue.enqueue(event);
     expect(config.storage.getList().length).toBe(1);
   });
 
   it('should process queue', () => {
-    var config = new Configuration({ apiKey:'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw', serverUrl:'http://localhost:50000'});
-    expect(config.storage.getList().length).toBe(0);
+    var config:Configuration = getConfiguration();
     var event:IEvent = { type: 'log', reference_id: '123454321' };
     config.queue.enqueue(event);
     expect(config.storage.getList().length).toBe(1);
@@ -26,8 +34,7 @@ describe('DefaultEventQueue', () => {
   });
 
   it('should discard event submission', () => {
-    var config = new Configuration({ apiKey:'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw', serverUrl:'http://localhost:50000'});
-    expect(config.storage.getList().length).toBe(0);
+    var config:Configuration = getConfiguration();
     config.queue.suspendProcessing(1, true);
 
     var event:IEvent = { type: 'log', reference_id: '123454321' };
@@ -36,8 +43,7 @@ describe('DefaultEventQueue', () => {
   });
 
   it('should suspend processing', (done) => {
-    var config = new Configuration({ apiKey:'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw', serverUrl:'http://localhost:50000'});
-    expect(config.storage.getList().length).toBe(0);
+    var config:Configuration = getConfiguration();
     config.queue.suspendProcessing(.0001);
 
     var event:IEvent = { type: 'log', reference_id: '123454321' };
diff --git a/src/storage/IStorage.ts b/src/storage/IStorage.ts
@@ -1,6 +1,8 @@
-export interface IStorage<T>{
-  save<T>(path:string, value:T):boolean;
+import { IStorageItem } from './IStorageItem';
+
+export interface IStorage<T> {
+  save(path:string, value:T):boolean;
   get(path:string):T;
-  getList(searchPattern?:string, limit?:number):{ path:string, value:T }[];
+  getList(searchPattern?:string, limit?:number):IStorageItem<T>[];
   remove(path:string):void;
 }
diff --git a/src/storage/IStorageItem.ts b/src/storage/IStorageItem.ts
@@ -0,0 +1,5 @@
+export interface IStorageItem<T> {
+  created:number;
+  path:string;
+  value:T;
+}
diff --git a/src/storage/InMemoryStorage-spec.ts b/src/storage/InMemoryStorage-spec.ts
@@ -1,5 +1,6 @@
 import { IEvent } from '../models/IEvent';
 import { InMemoryStorage } from './InMemoryStorage';
+import { IStorageItem } from './IStorageItem';
 
 describe('InMemoryStorage', () => {
   it('should save events', () => {
@@ -90,4 +91,61 @@ describe('InMemoryStorage', () => {
 
     expect(storage.getList().length).toBe(0);
   });
+
+  it('should get with limit', () => {
+    var storage = new InMemoryStorage<IEvent>(250);
+    for (var index:number = 0; index < 260; index++) {
+      storage.save('ex-q-' + index, { type: 'log', reference_id: index.toString() });
+    }
+
+    expect(storage.getList().length).toBe(250);
+    expect(storage.getList(null).length).toBe(250);
+    expect(storage.getList(null, 1).length).toBe(1)
+  });
+
+  it('should get the oldest events', () => {
+    function getDate(baseDate:Date, offset:number) {
+      return new Date(baseDate.getTime() + (offset * 60000));
+    }
+
+    const date:Date = new Date();
+    var storage = new InMemoryStorage<IEvent>();
+    for (var index:number = 0; index < 10; index++) {
+      storage.save('ex-q-' + index, {
+        date: getDate(date, index),
+        type: 'log',
+        reference_id: index.toString()
+      });
+
+      expect(storage.getList().length).toBe(index + 1);
+    }
+
+    var offset:number = 0;
+    var events:IStorageItem<IEvent>[] = storage.getList('ex-q-', 2);
+    while (events && events.length > 0) {
+      expect(2).toBe(events.length);
+      for (var ei = 0; ei < 2; ei++) {
+        expect(getDate(date, offset++)).toEqual(events[ei].value.date);
+        storage.remove(events[ei].path);
+      }
+
+      events = storage.getList('ex-q-', 2);
+    }
+  });
+
+  it('should respect max items limit', () => {
+    var storage = new InMemoryStorage<IEvent>(5);
+    for (var index:number = 0; index < 5; index++) {
+      storage.save('ex-q-' + index, { type: 'log', reference_id: index.toString() });
+    }
+
+    var events:IStorageItem<IEvent>[] = storage.getList();
+    expect(events.length).toBe(5);
+    expect(events[0].path).toBe('ex-q-0');
+    storage.save('ex-q-6', { type: 'log', reference_id: '6' });
+
+    events = storage.getList();
+    expect(events.length).toBe(5);
+    expect(events[0].path).toBe('ex-q-1');
+  });
 });
diff --git a/src/storage/InMemoryStorage.ts b/src/storage/InMemoryStorage.ts
@@ -1,28 +1,47 @@
+import { IEvent } from '../models/IEvent';
 import { IStorage } from './IStorage';
+import { IStorageItem } from './IStorageItem';
 
 export class InMemoryStorage<T> implements IStorage<T> {
-  private _items = {};
+  private _items:IStorageItem<T>[] = [];
+  private _maxItems:number;
+
+  constructor(maxItems?:number) {
+    this._maxItems = maxItems > 0 ? maxItems : 250;
+  }
+
+  public save(path:string, value:T):boolean {
+    if (!path || !value) {
+      return false;
+    }
+
+    if (this._items.push({ created: new Date().getTime(), path: path, value: value }) > this._maxItems) {
+      this._items.shift();
+    }
 
-  public save<T>(path:string, value:T):boolean {
-    this._items[path] = value;
     return true;
   }
 
   public get(path:string):T {
-    return this._items[path] || null;
+    var item:IStorageItem<T> = path ? this.getList(path, 1)[0] : null;
+    return item ? item.value : null;
   }
 
-  public getList(searchPattern?:string, limit?:number):{ path:string, value:T }[] {
-    var regex = new RegExp(searchPattern || '.*');
+  public getList(searchPattern?:string, limit?:number):IStorageItem<T>[] {
+    var items = this._items; // Optimization for minifier
+    if (!searchPattern) {
+      return items.slice(0, limit);
+    }
 
-    var results:{ path:string, value:T }[] = [];
-    for (var key in this._items) {
-      if (results.length >= limit) {
-        break;
-      }
+    var regex = new RegExp(searchPattern);
+    var results:IStorageItem<T>[] = [];
+    for (var index = 0; index < items.length; index++) {
+      if (regex.test(items[index].path)) {
+        results.push(items[index]);
 
-      if (regex.test(key)) {
-        results.push({ path: key, value: this._items[key] });
+        if (results.length >= limit) {
+          break;
+        }
       }
     }
 
@@ -31,7 +50,10 @@ export class InMemoryStorage<T> implements IStorage<T> {
 
   public remove(path:string):void {
     if (path) {
-      delete this._items[path];
+      var item = this.getList(path, 1)[0];
+      if (item) {
+        this._items.splice(this._items.indexOf(item), 1);
+      }
     }
   }
 }
