perf(electron-updater): a little bit more compact blockmap data

Doesn't make a lot of sense since in any case deflated, but anyway
electron-userland · Oct 13, 2017 · c92bc38 · c92bc38
1 parent 586140d
commit c92bc38
Show file tree

Hide file tree

Showing 14 changed files with 203 additions and 176 deletions.
diff --git a/package.json b/package.json
@@ -29,9 +29,9 @@
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
   "dependencies": {
     "7zip-bin": "^2.2.7",
-    "archiver": "^2.0.3",
+    "archiver": "^2.1.0",
     "async-exit-hook": "^2.0.1",
-    "aws-sdk": "^2.132.0",
+    "aws-sdk": "^2.133.0",
     "bluebird-lst": "^1.0.4",
     "chalk": "^2.1.0",
     "chromium-pickle-js": "^0.2.0",
@@ -112,7 +112,7 @@
     "ts-babel": "^4.1.6",
     "ts-jsdoc": "^2.0.6",
     "tslint": "^5.7.0",
-    "typescript": "^2.5.3",
+    "typescript": "^2.6.0-rc",
     "v8-compile-cache": "^1.1.0",
     "whitespace": "^2.1.0",
     "worker-farm": "^1.5.0",

diff --git a/packages/app-package-builder/src/blockMap.ts b/packages/app-package-builder/src/blockMap.ts
@@ -44,7 +44,11 @@ export async function createDifferentialPackage(archiveFile: string): Promise<Pa
 }
 
 async function appendBlockMapData(blockMap: BlockMap, archiveFile: string, fd: number, headerSize: number | null, addLength: boolean) {
-  const blockMapDataString = safeDump(blockMap)
+  // lzma doesn't make a lof of sense (151 KB lzma vs 156 KB deflate) for small text file where most of the data are unique strings (encoded sha256 checksums)
+  const blockMapDataString = safeDump(blockMap, {
+    indent: 0,
+    flowLevel: 0,
+  })
   const blockMapFileData = await deflateRaw(blockMapDataString, {level: 9})
 
   await write(fd, blockMapFileData)

diff --git a/packages/builder-util-runtime/src/CancellationToken.ts b/packages/builder-util-runtime/src/CancellationToken.ts
@@ -42,7 +42,7 @@ export class CancellationToken extends EventEmitter {
     }
   }
 
-  createPromise<R>(callback: (resolve: (thenableOrResult?: R) => void, reject: (error?: Error) => void, onCancel: (callback: () => void) => void) => void): Promise<R> {
+  createPromise<R>(callback: (resolve: (thenableOrResult?: R) => void, reject: (error: Error) => void, onCancel: (callback: () => void) => void) => void): Promise<R> {
     if (this.cancelled) {
       return BluebirdPromise.reject<R>(new CancellationError())
     }

diff --git a/packages/builder-util-runtime/src/httpExecutor.ts b/packages/builder-util-runtime/src/httpExecutor.ts
@@ -81,7 +81,7 @@ export abstract class HttpExecutor<REQUEST> {
     })
   }
 
-  addErrorAndTimeoutHandlers(request: any, reject: (error?: Error | null) => void) {
+  addErrorAndTimeoutHandlers(request: any, reject: (error: Error) => void) {
     this.addTimeOutHandler(request, reject)
     request.on("error", reject)
     request.on("aborted", () => {

diff --git a/packages/builder-util-runtime/src/uuid.ts b/packages/builder-util-runtime/src/uuid.ts
@@ -40,7 +40,6 @@ export class UUID {
   private ascii: string | null
   private binary: Buffer
   private version: number
-  private variant: string
 
   // from rfc4122#appendix-C
   static readonly DNS = new UUID("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
@@ -55,7 +54,6 @@ export class UUID {
     }
 
     this.version = check.version!!
-    this.variant = check.variant!!
 
     if (check.format === "ascii") {
       this.ascii = uuid as string

diff --git a/packages/builder-util/src/nodeHttpExecutor.ts b/packages/builder-util/src/nodeHttpExecutor.ts
@@ -24,7 +24,7 @@ export class NodeHttpExecutor extends HttpExecutor<ClientRequest> {
       this.doDownload(configureRequestOptionsFromUrl(url, {
         headers: options.headers || undefined,
         agent,
-      }), destination, 0, options, (error: Error) => {
+      }), destination, 0, options, error => {
         if (error == null) {
           resolve(destination)
         }

diff --git a/packages/electron-builder-squirrel-windows/package.json b/packages/electron-builder-squirrel-windows/package.json
@@ -14,7 +14,7 @@
     "builder-util": "^0.0.0-semantic-release",
     "bluebird-lst": "^1.0.4",
     "fs-extra-p": "^4.4.4",
-    "archiver": "^2.0.3",
+    "archiver": "^2.1.0",
     "sanitize-filename": "^1.6.1"
   },
   "peerDependencies": {

diff --git a/packages/electron-builder/src/targets/appx.ts b/packages/electron-builder/src/targets/appx.ts
@@ -1,5 +1,5 @@
 import BluebirdPromise from "bluebird-lst"
-import { Arch, asArray, use, log, debug } from "builder-util"
+import { Arch, asArray, log, debug } from "builder-util"
 import { walk, copyOrLinkFile } from "builder-util/out/fs"
 import { emptyDir, readdir, readFile, remove, writeFile } from "fs-extra-p"
 import * as path from "path"
@@ -105,7 +105,9 @@ export default class AppXTarget extends Target {
     await writeFile(mappingFile, mapping)
     packager.debugLogger.add("appx.mapping", mapping)
 
-    use(this.options.makeappxArgs, (it: Array<string>) => makeAppXArgs.push(...it))
+    if (this.options.makeappxArgs != null) {
+      makeAppXArgs.push(...this.options.makeappxArgs)
+    }
     await vm.exec(vm.toVmFile(path.join(vendorPath, "windows-10", Arch[arch], "makeappx.exe")), makeAppXArgs)
     await packager.sign(artifactPath)
 

diff --git a/packages/electron-publisher-s3/package.json b/packages/electron-publisher-s3/package.json
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.4.4",
-    "aws-sdk": "^2.132.0",
+    "aws-sdk": "^2.133.0",
     "mime": "^2.0.3",
     "electron-publish": "~0.0.0-semantic-release",
     "builder-util": "^0.0.0-semantic-release",

diff --git a/packages/electron-updater/CHANGELOG.md b/packages/electron-updater/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.12.0
+
+### Features
+
+* [Linux auto-update](https://github.com/electron-userland/electron-builder/releases/tag/v19.37.0)
+
 # 2.11.0
 
 ### Features

diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json
@@ -18,7 +18,7 @@
     "js-yaml": "^3.10.0",
     "semver": "^5.4.1",
     "source-map-support": "^0.5.0",
-    "builder-util-runtime": "^0.0.0-semantic-release",
+    "builder-util-runtime": "~0.0.0-semantic-release",
     "electron-is-dev": "^0.3.0",
     "xelement": "^1.0.16",
     "lodash.isequal": "^4.5.0"

diff --git a/packages/electron-updater/src/electronHttpExecutor.ts b/packages/electron-updater/src/electronHttpExecutor.ts
@@ -20,7 +20,7 @@ export class ElectronHttpExecutor extends HttpExecutor<Electron.ClientRequest> {
     return await options.cancellationToken.createPromise<string>((resolve, reject, onCancel) => {
       this.doDownload(configureRequestOptionsFromUrl(url, {
         headers: options.headers || undefined,
-      }), destination, 0, options, (error: Error) => {
+      }), destination, 0, options, error => {
         if (error == null) {
           resolve(destination)
         }