pinokiod 5.0.13 → 5.1.1

package/kernel/bin/git.js

@@ -52,8 +52,8 @@ class Git {
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
   }
-  env(cwd) {
-    const gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+  env() {
+    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
     return {
       GIT_CONFIG_GLOBAL: gitconfig_path,
       GH_CONFIG_DIR: this.kernel.path("config/gh")

package/kernel/git.js

@@ -131,9 +131,25 @@ class Git {
     }
   }
   async findGitDirs(dir, results = []) {
-    const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+    let entries
+    try {
+      entries = await fs.promises.readdir(dir, { withFileTypes: true });
+    } catch (err) {
+      if (err && (err.code === "ENOENT" || err.code === "EACCES")) {
+        return results
+      }
+      throw err
+    }
     for (const entry of entries) {
-      let type = await Util.file_type(dir, entry)
+      let type
+      try {
+        type = await Util.file_type(dir, entry)
+      } catch (err) {
+        if (err && (err.code === "ENOENT" || err.code === "EACCES")) {
+          continue
+        }
+        throw err
+      }
       if (type.directory) {
         if (entry.name === '.git') {
           results.push(path.join(dir, entry.name));
@@ -142,7 +158,14 @@ class Git {
         if (entry.name === 'node_modules' || entry.name === 'venv' || entry.name.startsWith(".")) {
           continue; // skip these heavy folders
         }
-        await this.findGitDirs(path.join(dir, entry.name), results);
+        try {
+          await this.findGitDirs(path.join(dir, entry.name), results);
+        } catch (err) {
+          if (err && (err.code === "ENOENT" || err.code === "EACCES")) {
+            continue
+          }
+          throw err
+        }
       }
     }
     return results;

package/kernel/index.js

@@ -1007,7 +1007,11 @@ class Kernel {
           this.git.init().then(() => {
             this.git.index(this).then(() => {
               //console.log(this.git.mapping)
+            }).catch((err) => {
+              console.warn("Git index error:", err && err.message ? err.message : err)
             })
+          }).catch((err) => {
+            console.warn("Git init error:", err && err.message ? err.message : err)
           })
           this.shell.init().then(async () => {
             this.bin.check({

package/kernel/workspace_status.js

@@ -0,0 +1,111 @@
+const ParcelWatcher = require('@parcel/watcher')
+
+class WorkspaceStatusManager {
+  constructor(options = {}) {
+    this.enableWatchers = options.enableWatchers !== false
+    this.fallbackIntervalMs = typeof options.fallbackIntervalMs === 'number' ? options.fallbackIntervalMs : 60000
+    this.cache = new Map()
+    this.watchers = new Map()
+    this.defaultIgnores = options.ignores && Array.isArray(options.ignores) ? options.ignores : [
+      '**/.git/**',
+      '**/node_modules/**',
+      '**/.venv/**',
+      '**/venv/**',
+      '**/env/**',
+      '**/__pycache__/**',
+      '**/site-packages/**',
+      '**/dist/**',
+      '**/build/**',
+      '**/.cache/**',
+      '**/logs/**',
+      '**/*.log',
+      '**/tmp/**',
+      '**/temp/**',
+      '**/.parcel-cache/**',
+      '**/.webpack/**',
+    ]
+  }
+
+  markDirty(workspaceName) {
+    let entry = this.cache.get(workspaceName)
+    if (!entry) {
+      entry = { dirty: true, inflight: null, data: null, updatedAt: 0 }
+    } else {
+      entry.dirty = true
+    }
+    this.cache.set(workspaceName, entry)
+  }
+
+  async ensureWatcher(workspaceName, workspaceRoot) {
+    if (!this.enableWatchers) {
+      return
+    }
+    if (this.watchers.has(workspaceName)) {
+      return
+    }
+    try {
+      const subscription = await ParcelWatcher.subscribe(
+        workspaceRoot,
+        (error, events) => {
+          if (error) {
+            console.warn('workspace watcher error', workspaceName, error)
+            return
+          }
+          if (events && events.length > 0) {
+            console.log("Events", events)
+            this.markDirty(workspaceName)
+          }
+        },
+        { ignore: this.defaultIgnores }
+      )
+      this.watchers.set(workspaceName, subscription)
+      this.markDirty(workspaceName)
+    } catch (error) {
+      console.warn('workspace watcher unavailable, falling back to polling', workspaceName, error)
+      this.enableWatchers = false
+      this.watchers.clear()
+    }
+  }
+
+  async getStatus(workspaceName, computeStatusFn, workspaceRoot) {
+    let entry = this.cache.get(workspaceName)
+    if (!entry) {
+      entry = { dirty: true, inflight: null, data: null, updatedAt: 0 }
+      this.cache.set(workspaceName, entry)
+    }
+    const now = Date.now()
+    if (entry.updatedAt && (now - entry.updatedAt) > this.fallbackIntervalMs) {
+      entry.dirty = true
+    }
+    if (!this.enableWatchers) {
+      entry.dirty = true
+    }
+
+    if (!entry.dirty && entry.data) {
+      return entry.data
+    }
+    if (entry.inflight) {
+      return entry.inflight
+    }
+
+    if (this.enableWatchers && workspaceRoot) {
+      await this.ensureWatcher(workspaceName, workspaceRoot)
+    }
+
+    entry.inflight = (async () => {
+      const data = await computeStatusFn()
+      entry.data = data
+      entry.dirty = false
+      entry.updatedAt = Date.now()
+      entry.inflight = null
+      return data
+    })().catch((error) => {
+      entry.inflight = null
+      throw error
+    })
+
+    return entry.inflight
+  }
+}
+
+module.exports = WorkspaceStatusManager

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "5.0.13",
+  "version": "5.1.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -86,6 +86,7 @@
     "xterm-addon-serialize": "^0.9.0",
     "xterm-headless": "^5.1.0",
     "yaml": "^2.3.4",
-    "yargs-unparser-custom-flag": "^2.0.0"
+    "yargs-unparser-custom-flag": "^2.0.0",
+    "@parcel/watcher": "^2.4.1"
   }
 }

package/server/index.js

@@ -59,6 +59,7 @@ const Environment = require("../kernel/environment")
 const Cloudflare = require("../kernel/api/cloudflare")
 const Util = require("../kernel/util")
 const Info = require("../kernel/info")
+const WorkspaceStatusManager = require("../kernel/workspace_status")
 
 const Setup = require("../kernel/bin/setup")
 
@@ -120,6 +121,10 @@ class Server {
       /(^|\/)\.pytest_cache\//,
       /(^|\/)\.git\//
     ]
+    this.workspaceStatus = new WorkspaceStatusManager({
+      enableWatchers: process.env.PINOKIO_DISABLE_WATCH === '1' ? false : true,
+      fallbackIntervalMs: 60000,
+    })
 
     // sometimes the C:\Windows\System32 is not in PATH, need to add
     let platform = os.platform()
@@ -854,9 +859,11 @@ class Server {
   async chrome(req, res, type, options) {
 
     let d = Date.now()
+    console.time("bin check")
     let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
       bin: this.kernel.bin.preset("dev"),
     })
+    console.timeEnd("bin check")
     if (!requirements_pending && install_required) {
       res.redirect(`/setup/dev?callback=${req.originalUrl}`)
       return
@@ -7404,7 +7411,12 @@ class Server {
     }))
     this.app.get("/info/gitstatus/:name", ex(async (req, res) => {
       try {
-        const data = await this.computeWorkspaceGitStatus(req.params.name)
+        const workspaceRoot = this.kernel.path("api", req.params.name)
+        const data = await this.workspaceStatus.getStatus(
+          req.params.name,
+          () => this.computeWorkspaceGitStatus(req.params.name),
+          workspaceRoot
+        )
         res.json(data)
       } catch (error) {
         console.error('[git-status] compute error', req.params.name, error)