Updated autoupdate loop

example/app.js

@@ -1,4 +1,4 @@
-import Doodle3DManager from 'src/doodle3dmanager.js';
+import {Doodle3DManager} from 'src/index.js';
 
 const doodle3DManager = new Doodle3DManager();
 const TABLE = document.getElementById('table');

src/configapi.js

@@ -14,8 +14,6 @@ export default class {
 	}
 
 	set (data) {
-		var scope = this;
-
 		return rest.post(`${this.api}config`, data);
 	}
 }

src/doodle3dapi.js

@@ -1,5 +1,4 @@
 import EventDispatcher from 'casperlamboo/EventDispatcher';
-import * as rest from './restapi.js';
 import ConfigAPI from './configapi.js';
 import InfoAPI from './infoapi.js';
 import NetworkAPI from './networkapi.js';
@@ -22,7 +21,6 @@ export default class extends EventDispatcher {
 		this.state = {};
 
 		this.maxBatchSize = 10*1024;
-		this.maxBufferSize = 1024*1024;
 		this.fullBufferTimeout = 10000;
 
 		this.config = new ConfigAPI(this.api);
@@ -92,28 +90,17 @@ export default class extends EventDispatcher {
 			let lastIndex = 0;
 			let start = true;
 			while (lastIndex !== gcode.length) {
-				let index = gcode.lastIndexOf('\n', lastIndex + this.maxBatchSize);
+				let lastIndex = lastIndex + this.maxBatchSize;
+				let index = gcode.lastIndexOf('\n', lastIndex);
 				let batch = gcode.substring(lastIndex, index);
 
 				let progress = await this.printer.progress();
 
-				if (progress['buffered_lines'] + batch.length < this.maxBufferSize) {
-					try {
 				await this._sendBatch(batch, start);
 
 				start = false;
 				lastIndex = index + 1; //skip next \n
 			}
-					catch (error) {
-						console.log('error while sending gcode', error);
-
-						await sleep(this.fullBufferTimeout);
-					}
-				}
-				else {
-					await sleep(this.fullBufferTimeout);
-				}
-			}
 
 			this.autoUpdate = autoUpdateState;
 
@@ -139,12 +126,11 @@ export default class extends EventDispatcher {
 		}
 	}
 
-	_sendBatch (gcode, index) {
+	_sendBatch (gcode, start) {
 		return new Promise (async (resolve, reject) => {
 			try {
-				let first = index === 0;
-				let start = first;
-				let printRequest = await this.printer.print(gcode, first, start);
+				let response = await this.printer.print(gcode, start, start);
+				// maybe do something with failing response
 
 				console.log(`batch sent: ${index}`, printRequest);
 			}

src/doodle3dmanager.js

@@ -3,7 +3,7 @@ import Doodle3DAPI from './doodle3dapi.js';
 import EventDispatcher from 'casperlamboo/EventDispatcher';
 import {sleep} from './utils.js';
 
-export default class extends EventDispatcher {
+export default class Doodle3DManager extends EventDispatcher {
 	constructor () {
 		super();
 
@@ -50,24 +50,35 @@ export default class extends EventDispatcher {
 
 	_checkAlive () {
 		return new Promise(async (resolve, reject) => {
-			for (let box of this.boxes) {
-				let alive = await box.checkAlive();
 
+			await Promise.all(this.boxes.map((box) => {
+				let promise = box.checkAlive();
+				promise.then((alive) => {
 					if (!alive) {
 						this._removeBox(box);
 					}
-			}
+				})
+
+				return promise;
+			}));
+
 			resolve();
 		});
 	}
 
 	_checkNew () {
 		return new Promise(async (resolve, reject) => {	
+			let boxes;	
 			try {
-				let boxes = await rest.get(`${this.api}list.php`);
+				boxes = await rest.get(`${this.api}list.php`);
+			}
+			catch (error) {
+				console.warn('fail connecting to Doodle3D server', error);
+				return;
+			}
 
 			if (this.checkNonServerBoxes) {
-					boxes = boxes.concat(this.nonServerBoxes);
+				boxes = [...boxes, ...this.nonServerBoxes];
 			}
 
 			let knownIPs = this.boxes.map((box) => box.boxData.localip);
@@ -85,10 +96,6 @@ export default class extends EventDispatcher {
 			}
 
 			resolve();
-			}
-			catch (error) {
-				console.warn('fail connecting to Doodle3D server');
-			}
 		});
 	}