Purge build dir after 10mins

esm-dev · Apr 24, 2023 · d4f69cd · d4f69cd
1 parent ff8c39b
commit d4f69cd
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/server/build.go b/server/build.go
@@ -56,10 +56,11 @@ func (task *BuildTask) Build() (esm *ESMBuild, err error) {
  task.Deprecated = p.Deprecated
  }
 
+ versionName := task.Pkg.VersionName()
  if task.wd == "" {
- task.wd = path.Join(cfg.WorkDir, fmt.Sprintf("npm/%s", task.Pkg.VersionName()))
- ensureDir(task.wd)
+ task.wd = path.Join(cfg.WorkDir, fmt.Sprintf("npm/%s", versionName))
 
+ err = ensureDir(task.wd)
  if err != nil {
  return
  }
@@ -76,6 +77,22 @@ func (task *BuildTask) Build() (esm *ESMBuild, err error) {
  }
  }
 
+ purgeDelay := 10 * time.Minute
+ v, loaded := purgeTimers.LoadAndDelete(versionName)
+ if loaded {
+ if t, ok := v.(*time.Timer); ok {
+ t.Stop()
+ }
+ }
+ defer func() {
+ wd := task.wd
+ purgeTimers.Store(versionName, time.AfterFunc(purgeDelay, func() {
+ purgeTimers.Delete(versionName)
+ log.Debugf("Purging %s...", versionName)
+ os.RemoveAll(wd)
+ }))
+ }()
+
  task.stage = "install"
  err = installPackage(task.wd, task.Pkg)
  if err != nil {

diff --git a/server/node_services.go b/server/node_services.go
@@ -95,7 +95,7 @@ func startNodeServices() (err error) {
  }
 
  // install services
- cmd := exec.Command("pnpm", "add", "esm-node-services")
+ cmd := exec.Command("pnpm", "add", "esm-node-services@0.7.14")
  cmd.Dir = wd
  var output []byte
  output, err = cmd.CombinedOutput()

diff --git a/server/server.go b/server/server.go
@@ -31,6 +31,7 @@ var (
  embedFS EmbedFS
  fetchLock sync.Map
  installLock sync.Map
+ purgeTimers sync.Map
 )
 
 type EmbedFS interface {

diff --git a/server/server_handler.go b/server/server_handler.go
@@ -209,9 +209,9 @@ func getHandler() rex.Handle {
  return rex.Content("index.html", startTime, bytes.NewReader(html))
 
  case "/status.json":
- buildQueue.lock.RLock()
  q := make([]map[string]interface{}, buildQueue.list.Len())
  i := 0
+ buildQueue.lock.RLock()
  for el := buildQueue.list.Front(); el != nil; el = el.Next() {
  t, ok := el.Value.(*queueTask)
  if ok {
@@ -236,6 +236,13 @@ func getHandler() rex.Handle {
  }
  }
  buildQueue.lock.RUnlock()
+
+ n := 0
+ purgeTimers.Range(func(key, value interface{}) bool {
+ n++
+ return true
+ })
+
  res, err := fetch(fmt.Sprintf("http://localhost:%d", cfg.NsPort))
  if err != nil {
  kill(nsPidFile)
@@ -246,12 +253,14 @@ func getHandler() rex.Handle {
  if err != nil {
  return err
  }
+
  ctx.SetHeader("Cache-Control", "private, no-store, no-cache, must-revalidate")
  return map[string]interface{}{
- "buildQueue": q[:i],
- "ns": string(out),
- "version": VERSION,
- "uptime": time.Since(startTime).String(),
+ "buildQueue": q[:i],
+ "purgeTimers": n,
+ "ns": string(out),
+ "version": VERSION,
+ "uptime": time.Since(startTime).String(),
  }
 
  case "/build-target":