feat: cleanup unused fpm versions

develar · develar · commit 633d00625cdf · 2016-05-09T19:28:41.000+02:00
diff --git a/.idea/dictionaries/develar.xml b/.idea/dictionaries/develar.xml
diff --git a/.travis.yml b/.travis.yml
@@ -49,7 +49,8 @@ script:
 - npm run test
 
 after_success:
-  - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" ]]; then npm run semantic-release ; fi
+- node out/cleanup.js
+- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" ]]; then npm run semantic-release ; fi
 
 branches:
   except:
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   ],
   "bin": {
     "build": "./out/build-cli.js",
+    "cleanup": "./out/cleanup.js",
     "install-app-deps": "./out/install-app-deps.js"
   },
   "scripts": {
diff --git a/src/cleanup.ts b/src/cleanup.ts
@@ -0,0 +1,62 @@
+#! /usr/bin/env node
+
+import { homedir } from "os"
+import { readdir, lstat, Stats, remove, readFile } from "fs-extra-p"
+import { Promise as BluebirdPromise } from "bluebird"
+import * as path from "path"
+
+//noinspection JSUnusedLocalSymbols
+const __awaiter = require("./awaiter")
+
+async function main() {
+  const dir = path.join(homedir(), ".cache", "fpm")
+  let items: string[] | null = null
+  try {
+    items = await readdir(dir)
+  }
+  catch (e) {
+    if (e.code !== "ENOENT") {
+      throw e
+    }
+    return
+  }
+
+  await BluebirdPromise.map(items, <(item: string) => BluebirdPromise<any>> (async (it) => {
+    let stat: Stats | null = null
+    const itemPath = path.join(dir, it)
+    try {
+      stat = await lstat(itemPath)
+    }
+    catch (e) {
+      if (e.code !== "ENOENT") {
+        throw e
+      }
+      return
+    }
+
+    if (!stat!.isDirectory() || !(await isRecentlyUsed(itemPath))) {
+      console.log(`remove unused ${itemPath}`)
+      await remove(itemPath)
+    }
+  }))
+
+  await BluebirdPromise.map(items, remove)
+}
+
+async function isRecentlyUsed(dir: string) {
+  try {
+    const lastUsed = parseInt(await readFile(path.join(dir, ".lastUsed"), "utf8"), 10)
+    if (!isNaN(lastUsed) && (Date.now() - lastUsed) < 3600000) {
+      return true
+    }
+  }
+  catch (e) {
+    if (e.code !== "ENOENT") {
+      throw e
+    }
+  }
+
+  return false
+}
+
+main()
diff --git a/src/codeSign.ts b/src/codeSign.ts
@@ -30,7 +30,7 @@ function downloadUrlOrBase64(urlOrBase64: string, destination: string): Bluebird
     return download(urlOrBase64, destination)
   }
   else {
-    return outputFile(destination, Buffer.from(urlOrBase64, "base64"))
+    return outputFile(destination, new Buffer(urlOrBase64, "base64"))
   }
 }
 
diff --git a/src/fpmDownload.ts b/src/fpmDownload.ts
@@ -1,10 +1,11 @@
 import { statOrNull, spawn, debug, debug7z } from "./util"
-import { readdir, mkdirs, move, remove } from "fs-extra-p"
+import {  rename, remove } from "fs-extra-p"
 import { download } from "./httpRequest"
 import { path7za } from "7zip-bin"
 import * as path from "path"
 import { homedir } from "os"
 import { Promise as BluebirdPromise } from "bluebird"
+import { writeFile } from "fs"
 
 //noinspection JSUnusedLocalSymbols
 const __awaiter = require("./awaiter")
@@ -47,9 +48,6 @@ async function doDownloadFpm(version: string, osAndArch: string): Promise<string
     return path.join(fpmDir, "fpm")
   }
 
-  // the only version currently supported (i.e. all clients are consumed the same version
-  await emptyDir(cacheDir, dirName)
-
   // 7z cannot be extracted from the input stream, temp file is required
   const tempName = getTempName()
   const archiveName = path.join(cacheDir, tempName + ".7z")
