@blueyerobotics/blueye-ts 1.1.0 → 1.2.0

package/dist/src/client.d.ts

@@ -16,13 +16,14 @@ export type Events = {
 };
 export declare const isInProtocol: (key: string) => key is keyof typeof blueye.protocol;
 export declare class BlueyeClient {
+    timeout: number;
     private wsPubSub;
     private wsReqRep;
     private isReqRepConnected;
     private logger;
     private pendingRequests;
     sub: Emitter<Events>;
-    constructor(logLevel?: LogLevel);
+    constructor(timeout?: number, logLevel?: LogLevel);
     sendRequest<T extends Req>(req: T, opts?: CreateArgs<T>): Promise<DecodedOutput<T> | null>;
     getTelemetry<T extends Tel>(type: T): Promise<DecodedTelOutput<T>>;
 }

package/dist/src/client.js

@@ -14,13 +14,15 @@ const isInProtocol = (key) => {
 };
 exports.isInProtocol = isInProtocol;
 class BlueyeClient {
+    timeout;
     wsPubSub;
     wsReqRep;
     isReqRepConnected = false;
     logger;
     pendingRequests = new Map();
     sub = new strict_event_emitter_1.Emitter();
-    constructor(logLevel = consola_1.LogLevels.info) {
+    constructor(timeout = 2000, logLevel = consola_1.LogLevels.info) {
+        this.timeout = timeout;
         this.logger = (0, consola_1.createConsola)({ level: logLevel, formatOptions: { colors: true, compact: false } });
         this.wsPubSub = new WebSocket(WS_PUBSUB_URL);
         this.wsReqRep = new WebSocket(WS_REQREP_URL);
@@ -44,7 +46,6 @@ class BlueyeClient {
             if (!id)
                 throw new Error("Response id is missing");
             this.pendingRequests.get(id)?.({ key, data });
-            this.pendingRequests.delete(id);
         });
     }
     async sendRequest(req, opts = {}) {
@@ -55,10 +56,10 @@ class BlueyeClient {
             this.logger.debug("Waiting...");
             await new Promise(res => setTimeout(res, 50));
         }
+        const id = (0, uuid_1.v4)();
         const { key, data } = await Promise.race([
-            new Promise((_, reject) => setTimeout(() => reject(new Error("Request timed out")), 2000)),
+            new Promise((_, reject) => setTimeout(() => reject(new Error("Request timed out")), this.timeout)),
             new Promise(resolve => {
-                const id = (0, uuid_1.v4)();
                 const request = JSON.stringify({
                     id,
                     key: `blueye.protocol.${req}`,
@@ -68,6 +69,7 @@ class BlueyeClient {
                 this.wsReqRep.send(request);
             })
         ]);
+        this.pendingRequests.delete(id);
         if (key === "Empty") {
             return null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueyerobotics/blueye-ts",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A TypeScript client for interacting with Blueye underwater drones.",
   "repository": {
     "type": "git",