feat(electron-updater): NSIS autoUpdater.setFeedURL throws error

Closes electron-userland#1105
develar · Jan 21, 2017 · eb6a453 · eb6a453
1 parent 3dd87da
commit eb6a453
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 128 deletions.
diff --git a/docs/Auto Update.md b/docs/Auto Update.md
@@ -98,13 +98,13 @@ The `autoUpdater` object has the following methods:
 
 ### `autoUpdater.setFeedURL(options)`
 
-* `options` GenericServerOptions | BintrayOptions | GithubOptions — if you want to override configuration in the `app-update.yml`.
+* `options` GenericServerOptions | BintrayOptions | GithubOptions | string — if you want to override configuration in the `app-update.yml`.
 
-Sets the `options`. Windows-only for now. On macOS please refer [electron setFeedURL reference](https://github.com/electron/electron/blob/master/docs/api/auto-updater.md#autoupdatersetfeedurlurl-requestheaders).
+Sets the `options`. If value is `string`, `GenericServerOptions` will be set with value as `url`.
 
 ### `autoUpdater.checkForUpdates(): Promise<UpdateCheckResult>`
 
-Asks the server whether there is an update. On macOS you must call `setFeedURL` before using this API.
+Asks the server whether there is an update.
 
 ### `autoUpdater.quitAndInstall()`
 

diff --git a/packages/electron-updater/src/AppUpdater.ts b/packages/electron-updater/src/AppUpdater.ts
@@ -89,8 +89,16 @@ export abstract class AppUpdater extends EventEmitter {
     return "Deprecated. Do not use it."
   }
 
-  setFeedURL(value: PublishConfiguration | BintrayOptions | GithubOptions | GenericServerOptions) {
-    this.clientPromise = BluebirdPromise.resolve(createClient(value))
+  setFeedURL(value: PublishConfiguration | BintrayOptions | GithubOptions | GenericServerOptions | string) {
+    // https://github.com/electron-userland/electron-builder/issues/1105
+    let client: Provider<any>
+    if (typeof value === "string") {
+      client = new GenericProvider({provider: "generic", url: value})
+    }
+    else {
+      client = createClient(value)
+    }
+    this.clientPromise = BluebirdPromise.resolve(client)
   }
 
   checkForUpdates(): Promise<UpdateCheckResult> {
@@ -118,7 +126,7 @@ export abstract class AppUpdater extends EventEmitter {
     this.emit("checking-for-update")
     try {
       if (this.clientPromise == null) {
-        this.clientPromise = loadUpdateConfig()
+        this.clientPromise = loadUpdateConfig().then(it => createClient(it))
       }
       return await this.doCheckForUpdates()
     }
@@ -205,7 +213,7 @@ export abstract class AppUpdater extends EventEmitter {
 }
 
 async function loadUpdateConfig() {
-  return createClient(safeLoad(await readFile(path.join((<any>global).__test_resourcesPath || (<any>process).resourcesPath, "app-update.yml"), "utf-8")))
+  return safeLoad(await readFile(path.join((<any>global).__test_resourcesPath || (<any>process).resourcesPath, "app-update.yml"), "utf-8"))
 }
 
 function createClient(data: string | PublishConfiguration | BintrayOptions | GithubOptions) {