pinokiod 3.2.149 → 3.2.150

package/kernel/python/index.js

@@ -22,7 +22,7 @@ class Python {
       } else {
         console.log("request unsuccessful. retrying in 3 seconds...")
         ondata({
-          raw: "\r\nrequest successful. retrying in 3 seconds...\r\n"
+          raw: "\r\nrequest unsuccessful. retrying in 3 seconds...\r\n"
         })
         await new Promise((resolve, reject) => {
           setTimeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.149",
+  "version": "3.2.150",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -226,6 +226,18 @@ class Server {
     let rawpath = "/api/" + name
     let config  = (await this.kernel.loader.load(app_path)).resolved
 
+    let error = null
+    if (config && config.version) {
+      let coerced = semver.coerce(config.version)
+      console.log("version", { coerced, v: config.version })
+      if (semver.satisfies(coerced, this.kernel.schema)) {
+        console.log("semver satisfied", config.version, this.kernel.schema)
+      } else {
+        console.log("semver NOT satisfied", config.version, this.kernel.schema)
+        error = `Please update Pinokio to the latest version (current script version: ${config.version}, supported: ${this.kernel.schema}`
+      }
+    }
+
 
 
 //    let requires_instantiation = false
@@ -316,6 +328,7 @@ class Server {
     const env = await this.kernel.env("api/" + name)
 
     res.render("app", {
+      error,
       env,
       mode,
       port: this.port,
@@ -398,6 +411,7 @@ class Server {
       } catch (e) {
 //        console.log("ERROR", e)
       }
+
     }
 
 //    if (pathComponents.length > 1) {
@@ -1159,6 +1173,7 @@ class Server {
           let p = path.resolve(uri, item.name, "pinokio.js")
           let config  = (await this.kernel.loader.load(p)).resolved
           if (config) {
+            /*
             if (config.version) {
               let coerced = semver.coerce(config.version)
               console.log("version", { coerced, v: config.version })
@@ -1169,6 +1184,7 @@ class Server {
                 error = `Please update Pinokio to the latest version (current script version: ${config.version}, supported: ${this.kernel.schema}`
               }
             }
+            */
 //            if (config.run) {
 //              items[i].run = config.run
 //            }

package/server/views/app.ejs

@@ -399,6 +399,20 @@ nav .logo {
   font-size: 14px;
   padding: 10px;
 }
+nav.error-message .btn {
+  letter-spacing: 0px;
+  background: royalblue;
+  font-size: 20px;
+  padding: 10px 20px;
+}
+nav.error-message {
+  background: yellow !important;
+  flex-grow: 1;
+  padding: 50px;
+  font-size: 40px;
+  color: black;
+  letter-spacing: -2px;
+}
 body.dark #location {
   color: white;
 }
@@ -550,14 +564,6 @@ body.dark .loader-container {
 </head>
 <body class='<%=theme%>' data-platform="<%=platform%>">
 <aside class='active'>
-  <!--
-  <div class='footer'>
-    <button class='btn header-item' id='clone-tab'><i class='fa-regular fa-copy'></i></button>
-    <a class='btn header-item' id='open-browser' target="_blank" href="" features="browser"><i class="fa-solid fa-square-arrow-up-right"></i></a>
-    <button class='btn header-item' id='reload'><i class="fa-solid fa-rotate-right"></i></button>
-    <div id='new-tab' class='btn header-item'><i class="fa-solid fa-plus"></i></div>
-  </div>
-  -->
   <div class='header-top header-item'>
     <div class='app-info'>
       <% if (config.icon) { %>
@@ -622,41 +628,49 @@ body.dark .loader-container {
   </div>
   -->
 </aside>
-<div class='container'>
-  <nav>
-    <div class='bar'>
-      <button class='btn2' id='menu-mobile'><i class="fa-solid fa-bars"></i></button>
-      <button class='btn2' id='menu'>
-        <img src="<%=rawpath%>/<%=config.icon%>?raw=true"/>
-        <i class="fa-solid fa-arrow-right-to-bracket fa-rotate-180"></i>
-      </button>
-      <% if (agent === "electron") { %>
-        <button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
-        <button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
-      <% } %>
-      <button class='btn2' id='reload'><i class="fa-solid fa-rotate-right"></i> Refresh</button>
-      <% if (agent === "electron") { %>
-        <a class='btn2' id='open-browser' target="_blank" href="" features="browser"><i class="fa-solid fa-square-arrow-up-right"></i> Popout</a>
-      <% } else { %>
-        <a class='btn2' id='open-browser' target="_blank" href=""><i class="fa-solid fa-square-arrow-up-right"></i> Popout</a>
-      <% } %>
-      <button class='btn2' id='clone-tab'><i class='fa-regular fa-copy'></i> Clone</button>
-      <div id='new-tab' class='btn2'><i class="fa-solid fa-plus"></i> Tab</div>
-      <input type='url' id='location' readonly>
-    </div>
+<% if (error) { %>
+  <nav class='error-message'>
+    <div><i class="fa-solid fa-rotate"></i> <%=error%></div>
+    <div class='flexible'></div>
+    <a class='btn' target="_blank" href="https://program.pinokio.computer/#/?id=install">Download</a>
   </nav>
-  <main class='browserview'>
-    <% if (false) { %>
-      <% if (config.menu) { %>
-        <% config.menu.forEach((item) => { %>
-          <% if (item.btn && item.src) { %>
-            <iframe name='<%=item.src%>' class='hidden'></iframe>
-          <% } %>
-        <% }) %>
+<% } else { %>
+  <div class='container'>
+    <nav>
+      <div class='bar'>
+        <button class='btn2' id='menu-mobile'><i class="fa-solid fa-bars"></i></button>
+        <button class='btn2' id='menu'>
+          <img src="<%=rawpath%>/<%=config.icon%>?raw=true"/>
+          <i class="fa-solid fa-arrow-right-to-bracket fa-rotate-180"></i>
+        </button>
+        <% if (agent === "electron") { %>
+          <button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
+          <button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
+        <% } %>
+        <button class='btn2' id='reload'><i class="fa-solid fa-rotate-right"></i> Refresh</button>
+        <% if (agent === "electron") { %>
+          <a class='btn2' id='open-browser' target="_blank" href="" features="browser"><i class="fa-solid fa-square-arrow-up-right"></i> Popout</a>
+        <% } else { %>
+          <a class='btn2' id='open-browser' target="_blank" href=""><i class="fa-solid fa-square-arrow-up-right"></i> Popout</a>
+        <% } %>
+        <button class='btn2' id='clone-tab'><i class='fa-regular fa-copy'></i> Clone</button>
+        <div id='new-tab' class='btn2'><i class="fa-solid fa-plus"></i> Tab</div>
+        <input type='url' id='location' readonly>
+      </div>
+    </nav>
+    <main class='browserview'>
+      <% if (false) { %>
+        <% if (config.menu) { %>
+          <% config.menu.forEach((item) => { %>
+            <% if (item.btn && item.src) { %>
+              <iframe name='<%=item.src%>' class='hidden'></iframe>
+            <% } %>
+          <% }) %>
+        <% } %>
       <% } %>
-    <% } %>
-  </main>
-</div>
+    </main>
+  </div>
+<% } %>
 <script>
 let loaded = {}
 let cursorIndex = 0;