@@ -68,27 +66,18 @@ async function doDownloadFpm(version: string, osAndArch: string): Promise<string
     stdio: ["ignore", debug.enabled ? "inherit" : "ignore", "inherit"],
   })
 
-  await BluebirdPromise.all([move(path.join(tempUnpackDir, dirName), fpmDir, {clobber: true}), remove(archiveName)])
-  await remove(tempUnpackDir)
+  await BluebirdPromise.all<any>([
+    rename(path.join(tempUnpackDir, dirName), fpmDir)
+      .catch(e => {
+        console.warn("Cannot move downloaded fpm into final location (another process downloaded faster?): " + e)
+      }),
+    remove(archiveName),
+  ])
+  await BluebirdPromise.all([
+    remove(tempUnpackDir),
+    writeFile(path.join(fpmDir, ".lastUsed"), Date.now().toString())
+  ])
 
   debug(`fpm downloaded to ${fpmDir}`)
   return path.join(fpmDir, "fpm")
-}
-
-// prefix to not delete dir or archived dir (.7z)
-async function emptyDir(dir: string, excludeNamePrefix: string) {
-  let items: string[] | null = null
-  try {
-    items = await readdir(dir)
-  }
-  catch (e) {
-    await mkdirs(dir)
-    return
-  }
-
-  items = items!
-    .filter(it => !it.startsWith(excludeNamePrefix))
-    .map(it => path.join(dir, it))
-
-  await BluebirdPromise.map(items, remove)
 }
diff --git a/test/src/ArtifactPublisherTest.ts b/test/src/ArtifactPublisherTest.ts
@@ -14,7 +14,7 @@ function versionNumber() {
   return getRandomInt(0, 99) + "." + Date.now() + "." + getRandomInt(0, 9)
 }
 
-const token = Buffer.from("Y2Y5NDdhZDJhYzJlMzg1OGNiNzQzYzcwOWZhNGI0OTk2NWQ4ZDg3Yg==", "base64").toString()
+const token = new Buffer("Y2Y5NDdhZDJhYzJlMzg1OGNiNzQzYzcwOWZhNGI0OTk2NWQ4ZDg3Yg==", "base64").toString()
 const iconPath = join(__dirname, "..", "fixtures", "test-app", "build", "icon.icns")
 
 //test("GitHub unauthorized", async (t) => {
diff --git a/tsconfig.json b/tsconfig.json
@@ -59,6 +59,7 @@
     "src/awaiter.ts",
     "src/build-cli.ts",
     "src/builder.ts",
+    "src/cleanup.ts",
     "src/codeSign.ts",
     "src/errorMessages.ts",
     "src/fpmDownload.ts",

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function downloadUrlOrBase64(urlOrBase64: string, destination: string): Bluebird`
`30`	`30`	`return download(urlOrBase64, destination)`
`31`	`31`	`}`
`32`	`32`	`else {`
`33`		`- return outputFile(destination, Buffer.from(urlOrBase64, "base64"))`
	`33`	`+ return outputFile(destination, new Buffer(urlOrBase64, "base64"))`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function versionNumber() {`
`14`	`14`	`return getRandomInt(0, 99) + "." + Date.now() + "." + getRandomInt(0, 9)`
`15`	`15`	`}`
`16`	`16`
`17`		`-const token = Buffer.from("Y2Y5NDdhZDJhYzJlMzg1OGNiNzQzYzcwOWZhNGI0OTk2NWQ4ZDg3Yg==", "base64").toString()`
	`17`	`+const token = new Buffer("Y2Y5NDdhZDJhYzJlMzg1OGNiNzQzYzcwOWZhNGI0OTk2NWQ4ZDg3Yg==", "base64").toString()`
`18`	`18`	`const iconPath = join(__dirname, "..", "fixtures", "test-app", "build", "icon.icns")`
`19`	`19`
`20`	`20`	`//test("GitHub unauthorized", async (t) => {`