electron-incremental-update 1.2.0 → 2.0.0-beta.1

package/dist/utils.js

@@ -1,38 +1,62 @@
 import {
+  decrypt,
   disableHWAccForWin7,
+  encrypt,
+  getAppVersion,
+  getEntryVersion,
   getPathFromAppNameAsar,
-  getPaths,
-  getVersions,
+  getPathFromEntryAsar,
+  getPathFromPreload,
+  getPathFromPublic,
   handleUnexpectedErrors,
-  is,
+  hashString,
+  isDev,
+  isLinux,
+  isLowerVersionDefault,
+  isMac,
   isUpdateJSON,
-  loadNativeModuleFromEntry,
-  parseGithubCdnURL,
+  isWin,
+  loadPage,
   parseVersion,
+  requireNative,
   restartApp,
   setAppUserModelId,
   setPortableAppDataPath,
+  signature,
   singleInstance,
   unzipFile,
+  verifySignatureDefault,
   waitAppReady,
   zipFile
-} from "./chunk-RQCTJY4L.js";
+} from "./chunk-RSLOPAIZ.js";
 export {
+  decrypt,
   disableHWAccForWin7,
+  encrypt,
+  getAppVersion,
+  getEntryVersion,
   getPathFromAppNameAsar,
-  getPaths,
-  getVersions,
+  getPathFromEntryAsar,
+  getPathFromPreload,
+  getPathFromPublic,
   handleUnexpectedErrors,
-  is,
+  hashString,
+  isDev,
+  isLinux,
+  isLowerVersionDefault,
+  isMac,
   isUpdateJSON,
-  loadNativeModuleFromEntry,
-  parseGithubCdnURL,
+  isWin,
+  loadPage,
   parseVersion,
+  requireNative,
   restartApp,
   setAppUserModelId,
   setPortableAppDataPath,
+  signature,
   singleInstance,
   unzipFile,
+  verifySignatureDefault,
   waitAppReady,
   zipFile
 };

package/dist/{pure-GoN_3MEj.d.cts → version-CffZWDhZ.d.cts}

@@ -1,9 +1,3 @@
-/**
- * parse Github CDN URL for accelerating the speed of downloading
- *
- * {@link https://github.com/XIU2/UserScript/blob/master/GithubEnhanced-High-Speed-Download.user.js#L34 some public CDN links}
- */
-declare function parseGithubCdnURL(originRepoURL: string, cdnPrefix: string, relativeFilePath: string): string;
 /**
  * handle all unhandled error
  * @param callback callback function
@@ -17,15 +11,22 @@ interface Version {
     stageVersion: number;
 }
 declare function parseVersion(version: string): Version;
+declare function isLowerVersionDefault(oldVer: string, newVer: string): boolean;
+/**
+ * update info json
+ */
 type UpdateInfo = {
     signature: string;
     minimumVersion: string;
     version: string;
     size: number;
 };
+/**
+ * {@link UpdateInfo} with beta
+ */
 type UpdateJSON = UpdateInfo & {
     beta: UpdateInfo;
 };
 declare function isUpdateJSON(json: any): json is UpdateJSON;
 
-export { type UpdateInfo as U, type Version as V, type UpdateJSON as a, parseVersion as b, handleUnexpectedErrors as h, isUpdateJSON as i, parseGithubCdnURL as p };
+export { type UpdateJSON as U, type Version as V, type UpdateInfo as a, isUpdateJSON as b, handleUnexpectedErrors as h, isLowerVersionDefault as i, parseVersion as p };

package/dist/{pure-GoN_3MEj.d.ts → version-CffZWDhZ.d.ts}

