pinokiod 3.10.1 → 3.10.2

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.
Files changed (5) hide show
  1. package/package.json +1 -1
  2. package/server/index.js +5 -0
  3. package/server/public/commander.js +3 -0
  4. package/server/views/network.ejs +1 -0
  5. package/server/views/shell.ejs +8 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pinokiod",
3
- "version": "3.10.1",
3
+ "version": "3.10.2",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/server/index.js CHANGED
@@ -3055,6 +3055,7 @@ class Server {
3055
3055
  // params.set("kill", "/Logged in/i")
3056
3056
  params.set("kill_message", "Click to return home")
3057
3057
  params.set("callback", encodeURIComponent("/github"))
3058
+ params.set("target", "_top")
3058
3059
  params.set("id", id)
3059
3060
  let url = `/shell/${id}?${params.toString()}`
3060
3061
  res.redirect(url)
@@ -3069,6 +3070,7 @@ class Server {
3069
3070
  params.set("kill_message", "Click to return home")
3070
3071
  params.set("callback", encodeURIComponent("/github"))
3071
3072
  params.set("id", id)
3073
+ params.set("target", "_top")
3072
3074
  let url = `/shell/${id}?${params.toString()}`
3073
3075
  res.redirect(url)
3074
3076
  }))
@@ -3092,6 +3094,7 @@ class Server {
3092
3094
  params.set("kill_message", "Your Github account is now connected.")
3093
3095
  params.set("callback", encodeURIComponent("/github"))
3094
3096
  params.set("id", id)
3097
+ params.set("target", "_top")
3095
3098
  let url = `/shell/${id}?${params.toString()}`
3096
3099
  res.redirect(url)
3097
3100
  }))
@@ -3113,6 +3116,7 @@ class Server {
3113
3116
 
3114
3117
  // create a new term from cwd
3115
3118
  let id = decodeURIComponent(req.params.id)
3119
+ let target = req.query.target ? req.query.target : null
3116
3120
  let cwd = this.kernel.path(this.kernel.api.filePath(decodeURIComponent(req.query.path)))
3117
3121
  let message = req.query.message ? decodeURIComponent(req.query.message) : null
3118
3122
  //let message = req.query.message ? req.query.message : null
@@ -3152,6 +3156,7 @@ class Server {
3152
3156
 
3153
3157
  let shell = this.kernel.shell.get(id)
3154
3158
  res.render("shell", {
3159
+ target,
3155
3160
  filepath: cwd,
3156
3161
  theme: this.theme,
3157
3162
  agent: this.agent,
package/server/public/commander.js CHANGED
@@ -25,6 +25,9 @@ const Commander = async (config) => {
25
25
  if (config.venv) {
26
26
  search_params.set("venv", config.venv)
27
27
  }
28
+ if (config.target) {
29
+ search_params.set("target", config.target)
30
+ }
28
31
 
29
32
  // env
30
33
  if (config.env) {
package/server/views/network.ejs CHANGED
@@ -668,6 +668,7 @@ document.querySelector("#advanced-label").addEventListener("click", (e) => {
668
668
  title: "Custom Router",
669
669
  placeholder: "enter a custom router git url",
670
670
  description: `<div>you can write your own custom routers to handle custom request handling for any port <a target="_blank" href="<%=docs%>">Learn more</a></div>`,
671
+ target: "_top",
671
672
  message: (url) => {
672
673
  let name = new URL(url).pathname.split("/").slice(-2).join("_")
673
674
  return encodeURIComponent(`git clone ${url} ${name}`)
package/server/views/shell.ejs CHANGED
@@ -198,8 +198,6 @@ document.addEventListener("DOMContentLoaded", async () => {
198
198
  await this.socket.close()
199
199
 
200
200
  let query = Object.fromEntries(new URLSearchParams(location.search))
201
- console.log(">>>>>>>> 1")
202
-
203
201
  let firstPacketReceived = false
204
202
  this.socket.run({
205
203
  //method: "kernel.bin.shell_start",
@@ -208,7 +206,7 @@ document.addEventListener("DOMContentLoaded", async () => {
208
206
  message: "<%-message%>",
209
207
  <% } %>
210
208
  <% if (venv) { %>
211
- venv: "<%=venv%>",
209
+ venv: "<%-JSON.stringify(venv).slice(1, -1)%>",
212
210
  <% } %>
213
211
  <% if (kill) { %>
214
212
  on: [{
@@ -760,9 +758,15 @@ document.addEventListener("DOMContentLoaded", async () => {
760
758
  </script>
761
759
  </head>
762
760
  <body class='<%=theme%>'>
763
- <header class='navheader grabbable'>
761
+ <% if (target === "_top") { %>
762
+ <header class='navheader grabbable'>
763
+ <% } else { %>
764
+ <header class='navheader3'>
765
+ <% } %>
764
766
  <h1>
767
+ <% if (target === "_top") { %>
765
768
  <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
769
+ <% } %>
766
770
  <div class='hidden btn run play-btn'>
767
771
  <span class='play'><i class="fa-solid fa-play"></i> Start</span>
768
772
  </div>