@ariva-mds/mds 2.0.0 → 2.2.0

package/lib/cjs/index.js

@@ -1,17 +1,156 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.goodBye = exports.helloWorld = void 0;
-function helloWorld() {
-    const message = 'Hello World from my example modern npm package!';
-    return message;
+exports.MdsConnection = exports.MarketstateUpdate = exports.MdsAuthdata = void 0;
+const reconnecting_websocket_1 = __importDefault(require("reconnecting-websocket"));
+const rxjs_1 = require("rxjs");
+class MdsAuthdata {
+    constructor(token) {
+        this.token = token;
+    }
 }
-exports.helloWorld = helloWorld;
-function goodBye() {
-    const message = 'Goodbye from my example modern npm package!';
-    return message;
+exports.MdsAuthdata = MdsAuthdata;
+class MarketstateUpdate {
+    constructor(state, update) {
+        this.state = state;
+        this.update = update;
+    }
 }
-exports.goodBye = goodBye;
-exports.default = {
-    helloWorld,
-    goodBye,
-};
+exports.MarketstateUpdate = MarketstateUpdate;
+class MdsConnection {
+    constructor(websocketUrl, authdataCallback, options = {}) {
+        this.counter = 0;
+        this.runningRequestsObservable = new Map();
+        this.runningRequestsPromise = new Map();
+        this.authdataCallback = authdataCallback;
+        this.websocketUrl = websocketUrl;
+        this.websocket = new reconnecting_websocket_1.default(this.websocketUrl, [], options.wsOptions);
+        this.stayAuthenticated();
+        this.websocket.onopen = function () {
+            console.log("connected");
+        };
+        this.websocket.onclose = function () {
+            console.log("close");
+        };
+        const outer = this;
+        this.websocket.onmessage = function (e) {
+            outer.processWebsocketMessageEvent(e);
+        };
+    }
+    heartbeat() {
+        return this.observable({ 'heartbeat': {} })
+            .pipe((0, rxjs_1.map)((x) => x.dataHeartbeat));
+    }
+    marketstates(marketstateQueries) {
+        const full = new Map();
+        return this.marketstateUpdates(marketstateQueries)
+            .pipe((0, rxjs_1.map)((update) => {
+            let existingEntry = full.get(update.marketstateId);
+            if (existingEntry) {
+                for (let key in update) {
+                    existingEntry[key] = update[key];
+                }
+            }
+            else {
+                existingEntry = update;
+                full.set(update.marketstateId, existingEntry);
+            }
+            return new MarketstateUpdate(existingEntry, update);
+        }));
+    }
+    marketstateUpdates(marketstateQueries) {
+        return this.observable({ 'subscribeMarketstates': { 'marketstateQueries': marketstateQueries } })
+            .pipe((0, rxjs_1.map)((x) => x.dataMarketstate));
+    }
+    marketstatesStates(marketstateQueries) {
+        return this.marketstates(marketstateQueries).pipe((0, rxjs_1.map)((x) => x.state));
+    }
+    priority(sources) {
+        return this.promise({ 'priority': { 'sources': sources } });
+    }
+    stayAuthenticated() {
+        const outer = this;
+        new rxjs_1.Observable((subscriber) => {
+            this.authdataCallback().then((mdsAuthdata) => outer.observable({ 'subscribeAuthentication': mdsAuthdata })).then((observable) => observable.subscribe({
+                next(x) {
+                    subscriber.next(x);
+                },
+                complete() {
+                    subscriber.complete();
+                },
+                error() {
+                    subscriber.complete();
+                }
+            }));
+        })
+            .pipe((0, rxjs_1.repeat)({ delay: 2000 }))
+            .subscribe((c) => console.log("auth outer " + c));
+    }
+    generateNextRequestId() {
+        return "request-" + this.counter++;
+    }
+    observable(req) {
+        const requestId = this.generateNextRequestId();
+        req.requestId = requestId;
+        const outer = this;
+        const observable = new rxjs_1.Observable((subscriber) => {
+            outer.runningRequestsObservable.set(requestId, subscriber);
+            outer.websocket.send(JSON.stringify(req));
+            // Provide a way of canceling and disposing the resources
+            return function unsubscribe() {
+                if (outer.runningRequestsObservable.has(requestId)) {
+                    outer.runningRequestsObservable.delete(requestId);
+                    outer.websocket.send(JSON.stringify({
+                        'cancel': { 'requestId': requestId }
+                    }));
+                }
+            };
+        });
+        return observable;
+    }
+    promise(req) {
+        const requestId = this.generateNextRequestId();
+        req.requestId = requestId;
+        const outer = this;
+        const promise = new Promise((resolve, reject) => {
+            outer.runningRequestsPromise.set(requestId, { 'resolve': resolve, 'reject': reject });
+            outer.websocket.send(JSON.stringify(req));
+        });
+        return promise;
+    }
+    processWebsocketMessageEvent(e) {
+        const msg = JSON.parse(e.data);
+        const promise = this.runningRequestsPromise.get(msg.requestId);
+        const subscriber = this.runningRequestsObservable.get(msg.requestId);
+        if (promise) {
+            if (msg.isError) {
+                promise.reject(msg.errorMessage);
+                this.runningRequestsPromise.delete(msg.requestId);
+            }
+            else if (msg.isComplete == true) {
+                promise.resolve(msg);
+                this.runningRequestsPromise.delete(msg.requestId);
+            }
+            else {
+                promise.reject("strange message " + msg);
+                this.runningRequestsPromise.delete(msg.requestId);
+            }
+        }
+        else if (subscriber) {
+            if (msg.isError) {
+                this.runningRequestsObservable.delete(msg.requestId);
+                subscriber.error(msg.errorMessage);
+            }
+            else if (msg.isComplete == true) {
+                this.runningRequestsObservable.delete(msg.requestId);
+                subscriber.complete();
+            }
+            else {
+                subscriber.next(msg);
+            }
+        }
+    }
+}
+exports.MdsConnection = MdsConnection;

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

@@ -1,8 +1,34 @@
-export declare function helloWorld(): string;
-export declare function goodBye(): string;
-declare const _default: {
-    helloWorld: typeof helloWorld;
-    goodBye: typeof goodBye;
+import { Observable } from 'rxjs';
+import { Options as ReconnectingWebSocketOptions } from 'reconnecting-websocket';
+export declare class MdsAuthdata {
+    token: string;
+    constructor(token: string);
+}
+export declare class MarketstateUpdate {
+    state: any;
+    update: any;
+    constructor(state: any, update: any);
+}
+export type Options = {
+    wsOptions?: ReconnectingWebSocketOptions;
 };
-export default _default;
+export declare class MdsConnection {
+    private websocketUrl;
+    private websocket;
+    private counter;
+    private readonly runningRequestsObservable;
+    private readonly runningRequestsPromise;
+    private readonly authdataCallback;
+    constructor(websocketUrl: string, authdataCallback: () => Promise<MdsAuthdata>, options?: Options);
+    heartbeat(): Observable<String>;
+    marketstates(marketstateQueries: String[]): Observable<MarketstateUpdate>;
+    marketstateUpdates(marketstateQueries: String[]): Observable<any>;
+    marketstatesStates(marketstateQueries: String[]): Observable<any>;
+    priority(sources: string[]): Promise<any>;
+    private stayAuthenticated;
+    private generateNextRequestId;
+    private observable;
+    private promise;
+    private processWebsocketMessageEvent;
+}
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,WAGzB;AAED,wBAAgB,OAAO,WAGtB;;;;;AAED,wBAGE"}
+{"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;AAE/E,qBAAa,WAAW;IAEb,KAAK,EAAE,MAAM,CAAC;gBAET,KAAK,EAAE,MAAM;CAI5B;AAED,qBAAa,iBAAiB;IAEnB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAG,GAAG,CAAA;gBAEP,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;CAKtC;AACD,MAAM,MAAM,OAAO,GAAG;IAClB,SAAS,CAAC,EAAE,4BAA4B,CAAC;CAC5C,CAAC;AAEF,qBAAa,aAAa;IAEtB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAwB;IAEzC,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA2C;IACrF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA+B;IAEtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;gBAElD,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,GAAE,OAAY;IAsB9F,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC;IAK/B,YAAY,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAkBzE,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC;IAKjE,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC;IAMjE,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAQhD,OAAO,CAAC,iBAAiB;IA4BzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,UAAU;IA0BlB,OAAO,CAAC,OAAO;IAiBf,OAAO,CAAC,4BAA4B;CA6BvC"}

package/lib/esm/index.mjs

@@ -1,12 +1,153 @@
-export function helloWorld() {
-    const message = 'Hello World from my example modern npm package!';
-    return message;
+import ReconnectingWebSocket from 'reconnecting-websocket';
+import { map, Observable, repeat } from 'rxjs';
+export class MdsAuthdata {
+    token;
+    constructor(token) {
+        this.token = token;
+    }
 }
-export function goodBye() {
-    const message = 'Goodbye from my example modern npm package!';
-    return message;
+export class MarketstateUpdate {
+    state;
+    update;
+    constructor(state, update) {
+        this.state = state;
+        this.update = update;
+    }
+}
+export class MdsConnection {
+    websocketUrl;
+    websocket;
+    counter = 0;
+    runningRequestsObservable = new Map();
+    runningRequestsPromise = new Map();
+    authdataCallback;
+    constructor(websocketUrl, authdataCallback, options = {}) {
+        this.authdataCallback = authdataCallback;
+        this.websocketUrl = websocketUrl;
+        this.websocket = new ReconnectingWebSocket(this.websocketUrl, [], options.wsOptions);
+        this.stayAuthenticated();
+        this.websocket.onopen = function () {
+            console.log("connected");
+        };
+        this.websocket.onclose = function () {
+            console.log("close");
+        };
+        const outer = this;
+        this.websocket.onmessage = function (e) {
+            outer.processWebsocketMessageEvent(e);
+        };
+    }
+    heartbeat() {
+        return this.observable({ 'heartbeat': {} })
+            .pipe(map((x) => x.dataHeartbeat));
+    }
+    marketstates(marketstateQueries) {
+        const full = new Map();
+        return this.marketstateUpdates(marketstateQueries)
+            .pipe(map((update) => {
+            let existingEntry = full.get(update.marketstateId);
+            if (existingEntry) {
+                for (let key in update) {
+                    existingEntry[key] = update[key];
+                }
+            }
+            else {
+                existingEntry = update;
+                full.set(update.marketstateId, existingEntry);
+            }
+            return new MarketstateUpdate(existingEntry, update);
+        }));
+    }
+    marketstateUpdates(marketstateQueries) {
+        return this.observable({ 'subscribeMarketstates': { 'marketstateQueries': marketstateQueries } })
+            .pipe(map((x) => x.dataMarketstate));
+    }
+    marketstatesStates(marketstateQueries) {
+        return this.marketstates(marketstateQueries).pipe(map((x) => x.state));
+    }
+    priority(sources) {
+        return this.promise({ 'priority': { 'sources': sources } });
+    }
+    stayAuthenticated() {
+        const outer = this;
+        new Observable((subscriber) => {
+            this.authdataCallback().then((mdsAuthdata) => outer.observable({ 'subscribeAuthentication': mdsAuthdata })).then((observable) => observable.subscribe({
+                next(x) {
+                    subscriber.next(x);
+                },
+                complete() {
+                    subscriber.complete();
+                },
+                error() {
+                    subscriber.complete();
+                }
+            }));
+        })
+            .pipe(repeat({ delay: 2000 }))
+            .subscribe((c) => console.log("auth outer " + c));
+    }
+    generateNextRequestId() {
+        return "request-" + this.counter++;
+    }
+    observable(req) {
+        const requestId = this.generateNextRequestId();
+        req.requestId = requestId;
+        const outer = this;
+        const observable = new Observable((subscriber) => {
+            outer.runningRequestsObservable.set(requestId, subscriber);
+            outer.websocket.send(JSON.stringify(req));
+            // Provide a way of canceling and disposing the resources
+            return function unsubscribe() {
+                if (outer.runningRequestsObservable.has(requestId)) {
+                    outer.runningRequestsObservable.delete(requestId);
+                    outer.websocket.send(JSON.stringify({
+                        'cancel': { 'requestId': requestId }
+                    }));
+                }
+            };
+        });
+        return observable;
+    }
+    promise(req) {
+        const requestId = this.generateNextRequestId();
+        req.requestId = requestId;
+        const outer = this;
+        const promise = new Promise((resolve, reject) => {
+            outer.runningRequestsPromise.set(requestId, { 'resolve': resolve, 'reject': reject });
+            outer.websocket.send(JSON.stringify(req));
+        });
+        return promise;
+    }
+    processWebsocketMessageEvent(e) {
+        const msg = JSON.parse(e.data);
+        const promise = this.runningRequestsPromise.get(msg.requestId);
+        const subscriber = this.runningRequestsObservable.get(msg.requestId);
+        if (promise) {
+            if (msg.isError) {
+                promise.reject(msg.errorMessage);
+                this.runningRequestsPromise.delete(msg.requestId);
+            }
+            else if (msg.isComplete == true) {
+                promise.resolve(msg);
+                this.runningRequestsPromise.delete(msg.requestId);
+            }
+            else {
+                promise.reject("strange message " + msg);
+                this.runningRequestsPromise.delete(msg.requestId);
+            }
+        }
+        else if (subscriber) {
+            if (msg.isError) {
+                this.runningRequestsObservable.delete(msg.requestId);
+                subscriber.error(msg.errorMessage);
+            }
+            else if (msg.isComplete == true) {
+                this.runningRequestsObservable.delete(msg.requestId);
+                subscriber.complete();
+            }
+            else {
+                subscriber.next(msg);
+            }
+        }
+    }
 }
-export default {
-    helloWorld,
-    goodBye,
-};

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

@@ -1,8 +1,34 @@
-export declare function helloWorld(): string;
-export declare function goodBye(): string;
-declare const _default: {
-    helloWorld: typeof helloWorld;
-    goodBye: typeof goodBye;
+import { Observable } from 'rxjs';
+import { Options as ReconnectingWebSocketOptions } from 'reconnecting-websocket';
+export declare class MdsAuthdata {
+    token: string;
+    constructor(token: string);
+}
+export declare class MarketstateUpdate {
+    state: any;
+    update: any;
+    constructor(state: any, update: any);
+}
+export type Options = {
+    wsOptions?: ReconnectingWebSocketOptions;
 };
-export default _default;
+export declare class MdsConnection {
+    private websocketUrl;
+    private websocket;
+    private counter;
+    private readonly runningRequestsObservable;
+    private readonly runningRequestsPromise;
+    private readonly authdataCallback;
+    constructor(websocketUrl: string, authdataCallback: () => Promise<MdsAuthdata>, options?: Options);
+    heartbeat(): Observable<String>;
+    marketstates(marketstateQueries: String[]): Observable<MarketstateUpdate>;
+    marketstateUpdates(marketstateQueries: String[]): Observable<any>;
+    marketstatesStates(marketstateQueries: String[]): Observable<any>;
+    priority(sources: string[]): Promise<any>;
+    private stayAuthenticated;
+    private generateNextRequestId;
+    private observable;
+    private promise;
+    private processWebsocketMessageEvent;
+}
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,WAGzB;AAED,wBAAgB,OAAO,WAGtB;;;;;AAED,wBAGE"}
+{"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;AAE/E,qBAAa,WAAW;IAEb,KAAK,EAAE,MAAM,CAAC;gBAET,KAAK,EAAE,MAAM;CAI5B;AAED,qBAAa,iBAAiB;IAEnB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAG,GAAG,CAAA;gBAEP,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;CAKtC;AACD,MAAM,MAAM,OAAO,GAAG;IAClB,SAAS,CAAC,EAAE,4BAA4B,CAAC;CAC5C,CAAC;AAEF,qBAAa,aAAa;IAEtB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAwB;IAEzC,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA2C;IACrF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA+B;IAEtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;gBAElD,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,GAAE,OAAY;IAsB9F,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC;IAK/B,YAAY,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC;IAkBzE,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC;IAKjE,kBAAkB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC;IAMjE,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAQhD,OAAO,CAAC,iBAAiB;IA4BzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,UAAU;IA0BlB,OAAO,CAAC,OAAO;IAiBf,OAAO,CAAC,4BAA4B;CA6BvC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ariva-mds/mds",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "Stock market data",
   "license": "MIT",
   "main": "./lib/cjs/index.js",
@@ -13,7 +13,8 @@
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
     "build:esm": "tsc -p ./configs/tsconfig.esm.json && mv lib/esm/index.js lib/esm/index.mjs",
     "build:cjs": "tsc -p ./configs/tsconfig.cjs.json",
-    "prepack": "npm run build"
+    "prepack": "npm run build",
+    "test": "mocha"
   },
   "files": [
     "lib/**/*"
@@ -32,6 +33,18 @@
     }
   },
   "dependencies": {
-    "typescript": "^4.9.5"
+    "node-fetch": "^3.3.0",
+    "reconnecting-websocket": "^4.4.0",
+    "rxjs": "^7.8.0",
+    "typescript": "^4.9.5",
+    "ws": "^8.12.0"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.4",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.11.18",
+    "chai": "^4.3.7",
+    "mocha": "^10.2.0",
+    "ts-node": "^10.9.1"
   }
 }