@opentap/runner-client 2.25.1 → 2.25.2-alpha.1.2.11280720052

package/dist/cjs/RunnerClient.js

@@ -25,11 +25,55 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunnerClient = void 0;
 var nats_ws_1 = require("nats.ws");
 var DTOs_1 = require("./DTOs");
 var BaseClient_1 = require("./BaseClient");
+var utils_1 = require("./utils");
 var RunnerClient = /** @class */ (function (_super) {
     __extends(RunnerClient, _super);
     function RunnerClient(baseSubject, options) {
@@ -92,6 +136,7 @@ var RunnerClient = /** @class */ (function (_super) {
                 return _this.request('SetDefaultSettings', repositoryPackageReference).then(_this.success()).catch(_this.error());
             },
         };
+        _this.runnerId = (0, utils_1.getSubjectParts)(baseSubject).runnerId;
         return _this;
     }
     /**
@@ -235,6 +280,121 @@ var RunnerClient = /** @class */ (function (_super) {
                 }
             } }));
     };
+    /**
+     * Connect to metrics published for the given SessionMetricInfo from the idle session
+     * @param  {ISessionMetricInfo} metricInfo
+     * @param  {(result:MetricValue|undefined,err:NatsError|Error|null)=>void} handler
+     * @param  {SubscriptionOptions} options?
+     * @returns Subscription
+     */
+    RunnerClient.prototype.connectMetric = function (metricInfo, inactiveThresholdMilliseconds, maxBatchSize, handler) {
+        var _this = this;
+        return this.createJetStreamConsumer('Metrics', "M.".concat(metricInfo.subjectPostfix), {
+            domain: this.runnerId,
+        }, { inactive_threshold: (0, nats_ws_1.nanos)(inactiveThresholdMilliseconds) }).then(function (consumer) {
+            var isCloseInitiated = false;
+            var deleteConsumer = consumer.delete.bind(consumer);
+            consumer.delete = function () {
+                isCloseInitiated = true;
+                return deleteConsumer();
+            };
+            // Async function here so the loop starts without blocking returning a consumer
+            (function () { return __awaiter(_this, void 0, void 0, function () {
+                var _loop_1, state_1;
+                var _this = this;
+                var e_1, _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _loop_1 = function () {
+                                var consumerInfo, arraySize, metricData_1, messages, index, messages_1, messages_1_1, message, e_1_1, error_1, error_2;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
+                                        case 0:
+                                            _c.trys.push([0, 18, , 19]);
+                                            return [4 /*yield*/, consumer.info()];
+                                        case 1:
+                                            consumerInfo = _c.sent();
+                                            arraySize = Math.min(maxBatchSize, consumerInfo.num_pending);
+                                            metricData_1 = {
+                                                encodedMetrics: new Array(arraySize),
+                                                timestamps: new Array(arraySize),
+                                            };
+                                            _c.label = 2;
+                                        case 2:
+                                            _c.trys.push([2, 16, , 17]);
+                                            return [4 /*yield*/, consumer.fetch({ max_messages: arraySize })];
+                                        case 3:
+                                            messages = _c.sent();
+                                            index = 0;
+                                            _c.label = 4;
+                                        case 4:
+                                            _c.trys.push([4, 9, 10, 15]);
+                                            messages_1 = (e_1 = void 0, __asyncValues(messages));
+                                            _c.label = 5;
+                                        case 5: return [4 /*yield*/, messages_1.next()];
+                                        case 6:
+                                            if (!(messages_1_1 = _c.sent(), !messages_1_1.done)) return [3 /*break*/, 8];
+                                            message = messages_1_1.value;
+                                            // Store the message data and timestamp
+                                            metricData_1.encodedMetrics[index] = message.data;
+                                            metricData_1.timestamps[index] = message.info.timestampNanos;
+                                            // If we are at the last message or there are no more pending messages, call the handler
+                                            if (index === arraySize - 1 || message.info.pending === 0) {
+                                                (function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                                                    return [2 /*return*/, handler(metricData_1)];
+                                                }); }); })();
+                                                return [3 /*break*/, 8];
+                                            }
+                                            // Increment the index
+                                            index++;
+                                            _c.label = 7;
+                                        case 7: return [3 /*break*/, 5];
+                                        case 8: return [3 /*break*/, 15];
+                                        case 9:
+                                            e_1_1 = _c.sent();
+                                            e_1 = { error: e_1_1 };
+                                            return [3 /*break*/, 15];
+                                        case 10:
+                                            _c.trys.push([10, , 13, 14]);
+                                            if (!(messages_1_1 && !messages_1_1.done && (_a = messages_1.return))) return [3 /*break*/, 12];
+                                            return [4 /*yield*/, _a.call(messages_1)];
+                                        case 11:
+                                            _c.sent();
+                                            _c.label = 12;
+                                        case 12: return [3 /*break*/, 14];
+                                        case 13:
+                                            if (e_1) throw e_1.error;
+                                            return [7 /*endfinally*/];
+                                        case 14: return [7 /*endfinally*/];
+                                        case 15: return [3 /*break*/, 17];
+                                        case 16:
+                                            error_1 = _c.sent();
+                                            return [2 /*return*/, "break"];
+                                        case 17: return [3 /*break*/, 19];
+                                        case 18:
+                                            error_2 = _c.sent();
+                                            return [2 /*return*/, "break"];
+                                        case 19: return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            _b.label = 1;
+                        case 1:
+                            if (!!isCloseInitiated) return [3 /*break*/, 3];
+                            return [5 /*yield**/, _loop_1()];
+                        case 2:
+                            state_1 = _b.sent();
+                            if (state_1 === "break")
+                                return [3 /*break*/, 3];
+                            return [3 /*break*/, 1];
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            }); })();
+            return consumer;
+        });
+    };
     return RunnerClient;
 }(BaseClient_1.BaseClient));
 exports.RunnerClient = RunnerClient;

