Merge pull request #12 from arduino/bugfix/trimmed-files

murilopolese · web-flow · commit c44ffe6a895f · 2023-07-06T16:27:28.000+02:00
Bugfix/trimmed files
diff --git a/micropython.js b/micropython.js
@@ -19,9 +19,10 @@ function fixLineBreak(str) {
 function extract(out) {
   /*
    * Message ($msg) will come out following this template:
-   * "OK${msg}\x04\x04>"
+   * "OK${msg}\x04${err}\x04>"
+   * TODO: consider error handling
    */
-  return out.slice(2, -3).trim()
+  return out.slice(2, -3)
 }
 
 class MicroPythonBoard {
@@ -114,9 +115,9 @@ class MicroPythonBoard {
   }
 
   async get_prompt() {
-    await sleep(100)
+    await sleep(150)
     await this.stop()
-    await sleep(100)
+    await sleep(150)
     const out = await this.write_and_read_until(`\r\x03\x02`, '\r\n>>>')
     return Promise.resolve(out)
   }
@@ -206,7 +207,7 @@ class MicroPythonBoard {
     await this.enter_raw_repl()
     let output = await this.exec_raw(command)
     await this.exit_raw_repl()
-    const exists = extract(output) == '1'
+    const exists = output[2] == '1'
     return Promise.resolve(exists)
   }
 
@@ -257,7 +258,7 @@ class MicroPythonBoard {
       )
       await this.exit_raw_repl()
       output = extract(output)
-      return Promise.resolve(output)
+      return Promise.resolve(fixLineBreak(output))
     }
     return Promise.reject(new Error(`Path to file was not specified`))
   }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "micropython.js",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Interpretation of pyboard.py in javascript",
   "main": "micropython.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ function fixLineBreak(str) {`
`19`	`19`	`function extract(out) {`
`20`	`20`	`/*`
`21`	`21`	`* Message ($msg) will come out following this template:`
`22`		`- * "OK${msg}\x04\x04>"`
	`22`	`+ * "OK${msg}\x04${err}\x04>"`
	`23`	`+ * TODO: consider error handling`
`23`	`24`	`*/`
`24`		`- return out.slice(2, -3).trim()`
	`25`	`+ return out.slice(2, -3)`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`class MicroPythonBoard {`
`@@ -114,9 +115,9 @@ class MicroPythonBoard {`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`async get_prompt() {`
`117`		`- await sleep(100)`
	`118`	`+ await sleep(150)`
`118`	`119`	`await this.stop()`
`119`		`- await sleep(100)`
	`120`	`+ await sleep(150)`
`120`	`121`	const out = await this.write_and_read_until(`\r\x03\x02`, '\r\n>>>')
`121`	`122`	`return Promise.resolve(out)`
`122`	`123`	`}`
`@@ -206,7 +207,7 @@ class MicroPythonBoard {`
`206`	`207`	`await this.enter_raw_repl()`
`207`	`208`	`let output = await this.exec_raw(command)`
`208`	`209`	`await this.exit_raw_repl()`
`209`		`- const exists = extract(output) == '1'`
	`210`	`+ const exists = output[2] == '1'`
`210`	`211`	`return Promise.resolve(exists)`
`211`	`212`	`}`
`212`	`213`
`@@ -257,7 +258,7 @@ class MicroPythonBoard {`
`257`	`258`	`)`
`258`	`259`	`await this.exit_raw_repl()`
`259`	`260`	`output = extract(output)`
`260`		`- return Promise.resolve(output)`
	`261`	`+ return Promise.resolve(fixLineBreak(output))`
`261`	`262`	`}`
`262`	`263`	return Promise.reject(new Error(`Path to file was not specified`))
`263`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "micropython.js",`
`3`		`- "version": "1.4.1",`
	`3`	`+ "version": "1.4.2",`
`4`	`4`	`"description": "Interpretation of pyboard.py in javascript",`
`5`	`5`	`"main": "micropython.js",`
`6`	`6`	`"scripts": {`