@dronedeploy/rocos-js-sdk 2.6.1 → 3.0.0-alpha.20

package/services/CallerService.spec.js

@@ -0,0 +1,227 @@
+import { AckStatus, ResultStatus, Stage, UIDVersion, } from '../models';
+import { concatMap, delay, from, of } from 'rxjs';
+import { CallerService } from './CallerService';
+import { TestScheduler } from 'rxjs/testing';
+const makeCallerMessage = (responses) => ({
+    responses: {
+        responses: responses ?? [],
+    },
+});
+const makeCallerChunkedMessage = (responses) => {
+    return responses.map((response, index) => {
+        if ('return' in response) {
+            throw new Error('Cannot create chunked message with return');
+        }
+        const chunk = response;
+        chunk.chunkIndex = index;
+        chunk.chunkCount = responses.length;
+        chunk.header = {
+            created: '0',
+            meta: {},
+        };
+        return {
+            chunks: {
+                chunks: [chunk],
+            },
+        };
+    });
+};
+const uid = {
+    hash: 'hash',
+    version: UIDVersion.HEADER_HASH_RAND,
+};
+const ack = (id) => ({
+    uid,
+    ack: {
+        status: AckStatus.PROGRESS,
+        message: id,
+        stage: Stage.AGENT,
+    },
+});
+const ret = (id) => {
+    const encoder = new TextEncoder();
+    const payload = encoder.encode(JSON.stringify({ id }));
+    return {
+        uid,
+        return: {
+            payload,
+        },
+    };
+};
+const chunkRet = (payload) => {
+    const array = new TextEncoder().encode(payload);
+    return {
+        uid,
+        payload: array,
+        chunkIndex: 0,
+        chunkCount: 1,
+        header: {
+            created: '0',
+            meta: {},
+        },
+    };
+};
+const res = (ok) => ({
+    uid,
+    result: {
+        status: ok ? ResultStatus.COMPLETE_SUCCESS : ResultStatus.FATAL,
+        message: ok ? 'everything is fine' : 'nothing is fine',
+    },
+});
+let testScheduler;
+let service;
+describe('CallerService', () => {
+    beforeEach(() => {
+        service = new CallerService({
+            url: 'http://localhost:8080',
+            token: 'token',
+        });
+        testScheduler = new TestScheduler((actual, expected) => {
+            expect(actual).toEqual(expected);
+        });
+    });
+    describe('callRaw', () => {
+        it('should handle a successful call', () => {
+            // Arrange
+            jest.spyOn(service, 'invokeRequest').mockImplementation(() => {
+                return from([
+                    makeCallerMessage([ack('a')]),
+                    makeCallerMessage([ack('b')]),
+                    makeCallerMessage([ack('c'), ret(1)]),
+                    makeCallerMessage([ret(2)]),
+                    makeCallerMessage([ret(3), ret(4)]),
+                    makeCallerMessage([ack('d')]),
+                    makeCallerMessage([ack('e')]),
+                    makeCallerMessage([ack('f')]),
+                    makeCallerMessage([ack('g'), res(true)]),
+                    makeCallerMessage([ack('h')]),
+                ]).pipe(concatMap((item) => of(item).pipe(delay(1))));
+            });
+            testScheduler.run(({ expectObservable }) => {
+                // Act
+                const call = service.call({
+                    callsign: 'callsign',
+                    projectId: 'project',
+                    source: '/test',
+                });
+                // Assert
+                const expectedAckMarbles = '-abc--def|';
+                const expectedRetMarbles = '---ab(cd)|';
+                const expectedResMarbles = '---------(a|)';
+                const expectedAckValues = {
+                    a: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'a' },
+                    b: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'b' },
+                    c: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'c' },
+                    d: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'd' },
+                    e: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'e' },
+                    f: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'f' },
+                };
+                const expectedReturnValues = {
+                    a: { id: 1 },
+                    b: { id: 2 },
+                    c: { id: 3 },
+                    d: { id: 4 },
+                };
+                const expectedResultValues = {
+                    a: { status: ResultStatus.COMPLETE_SUCCESS, message: 'everything is fine' },
+                };
+                expectObservable(call.ack$).toBe(expectedAckMarbles, expectedAckValues);
+                expectObservable(call.return$).toBe(expectedRetMarbles, expectedReturnValues);
+                expectObservable(call.result$).toBe(expectedResMarbles, expectedResultValues);
+            });
+        });
+        it('should handle a failed call', () => {
+            // Arrange
+            jest.spyOn(service, 'invokeRequest').mockImplementation(() => {
+                return from([
+                    makeCallerMessage([ack('a')]),
+                    makeCallerMessage([ack('b')]),
+                    makeCallerMessage([ack('c'), ret(1)]),
+                    makeCallerMessage([ret(2)]),
+                    makeCallerMessage([ret(3), ret(4)]),
+                    makeCallerMessage([ack('d')]),
+                    makeCallerMessage([ack('e')]),
+                    makeCallerMessage([ack('f')]),
+                    makeCallerMessage([ack('g'), res(false)]),
+                    makeCallerMessage([ack('h')]),
+                ]).pipe(concatMap((item) => of(item).pipe(delay(1))));
+            });
+            testScheduler.run(({ expectObservable }) => {
+                // Act
+                const call = service.call({
+                    callsign: 'callsign',
+                    projectId: 'project',
+                    source: '/test',
+                });
+                // Assert
+                const expectedAckMarbles = '-abc--def#';
+                const expectedRetMarbles = '---ab(cd)#';
+                const expectedResMarbles = '---------(a|)';
+                const expectedAckValues = {
+                    a: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'a' },
+                    b: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'b' },
+                    c: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'c' },
+                    d: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'd' },
+                    e: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'e' },
+                    f: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'f' },
+                };
+                const expectedReturnValues = {
+                    a: { id: 1 },
+                    b: { id: 2 },
+                    c: { id: 3 },
+                    d: { id: 4 },
+                };
+                const expectedResultValues = {
+                    a: { status: ResultStatus.FATAL, message: 'nothing is fine' },
+                };
+                expectObservable(call.ack$).toBe(expectedAckMarbles, expectedAckValues, res(false).result);
+                expectObservable(call.return$).toBe(expectedRetMarbles, expectedReturnValues, res(false).result);
+                expectObservable(call.result$).toBe(expectedResMarbles, expectedResultValues);
+            });
+        });
+        it('should handle a successful chunked call', () => {
+            // Arrange
+            jest.spyOn(service, 'invokeRequest').mockImplementation(() => {
+                return from([
+                    ...makeCallerChunkedMessage([
+                        chunkRet('[{"'),
+                        chunkRet('id":1},'),
+                        ack('a'),
+                        chunkRet('{"id":2}'),
+                        ack('b'),
+                        chunkRet(']'),
+                    ]),
+                    makeCallerMessage([ack('c'), ret(3)]),
+                    makeCallerMessage([res(true)]),
+                ]).pipe(concatMap((item) => of(item).pipe(delay(1))));
+            });
+            testScheduler.run(({ expectObservable }) => {
+                // Act
+                const call = service.call({
+                    callsign: 'callsign',
+                    projectId: 'project',
+                    source: '/test',
+                });
+                // Assert
+                const expectedAckMarbles = '---a-b-c|';
+                const expectedRetMarbles = '------ab|';
+                const expectedResMarbles = '--------(a|)';
+                const expectedAckValues = {
+                    a: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'a' },
+                    b: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'b' },
+                    c: { stage: Stage.AGENT, status: AckStatus.PROGRESS, message: 'c' },
+                };
+                const expectedReturnValues = {
+                    a: [{ id: 1 }, { id: 2 }],
+                    b: { id: 3 },
+                };
+                const expectedResultValues = {
+                    a: { status: ResultStatus.COMPLETE_SUCCESS, message: 'everything is fine' },
+                };
+                expectObservable(call.ack$).toBe(expectedAckMarbles, expectedAckValues);
+                expectObservable(call.return$).toBe(expectedRetMarbles, expectedReturnValues);
+                expectObservable(call.result$).toBe(expectedResMarbles, expectedResultValues);
+            });
+        });
+    });
+});

