resolving conflicts and linting

packages/electron-updater/src/NsisUpdater.ts

@@ -7,7 +7,8 @@ import { BaseUpdater, InstallOptions } from "./BaseUpdater"
 import { DifferentialDownloaderOptions } from "./differentialDownloader/DifferentialDownloader"
 import { FileWithEmbeddedBlockMapDifferentialDownloader } from "./differentialDownloader/FileWithEmbeddedBlockMapDifferentialDownloader"
 import { GenericDifferentialDownloader } from "./differentialDownloader/GenericDifferentialDownloader"
-import { DOWNLOAD_PROGRESS, ResolvedUpdateFileInfo, blockmapFiles } from "./main"
+import { DOWNLOAD_PROGRESS, ResolvedUpdateFileInfo } from "./main"
+import { blockmapFiles } from "./util"
 import { findFile, Provider } from "./providers/Provider"
 import { unlink } from "fs-extra"
 import { verifySignature } from "./windowsExecutableCodeSignatureVerifier"
@@ -137,7 +138,7 @@ export class NsisUpdater extends BaseUpdater {
       if (this._testOnlyOptions != null && !this._testOnlyOptions.isUseDifferentialDownload) {
         return true
       }
-      const blockmapFileUrls = blockmapFiles(fileInfo, downloadUpdateOptions.updateInfoAndProvider.info, this.app);
+      const blockmapFileUrls = blockmapFiles(fileInfo.url, downloadUpdateOptions.updateInfoAndProvider.info.version, this.app.version)
       this._logger.info(`Download block maps (old: "${blockmapFileUrls[0]}", new: ${blockmapFileUrls[1]})`)
 
       const downloadBlockMap = async (url: URL): Promise<BlockMap> => {
@@ -171,9 +172,8 @@ export class NsisUpdater extends BaseUpdater {
         downloadOptions.onProgress = it => this.emit(DOWNLOAD_PROGRESS, it)
       }
 
-      const blockMapDataList = await Promise.all(blockmapFileUrls.map(u => downloadBlockMap(u)));
-      await new GenericDifferentialDownloader(fileInfo.info, this.httpExecutor, downloadOptions)
-        .download(blockMapDataList[0], blockMapDataList[1])
+      const blockMapDataList = await Promise.all(blockmapFileUrls.map(u => downloadBlockMap(u)))
+      await new GenericDifferentialDownloader(fileInfo.info, this.httpExecutor, downloadOptions).download(blockMapDataList[0], blockMapDataList[1])
       return false
     } catch (e) {
       this._logger.error(`Cannot download differentially, fallback to full download: ${e.stack || e}`)

packages/electron-updater/src/main.ts

@@ -1,10 +1,8 @@
-import { AppAdapter } from "./AppAdapter"
 import { CancellationToken, PackageFileInfo, ProgressInfo, UpdateFileInfo, UpdateInfo } from "builder-util-runtime"
 import { EventEmitter } from "events"
 import { URL } from "url"
 import { AppUpdater } from "./AppUpdater"
 import { LoginCallback } from "./electronHttpExecutor"
-import escapeRegExp from "lodash.escaperegexp"
 
 export { AppUpdater, NoOpLogger } from "./AppUpdater"
 export { UpdateInfo }
@@ -112,37 +110,3 @@ export interface Logger {
 
   debug?(message: string): void
 }
-<<<<<<< HEAD
-=======
-
-// if baseUrl path doesn't ends with /, this path will be not prepended to passed pathname for new URL(input, base)
-/** @internal */
-export function newBaseUrl(url: string): URL {
-  const result = new URL(url)
-  if (!result.pathname.endsWith("/")) {
-    result.pathname += "/"
-  }
-  return result
-}
-
-// addRandomQueryToAvoidCaching is false by default because in most cases URL already contains version number,
-// so, it makes sense only for Generic Provider for channel files
-export function newUrlFromBase(pathname: string, baseUrl: URL, addRandomQueryToAvoidCaching = false): URL {
-  const result = new URL(pathname, baseUrl)
-  // search is not propagated (search is an empty string if not specified)
-  const search = baseUrl.search
-  if (search != null && search.length !== 0) {
-    result.search = search
-  }
-  else if (addRandomQueryToAvoidCaching) {
-    result.search = `noCache=${Date.now().toString(32)}`
-  }
-  return result
-}
-
-export function blockmapFiles(fileInfo: ResolvedUpdateFileInfo, updateInfo: UpdateInfo, app: AppAdapter): URL[] {
-  const newBlockMapUrl = newUrlFromBase(`${fileInfo.url.pathname}.blockmap`, fileInfo.url)
-  const oldBlockMapUrl = newUrlFromBase(`${fileInfo.url.pathname.replace(new RegExp(escapeRegExp(updateInfo.version), "g"), app.version)}.blockmap`, fileInfo.url)
-  return [oldBlockMapUrl, newBlockMapUrl];
-}
->>>>>>> 5d147ceb (Refactored and added test case)

packages/electron-updater/src/util.ts

@@ -1,5 +1,7 @@
 // if baseUrl path doesn't ends with /, this path will be not prepended to passed pathname for new URL(input, base)
 import { URL } from "url"
+// @ts-ignore
+import * as escapeRegExp from "lodash.escaperegexp"
 
 /** @internal */
 export function newBaseUrl(url: string): URL {
@@ -27,3 +29,9 @@ export function newUrlFromBase(pathname: string, baseUrl: URL, addRandomQueryToA
 export function getChannelFilename(channel: string): string {
   return `${channel}.yml`
 }
+
+export function blockmapFiles(baseUrl: URL, oldVersion: string, newVersion: string): URL[] {
+  const newBlockMapUrl = newUrlFromBase(`${baseUrl.pathname}.blockmap`, baseUrl)
+  const oldBlockMapUrl = newUrlFromBase(`${baseUrl.pathname.replace(new RegExp(escapeRegExp(newVersion), "g"), oldVersion)}.blockmap`, baseUrl)
+  return [oldBlockMapUrl, newBlockMapUrl]
+}

test/src/urlUtilTest.ts

@@ -1,6 +1,5 @@
 import { URL } from "url"
-import { newUrlFromBase, blockmapFiles } from "electron-updater"
-import { TestAppAdapter } from "./helpers/TestAppAdapter"
+import { newUrlFromBase, blockmapFiles } from "electron-updater/out/util"
 
 test("newUrlFromBase", () => {
   const fileUrl = new URL("https://AWS_S3_HOST/bucket-yashraj/electron%20Setup%2011.0.3.exe")
@@ -20,17 +19,7 @@ test("create blockmap urls", () => {
   const baseUrlString = `https://gitlab.com/artifacts/master/raw/electron%20Setup%20${newVersion}.exe`
   const baseUrl = new URL(baseUrlString)
 
-  const fileInfo = {url: baseUrl, info: {url: baseUrlString, sha512: ''}};
-  const updateInfo = {
-    version: newVersion,
-    files: [fileInfo.info],
-    path: baseUrlString,
-    sha512: '',
-    releaseDate: 'Today',
-  }
-  const app = new TestAppAdapter(oldVersion, '')
-
-  const blockMapUrls = blockmapFiles(fileInfo, updateInfo, app);
+  const blockMapUrls = blockmapFiles(baseUrl, oldVersion, newVersion)
 
   expect(blockMapUrls[0].href).toBe('https://gitlab.com/artifacts/master/raw/electron%20Setup%201.1.9-2+ed8ccd.exe.blockmap');
   expect(blockMapUrls[1].href).toBe('https://gitlab.com/artifacts/master/raw/electron%20Setup%201.1.9-3+be4a1f.exe.blockmap');