package/dist/cjs/SessionClient.js

@@ -25,61 +25,16 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionClient = void 0;
 var DTOs_1 = require("./DTOs");
 var nats_ws_1 = require("nats.ws");
 var BaseClient_1 = require("./BaseClient");
-var utils_1 = require("./utils");
 var SessionClient = /** @class */ (function (_super) {
     __extends(SessionClient, _super);
     function SessionClient(baseSubject, options) {
         var _this = _super.call(this, baseSubject, options) || this;
         _this.subscriptions = [];
-        _this.runnerId = (0, utils_1.getSubjectParts)(baseSubject).runnerId;
         return _this;
     }
     /**
@@ -340,120 +295,6 @@ var SessionClient = /** @class */ (function (_super) {
                 }
             } }));
     };
-    /**
-     * Connect to metrics published for the given SessionMetricInfo
-     * @param  {ISessionMetricInfo} metricInfo
-     * @param  {(result:MetricValue|undefined,err:NatsError|Error|null)=>void} handler
-     * @param  {SubscriptionOptions} options?
-     * @returns Subscription
-     */
-    SessionClient.prototype.connectMetric = function (metricInfo, inactiveThresholdMilliseconds, maxBatchSize, handler) {
-        var _this = this;
-        return this.createJetStreamConsumer('Metrics', "M.".concat(metricInfo.subjectPostfix), {
-            domain: this.runnerId,
-        }, { inactive_threshold: (0, nats_ws_1.nanos)(inactiveThresholdMilliseconds) }).then(function (consumer) {
-            var isCloseInitiated = false;
-            var deleteConsumer = consumer.delete.bind(consumer);
-            consumer.delete = function () {
-                isCloseInitiated = true;
-                return deleteConsumer();
-            };
-            // Async function here so the loop starts without blocking returning a consumer
-            (function () { return __awaiter(_this, void 0, void 0, function () {
-                var _loop_1, state_1;
-                var _this = this;
-                var e_1, _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            _loop_1 = function () {
-                                var consumerInfo, arraySize, metricData_1, messages, index, messages_1, messages_1_1, message, e_1_1, error_1, error_2;
-                                return __generator(this, function (_c) {
-                                    switch (_c.label) {
-                                        case 0:
-                                            _c.trys.push([0, 18, , 19]);
-                                            return [4 /*yield*/, consumer.info()];
-                                        case 1:
-                                            consumerInfo = _c.sent();
-                                            arraySize = Math.min(maxBatchSize, consumerInfo.num_pending);
-                                            metricData_1 = {
-                                                encodedMetrics: new Array(arraySize),
-                                                timestamps: new Array(arraySize),
-                                            };
-                                            _c.label = 2;
-                                        case 2:
-                                            _c.trys.push([2, 16, , 17]);
-                                            return [4 /*yield*/, consumer.fetch({ max_messages: arraySize })];
-                                        case 3:
-                                            messages = _c.sent();
-                                            index = 0;
-                                            _c.label = 4;
-                                        case 4:
-                                            _c.trys.push([4, 9, 10, 15]);
-                                            messages_1 = (e_1 = void 0, __asyncValues(messages));
-                                            _c.label = 5;
-                                        case 5: return [4 /*yield*/, messages_1.next()];
-                                        case 6:
-                                            if (!(messages_1_1 = _c.sent(), !messages_1_1.done)) return [3 /*break*/, 8];
-                                            message = messages_1_1.value;
-                                            // Store the message data and timestamp
-                                            metricData_1.encodedMetrics[index] = message.data;
-                                            metricData_1.timestamps[index] = message.info.timestampNanos;
-                                            // If we are at the last message or there are no more pending messages, call the handler
-                                            if (index === arraySize - 1 || message.info.pending === 0) {
-                                                (function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                                    return [2 /*return*/, handler(metricData_1)];
-                                                }); }); })();
-                                            }
-                                            // Increment the index
-                                            index++;
-                                            _c.label = 7;
-                                        case 7: return [3 /*break*/, 5];
-                                        case 8: return [3 /*break*/, 15];
-                                        case 9:
-                                            e_1_1 = _c.sent();
-                                            e_1 = { error: e_1_1 };
-                                            return [3 /*break*/, 15];
-                                        case 10:
-                                            _c.trys.push([10, , 13, 14]);
-                                            if (!(messages_1_1 && !messages_1_1.done && (_a = messages_1.return))) return [3 /*break*/, 12];
-                                            return [4 /*yield*/, _a.call(messages_1)];
-                                        case 11:
-                                            _c.sent();
-                                            _c.label = 12;
-                                        case 12: return [3 /*break*/, 14];
-                                        case 13:
-                                            if (e_1) throw e_1.error;
-                                            return [7 /*endfinally*/];
-                                        case 14: return [7 /*endfinally*/];
-                                        case 15: return [3 /*break*/, 17];
-                                        case 16:
-                                            error_1 = _c.sent();
-                                            return [2 /*return*/, "break"];
-                                        case 17: return [3 /*break*/, 19];
-                                        case 18:
-                                            error_2 = _c.sent();
-                                            return [2 /*return*/, "break"];
-                                        case 19: return [2 /*return*/];
-                                    }
-                                });
-                            };
-                            _b.label = 1;
-                        case 1:
-                            if (!!isCloseInitiated) return [3 /*break*/, 3];
-                            return [5 /*yield**/, _loop_1()];
-                        case 2:
-                            state_1 = _b.sent();
-                            if (state_1 === "break")
-                                return [3 /*break*/, 3];
-                            return [3 /*break*/, 1];
-                        case 3: return [2 /*return*/];
-                    }
-                });
-            }); })();
-            return consumer;
-        });
-    };
     /**
      * Unsubscibe from session events
      */

