@dronedeploy/rocos-js-sdk 3.0.30 → 3.1.0

package/cjs/api/streams/caller/CallerStreamAbstract.js

@@ -9,7 +9,6 @@ const identifier_1 = require("../../../constants/identifier");
 const RocosStore_1 = require("../../../store/RocosStore");
 const StreamRegister_1 = require("../../StreamRegister");
 const operators_1 = require("rxjs/operators");
-const uuid_1 = require("uuid");
 class CallerStreamAbstract {
     constructor(config) {
         this.subscriberStatus = models_1.SubscriberStatusEnum.STOPPED;
@@ -81,7 +80,7 @@ class CallerStreamAbstract {
                 version: serviette_v1_pb_1.UIDVersion.HEADER_HASH_RAND,
                 content: {
                     oneofKind: 'hash',
-                    hash: uid ?? (0, uuid_1.v4)(),
+                    hash: uid ?? crypto.randomUUID(),
                 },
             },
             payload: this.getPayload(payload),

package/cjs/api/streams/caller/CallerStreamNode.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CallerStreamNode = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
@@ -128,7 +138,7 @@ class CallerStreamNode extends CallerStreamAbstract_1.CallerStreamAbstract {
         });
     }
     getPayload(payload) {
-        return Buffer.from(payload);
+        return new TextEncoder().encode(payload);
     }
     getMetadata(projectId, callsign, subsystem) {
         const meta = new grpc.Metadata();

package/cjs/api/streams/command/CommandStreamNode.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandStreamNode = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));

package/cjs/api/streams/control/ControlStreamNode.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ControlStreamNode = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));

package/cjs/api/streams/fileAccessor/FileAccessorStreamNode.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileAccessorStreamNode = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));

package/cjs/api/streams/search/SearchStreamNode.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchStreamNode = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));

package/cjs/api/streams/telemetry/TelemetryStream.js

@@ -15,6 +15,7 @@ class TelemetryStream extends TelemetryStreamAbstract_1.TelemetryStreamAbstract
         const port = config.port ? `:${config.port}` : '';
         const transport = new grpcweb_transport_1.GrpcWebFetchTransport({
             baseUrl: `${protocol}://${this.url}${port}`,
+            format: config.grpcWebFormat,
         });
         this.client = new teletubby_pb_client_1.TelemetryGatewayClient(transport);
     }

package/cjs/api/streams/telemetry/TelemetryStreamConnect.d.ts

@@ -0,0 +1,26 @@
+import { ITelemetryStreamConfig } from '../../../models';
+import { TelemetryAckStatus, TelemetryQueryRequest, TelemetryRequest } from '../../../grpc/teletubby_pb';
+import { TelemetryStreamAbstract } from './TelemetryStreamAbstract';
+/**
+ * Connect-protocol telemetry receive stream. Mirrors TelemetryStream (grpc-web) but uses
+ * @connectrpc/connect. Selected when config.transport === 'connect'.
+ *
+ * The shared TelemetryStreamAbstract is typed with the protobuf-ts message types, while the
+ * Connect client uses @bufbuild/protobuf types. Both serialise to identical protobuf wire
+ * bytes, so we bridge across the boundary with toBinary/fromBinary rather than hand-written
+ * field mapping. This keeps all reconnect/subscription/heartbeat logic shared and untouched.
+ */
+export declare class TelemetryStreamConnect extends TelemetryStreamAbstract {
+    private client;
+    private abortController?;
+    constructor(config: ITelemetryStreamConfig);
+    protected stopInternal(): void;
+    protected registerReceiver(): () => void;
+    private onError;
+    private onEnd;
+    private getHeaders;
+    protected requestTelemetry(req: TelemetryRequest): Promise<void>;
+    protected requestTelemetryQuery(req: TelemetryQueryRequest): Promise<void>;
+    protected sendAcknowledgmentInternal(uid: string, status: TelemetryAckStatus, noRetry: boolean): boolean;
+    protected sendHeartbeat(): void;
+}

