Merge pull request #4 from arduino/bugfix/save-large-files

Bugfix/save large files

Author: murilopolese

micropython.js

@@ -39,9 +39,8 @@ gc.collect()`
 class SerialConnection extends EventEmitter {
 	constructor() {
 		super()
+		this.executing = false
 		this.rawRepl = false
-		this.loadingFile = false
-		this.loadingFileList = false
 	}
 	/**
 	* List all available serial ports (with vendor id)
@@ -91,13 +90,15 @@ class SerialConnection extends EventEmitter {
 	* @param {String} code String of code to be executed. Line breaks must be `\n`
 	*/
 	execute(code) {
+		this.emit('execution-started')
 		// TODO: break code in lines and `_execRaw` line by line
 		this.stop()
 		this._enterRawRepl()
 		this._executeRaw(code)
-		.then(() => {
-			this._exitRawRepl()
-		})
+			.then(() => {
+				this.emit('execution-finished')
+				this._exitRawRepl()
+			})
 	}
 	/**
 	* Evaluate a command/expression.
@@ -125,7 +126,6 @@ class SerialConnection extends EventEmitter {
 	*/
 	listFiles() {
 		this.data = ''
-		this.loadingFileList = true
 		this.execute(codeListFiles)
 	}
 	/**
@@ -134,7 +134,6 @@ class SerialConnection extends EventEmitter {
 	*/
 	loadFile(path) {
 		this.data = ''
-		this.loadingFile = true
 		this.execute(codeLoadFile(path))
 	}
 	/**
@@ -152,23 +151,23 @@ class SerialConnection extends EventEmitter {
 		pCode += codeCollectGarbage + '\n'
 		// `content` is what comes from the editor. We want to write it
 		// line one by one on a file so we split by `\n`
-		var lineCount = 0;
-		var lines = content.split('\r\n')
-		lines.forEach((line) => {
+		let lines = content.split('\r\n')
+		lines.forEach((line, lineCount) => {
 			if (line) {
-				var nlMarker = line.indexOf('\n');
-				var crMarker = line.indexOf('\r');
 				// TODO: Sanitize line replace """ with \"""
 				// To avoid the string escaping with weirdly we encode
 				// the line plus the `\n` that we just removed to base64
 				pCode += `f.write("""${line}""")`
 				if(lineCount != lines.length - 1){
 					pCode += `\nf.write('\\n')\n`
 				}
-				lineCount++;
 			}
 		})
 		pCode += `\nf.close()\n`
+
+		this.once('execution-finished', () => {
+			this.emit('file-saved')
+		})
 		this.execute(pCode)
 	}
 
@@ -190,39 +189,6 @@ class SerialConnection extends EventEmitter {
 	_eventHandler(buffer) {
 		const data = buffer.toString()
 		this.emit('output', data)
-
-		// Getting data that should be sent to frontend
-		// Loading file content, listing files, etc
-		// if (data.indexOf('<REC>') !== -1) {
-		// 	this.recordingData = true
-		// }
-		// if (this.recordingData) {
-		// 	this.data += data
-		// }
-		// if (data.indexOf('<EOF>') !== -1) {
-		// 	const iofREC = this.data.indexOf('<REC>')
-		// 	const rec = this.data.indexOf('<REC>\r\n')+7
-		// 	const eof = this.data.indexOf('<EOF>')
-		// 	if (this.loadingFile) {
-		// 		this.emit('file-loaded', this.data.slice(rec, eof))
-		// 		this.loadingFile = false
-		// 	}
-		// 	if (this.loadingFileList) {
-		// 		this.emit('file-list-loaded', this.data.slice(rec, eof))
-		// 		this.loadingFileList = false
-		// 	}
-		// 	this.recordingData = false
-		// }
-
-		if (this.rawRepl && data.indexOf('\n>>> ') != -1) {
-			this.emit('execution-finished')
-			this.rawRepl = false
-		}
-
-		if (!this.rawRepl && data.indexOf('raw REPL;') != -1) {
-			this.emit('execution-started')
-			this.rawRepl = true
-		}
 	}
 	/**
 	* Put REPL in raw mode
@@ -241,32 +207,21 @@ class SerialConnection extends EventEmitter {
 	* @param {String} command Command to be written on connected port
 	*/
 	_executeRaw(command) {
-		const writePromise = (buffer) => {
-			return new Promise((resolve, reject) => {
-				setTimeout(() => {
-					this.port.write(buffer, (err) => {
-						if (err) return reject()
-						resolve()
-					})
-				}, 1)
-			})
-		}
-		const l = 1024
-		let slices = []
-		for(let i = 0; i < command.length; i+=l) {
-			let slice = command.slice(i, i+l)
-			slices.push(slice)
-		}
+		let p = 0
+		const l = 256
 		return new Promise((resolve, reject) => {
-			slices.reduce((cur, next) => {
-				return cur.then(() => {
-					return writePromise(next)
-				})
-			}, Promise.resolve())
-			.then()
-			.then(() => {
+			for(let i = 0; i < command.length; i+=l) {
+				let slice = command.slice(i, i+l)
+				setTimeout(() => {
+					this.port.write(slice)
+				}, p*10)
+				p += 1
+			}
+			let finished = (command.length / l) + 1
+			setTimeout(() => {
+				this.port.write('\x04')
 				resolve()
-			})
+			}, finished * 10)
 		})
 	}
 }

preload.js

@@ -35,11 +35,15 @@ serialBus.on('connect', (p) => {
 	})
 	connection.on('execution-started', () => {
 		console.log('serialBus', 'execution-started')
-		serialBus.emit('running')
+		serialBus.emit('execution-started')
 	})
 	connection.on('execution-finished', () => {
 		console.log('serialBus', 'execution-finished')
-		serialBus.emit('stopped')
+		serialBus.emit('execution-finished')
+	})
+	connection.on('file-saved', () => {
+		console.log('serialBus', 'file-saved')
+		serialBus.emit('file-saved')
 	})
 	connection.open(p)
 })

ui/blank/store.js

@@ -1,5 +1,7 @@
 function store(state, emitter) {
   state.connected = false
+  state.executing = false
+
   state.isPortDialogOpen = false
   state.ports = []
   state.panel = 'terminal' // terminal | files
@@ -92,27 +94,23 @@ function store(state, emitter) {
 
   emitter.on('list-board-folder', () => {
     console.log('list-board-folder')
-
     let outputBuffer = ''
     function parseData(o) {
       outputBuffer += o
       rawMessage = extractREPLMessage(outputBuffer)
       if (rawMessage) {
+        // console.log('raw message', rawMessage, outputBuffer)
         // Prepare to parse JSON
-        // console.log('raw message', rawMessage)
         rawMessage = rawMessage.replace(/'/g, `"`)
         try {
           let jsonMessage = JSON.parse(rawMessage)
           state.boardFiles = jsonMessage
           emitter.emit('render')
-        } catch(e) {
-
-        }
+        } catch(e) {}
         window.serialBus.off('data', parseData)
       }
     }
     window.serialBus.on('data', parseData)