package/dist/mjs/RunnerClient.d.ts

@@ -1,8 +1,9 @@
-import { ConnectionOptions, NatsError, Subscription, SubscriptionOptions } from 'nats.ws';
+import { ConnectionOptions, Consumer, NatsError, Subscription, SubscriptionOptions } from 'nats.ws';
 import { RunnerUpdateRequest } from './requestDTOs';
-import { ISession, Image, MetadataUpdatedEvent, RepositoryPackageReference, Session } from './DTOs';
+import { ISession, ISessionMetricInfo, Image, MetadataUpdatedEvent, RepositoryPackageReference, Session } from './DTOs';
 import { BaseClient } from './BaseClient';
 export declare class RunnerClient extends BaseClient {
+    private runnerId;
     default: {
         startSession: (testPlanRepositoryReference?: RepositoryPackageReference, timeout?: number) => Promise<Session>;
         startSessionWithOverriddenImage: (testPlanReference?: RepositoryPackageReference, imageOverride?: Image, timeout?: number) => Promise<Session>;
@@ -78,4 +79,15 @@ export declare class RunnerClient extends BaseClient {
      * @returns Subscription
      */
     connectMetadataUpdatedEvents(handler: (event: MetadataUpdatedEvent | undefined, err: NatsError | Error | null) => void, options?: SubscriptionOptions): Subscription;
+    /**
+     * Connect to metrics published for the given SessionMetricInfo from the idle session
+     * @param  {ISessionMetricInfo} metricInfo
+     * @param  {(result:MetricValue|undefined,err:NatsError|Error|null)=>void} handler
+     * @param  {SubscriptionOptions} options?
+     * @returns Subscription
+     */
+    connectMetric(metricInfo: ISessionMetricInfo, inactiveThresholdMilliseconds: number, maxBatchSize: number, handler: (metricData: {
+        encodedMetrics: Uint8Array[];
+        timestamps: number[];
+    }) => void): Promise<Consumer>;
 }

package/dist/mjs/RunnerClient.js

@@ -1,6 +1,23 @@
-import { JSONCodec } from 'nats.ws';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+import { JSONCodec, nanos } from 'nats.ws';
 import { Image, MetadataUpdatedEvent, RepositoryPackageReference, Session, } from './DTOs';
 import { BaseClient } from './BaseClient';
+import { getSubjectParts } from './utils';
 export class RunnerClient extends BaseClient {
     constructor(baseSubject, options) {
         super(baseSubject, options);
@@ -60,6 +77,7 @@ export class RunnerClient extends BaseClient {
                 return this.request('SetDefaultSettings', repositoryPackageReference).then(this.success()).catch(this.error());
             },
         };
+        this.runnerId = getSubjectParts(baseSubject).runnerId;
     }
     /**
      * Get the created image with the specified ID.
@@ -202,4 +220,76 @@ export class RunnerClient extends BaseClient {
                 }
             } }));
     }
+    /**
+     * Connect to metrics published for the given SessionMetricInfo from the idle session
+     * @param  {ISessionMetricInfo} metricInfo
+     * @param  {(result:MetricValue|undefined,err:NatsError|Error|null)=>void} handler
+     * @param  {SubscriptionOptions} options?
+     * @returns Subscription
+     */
+    connectMetric(metricInfo, inactiveThresholdMilliseconds, maxBatchSize, handler) {
+        return this.createJetStreamConsumer('Metrics', `M.${metricInfo.subjectPostfix}`, {
+            domain: this.runnerId,
+        }, { inactive_threshold: nanos(inactiveThresholdMilliseconds) }).then(consumer => {
+            let isCloseInitiated = false;
+            const deleteConsumer = consumer.delete.bind(consumer);
+            consumer.delete = () => {
+                isCloseInitiated = true;
+                return deleteConsumer();
+            };
+            // Async function here so the loop starts without blocking returning a consumer
+            (() => __awaiter(this, void 0, void 0, function* () {
+                var e_1, _a;
+                // eslint-disable-next-line no-constant-condition
+                while (!isCloseInitiated) {
+                    try {
+                        // Get the consumer info to determine the number of pending messages
+                        const consumerInfo = yield consumer.info();
+                        // We want to define the batch size based on how many message we will consume in the next fetch
+                        const arraySize = Math.min(maxBatchSize, consumerInfo.num_pending);
+                        // Create the object with preallocated arrays for better performance
+                        const metricData = {
+                            encodedMetrics: new Array(arraySize),
+                            timestamps: new Array(arraySize),
+                        };
+                        try {
+                            // Fetch the messages
+                            const messages = yield consumer.fetch({ max_messages: arraySize });
+                            // for await of doesn't return the index, so we need to keep track of it
+                            let index = 0;
+                            try {
+                                for (var messages_1 = (e_1 = void 0, __asyncValues(messages)), messages_1_1; messages_1_1 = yield messages_1.next(), !messages_1_1.done;) {
+                                    const message = messages_1_1.value;
+                                    // Store the message data and timestamp
+                                    metricData.encodedMetrics[index] = message.data;
+                                    metricData.timestamps[index] = message.info.timestampNanos;
+                                    // If we are at the last message or there are no more pending messages, call the handler
+                                    if (index === arraySize - 1 || message.info.pending === 0) {
+                                        (() => __awaiter(this, void 0, void 0, function* () { return handler(metricData); }))();
+                                        break;
+                                    }
+                                    // Increment the index
+                                    index++;
+                                }
+                            }
+                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                            finally {
+                                try {
+                                    if (messages_1_1 && !messages_1_1.done && (_a = messages_1.return)) yield _a.call(messages_1);
+                                }
+                                finally { if (e_1) throw e_1.error; }
+                            }
+                        }
+                        catch (error) {
+                            break;
+                        }
+                    }
+                    catch (error) {
+                        break;
+                    }
+                }
+            }))();
+            return consumer;
+        });
+    }
 }

package/dist/mjs/SessionClient.d.ts

@@ -1,9 +1,8 @@
-import { BreakPoints, CommonContext, CommonSettings, DataGridControl, IMetricsConfiguration, ISessionMetricInfo, Image, Interaction, ListItemType, LogList, MetricsConfiguration, OnTestPlanRun, OnTestStepRun, Parameter, RepositoryPackageDefinition, RepositoryPackageReference, Resource, Result, RunStatus, SessionEvent, Setting, TestPlan, TestRun, TestStepType, TestStepValidationError, WatchDog } from './DTOs';
-import { ConnectionOptions, Consumer, NatsError, Subscription, SubscriptionOptions } from 'nats.ws';
+import { BreakPoints, CommonContext, CommonSettings, DataGridControl, IMetricsConfiguration, Image, Interaction, ListItemType, LogList, MetricsConfiguration, OnTestPlanRun, OnTestStepRun, Parameter, RepositoryPackageDefinition, RepositoryPackageReference, Resource, Result, RunStatus, SessionEvent, Setting, TestPlan, TestRun, TestStepType, TestStepValidationError, WatchDog } from './DTOs';
+import { ConnectionOptions, NatsError, Subscription, SubscriptionOptions } from 'nats.ws';
 import { BaseClient } from './BaseClient';
 export declare class SessionClient extends BaseClient {
     private subscriptions;
-    private runnerId;
     constructor(baseSubject: string, options: ConnectionOptions);
     /**
      * @param sessionLogsHandler Function to be called when log list or error is received
@@ -82,17 +81,6 @@ export declare class SessionClient extends BaseClient {
      * @returns Subscription
      */
     connectTestStepRunResults(testPlanRunId: string, testStepRunId: string, resultName: string, handler: (result: Result | undefined, err: NatsError | Error | null) => void, options?: SubscriptionOptions): Subscription;
-    /**
-     * Connect to metrics published for the given SessionMetricInfo
-     * @param  {ISessionMetricInfo} metricInfo
-     * @param  {(result:MetricValue|undefined,err:NatsError|Error|null)=>void} handler
-     * @param  {SubscriptionOptions} options?
-     * @returns Subscription
-     */
-    connectMetric(metricInfo: ISessionMetricInfo, inactiveThresholdMilliseconds: number, maxBatchSize: number, handler: (metricData: {
-        encodedMetrics: Uint8Array[];
-        timestamps: number[];
-    }) => void): Promise<Consumer>;
     /**
      * Unsubscibe from session events
      */

package/dist/mjs/SessionClient.js

@@ -1,28 +1,10 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 import { BreakPoints, CommonContext, CommonSettings, DataGridControl, Image, Interaction, ListItemType, LogList, MetricsConfiguration, OnTestPlanRun, OnTestStepRun, Parameter, Result, RunStatus, SessionEvent, Setting, TestPlan, TestRun, TestStepType, TestStepValidationError, WatchDog, } from './DTOs';
-import { JSONCodec, nanos } from 'nats.ws';
+import { JSONCodec } from 'nats.ws';
 import { BaseClient } from './BaseClient';
-import { getSubjectParts } from './utils';
 export class SessionClient extends BaseClient {
     constructor(baseSubject, options) {
         super(baseSubject, options);
         this.subscriptions = [];
-        this.runnerId = getSubjectParts(baseSubject).runnerId;
     }
     /**
      * @param sessionLogsHandler Function to be called when log list or error is received
@@ -282,77 +264,6 @@ export class SessionClient extends BaseClient {
                 }
             } }));
     }
-    /**
-     * Connect to metrics published for the given SessionMetricInfo
-     * @param  {ISessionMetricInfo} metricInfo
-     * @param  {(result:MetricValue|undefined,err:NatsError|Error|null)=>void} handler
-     * @param  {SubscriptionOptions} options?
-     * @returns Subscription
-     */
-    connectMetric(metricInfo, inactiveThresholdMilliseconds, maxBatchSize, handler) {
-        return this.createJetStreamConsumer('Metrics', `M.${metricInfo.subjectPostfix}`, {
-            domain: this.runnerId,
-        }, { inactive_threshold: nanos(inactiveThresholdMilliseconds) }).then(consumer => {
-            let isCloseInitiated = false;
-            const deleteConsumer = consumer.delete.bind(consumer);
-            consumer.delete = () => {
-                isCloseInitiated = true;
-                return deleteConsumer();
-            };
-            // Async function here so the loop starts without blocking returning a consumer
-            (() => __awaiter(this, void 0, void 0, function* () {
-                var e_1, _a;
-                // eslint-disable-next-line no-constant-condition
-                while (!isCloseInitiated) {
-                    try {
-                        // Get the consumer info to determine the number of pending messages
-                        const consumerInfo = yield consumer.info();
-                        // We want to define the batch size based on how many message we will consume in the next fetch
-                        const arraySize = Math.min(maxBatchSize, consumerInfo.num_pending);
-                        // Create the object with preallocated arrays for better performance
-                        const metricData = {
-                            encodedMetrics: new Array(arraySize),
-                            timestamps: new Array(arraySize),
-                        };
-                        try {
-                            // Fetch the messages
-                            const messages = yield consumer.fetch({ max_messages: arraySize });
-                            // for await of doesn't return the index, so we need to keep track of it
-                            let index = 0;
-                            try {
-                                for (var messages_1 = (e_1 = void 0, __asyncValues(messages)), messages_1_1; messages_1_1 = yield messages_1.next(), !messages_1_1.done;) {
-                                    const message = messages_1_1.value;
-                                    // Store the message data and timestamp
-                                    metricData.encodedMetrics[index] = message.data;
-                                    metricData.timestamps[index] = message.info.timestampNanos;
-                                    // If we are at the last message or there are no more pending messages, call the handler
-                                    if (index === arraySize - 1 || message.info.pending === 0) {
-                                        (() => __awaiter(this, void 0, void 0, function* () { return handler(metricData); }))();
-                                    }
-                                    // Increment the index
-                                    index++;
-                                }
-                            }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                            finally {
-                                try {
-                                    if (messages_1_1 && !messages_1_1.done && (_a = messages_1.return)) yield _a.call(messages_1);
-                                }
-                                finally { if (e_1) throw e_1.error; }
-                            }
-                        }
-                        catch (error) {
-                            break;
-                        }
-                    }
-                    catch (error) {
-                        break;
-                    }
-                }
-            }))();
-            return consumer;
-        });
-    }
     /**
      * Unsubscibe from session events
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentap/runner-client",
-  "version": "2.25.1",
+  "version": "2.25.2-alpha.1.2.11280720052",
   "description": "This is the web client for the OpenTAP Runner.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/mjs/index.js",