@gibme/mikrotik 2.0.4 → 2.0.5

package/dist/index.js

@@ -697,27 +697,62 @@ class Mikrotik extends ssh_1.default {
     terse(command) {
         return __awaiter(this, void 0, void 0, function* () {
             const results = [];
-            const lines = (yield this.exec(command))
-                .toString()
+            (yield this.exec(command)).toString()
                 .split('\r\n')
                 .map(line => line.trim())
-                .filter(line => line.split(/\s+/).length !== 0 && line.length !== 0);
-            lines.forEach(line => {
-                const result = {};
-                line.split(/\s+/)
-                    .map(col => col.trim())
-                    .forEach(col => {
-                    if (!result.idx && !isNaN(parseInt(col))) {
-                        result.idx = parseInt(col);
+                .filter(line => line.split(/\s+/).length !== 0 && line.length !== 0)
+                .forEach(line => {
+                const result = (() => {
+                    const [, flags] = line.split(/\s+/).map(part => part.trim());
+                    const result = {};
+                    // get the id or the number
+                    if (line.startsWith('*')) {
+                        result.id = line.split(/\s/).shift();
+                    }
+                    else if (!isNaN(parseInt(line))) {
+                        result.idx = parseInt(line);
                     }
-                    if (col.includes('=')) {
-                        const [key, ...value] = col.split('=');
-                        result[key] = value.join('=');
+                    result.flags = flags.includes('=') ? '' : flags;
+                    return result;
+                })();
+                /**
+                 * This looks like a mess; however, RouterOS will return values with spaced
+                 * which causes havoc if a simple regex matcher is applied to the key-value pairs
+                 */
+                do {
+                    const middle = line.indexOf('=') + 1;
+                    const start = (() => {
+                        const start = line.substring(0, middle).lastIndexOf(' ');
+                        return start === -1 ? 0 : start;
+                    })();
+                    const next = (() => {
+                        const next = line.substring(middle).indexOf('=');
+                        return next === -1 ? -1 : next + middle;
+                    })();
+                    const end = (() => {
+                        if (next === -1)
+                            return -1;
+                        const end = line.substring(middle, next).lastIndexOf(' ');
+                        return end === -1 ? -1 : end + middle;
+                    })();
+                    const [key, value] = line.substring(start, end !== -1 ? end : undefined)
+                        .trim().split(/=/);
+                    if (parseFloat(value).toString() === value) {
+                        result[key] = parseFloat(value);
+                    }
+                    else if (parseInt(value).toString() === value) {
+                        result[key] = parseInt(value);
                     }
                     else {
-                        result[col] = col;
+                        result[key] = value;
                     }
-                });
+                    if (end > 0) {
+                        line = line.substring(end);
+                    }
+                    else {
+                        line = '';
+                    }
+                } while (line.length !== 0);
                 if (Object.keys(result).length !== 0)
                     results.push(result);
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gibme/mikrotik",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "A simple mikrotik helper/wrapper",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",