@ariva-mds/mds 2.13.0 → 2.15.0

package/lib/cjs/index.js

@@ -24,10 +24,12 @@ class MdsConnectionState {
     constructor() {
         this.isConnected = false;
         this.isAuthenticated = false;
+        this.lastUpdate = new Date();
     }
     connectionOpened() {
         this.isConnected = true;
         this.isAuthenticated = false;
+        this.lastUpdate = new Date();
     }
     connectionClosed() {
         this.isConnected = false;
@@ -39,87 +41,129 @@ class MdsConnectionState {
     authenticationEnded() {
         this.isAuthenticated = false;
     }
+    messageReceived() {
+        this.lastUpdate = new Date();
+    }
+    isTimedOut() {
+        return Date.now() - this.lastUpdate.getTime() < 20000; // 20 seconds timeout
+    }
 }
 exports.MdsConnectionState = MdsConnectionState;
+class RunningRequest {
+    static withObservable(request, observableSubscriber) {
+        const n = new RunningRequest();
+        n.observableSubscriber = observableSubscriber;
+        n.request = request;
+        return n;
+    }
+    static withPromise(request, resolve, reject) {
+        const n = new RunningRequest();
+        n.promiseResolve = resolve;
+        n.promiseReject = reject;
+        n.request = request;
+        return n;
+    }
+}
 class MdsConnection {
+    /**
+     * construct an MdsCoonnection
+     */
     constructor(websocketUrl, authdataCallback, options = { debug: false }) {
         this.state = new MdsConnectionState();
         this.waitingForAuthentification = [];
-        this.counter = 0;
-        this.runningRequestsObservable = new Map();
-        this.runningRequestsPromise = new Map();
-        this.runningRequestsParameters = new Map();
-        this.replayRequestsOnOpen = new Map();
+        this.waitingForReconnect = [];
+        this.nextGeneratedRequestId = 0;
+        this.runningRequests = new Map();
         this.isDebug = false;
         this.authdataCallback = authdataCallback;
-        this.websocketUrl = websocketUrl;
         this.isDebug = options.debug ? true : false;
-        this.websocket = new reconnecting_websocket_1.default(this.websocketUrl, [], options.wsOptions);
-        this.stayAuthenticated();
+        this.websocket = new reconnecting_websocket_1.default(websocketUrl, [], options.wsOptions);
         const outer = this;
+        // open-handler -> resend open requests from previous connection
         this.websocket.onopen = function () {
+            outer.debug("websocket open, resending " + JSON.stringify(outer.waitingForReconnect));
             outer.state.connectionOpened();
             // @ts-ignore
-            for (let [key, value] of outer.replayRequestsOnOpen) {
-                if (!value.subscribeAuthentication) {
-                    outer.sendWhenAuthenticated(value);
-                }
-                else {
-                    outer.websocket.send(JSON.stringify(value));
-                }
+            for (const request of outer.waitingForReconnect) {
+                outer.sendAsSoonAsAuthenticationPermits(request.request);
             }
         };
+        // close handler -> store open requests for resending on reconnect
         this.websocket.onclose = function () {
+            outer.debug("websocket closed, queuing " + JSON.stringify(outer.waitingForReconnect));
             outer.state.connectionClosed();
-            outer.replayRequestsOnOpen = new Map(outer.runningRequestsParameters);
-            outer.debug("close");
+            outer.waitingForReconnect = Array.from(outer.runningRequests.values());
         };
         this.websocket.onmessage = function (e) {
             outer.processWebsocketMessageEvent(e);
         };
+        this.stayAuthenticated();
+        setInterval(() => {
+            if (!outer.state.isTimedOut()) {
+                outer.debug("websocket timed out, calling reconnect");
+                outer.websocket.reconnect();
+            }
+        }, 1000);
     }
+    /**
+     * create a hearbeat observable that can be subscribed to
+     */
     heartbeat() {
         return this.observable({ 'heartbeat': {} }, true)
             .pipe((0, rxjs_1.map)((x) => x.dataHeartbeat));
     }
+    /**
+     * create a MarketstateUpdate observable that can be subscribed to, contains both full state and delta for every marketstate
+     */
     marketstates(marketstateQueries) {
         const full = new Map();
         return this.marketstateUpdates(marketstateQueries)
             .pipe((0, rxjs_1.map)((update) => {
             let existingEntry = update.marketstateId ? full.get(update.marketstateId) : null;
-            if (existingEntry) {
-                const existingJson = (0, MarketstateWithId_1.MarketstateWithIdToJSON)(existingEntry);
-                const updateJson = (0, MarketstateWithId_1.MarketstateWithIdToJSON)(update);
-                for (let key in updateJson) {
-                    if (!(updateJson[key] == undefined)) {
-                        existingJson[key] = updateJson[key];
-                    }
-                }
-                existingEntry = (0, MarketstateWithId_1.MarketstateWithIdFromJSON)(existingJson);
-                if (update.marketstateId) {
+            if (update.marketstateId) {
+                if (existingEntry) {
+                    existingEntry = this.updateExistingMarketstateWithDeltaUpdate(existingEntry, update);
                     full.set(update.marketstateId, existingEntry);
                 }
-            }
-            else {
-                existingEntry = update;
-                if (update.marketstateId) {
+                else {
+                    existingEntry = update;
                     full.set(update.marketstateId, existingEntry);
                 }
             }
             return new MarketstateUpdate(existingEntry, update);
         }));
     }
+    /**
+     * create a Marketstate observable that can be subscribed to, contains only delta for every marketstate
+     */
     marketstateUpdates(marketstateQueries) {
         return this.observable({ 'subscribeMarketstates': { 'marketstateQueries': marketstateQueries } }, true)
             .pipe((0, rxjs_1.map)((x) => (0, MarketstateWithId_1.MarketstateWithIdFromJSON)(x.dataMarketstate)));
     }
+    /**
+     * create a Marketstate observable that can be subscribed to, contains only full state for every marketstate
+     */
     marketstatesStates(marketstateQueries) {
         return this.marketstates(marketstateQueries).pipe((0, rxjs_1.map)((x) => x.state));
     }
+    /**
+     * sets the priority for sources
+     */
     priority(sources) {
         return this.promise({ 'priority': { 'sources': sources } });
     }
-    sendWhenAuthenticated(json) {
+    updateExistingMarketstateWithDeltaUpdate(existingEntry, update) {
+        const existingJson = (0, MarketstateWithId_1.MarketstateWithIdToJSON)(existingEntry);
+        const updateJson = (0, MarketstateWithId_1.MarketstateWithIdToJSON)(update);
+        for (let key in updateJson) {
+            if (!(updateJson[key] == undefined)) {
+                existingJson[key] = updateJson[key];
+            }
+        }
+        existingEntry = (0, MarketstateWithId_1.MarketstateWithIdFromJSON)(existingJson);
+        return existingEntry;
+    }
+    sendAsSoonAsAuthenticationPermits(json) {
         if (this.state.isAuthenticated || json.subscribeAuthentication) {
             this.websocket.send(JSON.stringify(json));
         }
@@ -134,8 +178,8 @@ class MdsConnection {
                 next(x) {
                     if (x.dataAuthentication.secondsToLive > 30) {
                         subscriber.next(x);
-                        for (const json of outer.waitingForAuthentification) {
-                            outer.websocket.send(JSON.stringify(json));
+                        for (const requestParameter of outer.waitingForAuthentification) {
+                            outer.websocket.send(JSON.stringify(requestParameter));
                         }
                         outer.waitingForAuthentification = [];
                         outer.state.authenticationAccepted();
@@ -155,21 +199,20 @@ class MdsConnection {
             .subscribe((c) => outer.debug("auth outer " + c));
     }
     generateNextRequestId() {
-        return "request-" + this.counter++;
+        return "request-" + this.nextGeneratedRequestId++;
     }
     observable(req, sendEventWithoutAuthentification = false) {
         const requestId = this.generateNextRequestId();
         req.requestId = requestId;
         const outer = this;
         const observable = new rxjs_1.Observable((subscriber) => {
-            outer.runningRequestsObservable.set(requestId, subscriber);
-            outer.runningRequestsParameters.set(requestId, req);
-            outer.sendWhenAuthenticated(req);
+            outer.runningRequests.set(requestId, RunningRequest.withObservable(req, subscriber));
+            outer.sendAsSoonAsAuthenticationPermits(req);
             // Provide a way of canceling and disposing the resources
             return function unsubscribe() {
-                if (outer.runningRequestsObservable.has(requestId)) {
-                    outer.runningRequestsObservable.delete(requestId);
-                    outer.runningRequestsParameters.delete(requestId);
+                let runningRequest = outer.runningRequests.get(requestId);
+                if (runningRequest && runningRequest.observableSubscriber) {
+                    outer.runningRequests.delete(requestId);
                     outer.websocket.send(JSON.stringify({
                         'cancel': { 'requestId': requestId }
                     }));
@@ -183,47 +226,41 @@ class MdsConnection {
         req.requestId = requestId;
         const outer = this;
         const promise = new Promise((resolve, reject) => {
-            outer.runningRequestsPromise.set(requestId, { 'resolve': resolve, 'reject': reject });
-            outer.runningRequestsParameters.set(requestId, req);
-            outer.sendWhenAuthenticated(req);
+            outer.runningRequests.set(requestId, RunningRequest.withPromise(req, resolve, reject));
+            outer.sendAsSoonAsAuthenticationPermits(req);
         });
         return promise;
     }
     processWebsocketMessageEvent(e) {
         const msg = JSON.parse(e.data);
         this.debug("we received " + JSON.stringify(msg));
-        const promise = this.runningRequestsPromise.get(msg.requestId);
-        const subscriber = this.runningRequestsObservable.get(msg.requestId);
-        if (promise) {
+        const request = this.runningRequests.get(msg.requestId);
+        this.state.messageReceived();
+        if (request && request.promiseResolve) {
             if (msg.isError) {
-                promise.reject(msg.errorMessage);
-                this.runningRequestsPromise.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
+                request.promiseReject(msg.errorMessage);
+                this.runningRequests.delete(msg.requestId);
             }
             else if (msg.isComplete == true) {
-                promise.resolve(msg);
-                this.runningRequestsPromise.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
+                request.promiseResolve(msg);
+                this.runningRequests.delete(msg.requestId);
             }
             else {
-                promise.reject("strange message " + msg);
-                this.runningRequestsPromise.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
+                request.promiseReject(msg.errorMessage);
+                this.runningRequests.delete(msg.requestId);
             }
         }
-        else if (subscriber) {
-            if (msg.isError) {
-                this.runningRequestsObservable.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
-                subscriber.error(msg.errorMessage);
+        else if (request && request.observableSubscriber) {
+            if (msg.isError == true) {
+                this.runningRequests.delete(msg.requestId);
+                request.observableSubscriber.error(msg.errorMessage);
             }
             else if (msg.isComplete == true) {
-                this.runningRequestsObservable.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
-                subscriber.complete();
+                this.runningRequests.delete(msg.requestId);
+                request.observableSubscriber.complete();
             }
             else {
-                subscriber.next(msg);
+                request.observableSubscriber.next(msg);
             }
         }
     }

package/lib/cjs/types/index.d.ts

@@ -1,5 +1,5 @@
-import { Observable } from 'rxjs';
 import { Options as ReconnectingWebSocketOptions } from 'reconnecting-websocket';
+import { Observable } from 'rxjs';
 import { MarketstateWithId } from './models/MarketstateWithId';
 export declare class MdsAuthdata {
     token: string;
@@ -13,34 +13,53 @@ export declare class MarketstateUpdate {
 export declare class MdsConnectionState {
     isConnected: boolean;
     isAuthenticated: boolean;
+    lastUpdate: Date;
     connectionOpened(): void;
     connectionClosed(): void;
     authenticationAccepted(): void;
     authenticationEnded(): void;
+    messageReceived(): void;
+    isTimedOut(): boolean;
 }
-export type Options = {
+export type MdsOptions = {
     debug?: boolean;
     wsOptions?: ReconnectingWebSocketOptions;
 };
 export declare class MdsConnection {
-    private websocketUrl;
     private websocket;
+    private readonly authdataCallback;
     private state;
     private waitingForAuthentification;
-    private counter;
-    private readonly runningRequestsObservable;
-    private readonly runningRequestsPromise;
-    private readonly runningRequestsParameters;
-    private replayRequestsOnOpen;
-    private readonly authdataCallback;
+    private waitingForReconnect;
+    private nextGeneratedRequestId;
+    private readonly runningRequests;
     private isDebug;
-    constructor(websocketUrl: string, authdataCallback: () => Promise<MdsAuthdata>, options?: Options);
+    /**
+     * construct an MdsCoonnection
+     */
+    constructor(websocketUrl: string, authdataCallback: () => Promise<MdsAuthdata>, options?: MdsOptions);
+    /**
+     * create a hearbeat observable that can be subscribed to
+     */
     heartbeat(): Observable<String>;
+    /**
+     * create a MarketstateUpdate observable that can be subscribed to, contains both full state and delta for every marketstate
+     */
     marketstates(marketstateQueries: String[]): Observable<MarketstateUpdate>;
+    /**
+     * create a Marketstate observable that can be subscribed to, contains only delta for every marketstate
+     */
     marketstateUpdates(marketstateQueries: String[]): Observable<MarketstateWithId>;
+    /**
+     * create a Marketstate observable that can be subscribed to, contains only full state for every marketstate
+     */
     marketstatesStates(marketstateQueries: String[]): Observable<MarketstateWithId>;
+    /**
+     * sets the priority for sources
+     */
     priority(sources: string[]): Promise<void>;
-    private sendWhenAuthenticated;
+    private updateExistingMarketstateWithDeltaUpdate;
+    private sendAsSoonAsAuthenticationPermits;
     private stayAuthenticated;
     private generateNextRequestId;
     private observable;

package/lib/cjs/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,UAAU,EAAqB,MAAM,MAAM,CAAC;AACzD,OAAO,EAAC,OAAO,IAAI,4BAA4B,EAAC,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAC,iBAAiB,EAAqD,MAAM,4BAA4B,CAAA;AAGhH,qBAAa,WAAW;IAEb,KAAK,EAAE,MAAM,CAAC;gBAET,KAAK,EAAE,MAAM;CAI5B;AAID,qBAAa,iBAAiB;IAEnB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAG,iBAAiB,CAAA;gBAErB,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;CAKtC;AAED,qBAAa,kBAAkB;IACpB,WAAW,EAAG,OAAO,CAAS;IAC9B,eAAe,EAAG,OAAO,CAAS;IAEzC,gBAAgB;IAKhB,gBAAgB;IAKhB,sBAAsB;IAItB,mBAAmB;CAGtB;AAED,MAAM,MAAM,OAAO,GAAG;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,4BAA4B,CAAC;CAC5C,CAAC;AAEF,qBAAa,aAAa;IAEtB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,KAAK,CAAiD;IAC9D,OAAO,CAAC,0BAA0B,CAAc;IAEhD,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA2C;IACrF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA+B;IACtE,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA+B;IACzE,OAAO,CAAC,oBAAoB,CAA+B;IAE3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAC9D,OAAO,CAAC,OAAO,CAAkB;gBAErB,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,GAAE,OAA0B;IAmC5G,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC;IAK/B,YAAY,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IA4BzE,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAK/E,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAM/E,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjD,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,iBAAiB;IAsCzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,UAAU;IA4BlB,OAAO,CAAC,OAAO;IAkBf,OAAO,CAAC,4BAA4B;IAkCpC,OAAO,CAAC,KAAK;CAKhB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAA8B,EAAC,OAAO,IAAI,4BAA4B,EAAC,MAAM,wBAAwB,CAAC;AACtG,OAAO,EAAM,UAAU,EAAqB,MAAM,MAAM,CAAC;AACzD,OAAO,EAAC,iBAAiB,EAAqD,MAAM,4BAA4B,CAAA;AAGhH,qBAAa,WAAW;IAEb,KAAK,EAAE,MAAM,CAAC;gBAET,KAAK,EAAE,MAAM;CAI5B;AAGD,qBAAa,iBAAiB;IAEnB,KAAK,EAAE,iBAAiB,CAAC;IACzB,MAAM,EAAE,iBAAiB,CAAA;gBAEpB,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;CAKtC;AAGD,qBAAa,kBAAkB;IACpB,WAAW,EAAE,OAAO,CAAS;IAC7B,eAAe,EAAE,OAAO,CAAS;IACjC,UAAU,EAAE,IAAI,CAAc;IAErC,gBAAgB;IAMhB,gBAAgB;IAKhB,sBAAsB;IAItB,mBAAmB;IAInB,eAAe;IAIR,UAAU;CAGpB;AAGD,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,4BAA4B,CAAC;CAC5C,CAAC;AAyBF,qBAAa,aAAa;IAEtB,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAE9D,OAAO,CAAC,KAAK,CAAgD;IAE7D,OAAO,CAAC,0BAA0B,CAAa;IAC/C,OAAO,CAAC,mBAAmB,CAAwB;IAEnD,OAAO,CAAC,sBAAsB,CAAa;IAE3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0C;IAE1E,OAAO,CAAC,OAAO,CAAkB;IAGjC;;OAEG;gBAES,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,GAAE,UAA2B;IAyCpH;;OAEG;IAEI,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC;IAKtC;;OAEG;IAEI,YAAY,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAmBhF;;OAEG;IAEI,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAKtF;;OAEG;IAEI,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAMtF;;OAEG;IAEI,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjD,OAAO,CAAC,wCAAwC;IAehD,OAAO,CAAC,iCAAiC;IASzC,OAAO,CAAC,iBAAiB;IAuCzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,UAAU;IA2BlB,OAAO,CAAC,OAAO;IAgBf,OAAO,CAAC,4BAA4B;IA6BpC,OAAO,CAAC,KAAK;CAKhB"}

package/lib/esm/index.mjs

@@ -1,6 +1,6 @@
 import ReconnectingWebSocket from 'reconnecting-websocket';
 import { map, Observable, repeat } from 'rxjs';
-import { MarketstateWithIdToJSON, MarketstateWithIdFromJSON } from './models/MarketstateWithId';
+import { MarketstateWithIdFromJSON, MarketstateWithIdToJSON } from './models/MarketstateWithId';
 export class MdsAuthdata {
     token;
     constructor(token) {
@@ -18,9 +18,11 @@ export class MarketstateUpdate {
 export class MdsConnectionState {
     isConnected = false;
     isAuthenticated = false;
+    lastUpdate = new Date();
     connectionOpened() {
         this.isConnected = true;
         this.isAuthenticated = false;
+        this.lastUpdate = new Date();
     }
     connectionClosed() {
         this.isConnected = false;
@@ -32,89 +34,134 @@ export class MdsConnectionState {
     authenticationEnded() {
         this.isAuthenticated = false;
     }
+    messageReceived() {
+        this.lastUpdate = new Date();
+    }
+    isTimedOut() {
+        return Date.now() - this.lastUpdate.getTime() < 20000; // 20 seconds timeout
+    }
+}
+class RunningRequest {
+    observableSubscriber;
+    promiseResolve;
+    promiseReject;
+    request;
+    static withObservable(request, observableSubscriber) {
+        const n = new RunningRequest();
+        n.observableSubscriber = observableSubscriber;
+        n.request = request;
+        return n;
+    }
+    static withPromise(request, resolve, reject) {
+        const n = new RunningRequest();
+        n.promiseResolve = resolve;
+        n.promiseReject = reject;
+        n.request = request;
+        return n;
+    }
 }
 export class MdsConnection {
-    websocketUrl;
     websocket;
+    authdataCallback;
     state = new MdsConnectionState();
     waitingForAuthentification = [];
-    counter = 0;
-    runningRequestsObservable = new Map();
-    runningRequestsPromise = new Map();
-    runningRequestsParameters = new Map();
-    replayRequestsOnOpen = new Map();
-    authdataCallback;
+    waitingForReconnect = [];
+    nextGeneratedRequestId = 0;
+    runningRequests = new Map();
     isDebug = false;
+    /**
+     * construct an MdsCoonnection
+     */
     constructor(websocketUrl, authdataCallback, options = { debug: false }) {
         this.authdataCallback = authdataCallback;
-        this.websocketUrl = websocketUrl;
         this.isDebug = options.debug ? true : false;
-        this.websocket = new ReconnectingWebSocket(this.websocketUrl, [], options.wsOptions);
-        this.stayAuthenticated();
+        this.websocket = new ReconnectingWebSocket(websocketUrl, [], options.wsOptions);
         const outer = this;
+        // open-handler -> resend open requests from previous connection
         this.websocket.onopen = function () {
+            outer.debug("websocket open, resending " + JSON.stringify(outer.waitingForReconnect));
             outer.state.connectionOpened();
             // @ts-ignore
-            for (let [key, value] of outer.replayRequestsOnOpen) {
-                if (!value.subscribeAuthentication) {
-                    outer.sendWhenAuthenticated(value);
-                }
-                else {
-                    outer.websocket.send(JSON.stringify(value));
-                }
+            for (const request of outer.waitingForReconnect) {
+                outer.sendAsSoonAsAuthenticationPermits(request.request);
             }
         };
+        // close handler -> store open requests for resending on reconnect
         this.websocket.onclose = function () {
+            outer.debug("websocket closed, queuing " + JSON.stringify(outer.waitingForReconnect));
             outer.state.connectionClosed();
-            outer.replayRequestsOnOpen = new Map(outer.runningRequestsParameters);
-            outer.debug("close");
+            outer.waitingForReconnect = Array.from(outer.runningRequests.values());
         };
         this.websocket.onmessage = function (e) {
             outer.processWebsocketMessageEvent(e);
         };
+        this.stayAuthenticated();
+        setInterval(() => {
+            if (!outer.state.isTimedOut()) {
+                outer.debug("websocket timed out, calling reconnect");
+                outer.websocket.reconnect();
+            }
+        }, 1000);
     }
+    /**
+     * create a hearbeat observable that can be subscribed to
+     */
     heartbeat() {
         return this.observable({ 'heartbeat': {} }, true)
             .pipe(map((x) => x.dataHeartbeat));
     }
+    /**
+     * create a MarketstateUpdate observable that can be subscribed to, contains both full state and delta for every marketstate
+     */
     marketstates(marketstateQueries) {
         const full = new Map();
         return this.marketstateUpdates(marketstateQueries)
             .pipe(map((update) => {
             let existingEntry = update.marketstateId ? full.get(update.marketstateId) : null;
-            if (existingEntry) {
-                const existingJson = MarketstateWithIdToJSON(existingEntry);
-                const updateJson = MarketstateWithIdToJSON(update);
-                for (let key in updateJson) {
-                    if (!(updateJson[key] == undefined)) {
-                        existingJson[key] = updateJson[key];
-                    }
-                }
-                existingEntry = MarketstateWithIdFromJSON(existingJson);
-                if (update.marketstateId) {
+            if (update.marketstateId) {
+                if (existingEntry) {
+                    existingEntry = this.updateExistingMarketstateWithDeltaUpdate(existingEntry, update);
                     full.set(update.marketstateId, existingEntry);
                 }
-            }
-            else {
-                existingEntry = update;
-                if (update.marketstateId) {
+                else {
+                    existingEntry = update;
                     full.set(update.marketstateId, existingEntry);
                 }
             }
             return new MarketstateUpdate(existingEntry, update);
         }));
     }
+    /**
+     * create a Marketstate observable that can be subscribed to, contains only delta for every marketstate
+     */
     marketstateUpdates(marketstateQueries) {
         return this.observable({ 'subscribeMarketstates': { 'marketstateQueries': marketstateQueries } }, true)
             .pipe(map((x) => MarketstateWithIdFromJSON(x.dataMarketstate)));
     }
+    /**
+     * create a Marketstate observable that can be subscribed to, contains only full state for every marketstate
+     */
     marketstatesStates(marketstateQueries) {
         return this.marketstates(marketstateQueries).pipe(map((x) => x.state));
     }
+    /**
+     * sets the priority for sources
+     */
     priority(sources) {
         return this.promise({ 'priority': { 'sources': sources } });
     }
-    sendWhenAuthenticated(json) {
+    updateExistingMarketstateWithDeltaUpdate(existingEntry, update) {
+        const existingJson = MarketstateWithIdToJSON(existingEntry);
+        const updateJson = MarketstateWithIdToJSON(update);
+        for (let key in updateJson) {
+            if (!(updateJson[key] == undefined)) {
+                existingJson[key] = updateJson[key];
+            }
+        }
+        existingEntry = MarketstateWithIdFromJSON(existingJson);
+        return existingEntry;
+    }
+    sendAsSoonAsAuthenticationPermits(json) {
         if (this.state.isAuthenticated || json.subscribeAuthentication) {
             this.websocket.send(JSON.stringify(json));
         }
@@ -129,8 +176,8 @@ export class MdsConnection {
                 next(x) {
                     if (x.dataAuthentication.secondsToLive > 30) {
                         subscriber.next(x);
-                        for (const json of outer.waitingForAuthentification) {
-                            outer.websocket.send(JSON.stringify(json));
+                        for (const requestParameter of outer.waitingForAuthentification) {
+                            outer.websocket.send(JSON.stringify(requestParameter));
                         }
                         outer.waitingForAuthentification = [];
                         outer.state.authenticationAccepted();
@@ -150,21 +197,20 @@ export class MdsConnection {
             .subscribe((c) => outer.debug("auth outer " + c));
     }
     generateNextRequestId() {
-        return "request-" + this.counter++;
+        return "request-" + this.nextGeneratedRequestId++;
     }
     observable(req, sendEventWithoutAuthentification = false) {
         const requestId = this.generateNextRequestId();
         req.requestId = requestId;
         const outer = this;
         const observable = new Observable((subscriber) => {
-            outer.runningRequestsObservable.set(requestId, subscriber);
-            outer.runningRequestsParameters.set(requestId, req);
-            outer.sendWhenAuthenticated(req);
+            outer.runningRequests.set(requestId, RunningRequest.withObservable(req, subscriber));
+            outer.sendAsSoonAsAuthenticationPermits(req);
             // Provide a way of canceling and disposing the resources
             return function unsubscribe() {
-                if (outer.runningRequestsObservable.has(requestId)) {
-                    outer.runningRequestsObservable.delete(requestId);
-                    outer.runningRequestsParameters.delete(requestId);
+                let runningRequest = outer.runningRequests.get(requestId);
+                if (runningRequest && runningRequest.observableSubscriber) {
+                    outer.runningRequests.delete(requestId);
                     outer.websocket.send(JSON.stringify({
                         'cancel': { 'requestId': requestId }
                     }));
@@ -178,47 +224,41 @@ export class MdsConnection {
         req.requestId = requestId;
         const outer = this;
         const promise = new Promise((resolve, reject) => {
-            outer.runningRequestsPromise.set(requestId, { 'resolve': resolve, 'reject': reject });
-            outer.runningRequestsParameters.set(requestId, req);
-            outer.sendWhenAuthenticated(req);
+            outer.runningRequests.set(requestId, RunningRequest.withPromise(req, resolve, reject));
+            outer.sendAsSoonAsAuthenticationPermits(req);
         });
         return promise;
     }
     processWebsocketMessageEvent(e) {
         const msg = JSON.parse(e.data);
         this.debug("we received " + JSON.stringify(msg));
-        const promise = this.runningRequestsPromise.get(msg.requestId);
-        const subscriber = this.runningRequestsObservable.get(msg.requestId);
-        if (promise) {
+        const request = this.runningRequests.get(msg.requestId);
+        this.state.messageReceived();
+        if (request && request.promiseResolve) {
             if (msg.isError) {
-                promise.reject(msg.errorMessage);
-                this.runningRequestsPromise.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
+                request.promiseReject(msg.errorMessage);
+                this.runningRequests.delete(msg.requestId);
             }
             else if (msg.isComplete == true) {
-                promise.resolve(msg);
-                this.runningRequestsPromise.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
+                request.promiseResolve(msg);
+                this.runningRequests.delete(msg.requestId);
             }
             else {
-                promise.reject("strange message " + msg);
-                this.runningRequestsPromise.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
+                request.promiseReject(msg.errorMessage);
+                this.runningRequests.delete(msg.requestId);
             }
         }
-        else if (subscriber) {
-            if (msg.isError) {
-                this.runningRequestsObservable.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
-                subscriber.error(msg.errorMessage);
+        else if (request && request.observableSubscriber) {
+            if (msg.isError == true) {
+                this.runningRequests.delete(msg.requestId);
+                request.observableSubscriber.error(msg.errorMessage);
             }
             else if (msg.isComplete == true) {
-                this.runningRequestsObservable.delete(msg.requestId);
-                this.runningRequestsParameters.delete(msg.requestId);
-                subscriber.complete();
+                this.runningRequests.delete(msg.requestId);
+                request.observableSubscriber.complete();
             }
             else {
-                subscriber.next(msg);
+                request.observableSubscriber.next(msg);
             }
         }
     }