package/cjs/api/streams/telemetry/TelemetryStreamConnect.js

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TelemetryStreamConnect = void 0;
+const connect_1 = require("@connectrpc/connect");
+const models_1 = require("../../../models");
+const teletubby_pb_1 = require("../../../grpc/connect/teletubby_pb");
+const teletubby_pb_2 = require("../../../grpc/teletubby_pb");
+const protobuf_1 = require("@bufbuild/protobuf");
+const RocosLogger_1 = require("../../../logger/RocosLogger");
+const TelemetryStreamAbstract_1 = require("./TelemetryStreamAbstract");
+const connect_web_1 = require("@connectrpc/connect-web");
+/**
+ * Connect-protocol telemetry receive stream. Mirrors TelemetryStream (grpc-web) but uses
+ * @connectrpc/connect. Selected when config.transport === 'connect'.
+ *
+ * The shared TelemetryStreamAbstract is typed with the protobuf-ts message types, while the
+ * Connect client uses @bufbuild/protobuf types. Both serialise to identical protobuf wire
+ * bytes, so we bridge across the boundary with toBinary/fromBinary rather than hand-written
+ * field mapping. This keeps all reconnect/subscription/heartbeat logic shared and untouched.
+ */
+class TelemetryStreamConnect extends TelemetryStreamAbstract_1.TelemetryStreamAbstract {
+    constructor(config) {
+        super(config);
+        this.logger = RocosLogger_1.RocosLogger.getInstance(`TelemetryStreamConnect(${this.identifier})`);
+        const protocol = config.insecure ? 'http' : 'https';
+        const port = config.port ? `:${config.port}` : '';
+        const transport = (0, connect_web_1.createConnectTransport)({
+            baseUrl: `${protocol}://${this.url}${port}`,
+            // Binary proto codec. The Connect default is JSON, which fails to decode real telemetry
+            // payloads containing control characters (verified against a live robot on dev) and is
+            // less efficient. Binary is required for correctness here.
+            useBinaryFormat: true,
+        });
+        this.client = (0, connect_1.createClient)(teletubby_pb_1.TelemetryGateway, transport);
+    }
+    stopInternal() {
+        if (this.abortController) {
+            this.logger.info('Starting stop stream process');
+            this.abortController.abort();
+            this.abortController = undefined;
+            this.logger.info('Finished stop stream process');
+        }
+    }
+    registerReceiver() {
+        this.logger.info('registerReceiver');
+        // Reset counter
+        this.receivedMessagesCount = 0;
+        const abortController = new AbortController();
+        this.abortController = abortController;
+        void (async () => {
+            try {
+                const stream = this.client.registerReceiver((0, protobuf_1.create)(teletubby_pb_1.RegistrationMessageSchema, {}), {
+                    headers: this.getHeaders(this.projectId),
+                    signal: abortController.signal,
+                });
+                for await (const msg of stream) {
+                    // Bridge connect-es message -> protobuf-ts TelemetryMessage with a direct field map.
+                    // (Avoids a per-message re-serialize/re-parse; created/seq are int64/uint64 -> string
+                    // for protobuf-ts's long_type_string config.)
+                    const ptMsg = teletubby_pb_2.TelemetryMessage.create({
+                        source: msg.source,
+                        callsign: msg.callsign,
+                        payload: msg.payload,
+                        uid: msg.uid,
+                        created: msg.created.toString(),
+                        seq: msg.seq.toString(),
+                        meta: msg.meta,
+                    });
+                    this.onData(ptMsg, false);
+                }
+                this.onEnd(true);
+            }
+            catch (e) {
+                if (abortController.signal.aborted) {
+                    this.logger.debug('registerReceiver', 'aborted');
+                    return;
+                }
+                void this.onError(e);
+                this.onEnd(false);
+            }
+        })();
+        this.listenMessagesAndRenew();
+        return () => {
+            abortController.abort();
+        };
+    }
+    async onError(e) {
+        this.logger.error(`Telemetry Stream Error: ${e}, SubscriberId: ${this.subscriberId}`);
+        this.subscriberStatus = models_1.SubscriberStatusEnum.ERROR;
+        this.statusStream$.next(this.subscriberStatus);
+    }
+    onEnd(ok) {
+        this.logger.debug('registerReceiver', 'end');
+        if (ok) {
+            this.stopInternal();
+            this.registerReceiver();
+        }
+    }
+    getHeaders(projectId) {
+        const result = {
+            // Canary marker: the istio VirtualService routes only requests carrying this header to
+            // the Connect-Go handler (:8083), leaving existing grpc-web traffic untouched. Harmless
+            // when the backend does a full cutover or is hit directly. Must match the chart's
+            // virtualService.routes.connect.matchHeader.
+            'x-tt-connect': '1',
+        };
+        if (this.token) {
+            result.authorization = this.token;
+        }
+        if (projectId) {
+            result['r-p'] = projectId;
+        }
+        return result;
+    }
+    async requestTelemetry(req) {
+        this.logger.debug('Sending telemetry request');
+        try {
+            const connectReq = (0, protobuf_1.fromBinary)(teletubby_pb_1.TelemetryRequestSchema, teletubby_pb_2.TelemetryRequest.toBinary(req));
+            await this.client.requestTelemetry(connectReq, { headers: this.getHeaders(this.projectId) });
+        }
+        catch (e) {
+            this.logger.error('error requestTelemetry ', e);
+            throw e;
+        }
+    }
+    async requestTelemetryQuery(req) {
+        this.logger.debug('Requesting telemetry with query');
+        try {
+            const connectReq = (0, protobuf_1.fromBinary)(teletubby_pb_1.TelemetryQueryRequestSchema, teletubby_pb_2.TelemetryQueryRequest.toBinary(req));
+            await this.client.requestTelemetryQuery(connectReq, { headers: this.getHeaders(this.projectId) });
+        }
+        catch (e) {
+            this.logger.error('error requestTelemetryQuery ', e);
+            throw e;
+        }
+    }
+    sendAcknowledgmentInternal(uid, status, noRetry) {
+        this.logger.error('Error can not send Acknowledgment on connect client', { uid, status, noRetry });
+        return false;
+    }
+    sendHeartbeat() {
+        // Server-streaming Connect has no client->server channel for heartbeats.
+    }
+}
+exports.TelemetryStreamConnect = TelemetryStreamConnect;

package/cjs/api/streams/telemetry/TelemetryStreamNode.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelemetryStreamNode = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
@@ -30,7 +40,6 @@ const teletubby_pb_1 = require("../../../grpc/teletubby_pb");
 const RocosLogger_1 = require("../../../logger/RocosLogger");
 const teletubby_pb_grpc_client_1 = require("../../../grpc/teletubby_pb.grpc-client");
 const TelemetryStreamAbstract_1 = require("./TelemetryStreamAbstract");
-const uuid_1 = require("uuid");
 class TelemetryStreamNode extends TelemetryStreamAbstract_1.TelemetryStreamAbstract {
     constructor(config) {
         super(config);
@@ -130,7 +139,7 @@ class TelemetryStreamNode extends TelemetryStreamAbstract_1.TelemetryStreamAbstr
     getMetaData() {
         const meta = new grpc.Metadata();
         meta.add('r-p', this.projectId);
-        meta.add('r-tid', (0, uuid_1.v4)());
+        meta.add('r-tid', crypto.randomUUID());
         meta.add('r-cs', 'rocos-js-sdk-agent');
         if (this.token)
             meta.add('authorization', this.token);

package/cjs/grpc/conker_pb.grpc-client.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RobotControlClient = void 0;
 /* eslint-disable */