-
     window.serialBus.emit('list-files')
   })
   emitter.on('select-board-file', (file) => {
@@ -131,9 +129,7 @@ function store(state, emitter) {
       }
     }
     window.serialBus.on('data', parseData)
-
     window.serialBus.emit('load-file', file)
-
     emitter.emit('render')
   })
 
@@ -164,19 +160,15 @@ function store(state, emitter) {
     }
 
     if (state.selectedDevice === 'disk') {
-      window.diskBus.emit(
-        'save-file',
-        {
-          folder: state.diskFolder,
-          filename: state.selectedFile,
-          content: editor.getValue()
-        }
-      )
+      window.diskBus.emit( 'save-file', {
+        folder: state.diskFolder,
+        filename: state.selectedFile,
+        content: editor.getValue()
+      })
     }
 
     if (state.selectedDevice === 'board') {
       window.serialBus.emit('save-file', state.selectedFile, editor.getValue())
-      setTimeout(() => emitter.emit('list-board-folder'), 100)
     }
   })
   emitter.on('remove-file', () => {
@@ -252,10 +244,8 @@ function store(state, emitter) {
     console.log('send-file-to-board')
     let editor = state.cache(AceEditor, 'editor').editor
     window.serialBus.emit('save-file', state.selectedFile, editor.getValue())
-    emitter.emit('update-files')
   })
 
-
   window.serialBus.on('connected', (port) => {
     console.log('serialBus', 'connected', port)
     state.connected = true
@@ -264,11 +254,6 @@ function store(state, emitter) {
     emitter.emit('list-board-folder')
     emitter.emit('render')
   })
-  window.serialBus.on('serialBus', (port) => {
-    console.log('serialBus', 'disconnected', port)
-    state.connected = false
-    emitter.emit('render')
-  })
   window.serialBus.on('ports', (ports) => {
     console.log('serialBus', 'ports', ports)
     state.ports = ports
@@ -279,6 +264,9 @@ function store(state, emitter) {
     state.cache(XTerm, 'terminal').term.write(buffer)
     state.cache(XTerm, 'terminal').term.scrollToBottom()
   })
+  window.serialBus.on('file-saved', () => {
+    setTimeout(() => emitter.emit('update-files'), 100)
+  })
 
   window.diskBus.on('folder-opened', ({ folder, files }) => {
     console.log('diskBus', 'folder-opened', folder, files)