package/services/CallerServiceNode.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CallerServiceNode = void 0;
-const CallerService_1 = require("./CallerService");
-const CallerStreamNode_1 = require("../api/streams/caller/CallerStreamNode");
-class CallerServiceNode extends CallerService_1.CallerService {
+import { CallerService } from './CallerService';
+import { CallerStreamNode } from '../api/streams/caller/CallerStreamNode';
+export class CallerServiceNode extends CallerService {
     getStream(config) {
-        return new CallerStreamNode_1.CallerStreamNode(config);
+        return new CallerStreamNode(config);
     }
 }
-exports.CallerServiceNode = CallerServiceNode;

package/services/CommandService.d.ts

@@ -1,21 +1,9 @@
-import { Observable, Subject } from 'rxjs';
-import { IBaseService } from '../models/IBaseService';
-import { ICommandParams } from '../models/params/ICommandParams';
-import { ICommandStream } from '../models/stream/ICommandStream';
-import { IRocosCommandMessage } from '../models/message/IRocosCommandMessage';
-import { IRocosSDKConfig } from '../models/IRocosSDKConfig';
-import { IStreamConfig } from '../models/IStreamConfig';
-import { ISubscriberStatus } from '../models/ISubscriberStatus';
-import { SubscriberStatusEnum } from '../models/SubscriberStatusEnum';
-export declare class CommandService implements IBaseService, ISubscriberStatus {
-    private config;
-    private logger;
-    private status;
-    status$: Subject<SubscriberStatusEnum>;
+import { ICommandParams, ICommandStream, IRocosCommandMessage, IRocosSDKConfig, IStreamConfig } from '../models';
+import { Observable } from 'rxjs';
+import { BaseStreamService } from './BaseStreamService';
+export declare class CommandService extends BaseStreamService<ICommandStream> {
     constructor(config: IRocosSDKConfig);
-    getStatus(): boolean;
     invokeRequest(params: ICommandParams): Observable<IRocosCommandMessage>;
-    private createStream;
-    private initStream;
+    protected createStream(): Promise<ICommandStream>;
     protected getStream(config: IStreamConfig): ICommandStream;
 }

package/services/CommandService.js

@@ -1,26 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandService = void 0;
-const rxjs_1 = require("rxjs");
-const CommandStream_1 = require("../api/streams/command/CommandStream");
-const identifier_1 = require("../constants/identifier");
-const RocosLogger_1 = require("../logger/RocosLogger");
-const RocosStore_1 = require("../store/RocosStore");
-const StreamRegister_1 = require("../api/StreamRegister");
-const SubscriberStatusEnum_1 = require("../models/SubscriberStatusEnum");
-const operators_1 = require("rxjs/operators");
-class CommandService {
+import { Subject } from 'rxjs';
+import { BaseStreamService } from './BaseStreamService';
+import { CommandStream } from '../api/streams/command/CommandStream';
+import { IDENTIFIER_NAME_COMMAND } from '../constants/identifier';
+import { finalize } from 'rxjs/operators';
+export class CommandService extends BaseStreamService {
     constructor(config) {
-        this.status = false;
-        this.status$ = new rxjs_1.Subject();
-        this.config = config;
-        this.logger = RocosLogger_1.RocosLogger.getInstance(`CommandService(${this.config.url})`);
-    }
-    getStatus() {
-        return this.status;
+        super('CommandService', config);
     }
     invokeRequest(params) {
-        const subject = new rxjs_1.Subject();
+        const subject = new Subject();
         let subscription;
         this.createStream()
             .then((stream) => {
@@ -30,52 +18,21 @@ class CommandService {
             this.logger.info('invokeRequest error', e);
             subject.error(e);
         });
-        return subject.asObservable().pipe(operators_1.finalize(() => {
-            subscription === null || subscription === void 0 ? void 0 : subscription.unsubscribe();
+        return subject.asObservable().pipe(finalize(() => {
+            subscription?.unsubscribe();
         }));
     }
     async createStream() {
-        const scope = 'default';
-        const identifier = StreamRegister_1.StreamRegister.getIdentifier(identifier_1.IDENTIFIER_NAME_COMMAND, scope);
-        const streamRegister = StreamRegister_1.StreamRegister.getInstance();
-        let stream = streamRegister.getStream(identifier);
-        if (!stream) {
-            stream = this.getStream({
-                url: this.config.url,
-                token: this.config.token,
-                scope,
-                options: this.config.options,
-                port: this.config.port,
-                insecure: this.config.insecure,
-            });
-            stream.statusStream$.subscribe((msg) => {
-                this.status = msg === SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED || msg === SubscriberStatusEnum_1.SubscriberStatusEnum.ALIVE;
-                this.status$.next(msg);
-            });
-            // don't wait for these promises, they can be init after startup
-            await streamRegister.addStream(stream);
-            await this.initStream(stream);
-        }
-        return stream;
-    }
-    async initStream(stream) {
-        // an async callback to set the stream token in case one was not set at startup
-        if (!this.config.token) {
-            try {
-                const authService = RocosStore_1.RocosStore.getSDKInstance(this.config).getAuthService();
-                const token = await authService.getToken();
-                if (token === null || token === void 0 ? void 0 : token.value) {
-                    this.config.token = token === null || token === void 0 ? void 0 : token.value;
-                    stream.setToken(this.config.token);
-                }
-            }
-            catch (e) {
-                this.logger.info('Can not retrieve auth token', e);
-            }
-        }
+        return (await this.createStreamFromConfig(IDENTIFIER_NAME_COMMAND, {
+            url: this.config.url,
+            token: this.config.token,
+            scope: 'default',
+            options: this.config.options,
+            port: this.config.port,
+            insecure: this.config.insecure,
+        })).stream;
     }
     getStream(config) {
-        return new CommandStream_1.CommandStream(config);
+        return new CommandStream(config);
     }
 }
-exports.CommandService = CommandService;

package/services/CommandServiceNode.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandServiceNode = void 0;
-const CommandService_1 = require("./CommandService");
-const CommandStreamNode_1 = require("../api/streams/command/CommandStreamNode");
-class CommandServiceNode extends CommandService_1.CommandService {
+import { CommandService } from './CommandService';
+import { CommandStreamNode } from '../api/streams/command/CommandStreamNode';
+export class CommandServiceNode extends CommandService {
     getStream(config) {
-        return new CommandStreamNode_1.CommandStreamNode(config);
+        return new CommandStreamNode(config);
     }
 }
-exports.CommandServiceNode = CommandServiceNode;

package/services/ConfigGroupService.js

@@ -1,18 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigGroupService = void 0;
-const api_1 = require("../constants/api");
-const RocosError_1 = require("../models/RocosError");
-const BaseServiceAbstract_1 = require("./BaseServiceAbstract");
-const RocosLogger_1 = require("../logger/RocosLogger");
-const formatServiceUrl_1 = require("../helpers/formatServiceUrl");
-class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
+import { API_PROJECT_GROUP_TYPE_CONFIG_URL, API_PROJECT_GROUP_TYPE_ID_URL, API_PROJECT_GROUP_TYPE_OWNER_ID_URL, API_PROJECT_GROUP_TYPE_OWNER_OVERRIDE_URL, API_PROJECT_GROUP_TYPE_PUBLISH_URL, API_PROJECT_GROUP_TYPE_URL, API_PROJECT_GROUP_TYPE_VERSION_URL, } from '../constants/api';
+import { RocosError, errorCodes } from '../models/RocosError';
+import { BaseServiceAbstract } from './BaseServiceAbstract';
+import { RocosLogger } from '../logger/RocosLogger';
+import { formatServiceUrl } from '../helpers/formatServiceUrl';
+export class ConfigGroupService extends BaseServiceAbstract {
     constructor(config) {
         super(config);
-        this.logger = RocosLogger_1.RocosLogger.getInstance(`ConfigGroupService(${this.config.url})`);
+        this.logger = RocosLogger.getInstance(`ConfigGroupService(${this.config.url})`);
     }
     getError(e) {
-        return new RocosError_1.RocosError(e, RocosError_1.errorCodes.CONFIG_GROUP_SERVICE_ERROR);
+        return new RocosError(e, errorCodes.CONFIG_GROUP_SERVICE_ERROR);
     }
     getStatus() {
         return true;
@@ -26,7 +23,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     // TODO: map the response object
     async create(projectId, type, model) {
-        return this.callPost(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_URL, { url: this.config.url, projectId, type }, this.config.insecure), model, `Failed to create config group for ${projectId}, type ${type}.`);
+        return this.callPost(formatServiceUrl(API_PROJECT_GROUP_TYPE_URL, { url: this.config.url, projectId, type }, this.config.insecure), model, `Failed to create config group for ${projectId}, type ${type}.`);
     }
     /**
      * Get a config group list
@@ -36,7 +33,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     // TODO: map the response object
     async list(projectId, type) {
-        return this.callGet(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_URL, { url: this.config.url, projectId, type }, this.config.insecure), `Failed to get config group list for ${projectId}, type ${type}.`);
+        return this.callGet(formatServiceUrl(API_PROJECT_GROUP_TYPE_URL, { url: this.config.url, projectId, type }, this.config.insecure), `Failed to get config group list for ${projectId}, type ${type}.`);
     }
     /**
      * Update a config group
@@ -48,7 +45,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     // TODO: map the response object
     async update(projectId, type, configGroupId, model) {
-        return this.callPut(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_ID_URL, { url: this.config.url, projectId, type, configGroupId }, this.config.insecure), model, `Failed to update config group for ${projectId}, type ${type}, configGroupId ${configGroupId}.`);
+        return this.callPut(formatServiceUrl(API_PROJECT_GROUP_TYPE_ID_URL, { url: this.config.url, projectId, type, configGroupId }, this.config.insecure), model, `Failed to update config group for ${projectId}, type ${type}, configGroupId ${configGroupId}.`);
     }
     /**
      * Get a config group
@@ -59,7 +56,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     // TODO: map the response object
     async info(projectId, type, configGroupId) {
-        return this.callGet(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_ID_URL, { url: this.config.url, projectId, type, configGroupId }, this.config.insecure), `Failed to get config group for ${projectId}, type ${type}, configGroupId ${configGroupId}.`);
+        return this.callGet(formatServiceUrl(API_PROJECT_GROUP_TYPE_ID_URL, { url: this.config.url, projectId, type, configGroupId }, this.config.insecure), `Failed to get config group for ${projectId}, type ${type}, configGroupId ${configGroupId}.`);
     }
     /**
      * Publish a config group
@@ -71,7 +68,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     // TODO: map the response object
     async publish(projectId, type, configGroupId, model) {
-        return this.callPost(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_PUBLISH_URL, { url: this.config.url, projectId, type, configGroupId }, this.config.insecure), model, `Failed to publish config group for ${projectId}, type ${type}, configGroupId ${configGroupId}.`);
+        return this.callPost(formatServiceUrl(API_PROJECT_GROUP_TYPE_PUBLISH_URL, { url: this.config.url, projectId, type, configGroupId }, this.config.insecure), model, `Failed to publish config group for ${projectId}, type ${type}, configGroupId ${configGroupId}.`);
     }
     /**
      * Update a config
@@ -87,7 +84,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
     async updateConfig(projectId, type, configGroupId, configId, 
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     content) {
-        return this.callPut(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_CONFIG_URL, {
+        return this.callPut(formatServiceUrl(API_PROJECT_GROUP_TYPE_CONFIG_URL, {
             url: this.config.url,
             projectId,
             type,
@@ -105,7 +102,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     // TODO: map the response object
     async getByVersion(projectId, type, configGroupId, version) {
-        return this.callGet(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_VERSION_URL, {
+        return this.callGet(formatServiceUrl(API_PROJECT_GROUP_TYPE_VERSION_URL, {
             url: this.config.url,
             projectId,
             type,
@@ -127,7 +124,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
     async overrideByOwnerId(projectId, type, configGroupId, ownerId, 
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     content) {
-        return this.callPost(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_OWNER_OVERRIDE_URL, {
+        return this.callPost(formatServiceUrl(API_PROJECT_GROUP_TYPE_OWNER_OVERRIDE_URL, {
             url: this.config.url,
             projectId,
             type,
@@ -145,7 +142,7 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     // TODO: map the response object
     async getOverrideConfig(projectId, type, configGroupId, ownerId) {
-        return this.callGet(formatServiceUrl_1.formatServiceUrl(api_1.API_PROJECT_GROUP_TYPE_OWNER_ID_URL, {
+        return this.callGet(formatServiceUrl(API_PROJECT_GROUP_TYPE_OWNER_ID_URL, {
             url: this.config.url,
             projectId,
             type,
@@ -154,4 +151,3 @@ class ConfigGroupService extends BaseServiceAbstract_1.BaseServiceAbstract {
         }, this.config.insecure), `Failed to get override for ${projectId}, type ${type}, configGroupId ${configGroupId}, ownerId ${ownerId}.`);
     }
 }
-exports.ConfigGroupService = ConfigGroupService;

package/services/ControlService.d.ts

@@ -1,23 +1,11 @@
-import { ControlActionType, IControlParams } from '../models/params/IControlParams';
-import { Observable, Subject } from 'rxjs';
-import { IBaseService } from '../models/IBaseService';
-import { IControlStream } from '../models/stream/IControlStream';
-import { IRocosControlMessage } from '../models/message/IRocosControlMessage';
-import { IRocosSDKConfig } from '../models/IRocosSDKConfig';
-import { IStreamConfig } from '../models/IStreamConfig';
-import { ISubscriberStatus } from '../models/ISubscriberStatus';
-import { SubscriberStatusEnum } from '../models/SubscriberStatusEnum';
-export declare class ControlService implements IBaseService, ISubscriberStatus {
-    private config;
-    private logger;
-    private status;
-    status$: Subject<SubscriberStatusEnum>;
+import { ControlActionType, IControlParams, IControlStream, IRocosControlMessage, IRocosSDKConfig, IStreamConfig } from '../models';
+import { Observable } from 'rxjs';
+import { BaseStreamService } from './BaseStreamService';
+export declare class ControlService extends BaseStreamService<IControlStream> {
     constructor(config: IRocosSDKConfig);
-    getStatus(): boolean;
     takeActionWithAck(action: ControlActionType, params: IControlParams, ackTimeoutInSeconds?: number): Observable<string>;
     sendCommand(params: IControlParams): Promise<void>;
     sendCommandWithAck(params: IControlParams): Observable<IRocosControlMessage>;
-    private createStream;
-    private initStream;
+    protected createStream(): Promise<IControlStream>;
     protected getStream(config: IStreamConfig): IControlStream;
 }

package/services/ControlService.js

@@ -1,26 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControlService = void 0;
-const rxjs_1 = require("rxjs");
-const ControlStream_1 = require("../api/streams/control/ControlStream");
-const identifier_1 = require("../constants/identifier");
-const RocosLogger_1 = require("../logger/RocosLogger");
-const RocosStore_1 = require("../store/RocosStore");
-const StreamRegister_1 = require("../api/StreamRegister");
-const SubscriberStatusEnum_1 = require("../models/SubscriberStatusEnum");
-const operators_1 = require("rxjs/operators");
-class ControlService {
+import { Subject } from 'rxjs';
+import { BaseStreamService } from './BaseStreamService';
+import { ControlStream } from '../api/streams/control/ControlStream';
+import { IDENTIFIER_NAME_CONTROL } from '../constants/identifier';
+import { finalize } from 'rxjs/operators';
+export class ControlService extends BaseStreamService {
     constructor(config) {
-        this.status = false;
-        this.status$ = new rxjs_1.Subject();
-        this.config = config;
-        this.logger = RocosLogger_1.RocosLogger.getInstance(`ControlService(${this.config.url})`);
-    }
-    getStatus() {
-        return this.status;
+        super('ControlService', config);
     }
     takeActionWithAck(action, params, ackTimeoutInSeconds = 15) {
-        const subject = new rxjs_1.Subject();
+        const subject = new Subject();
         let subscription;
         this.createStream()
             .then((stream) => {
@@ -30,8 +18,8 @@ class ControlService {
             this.logger.info('takeActionWithAck error', e);
             subject.error(e);
         });
-        return subject.asObservable().pipe(operators_1.finalize(() => {
-            subscription === null || subscription === void 0 ? void 0 : subscription.unsubscribe();
+        return subject.asObservable().pipe(finalize(() => {
+            subscription?.unsubscribe();
         }));
     }
     async sendCommand(params) {
@@ -39,7 +27,7 @@ class ControlService {
         return stream.sendCommand(params);
     }
     sendCommandWithAck(params) {
-        const subject = new rxjs_1.Subject();
+        const subject = new Subject();
         let subscription;
         this.createStream()
             .then((stream) => {
@@ -49,52 +37,21 @@ class ControlService {
             this.logger.info('sendCommandWithAck error', e);
             subject.error(e);
         });
-        return subject.asObservable().pipe(operators_1.finalize(() => {
-            subscription === null || subscription === void 0 ? void 0 : subscription.unsubscribe();
+        return subject.asObservable().pipe(finalize(() => {
+            subscription?.unsubscribe();
         }));
     }
     async createStream() {
-        const scope = 'default';
-        const identifier = StreamRegister_1.StreamRegister.getIdentifier(identifier_1.IDENTIFIER_NAME_CONTROL, scope);
-        const streamRegister = StreamRegister_1.StreamRegister.getInstance();
-        let stream = streamRegister.getStream(identifier);
-        if (!stream) {
-            stream = this.getStream({
-                url: this.config.url,
-                token: this.config.token,
-                scope,
-                options: this.config.options,
-                port: this.config.port,
-                insecure: this.config.insecure,
-            });
-            stream.statusStream$.subscribe((msg) => {
-                this.status = msg === SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED || msg === SubscriberStatusEnum_1.SubscriberStatusEnum.ALIVE;
-                this.status$.next(msg);
-            });
-            // don't wait for these promises, they can be init after startup
-            await streamRegister.addStream(stream);
-            await this.initStream(stream);
-        }
-        return stream;
-    }
-    async initStream(stream) {
-        // an async callback to set the stream token in case one was not set at startup
-        if (!this.config.token) {
-            try {
-                const authService = RocosStore_1.RocosStore.getSDKInstance(this.config).getAuthService();
-                const token = await authService.getToken();
-                if (token === null || token === void 0 ? void 0 : token.value) {
-                    this.config.token = token === null || token === void 0 ? void 0 : token.value;
-                    stream.setToken(this.config.token);
-                }
-            }
-            catch (e) {
-                this.logger.info('Can not retrieve auth token', e);
-            }
-        }
+        return (await this.createStreamFromConfig(IDENTIFIER_NAME_CONTROL, {
+            url: this.config.url,
+            token: this.config.token,
+            scope: 'default',
+            options: this.config.options,
+            port: this.config.port,
+            insecure: this.config.insecure,
+        })).stream;
     }
     getStream(config) {
-        return new ControlStream_1.ControlStream(config);
+        return new ControlStream(config);
     }
 }
-exports.ControlService = ControlService;