@@ -1,9 +1,3 @@
-/**
- * parse Github CDN URL for accelerating the speed of downloading
- *
- * {@link https://github.com/XIU2/UserScript/blob/master/GithubEnhanced-High-Speed-Download.user.js#L34 some public CDN links}
- */
-declare function parseGithubCdnURL(originRepoURL: string, cdnPrefix: string, relativeFilePath: string): string;
 /**
  * handle all unhandled error
  * @param callback callback function
@@ -17,15 +11,22 @@ interface Version {
     stageVersion: number;
 }
 declare function parseVersion(version: string): Version;
+declare function isLowerVersionDefault(oldVer: string, newVer: string): boolean;
+/**
+ * update info json
+ */
 type UpdateInfo = {
     signature: string;
     minimumVersion: string;
     version: string;
     size: number;
 };
+/**
+ * {@link UpdateInfo} with beta
+ */
 type UpdateJSON = UpdateInfo & {
     beta: UpdateInfo;
 };
 declare function isUpdateJSON(json: any): json is UpdateJSON;
 
-export { type UpdateInfo as U, type Version as V, type UpdateJSON as a, parseVersion as b, handleUnexpectedErrors as h, isUpdateJSON as i, parseGithubCdnURL as p };
+export { type UpdateJSON as U, type Version as V, type UpdateInfo as a, isUpdateJSON as b, handleUnexpectedErrors as h, isLowerVersionDefault as i, parseVersion as p };

package/dist/vite.js

@@ -1,6 +1,6 @@
 // src/vite.ts
 import { basename as basename2, join as join2, resolve } from "node:path";
-import { cpSync, existsSync as existsSync4, rmSync as rmSync2 } from "node:fs";
+import { cpSync, existsSync as existsSync4, rmSync } from "node:fs";
 import { mergeConfig as mergeConfig2, normalizePath as normalizePath2 } from "vite";
 import ElectronSimple from "vite-plugin-electron/simple";
 import { startup } from "vite-plugin-electron";
@@ -14,30 +14,9 @@ import Asar from "@electron/asar";
 import { build } from "esbuild";
 import { mergeConfig } from "vite";
 
