fix: always revalidate cache

Close #1186

Author: develar

.idea/dictionaries/develar.xml

@@ -73,7 +73,7 @@
     "path-sort": "^0.1.0",
     "source-map-support": "^0.4.10",
     "ts-babel": "^1.3.5",
-    "tslint": "^4.3.1",
+    "tslint": "^4.4.2",
     "typescript": "^2.1.5",
     "whitespace": "^2.1.0"
   },

package.json

@@ -1,7 +1,7 @@
 import { BintrayOptions } from "./publishOptions"
 import { request, configureRequestOptions } from "./httpExecutor"
 
-export function bintrayRequest<T>(path: string, auth: string | null, data: {[name: string]: any; } | null = null, method?: string): Promise<T> {
+export function bintrayRequest<T>(path: string, auth: string | null, data: {[name: string]: any; } | null = null, method?: "GET" | "DELETE" | "PUT"): Promise<T> {
   return request<T>(configureRequestOptions({hostname: "api.bintray.com", path: path}, auth, method), data)
 }
 

packages/electron-builder-http/src/bintray.ts

@@ -63,19 +63,14 @@ export abstract class HttpExecutor<REQUEST_OPTS, REQUEST> {
   protected readonly debug = _debug("electron-builder")
 
   request<T>(options: RequestOptions, data?: { [name: string]: any; } | null): Promise<T> {
-    options = Object.assign({headers: {"User-Agent": "electron-builder"}}, options)
-
+    configureRequestOptions(options)
     const encodedData = data == null ? undefined : new Buffer(JSON.stringify(data))
     if (encodedData != null) {
       options.method = "post"
-      if (options.headers == null) {
-        options.headers = {}
-      }
-
-      options.headers["Content-Type"] = "application/json"
-      options.headers["Content-Length"] = encodedData.length
+      options.headers!["Content-Type"] = "application/json"
+      options.headers!["Content-Length"] = encodedData.length
     }
-    return this.doApiRequest<T>(<any>options, it => (<any>it).end(encodedData), 0)
+    return this.doApiRequest<T>(<REQUEST_OPTS>options, it => (<any>it).end(encodedData), 0)
   }
 
   protected abstract doApiRequest<T>(options: REQUEST_OPTS, requestProcessor: (request: REQUEST, reject: (error: Error) => void) => void, redirectCount: number): Promise<T>
@@ -270,7 +265,7 @@ function configurePipes(options: DownloadOptions, response: any, destination: st
   fileOut.on("finish", () => (<any>fileOut.close)(callback))
 }
 
-export function configureRequestOptions(options: RequestOptions, token: string | null, method?: string): RequestOptions {
+export function configureRequestOptions(options: RequestOptions, token?: string | null, method?: "GET" | "DELETE" | "PUT"): RequestOptions {
   if (method != null) {
     options.method = method
   }
@@ -286,6 +281,10 @@ export function configureRequestOptions(options: RequestOptions, token: string |
   if (headers["User-Agent"] == null) {
     headers["User-Agent"] = "electron-builder"
   }
+
+  if ((method == null || method === "GET") || headers["Cache-Control"] == null) {
+    headers["Cache-Control"] = "no-cache"
+  }
   return options
 }
 

packages/electron-builder-http/src/httpExecutor.ts

@@ -63,7 +63,6 @@ export class BintrayPublisher extends Publisher {
           path: `/content/${this.client.owner}/${this.client.repo}/${this.client.packageName}/${version.name}/${fileName}`,
           method: "PUT",
           headers: {
-            "User-Agent": "electron-builder",
             "Content-Length": dataLength,
             "X-Bintray-Override": "1",
             "X-Bintray-Publish": "1",

packages/electron-builder/src/publish/BintrayPublisher.ts

@@ -103,7 +103,6 @@ export class GitHubPublisher extends Publisher {
           method: "POST",
           headers: {
             Accept: "application/vnd.github.v3+json",
-            "User-Agent": "electron-builder",
             "Content-Type": mime.lookup(fileName),
             "Content-Length": dataLength
           }
@@ -180,7 +179,7 @@ export class GitHubPublisher extends Publisher {
     warn(`Cannot delete release ${release.id}`)
   }
 
-  private githubRequest<T>(path: string, token: string | null, data: {[name: string]: any; } | null = null, method?: string): Promise<T> {
+  private githubRequest<T>(path: string, token: string | null, data: {[name: string]: any; } | null = null, method?: "GET" | "DELETE" | "PUT"): Promise<T> {
     return this.httpExecutor.request<T>(configureRequestOptions({
       hostname: "api.github.com",
       path: path,

packages/electron-builder/src/publish/gitHubPublisher.ts

@@ -5,7 +5,7 @@ import BluebirdPromise from "bluebird-lst-c"
 import * as path from "path"
 import { homedir } from "os"
 import { parse as parseIni } from "ini"
-import { HttpExecutor, DownloadOptions } from "electron-builder-http"
+import { HttpExecutor, DownloadOptions, configureRequestOptions } from "electron-builder-http"
 import { RequestOptions } from "https"
 import { parse as parseUrl } from "url"
 
@@ -24,14 +24,12 @@ export class NodeHttpExecutor extends HttpExecutor<RequestOptions, ClientRequest
     const agent = await this.httpsAgentPromise
     return await new BluebirdPromise<string>((resolve, reject) => {
       const parsedUrl = parseUrl(url)
-      this.doDownload({
+      this.doDownload(configureRequestOptions({
         hostname: parsedUrl.hostname,
         path: parsedUrl.path,
-        headers: Object.assign({
-          "User-Agent": "electron-builder"
-        }, options == null ? null : options.headers),
+        headers: (options == null ? null : options.headers) || undefined,
         agent: agent,
-      }, destination, 0, options || {}, (error: Error) => {
+      }), destination, 0, options || {}, (error: Error) => {
         if (error == null) {
           resolve(destination)
         }

packages/electron-builder/src/util/nodeHttpExecutor.ts

@@ -37,11 +37,11 @@ export abstract class AppUpdater extends EventEmitter {
 
   public readonly signals = new UpdaterSignal(this)
 
-  private appUpdateConfigPath: string | null
+  private _appUpdateConfigPath: string | null
 
-  setUpdateConfigPath(value: string | null) {
+  set updateConfigPath(value: string | null) {
     this.clientPromise = null
-    this.appUpdateConfigPath =  value
+    this._appUpdateConfigPath =  value
   }
 
   protected updateAvailable = false
@@ -232,10 +232,10 @@ export abstract class AppUpdater extends EventEmitter {
   abstract quitAndInstall(): void
 
   async loadUpdateConfig() {
-    if (this.appUpdateConfigPath == null) {
-      this.appUpdateConfigPath = path.join(process.resourcesPath, "app-update.yml")
+    if (this._appUpdateConfigPath == null) {
+      this._appUpdateConfigPath = path.join(process.resourcesPath, "app-update.yml")
     }
-    return safeLoad(await readFile(this.appUpdateConfigPath, "utf-8"))
+    return safeLoad(await readFile(this._appUpdateConfigPath, "utf-8"))
   }
 }
 

packages/electron-updater/src/AppUpdater.ts

@@ -22,7 +22,7 @@ export class GenericProvider extends Provider<UpdateInfo> {
         hostname: this.baseUrl.hostname,
         path: `${pathname}${this.baseUrl.search || ""}`,
         protocol: this.baseUrl.protocol,
-        headers: Object.assign({"Cache-Control": "no-cache, no-store, must-revalidate"}, this.requestHeaders)
+        headers: this.requestHeaders || undefined
       }
       if (this.baseUrl.port != null) {
         options.port = parseInt(this.baseUrl.port, 10)

packages/electron-updater/src/GenericProvider.ts

@@ -24,6 +24,7 @@ export class NsisUpdater extends AppUpdater {
   protected async doDownloadUpdate(versionInfo: VersionInfo, fileInfo: FileInfo) {
     const downloadOptions: DownloadOptions = {
       skipDirCreation: true,
+      headers: this.requestHeaders || undefined,
     }
 
     if (this.listenerCount(DOWNLOAD_PROGRESS) > 0) {
@@ -33,9 +34,6 @@ export class NsisUpdater extends AppUpdater {
     if (fileInfo != null && fileInfo.sha2 != null) {
       downloadOptions.sha2 = fileInfo.sha2
     }
-    if (this.requestHeaders != null) {
-      downloadOptions.headers = this.requestHeaders
-    }
 
     const logger = this.logger
     const tempDir = await mkdtemp(`${path.join(tmpdir(), "up")}-`)