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

package/api/streams/control/ControlStreamNode.js

@@ -1,55 +1,30 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControlStreamNode = void 0;
-const grpc = __importStar(require("@grpc/grpc-js"));
-const rxjs_1 = require("rxjs");
-const ControlStreamAbstract_1 = require("./ControlStreamAbstract");
-const conker_grpc_pb_1 = require("../../../grpc/robot-control/conker_grpc_pb");
-const RocosControlMessage_1 = require("../../../models/message/RocosControlMessage");
-const RocosLogger_1 = require("../../../logger/RocosLogger");
-const SubscriberStatusEnum_1 = require("../../../models/SubscriberStatusEnum");
-class ControlStreamNode extends ControlStreamAbstract_1.ControlStreamAbstract {
+import * as grpc from '@grpc/grpc-js';
+import { RocosControlMessage, SubscriberStatusEnum, } from '../../../models';
+import { Observable } from 'rxjs';
+import { ControlStreamAbstract } from './ControlStreamAbstract';
+import { RobotControlClient } from '../../../grpc/conker_pb.grpc-client';
+import { RocosLogger } from '../../../logger/RocosLogger';
+export class ControlStreamNode extends ControlStreamAbstract {
     constructor(config) {
         super(config);
-        this.logger = RocosLogger_1.RocosLogger.getInstance(`ControlStreamNode(${this.identifier})`);
+        this.logger = RocosLogger.getInstance(`ControlStreamNode(${this.identifier})`);
         const port = config.port || 443;
         const credentials = config.insecure ? grpc.credentials.createInsecure() : grpc.credentials.createSsl();
-        this.client = new conker_grpc_pb_1.RobotControlClient(`${this.url}:${port}`, credentials);
+        this.client = new RobotControlClient(`${this.url}:${port}`, credentials);
     }
     controlRobotCall(request, params) {
         const metadata = this.getMetadata(params.projectId, params.callsign);
-        this.client.controlRobotCall(request, metadata, (err, ack) => {
-            return null;
-        });
+        this.client.controlRobotCall(request, metadata);
     }
     controlRobotCallWithAckStream(request, params) {
         const metadata = this.getMetadata(params.projectId, params.callsign);
         let call;
-        return new rxjs_1.Observable((emitter) => {
+        return new Observable((emitter) => {
             call = this.client.controlRobotCallWithAckStream(request, metadata);
-            this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.ALIVE;
+            this.subscriberStatus = SubscriberStatusEnum.ALIVE;
             this.statusStream$.next(this.subscriberStatus);
             call.on('data', (update) => {
-                const message = RocosControlMessage_1.RocosControlMessage.fromMessage(update);
+                const message = RocosControlMessage.fromMessage(update);
                 emitter.next(message);
                 this.logger.debug('controlRobotCallWithAckStream - on(data)', {
                     projectId: params.projectId,
@@ -58,7 +33,7 @@ class ControlStreamNode extends ControlStreamAbstract_1.ControlStreamAbstract {
                 });
             });
             call.on('end', () => {
-                this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED;
+                this.subscriberStatus = SubscriberStatusEnum.STOPPED;
                 this.statusStream$.next(this.subscriberStatus);
                 this.logger.debug('controlRobotCallWithAckStream - on(end)', {
                     projectId: params.projectId,
@@ -68,12 +43,12 @@ class ControlStreamNode extends ControlStreamAbstract_1.ControlStreamAbstract {
                 emitter.complete();
             });
             call.on('close', () => {
-                this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED;
+                this.subscriberStatus = SubscriberStatusEnum.STOPPED;
                 this.statusStream$.next(this.subscriberStatus);
                 this.logger.debug('controlRobotCallWithAckStream - on(close)');
             });
             call.on('error', (error) => {
-                this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.ERROR;
+                this.subscriberStatus = SubscriberStatusEnum.ERROR;
                 this.statusStream$.next(this.subscriberStatus);
                 this.logger.debug('controlRobotCallWithAckStream - on(error)', error);
                 emitter.error(error);
@@ -84,8 +59,9 @@ class ControlStreamNode extends ControlStreamAbstract_1.ControlStreamAbstract {
             };
         });
     }
-    setPayload(request, payload) {
-        request.setPayload(Buffer.from(payload).toString('base64'));
+    getPayload(payload) {
+        const buffer = Buffer.from(payload);
+        return Uint8Array.from(buffer);
     }
     getMetadata(projectId, callsign) {
         const meta = new grpc.Metadata();
@@ -95,4 +71,3 @@ class ControlStreamNode extends ControlStreamAbstract_1.ControlStreamAbstract {
         return meta;
     }
 }
-exports.ControlStreamNode = ControlStreamNode;

package/api/streams/fileAccessor/FileAccessorStream.d.ts

@@ -1,10 +1,8 @@
+import { IFileAccessorReqOpParams, IRocosOpResultMessage, IStreamConfig } from '../../../models';
 import { FileAccessorStreamAbstract } from './FileAccessorStreamAbstract';
-import { IFileAccessorReqOpParams } from '../../../models/params/IFileAccessorParams';
-import { IRocosOpResultMessage } from '../../../models/message/IRocosOpResultMessage';
-import { IStreamConfig } from '../../../models/IStreamConfig';
 export declare class FileAccessorStream extends FileAccessorStreamAbstract {
     private client;
     constructor(config: IStreamConfig);
-    serverReqOpInternal(params: IFileAccessorReqOpParams): Promise<IRocosOpResultMessage[]>;
+    protected serverReqOpInternal(params: IFileAccessorReqOpParams): Promise<IRocosOpResultMessage[]>;
     private getMetadata;
 }

package/api/streams/fileAccessor/FileAccessorStream.js

@@ -1,64 +1,50 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileAccessorStream = void 0;
-const filagree_pb_1 = require("../../../grpc/file-accessor/filagree_pb");
-const filagree_pb_service_1 = require("../../../grpc/file-accessor/filagree_pb_service");
-const FileAccessorStreamAbstract_1 = require("./FileAccessorStreamAbstract");
-const FileEnums_1 = require("../../../models/file/FileEnums");
-const RocosLogger_1 = require("../../../logger/RocosLogger");
-const RocosOpResultMessage_1 = require("../../../models/message/RocosOpResultMessage");
-const SubscriberStatusEnum_1 = require("../../../models/SubscriberStatusEnum");
-class FileAccessorStream extends FileAccessorStreamAbstract_1.FileAccessorStreamAbstract {
+import { OpRequestTarget, RocosOpResultMessage, SubscriberStatusEnum, } from '../../../models';
+import { FilagreeClient } from '../../../grpc/filagree_pb.client';
+import { FileAccessorStreamAbstract } from './FileAccessorStreamAbstract';
+import { GrpcWebFetchTransport } from '@protobuf-ts/grpcweb-transport';
+import { OpRequests } from '../../../grpc/filagree_pb';
+import { RocosLogger } from '../../../logger/RocosLogger';
+export class FileAccessorStream extends FileAccessorStreamAbstract {
     constructor(config) {
         super(config);
-        this.logger = RocosLogger_1.RocosLogger.getInstance(`FileAccessorStream(${this.identifier})`);
+        this.logger = RocosLogger.getInstance(`FileAccessorStream(${this.identifier})`);
         const protocol = config.insecure ? 'http' : 'https';
-        this.client = new filagree_pb_service_1.FilagreeClient(`${protocol}://${this.url}`);
+        const transport = new GrpcWebFetchTransport({
+            baseUrl: `${protocol}://${this.url}`,
+        });
+        this.client = new FilagreeClient(transport);
     }
-    serverReqOpInternal(params) {
-        return new Promise((resolve, reject) => {
-            this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.ALIVE;
-            this.statusStream$.next(this.subscriberStatus);
-            this.logger.debug('serverReqOp - request', {
-                status: this.subscriberStatus,
-                projectId: params.projectId,
-                callsign: params.callsign,
-            });
-            const req = new filagree_pb_1.OpRequest();
-            req.setOpcode(params.opCode);
-            req.setPath(params.path);
-            req.setTarget(params.target || FileEnums_1.OpRequestTarget.AGENT);
-            // Set map values
-            if (params.args) {
-                Object.keys(params.args).forEach((key) => {
-                    var _a;
-                    if ((_a = params === null || params === void 0 ? void 0 : params.args) === null || _a === void 0 ? void 0 : _a[key]) {
-                        req.getArgsMap().set(key, params.args[key]);
-                    }
-                });
-            }
-            const reqs = new filagree_pb_1.OpRequests();
-            reqs.setRequestsList([req]);
-            const metadata = this.getMetadata(params.projectId, params.callsign);
-            this.client.serverReqOp(reqs, metadata, (err, data) => {
-                if (err) {
-                    reject(err);
-                }
-                else if (data) {
-                    resolve(RocosOpResultMessage_1.RocosOpResultMessage.fromMessages(data));
-                }
-                else {
-                    reject('Error in serverReqOp call');
-                }
-                this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED;
-                this.statusStream$.next(this.subscriberStatus);
-                this.logger.debug('serverReqOp - response', {
-                    status: this.subscriberStatus,
-                    projectId: params.projectId,
-                    callsign: params.callsign,
-                });
-            });
+    async serverReqOpInternal(params) {
+        this.subscriberStatus = SubscriberStatusEnum.ALIVE;
+        this.statusStream$.next(this.subscriberStatus);
+        this.logger.debug('serverReqOp - request', {
+            status: this.subscriberStatus,
+            projectId: params.projectId,
+            callsign: params.callsign,
+        });
+        const metadata = this.getMetadata(params.projectId, params.callsign);
+        const reqs = OpRequests.create({
+            requests: [
+                {
+                    opcode: params.opCode.valueOf(),
+                    path: params.path,
+                    target: params.target?.valueOf() ?? OpRequestTarget.AGENT,
+                    args: params.args,
+                },
+            ],
         });
+        const response = await this.client.serverReqOp(reqs, { meta: metadata }).response;
+        this.subscriberStatus = SubscriberStatusEnum.STOPPED;
+        this.statusStream$.next(this.subscriberStatus);
+        this.logger.debug('serverReqOp - response', {
+            status: this.subscriberStatus,
+            projectId: params.projectId,
+            callsign: params.callsign,
+        });
+        if (response) {
+            return RocosOpResultMessage.fromMessages(response);
+        }
+        throw new Error('Error in serverReqOp call');
     }
     getMetadata(projectId, callsign) {
         const result = { authorization: this.token };
@@ -71,4 +57,3 @@ class FileAccessorStream extends FileAccessorStreamAbstract_1.FileAccessorStream
         return result;
     }
 }
-exports.FileAccessorStream = FileAccessorStream;

package/api/streams/fileAccessor/FileAccessorStreamAbstract.d.ts

@@ -1,26 +1,21 @@
-import { IFileAccessorParams, IFileAccessorReqOpParams } from '../../../models/params/IFileAccessorParams';
+import { IFileAccessorParams, IFileAccessorReqOpParams, IFileAccessorStream, IRocosOpResultMessage, IStreamConfig, SubscriberStatusEnum } from '../../../models';
 import { BehaviorSubject } from 'rxjs';
-import { IFileAccessorStream } from '../../../models/stream/IFileAccessorStream';
-import { IRocosOpResultMessage } from '../../../models/message/IRocosOpResultMessage';
-import { IStreamConfig } from '../../../models/IStreamConfig';
 import { Logger } from 'loglevel';
-import { SubscriberStatusEnum } from '../../../models/SubscriberStatusEnum';
 export declare abstract class FileAccessorStreamAbstract implements IFileAccessorStream {
     identifier: string;
     statusStream$: BehaviorSubject<SubscriberStatusEnum>;
     protected token: string;
-    private scope;
+    private readonly scope;
     protected url: string;
     protected subscriberStatus: SubscriberStatusEnum;
     protected logger: Logger;
-    constructor(config: IStreamConfig);
+    protected constructor(config: IStreamConfig);
     protected abstract serverReqOpInternal(params: IFileAccessorReqOpParams): Promise<IRocosOpResultMessage[]>;
     setToken(token: string): void;
     stopStream(): void;
     serverReqOp(params: IFileAccessorReqOpParams): Promise<IRocosOpResultMessage[]>;
     listFolder(params: IFileAccessorParams): Promise<IRocosOpResultMessage[]>;
     downloadFile(params: IFileAccessorParams): Promise<IRocosOpResultMessage[]>;
-    getDownloadFileLinkByUsingBlob(params: IFileAccessorParams): Promise<any>;
-    uploadFile(params: IFileAccessorParams, file: File): Promise<any>;
+    getDownloadFileLinkByUsingBlob(params: IFileAccessorParams): Promise<IRocosOpResultMessage[]>;
     private getPathForBlobSas;
 }

package/api/streams/fileAccessor/FileAccessorStreamAbstract.js

@@ -1,24 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileAccessorStreamAbstract = void 0;
-const FileEnums_1 = require("../../../models/file/FileEnums");
-// import { BlockBlobClient } from '@azure/storage-blob'
-const rxjs_1 = require("rxjs");
-const identifier_1 = require("../../../constants/identifier");
-const RocosStore_1 = require("../../../store/RocosStore");
-const StreamRegister_1 = require("../../StreamRegister");
-const SubscriberStatusEnum_1 = require("../../../models/SubscriberStatusEnum");
-const operators_1 = require("rxjs/operators");
-class FileAccessorStreamAbstract {
+import { OpCode, OpRequestTarget, SubscriberStatusEnum, } from '../../../models';
+import { BehaviorSubject } from 'rxjs';
+import { IDENTIFIER_NAME_FILE_ACCESSOR } from '../../../constants/identifier';
+import { RocosStore } from '../../../store/RocosStore';
+import { StreamRegister } from '../../StreamRegister';
+import { filter } from 'rxjs/operators';
+export class FileAccessorStreamAbstract {
     constructor(config) {
-        this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED;
+        this.subscriberStatus = SubscriberStatusEnum.STOPPED;
         this.scope = config.scope;
-        this.identifier = StreamRegister_1.StreamRegister.getIdentifier(identifier_1.IDENTIFIER_NAME_FILE_ACCESSOR, this.scope);
+        this.identifier = StreamRegister.getIdentifier(IDENTIFIER_NAME_FILE_ACCESSOR, this.scope);
         this.token = config.token;
         this.url = config.url;
-        this.statusStream$ = new rxjs_1.BehaviorSubject(SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED);
-        RocosStore_1.RocosStore.getChangeSubject()
-            .pipe(operators_1.filter((message) => {
+        this.statusStream$ = new BehaviorSubject(SubscriberStatusEnum.STOPPED);
+        RocosStore.getChangeSubject()
+            .pipe(filter((message) => {
             return message.type === 'token' && message.url === this.url;
         }))
             .subscribe((msg) => {
@@ -35,48 +30,33 @@ class FileAccessorStreamAbstract {
         return this.serverReqOpInternal(params);
     }
     async listFolder(params) {
-        return this.serverReqOp(Object.assign(Object.assign({}, params), { opCode: FileEnums_1.OpCode.INFO }));
+        return this.serverReqOp({ ...params, opCode: OpCode.INFO });
     }
     async downloadFile(params) {
-        return this.serverReqOp(Object.assign(Object.assign({}, params), { opCode: FileEnums_1.OpCode.READFILE }));
+        return this.serverReqOp({ ...params, opCode: OpCode.READFILE });
     }
     async getDownloadFileLinkByUsingBlob(params) {
-        const pathForBlobSas = this.getPathForBlobSas(params.projectId, params.callsign, params.path);
-        const msgs = await this.serverReqOp(Object.assign(Object.assign({}, params), { path: pathForBlobSas, opCode: FileEnums_1.OpCode.READFILE, target: FileEnums_1.OpRequestTarget.SERVER }));
+        const pathForBlobSas = this.getPathForBlobSas(params.callsign, params.path);
+        const msgs = await this.serverReqOp({
+            ...params,
+            path: pathForBlobSas,
+            opCode: OpCode.READFILE,
+            target: OpRequestTarget.SERVER,
+        });
         if (msgs && msgs.length > 0) {
             const [{ data: url }] = msgs;
             if (url) {
-                return this.serverReqOp(Object.assign(Object.assign({}, params), { opCode: FileEnums_1.OpCode.BLOBPUT, target: FileEnums_1.OpRequestTarget.AGENT, args: { url } }));
+                return this.serverReqOp({
+                    ...params,
+                    opCode: OpCode.BLOBPUT,
+                    target: OpRequestTarget.AGENT,
+                    args: { url },
+                });
             }
-            throw new Error('Could not create SAS');
-        }
-        else {
-            throw new Error('Could not create SAS');
-        }
-    }
-    async uploadFile(params, file) {
-        const pathForBlobSas = this.getPathForBlobSas(params.projectId, params.callsign, params.path);
-        const msgs = await this.serverReqOp(Object.assign(Object.assign({}, params), { path: pathForBlobSas, opCode: FileEnums_1.OpCode.BLOBSAS, target: FileEnums_1.OpRequestTarget.SERVER }));
-        if (msgs && msgs.length > 0) {
-            // TODO(matej): implement file upload using azure blob
-            // const [{ data: url }] = msgs
-            //
-            // if (url) {
-            //   const client = new BlockBlobClient(url)
-            //   return from(client.uploadBrowserData(file)).pipe(
-            //     mergeMap((res) => {
-            //       return this.serverReqOp(projectId, callsign, path, OpCode.BLOBGET, OpRequest.Target.AGENT, {
-            //         url,
-            //       })
-            //     }),
-            //   )
-            // }
-            throw new Error('Could not create SAS');
         }
         throw new Error('Could not create SAS');
     }
-    getPathForBlobSas(projectId, callsign, path) {
+    getPathForBlobSas(callsign, path) {
         return `/${callsign}${path}`;
     }
 }
-exports.FileAccessorStreamAbstract = FileAccessorStreamAbstract;

package/api/streams/fileAccessor/FileAccessorStreamNode.d.ts

@@ -1,7 +1,5 @@
+import { IFileAccessorReqOpParams, IRocosOpResultMessage, IStreamConfig } from '../../../models';
 import { FileAccessorStreamAbstract } from './FileAccessorStreamAbstract';
-import { IFileAccessorReqOpParams } from '../../../models/params/IFileAccessorParams';
-import { IRocosOpResultMessage } from '../../../models/message/IRocosOpResultMessage';
-import { IStreamConfig } from '../../../models/IStreamConfig';
 export declare class FileAccessorStreamNode extends FileAccessorStreamAbstract {
     private client;
     constructor(config: IStreamConfig);

package/api/streams/fileAccessor/FileAccessorStreamNode.js

@@ -1,77 +1,48 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileAccessorStreamNode = void 0;
-const grpc = __importStar(require("@grpc/grpc-js"));
-const filagree_pb_1 = require("../../../grpc/file-accessor/filagree_pb");
-const filagree_grpc_pb_1 = require("../../../grpc/file-accessor/filagree_grpc_pb");
-const FileAccessorStreamAbstract_1 = require("./FileAccessorStreamAbstract");
-const FileEnums_1 = require("../../../models/file/FileEnums");
-const RocosLogger_1 = require("../../../logger/RocosLogger");
-const RocosOpResultMessage_1 = require("../../../models/message/RocosOpResultMessage");
-const SubscriberStatusEnum_1 = require("../../../models/SubscriberStatusEnum");
-class FileAccessorStreamNode extends FileAccessorStreamAbstract_1.FileAccessorStreamAbstract {
+import * as grpc from '@grpc/grpc-js';
+import { OpRequestTarget, RocosOpResultMessage, SubscriberStatusEnum, } from '../../../models';
+import { FilagreeClient } from '../../../grpc/filagree_pb.grpc-client';
+import { FileAccessorStreamAbstract } from './FileAccessorStreamAbstract';
+import { OpRequests } from '../../../grpc/filagree_pb';
+import { RocosLogger } from '../../../logger/RocosLogger';
+export class FileAccessorStreamNode extends FileAccessorStreamAbstract {
     constructor(config) {
         super(config);
-        this.logger = RocosLogger_1.RocosLogger.getInstance(`FileAccessorStreamNode(${this.identifier})`);
-        const port = config.port || 443;
+        this.logger = RocosLogger.getInstance(`FileAccessorStreamNode(${this.identifier})`);
+        const port = config.port ?? 443;
         const credentials = config.insecure ? grpc.credentials.createInsecure() : grpc.credentials.createSsl();
-        this.client = new filagree_grpc_pb_1.FilagreeClient(`${this.url}:${port}`, credentials);
+        this.client = new FilagreeClient(`${this.url}:${port}`, credentials);
     }
     serverReqOpInternal(params) {
         return new Promise((resolve, reject) => {
-            this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.ALIVE;
+            this.subscriberStatus = SubscriberStatusEnum.ALIVE;
             this.statusStream$.next(this.subscriberStatus);
             this.logger.debug('serverReqOp - request', {
                 status: this.subscriberStatus,
                 projectId: params.projectId,
                 callsign: params.callsign,
             });
-            const req = new filagree_pb_1.OpRequest();
-            req.setOpcode(params.opCode);
-            req.setPath(params.path);
-            req.setTarget(params.target || FileEnums_1.OpRequestTarget.AGENT);
-            // Set map values
-            if (params.args) {
-                Object.keys(params.args).forEach((key) => {
-                    var _a;
-                    if ((_a = params === null || params === void 0 ? void 0 : params.args) === null || _a === void 0 ? void 0 : _a[key]) {
-                        req.getArgsMap().set(key, params.args[key]);
-                    }
-                });
-            }
-            const reqs = new filagree_pb_1.OpRequests();
-            reqs.setRequestsList([req]);
+            const reqs = OpRequests.create({
+                requests: [
+                    {
+                        opcode: params.opCode.valueOf(),
+                        path: params.path,
+                        target: params.target?.valueOf() ?? OpRequestTarget.AGENT,
+                        args: params.args,
+                    },
+                ],
+            });
             const metadata = this.getMetadata(params.projectId, params.callsign);
             this.client.serverReqOp(reqs, metadata, (err, data) => {
                 if (err) {
                     reject(err);
                 }
                 else if (data) {
-                    resolve(RocosOpResultMessage_1.RocosOpResultMessage.fromMessages(data));
+                    resolve(RocosOpResultMessage.fromMessages(data));
                 }
                 else {
                     reject('Error in serverReqOp call');
                 }
-                this.subscriberStatus = SubscriberStatusEnum_1.SubscriberStatusEnum.STOPPED;
+                this.subscriberStatus = SubscriberStatusEnum.STOPPED;
                 this.statusStream$.next(this.subscriberStatus);
                 this.logger.debug('serverReqOp - response', {
                     status: this.subscriberStatus,
@@ -93,4 +64,3 @@ class FileAccessorStreamNode extends FileAccessorStreamAbstract_1.FileAccessorSt
         return meta;
     }
 }
-exports.FileAccessorStreamNode = FileAccessorStreamNode;

package/api/streams/search/SearchStream.d.ts

@@ -1,9 +1,6 @@
-import { QueryDSLMessage, QueryMessage } from '../../../grpc/slowlane/slowlane_pb';
-import { ISearchParams, ISearchQueryParams, ISearchStreamParams } from '../../../models/params/ISearchParams';
+import { QueryDSLMessage, QueryMessage } from '../../../grpc/slowlane_pb';
+import { IRocosSearchMessage, IRocosSearchStatusMessage, ISearchParams, ISearchQueryParams, ISearchStreamParams, IStreamConfig } from '../../../models';
 import { Observable } from 'rxjs';
-import { IRocosSearchMessage } from '../../../models/message/IRocosSearchMessage';
-import { IRocosSearchStatusMessage } from '../../../models/message/IRocosSearchStatusMessage';
-import { IStreamConfig } from '../../../models/IStreamConfig';
 import { SearchStreamAbstract } from './SearchStreamAbstract';
 export declare class SearchStream extends SearchStreamAbstract {
     private client;