@gibme/mikrotik 2.0.0 → 2.0.2

package/dist/index.d.ts

@@ -108,12 +108,12 @@ export default class Mikrotik extends SSH {
      * @param command
      * @protected
      */
-    protected terse<Type extends object = any>(command: string): Promise<Type[]>;
+    terse<Type extends object = any>(command: string): Promise<Type[]>;
     /**
      * Executes a command that expects the result as a 'table' of key-value pairs separated by a colon (:)
      *
      * @param command
      * @protected
      */
-    protected kvs<Type extends object = any>(command: string): Promise<Type>;
+    kvs<Type extends object = any>(command: string): Promise<Type>;
 }

package/dist/index.js

@@ -375,14 +375,34 @@ class Mikrotik extends ssh_1.default {
                     });
                 }
                 this.on('stream', handleStream);
+                const cleanup = () => __awaiter(this, void 0, void 0, function* () {
+                    this.off('stream', handleStream);
+                    yield Mikrotik.cache.del(target);
+                });
                 yield Mikrotik.cache.set(target, target, options.duration); // set our mutex
-                yield this.stream(`/tool bandwidth-test protocol=${options.protocol} ` +
+                let command = `/tool bandwidth-test protocol=${options.protocol} ` +
                     `user=${username} password=${password} ` +
                     `duration=${options.duration}s direction=${options.direction} ` +
-                    `address=${target} random-data=${options.random_data ? 'yes' : 'no'} interval=1s`, {
+                    `address=${target} random-data=${options.random_data ? 'yes' : 'no'} interval=1s`;
+                if (options.local_tx_speed) {
+                    command += ` local-tx-speed=${options.local_tx_speed}M`;
+                }
+                if (options.remote_tx_speed) {
+                    command += ` remote-tx-speed=${options.remote_tx_speed}M`;
+                }
+                const cancel = yield this.stream(command, {
                     separator: '\r\n\r\n'
                 });
-                yield Mikrotik.cache.del(target); // release our mutex
+                this.once('stream_complete', () => __awaiter(this, void 0, void 0, function* () {
+                    yield cleanup();
+                }));
+                this.once('stream_cancelled', () => __awaiter(this, void 0, void 0, function* () {
+                    yield cleanup();
+                    return reject(new Error('Bandwidth Test Cancelled'));
+                }));
+                if (options.timeout) {
+                    setTimeout(cancel, options.timeout);
+                }
             }));
         });
     }

package/dist/types.d.ts

@@ -35,6 +35,15 @@ export declare namespace BandwidthTest {
         protocol: Protocol;
         random_data: boolean;
         callback: (frame: Update) => void;
+        timeout: number;
+        /**
+         * In Megabits
+         */
+        local_tx_speed: number;
+        /**
+         * In Megabits
+         */
+        remote_tx_speed: number;
     }
     export {};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gibme/mikrotik",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "A simple mikrotik helper/wrapper",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@gibme/cache": "^1.1.5",
-    "@gibme/ssh": "^1.0.2",
+    "@gibme/ssh": "^1.0.3",
     "@types/jsbn": "^1.2.33",
     "ip-address": "^9.0.5",
     "semver": "^7.6.2"