pinokiod 3.2.42 → 3.2.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/bin/index.js +6 -6
- package/kernel/shell.js +0 -10
- package/package.json +1 -1
package/kernel/bin/index.js
CHANGED
|
@@ -472,12 +472,12 @@ class Bin {
|
|
|
472
472
|
console.log("## Before m.mod.install", requirement)
|
|
473
473
|
await m.mod.install(requirement, ondata, this.kernel)
|
|
474
474
|
|
|
475
|
-
// 2 second delay to fix conda issue
|
|
476
|
-
await new Promise((resolve, reject) => {
|
|
477
|
-
setTimeout(() => {
|
|
478
|
-
resolve()
|
|
479
|
-
}, 2000)
|
|
480
|
-
})
|
|
475
|
+
// // 2 second delay to fix conda issue
|
|
476
|
+
// await new Promise((resolve, reject) => {
|
|
477
|
+
// setTimeout(() => {
|
|
478
|
+
// resolve()
|
|
479
|
+
// }, 2000)
|
|
480
|
+
// })
|
|
481
481
|
console.log("## After m.mod.install", requirement)
|
|
482
482
|
break
|
|
483
483
|
}
|
package/kernel/shell.js
CHANGED
|
@@ -605,8 +605,6 @@ class Shell {
|
|
|
605
605
|
conda_activation = []
|
|
606
606
|
}
|
|
607
607
|
|
|
608
|
-
console.log({ conda_activation })
|
|
609
|
-
|
|
610
608
|
// Visual Studio Build Tools (Exception)
|
|
611
609
|
// only add conda env if conda exists
|
|
612
610
|
// if (conda_activation.length > 0) {
|
|
@@ -691,7 +689,6 @@ class Shell {
|
|
|
691
689
|
this.done = false
|
|
692
690
|
this.ptyProcess = pty.spawn(this.shell, this.args, config)
|
|
693
691
|
this.ptyProcess.onData((data) => {
|
|
694
|
-
console.log("> onData", { done: this.done, data })
|
|
695
692
|
if (!this.done) {
|
|
696
693
|
this.queue.push(data)
|
|
697
694
|
}
|
|
@@ -708,7 +705,6 @@ class Shell {
|
|
|
708
705
|
return res
|
|
709
706
|
}
|
|
710
707
|
stop(message) {
|
|
711
|
-
console.log("STOP", { message })
|
|
712
708
|
return this.kill(message)
|
|
713
709
|
}
|
|
714
710
|
continue(message) {
|
|
@@ -723,7 +719,6 @@ class Shell {
|
|
|
723
719
|
}
|
|
724
720
|
}
|
|
725
721
|
kill(message, force) {
|
|
726
|
-
console.log("KILL", { message, force })
|
|
727
722
|
|
|
728
723
|
this.done = true
|
|
729
724
|
this.ready = false
|
|
@@ -834,7 +829,6 @@ ${cleaned}
|
|
|
834
829
|
this.vt.write(msg, () => {
|
|
835
830
|
let buf = this.vts.serialize()
|
|
836
831
|
let cleaned = this.stripAnsi(buf)
|
|
837
|
-
console.log({ buf, cleaned })
|
|
838
832
|
let response = {
|
|
839
833
|
id: this.id,
|
|
840
834
|
raw: msg,
|
|
@@ -844,19 +838,16 @@ ${cleaned}
|
|
|
844
838
|
if (this.cb) this.cb(response)
|
|
845
839
|
|
|
846
840
|
// Decide whether to kill or continue
|
|
847
|
-
console.log("this.ready", this.ready)
|
|
848
841
|
if (this.ready) {
|
|
849
842
|
// when ready, watch out for the prompt pattern that terminates with [\r\n ]
|
|
850
843
|
let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
|
|
851
844
|
let line = cleaned.replaceAll(/[\r\n]/g, "")
|
|
852
845
|
let test = line.match(termination_prompt_re)
|
|
853
|
-
console.log(">>>>>>>>", { line, test, termination_prompt_re })
|
|
854
846
|
if (test) {
|
|
855
847
|
let cache = cleaned
|
|
856
848
|
let cached_msg = msg
|
|
857
849
|
// todo: may need to handle cases when the command returns immediately with no output (example: 'which brew' returns immediately with no text if brew doesn't exist)
|
|
858
850
|
setTimeout(() => {
|
|
859
|
-
console.log({ cache, cleaned })
|
|
860
851
|
if (cache === cleaned) {
|
|
861
852
|
if (this.persistent) {
|
|
862
853
|
if (this.cb) this.cb({
|
|
@@ -884,7 +875,6 @@ ${cleaned}
|
|
|
884
875
|
// when not ready, wait for the first occurence of the prompt pattern.
|
|
885
876
|
let prompt_re = new RegExp(this.prompt_pattern, "g")
|
|
886
877
|
let test = cleaned.replaceAll(/[\r\n]/g, "").match(prompt_re)
|
|
887
|
-
console.log(">>>>>>>>", { cleaned, test, prompt_re })
|
|
888
878
|
if (test) {
|
|
889
879
|
if (test.length > 0) {
|
|
890
880
|
this.ready = true
|