[mikrotik-sdwan] fix wan address reslolving after failed route

Author: geoffhouse

src/modules/mikrotik-sdwan/container/workers/tasks/wanaddress.js

@@ -42,7 +42,7 @@ module.exports = async ({ routerOsApi, mongoSingle, wanAddressesCollection }) =>
                 logger.debug(`fetch: from ${address} via bridge ${route._bridgeName}`);
 
                 // do the fetch
-                const data = await routerOsApi.run("/tool/fetch", [
+                const data = await routerOsApi.conn.write("/tool/fetch", [
                     `=src-address=${address}`,
                     `=url=https://ifconfig.me/ip`,
                     `=mode=https`,

src/modules/mikrotik-sdwan/container/workers/worker-wanaddress.js

@@ -46,7 +46,7 @@ const main = async () => {
 
         workerTaskManager({
             tasks: [
-                { name: "wanaddress", seconds: 30 },
+                { name: "wanaddress", seconds: 30, delay: 10 },
             ], context: { routerOsApi, mongoSingle, wanAddressesCollection }, baseDir: __dirname
         });
 

src/server/core/routeros-api.js

@@ -86,9 +86,12 @@ class RouterOSApi {
 
     async run(command, params = {}) {
         // queue commands so RouterOS API never overlaps
+        // use .catch(() => {}) to prevent a failed command from poisoning the queue
+        // and blocking all subsequent commands
         logger.debug(`routeros-api: queueing command ${command} with params ${JSON.stringify(params)} for ${this.host}`);
-        this._queue = this._queue.then(() => this._execute(command, params));
-        return this._queue;
+        const next = this._queue.catch(() => { }).then(() => this._execute(command, params));
+        this._queue = next;
+        return next;
     }
 
     async _execute(command, params) {