-// src/crypto/utils.ts
-import { createHash } from "node:crypto";
-function hashString(data, length) {
-  const hash = createHash("SHA256").update(data).digest("binary");
-  return Buffer.from(hash).subarray(0, length);
-}
-
-// src/crypto/enc.ts
-import { createCipheriv, createPrivateKey, createSign } from "node:crypto";
-function encrypt(plainText, key, iv) {
-  const cipher = createCipheriv("aes-256-cbc", key, iv);
-  let encrypted = cipher.update(plainText, "utf8", "base64url");
-  encrypted += cipher.final("base64url");
-  return encrypted;
-}
-var signature = (buffer, privateKey, cert, version) => {
-  const sig = createSign("RSA-SHA256").update(buffer).sign(createPrivateKey(privateKey), "base64");
-  return encrypt(`${sig}%${version}`, hashString(cert, 32), hashString(buffer, 16));
-};
-
-// src/utils/pure.ts
+// src/utils/version.ts
 function parseVersion(version) {
-  const semver = /^(\d+)\.(\d+)\.(\d+)(?:-([a-z0-9.-]+))?/i;
-  const match = semver.exec(version);
+  const match = /^(\d+)\.(\d+)\.(\d+)(?:-([a-z0-9.-]+))?/i.exec(version);
   if (!match) {
     throw new TypeError(`invalid version: ${version}`);
   }
@@ -65,8 +44,8 @@ function isUpdateJSON(json) {
 }
 
 // src/utils/zip.ts
-import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { brotliCompress, brotliDecompress } from "node:zlib";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { brotliCompress } from "node:zlib";
 async function zipFile(filePath, targetFilePath = `${filePath}.gz`) {
   if (!existsSync(filePath)) {
     throw new Error(`path to be zipped not exist: ${filePath}`);
@@ -83,94 +62,36 @@ async function zipFile(filePath, targetFilePath = `${filePath}.gz`) {
   });
 }
 
-// src/build-plugins/log.ts
-import { createLogger } from "vite";
+// src/utils/crypto/utils.ts
+import { createHash } from "node:crypto";
+function hashString(data, length) {
+  const hash = createHash("SHA256").update(data).digest("binary");
+  return Buffer.from(hash).subarray(0, length);
+}
+
+// src/utils/crypto/encrypt.ts
+import { createCipheriv, createPrivateKey, createSign } from "node:crypto";
+function encrypt(plainText, key, iv) {
+  const cipher = createCipheriv("aes-256-cbc", key, iv);
+  let encrypted = cipher.update(plainText, "utf8", "base64url");
+  encrypted += cipher.final("base64url");
+  return encrypted;
+}
+function signature(buffer, privateKey, cert, version) {
+  const sig = createSign("RSA-SHA256").update(buffer).sign(createPrivateKey(privateKey), "base64");
+  return encrypt(`${sig}%${version}`, hashString(cert, 32), hashString(buffer, 16));
+}
 
 // src/build-plugins/constant.ts
+import { createLogger } from "vite";
 var id = "electron-incremental-updater";
 var bytecodeId = `${id}-bytecode`;
-var loaderId = `${id}-loader`;
-
-// src/build-plugins/log.ts
 var log = createLogger("info", { prefix: `[${id}]` });
 var bytecodeLog = createLogger("info", { prefix: `[${bytecodeId}]` });
 
 // src/build-plugins/bytecode/code.ts
 var bytecodeGeneratorScript = "const vm = require('vm')\nconst v8 = require('v8')\nconst wrap = require('module').wrap\nv8.setFlagsFromString('--no-lazy')\nv8.setFlagsFromString('--no-flush-bytecode')\nlet code = ''\nprocess.stdin.setEncoding('utf-8')\nprocess.stdin.on('readable', () => {\n  const data = process.stdin.read()\n  if (data !== null) {\n    code += data\n  }\n})\nprocess.stdin.on('end', () => {\n  try {\n    if (typeof code !== 'string') {\n      throw new Error('javascript code must be string.')\n    }\n    const script = new vm.Script(wrap(code), { produceCachedData: true })\n    const bytecodeBuffer = script.createCachedData()\n    process.stdout.write(bytecodeBuffer)\n  } catch (error) {\n    console.error(error)\n  }\n})\n";
-var bytecodeModuleLoaderCode = [
-  `"use strict";`,
-  `const fs = require("fs");`,
-  `const path = require("path");`,
-  `const vm = require("vm");`,
-  `const v8 = require("v8");`,
-  `const Module = require("module");`,
-  `v8.setFlagsFromString("--no-lazy");`,
-  `v8.setFlagsFromString("--no-flush-bytecode");`,
-  `const FLAG_HASH_OFFSET = 12;`,
-  `const SOURCE_HASH_OFFSET = 8;`,
-  `let dummyBytecode;`,
-  `function setFlagHashHeader(bytecodeBuffer) {`,
-  `  if (!dummyBytecode) {`,
-  `    const script = new vm.Script("", {`,
-  `      produceCachedData: true`,
-  `    });`,
-  `    dummyBytecode = script.createCachedData();`,
-  `  }`,
-  `  dummyBytecode.slice(FLAG_HASH_OFFSET, FLAG_HASH_OFFSET + 4).copy(bytecodeBuffer, FLAG_HASH_OFFSET);`,
-  `};`,
-  `function getSourceHashHeader(bytecodeBuffer) {`,
-  `  return bytecodeBuffer.slice(SOURCE_HASH_OFFSET, SOURCE_HASH_OFFSET + 4);`,
-  `};`,
-  `function buffer2Number(buffer) {`,
-  `  let ret = 0;`,
-  `  ret |= buffer[3] << 24;`,
-  `  ret |= buffer[2] << 16;`,
-  `  ret |= buffer[1] << 8;`,
-  `  ret |= buffer[0];`,
-  `  return ret;`,
-  `};`,
-  `Module._extensions[".jsc"] = Module._extensions[".cjsc"] = function (module, filename) {`,
-  `  const bytecodeBuffer = fs.readFileSync(filename);`,
-  `  if (!Buffer.isBuffer(bytecodeBuffer)) {`,
-  `    throw new Error("BytecodeBuffer must be a buffer object.");`,
-  `  }`,
-  `  setFlagHashHeader(bytecodeBuffer);`,
-  `  const length = buffer2Number(getSourceHashHeader(bytecodeBuffer));`,
-  `  let dummyCode = "";`,
-  `  if (length > 1) {`,
-  `    dummyCode = "\\"" + "\\u200b".repeat(length - 2) + "\\"";`,
-  `  }`,
-  `  const script = new vm.Script(dummyCode, {`,
-  `    filename: filename,`,
-  `    lineOffset: 0,`,
-  `    displayErrors: true,`,
-  `    cachedData: bytecodeBuffer`,
-  `  });`,
-  `  if (script.cachedDataRejected) {`,
-  `    throw new Error("Invalid or incompatible cached data (cachedDataRejected)");`,
-  `  }`,
-  `  const require = function (id) {`,
-  `    return module.require(id);`,
-  `  };`,
-  `  require.resolve = function (request, options) {`,
-  `    return Module._resolveFilename(request, module, false, options);`,
-  `  };`,
-  `  if (process.mainModule) {`,
-  `    require.main = process.mainModule;`,
-  `  }`,
-  `  require.extensions = Module._extensions;`,
-  `  require.cache = Module._cache;`,
-  `  const compiledWrapper = script.runInThisContext({`,
-  `    filename: filename,`,
-  `    lineOffset: 0,`,
-  `    columnOffset: 0,`,
-  `    displayErrors: true`,
-  `  });`,
-  `  const dirname = path.dirname(filename);`,
-  `  const args = [module.exports, require, module, filename, dirname, process, global];`,
-  `  return compiledWrapper.apply(module.exports, args);`,
-  `};`
-].join("\n");
+var bytecodeModuleLoaderCode = '"use strict";\nconst fs = require("fs");\nconst path = require("path");\nconst vm = require("vm");\nconst v8 = require("v8");\nconst Module = require("module");\nv8.setFlagsFromString("--no-lazy");\nv8.setFlagsFromString("--no-flush-bytecode");\nconst FLAG_HASH_OFFSET = 12;\nconst SOURCE_HASH_OFFSET = 8;\nlet dummyBytecode;\nfunction setFlagHashHeader(bytecodeBuffer) {\n  if (!dummyBytecode) {\n    const script = new vm.Script("", {\n      produceCachedData: true\n    });\n    dummyBytecode = script.createCachedData();\n  }\n  dummyBytecode.slice(FLAG_HASH_OFFSET, FLAG_HASH_OFFSET + 4).copy(bytecodeBuffer, FLAG_HASH_OFFSET);\n};\nfunction getSourceHashHeader(bytecodeBuffer) {\n  return bytecodeBuffer.slice(SOURCE_HASH_OFFSET, SOURCE_HASH_OFFSET + 4);\n};\nfunction buffer2Number(buffer) {\n  let ret = 0;\n  ret |= buffer[3] << 24;\n  ret |= buffer[2] << 16;\n  ret |= buffer[1] << 8;\n  ret |= buffer[0];\n  return ret;\n};\nModule._extensions[".jsc"] = Module._extensions[".cjsc"] = function (module, filename) {\n  const bytecodeBuffer = fs.readFileSync(filename);\n  if (!Buffer.isBuffer(bytecodeBuffer)) {\n    throw new Error("BytecodeBuffer must be a buffer object.");\n  }\n  setFlagHashHeader(bytecodeBuffer);\n  const length = buffer2Number(getSourceHashHeader(bytecodeBuffer));\n  let dummyCode = "";\n  if (length > 1) {\n    dummyCode = "\\"" + "\\u200b".repeat(length - 2) + "\\"";\n  }\n  const script = new vm.Script(dummyCode, {\n    filename: filename,\n    lineOffset: 0,\n    displayErrors: true,\n    cachedData: bytecodeBuffer\n  });\n  if (script.cachedDataRejected) {\n    throw new Error("Invalid or incompatible cached data (cachedDataRejected)");\n  }\n  const require = function (id) {\n    return module.require(id);\n  };\n  require.resolve = function (request, options) {\n    return Module._resolveFilename(request, module, false, options);\n  };\n  if (process.mainModule) {\n    require.main = process.mainModule;\n  }\n  require.extensions = Module._extensions;\n  require.cache = Module._cache;\n  const compiledWrapper = script.runInThisContext({\n    filename: filename,\n    lineOffset: 0,\n    columnOffset: 0,\n    displayErrors: true\n  });\n  const dirname = path.dirname(filename);\n  const args = [module.exports, require, module, filename, dirname, process, global];\n  return compiledWrapper.apply(module.exports, args);\n};\n';
 
 // src/build-plugins/bytecode/utils.ts
 import path from "node:path";
@@ -347,7 +268,7 @@ async function buildEntry({
   entryOutputDirPath,
   nativeModuleEntryMap,
   overrideEsbuildOptions
-}, cert, protectedStrings) {
+}, define, protectedStrings) {
   const option = mergeConfig(
     {
       entryPoints: {
@@ -366,9 +287,7 @@ async function buildEntry({
       loader: {
         ".node": "empty"
       },
-      define: {
-        __SIGNATURE_CERT__: JSON.stringify(cert)
-      }
+      define
     },
     overrideEsbuildOptions ?? {}
   );
@@ -384,7 +303,7 @@ async function buildEntry({
     if (isEntry) {
       code = code.replace(
         /(`-----BEGIN CERTIFICATE-----[\s\S]*-----END CERTIFICATE-----\n`)/,
-        (_, cert2) => `"${cert2.slice(1, -1).replace(/\n/g, "\\n")}"`
+        (_, cert) => `"${cert.slice(1, -1).replace(/\n/g, "\\n")}"`
       );
     }
     const transformedCode = convertString(
@@ -679,6 +598,28 @@ ${bytecodeLoaderBlock}`) : _code;
 function debugStartup(args) {
   process.env.VSCODE_DEBUG ? console.log("[startup] Electron App") : args.startup();
 }
+function getMainFilePath(options) {
+  let mainFilePath;
+  if (typeof options === "string") {
+    mainFilePath = basename2(options);
+  } else if (Array.isArray(options)) {
+    mainFilePath = basename2(options[0]);
+  } else {
+    const name = options?.index ?? options?.main;
+    if (!name) {
+      throw new Error(`\`options.main.files\` (${options}) must have "index" or "main" key, like \`{ index: "..." }\``);
+    }
+    mainFilePath = options?.index ? "index.js" : "main.js";
+  }
+  return mainFilePath.replace(/\.[cm]?ts$/, ".js");
+}
+function parseVersionPath(versionPath) {
+  versionPath = normalizePath2(versionPath);
+  if (!versionPath.startsWith("./")) {
+    versionPath = "./" + versionPath;
+  }
+  return new URL(versionPath, "file://").pathname.slice(1);
+}
 async function electronWithUpdater(options) {
   let {
     isBuild,
@@ -706,8 +647,8 @@ async function electronWithUpdater(options) {
     minify = false;
   }
   try {
-    rmSync2(_options.buildAsarOption.electronDistPath, { recursive: true, force: true });
-    rmSync2(_options.buildEntryOption.entryOutputDirPath, { recursive: true, force: true });
+    rmSync(_options.buildAsarOption.electronDistPath, { recursive: true, force: true });
+    rmSync(_options.buildEntryOption.entryOutputDirPath, { recursive: true, force: true });
   } catch (ignore) {
   }
   log.info(`remove old files`, { timestamp: true });
@@ -718,8 +659,21 @@ async function electronWithUpdater(options) {
   if (resolve(normalizePath2(pkg.main)) !== resolve(_appPath)) {
     throw new Error(`wrong "main" field in package.json: "${pkg.main}", it should be "${_appPath}"`);
   }
+  const define = {
+    __EIU_ELECTRON_DIST_PATH__: JSON.stringify(buildAsarOption.electronDistPath),
+    __EIU_ENTRY_DIST_PATH__: JSON.stringify(buildEntryOption.entryOutputDirPath),
+    __EIU_IS_DEV__: JSON.stringify(!isBuild),
+    __EIU_MAIN_DEV_DIR__: JSON.stringify(buildAsarOption.electronDistPath),
+    __EIU_MAIN_FILE__: JSON.stringify(getMainFilePath(_main.files)),
+    __EIU_SIGNATURE_CERT__: JSON.stringify(cert),
+    __EUI_VERSION_PATH__: JSON.stringify(parseVersionPath(buildVersionOption.versionPath))
+  };
   const _buildEntry = async () => {
-    await buildEntry(buildEntryOption, cert, isBuild ? bytecodeOptions?.protectedStrings : void 0);
+    await buildEntry(
+      buildEntryOption,
+      define,
+      isBuild ? bytecodeOptions?.protectedStrings : void 0
+    );
     log.info(`vite build entry to '${entryOutputDirPath}'`, { timestamp: true });
   };
   const _postBuild = postBuild ? async () => await postBuild({
@@ -742,10 +696,6 @@ async function electronWithUpdater(options) {
   };
   let isInit = false;
   const rollupOptions = {
-    // external: [
-    //   /^node:/,
-    //   ...Object.keys('dependencies' in pkg ? pkg.dependencies as object : {}),
-    // ],
     external: (src) => src.startsWith("node:") || Object.keys("dependencies" in pkg ? pkg.dependencies : {}).includes(src)
   };
   const electronPluginOptions = {
@@ -770,7 +720,8 @@ async function electronWithUpdater(options) {
             minify,
             outDir: `${buildAsarOption.electronDistPath}/main`,
             rollupOptions
-          }
+          },
+          define
         },
         _main.vite ?? {}
       )
@@ -803,7 +754,8 @@ async function electronWithUpdater(options) {
             minify,
             outDir: `${buildAsarOption.electronDistPath}/preload`,
             rollupOptions
-          }
+          },
+          define
         },
         _preload.vite ?? {}
       )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "type": "module",
-  "version": "1.2.0",
+  "version": "2.0.0-beta.1",
   "description": "electron incremental update tools, powered by vite",
   "author": "subframe7536",
   "license": "MIT",
@@ -23,12 +23,18 @@
     "./utils": {
       "import": "./dist/utils.js",
       "require": "./dist/utils.cjs"
+    },
+    "./provider": {
+      "import": "./dist/provider.js",
+      "require": "./dist/provider.cjs"
     }
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "files": [
     "dist",
+    "provider.d.ts",
+    "provider.js",
     "utils.d.ts",
     "utils.js",
     "vite.d.ts",
@@ -61,15 +67,15 @@
   "devDependencies": {
     "@subframe7536/eslint-config": "^0.6.6",
     "@types/babel__core": "^7.20.5",
-    "@types/node": "^20.14.7",
+    "@types/node": "^20.14.10",
     "bumpp": "^9.4.1",
     "electron": "28.2.10",
-    "eslint": "^9.5.0",
+    "eslint": "^9.7.0",
     "esno": "^4.7.0",
     "tsup": "^8.1.0",
-    "typescript": "^5.5.2",
-    "vite": "^5.3.1",
+    "typescript": "^5.5.3",
+    "vite": "^5.3.3",
     "vite-plugin-electron": "^0.28.7",
-    "vitest": "^1.6.0"
+    "vitest": "^2.0.2"
   }
 }

package/provider.d.ts

@@ -0,0 +1 @@
+export * from './dist/provider'

package/provider.js

@@ -0,0 +1 @@
+module.exports = require('./dist/provider.cjs')