electron-incremental-update 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/{zip-Dwm7s1C9.mjs → download-BGaAyi1Z.mjs}

@@ -1,50 +1,5 @@
-import { r as isUpdateJSON } from "./version--eVB2A7n.mjs";
+import { u as isUpdateJSON } from "./zip-DUK3opmV.mjs";
 import { app, net } from "electron";
-import crypto from "node:crypto";
-import zlib from "node:zlib";
-
-//#region src/utils/crypto.ts
-function hashBuffer(data, length) {
-	const hash = crypto.createHash("SHA256").update(data).digest("binary");
-	return Buffer.from(hash).subarray(0, length);
-}
-function aesEncrypt(plainText, key, iv) {
-	const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
-	return cipher.update(plainText, "utf8", "base64url") + cipher.final("base64url");
-}
-/**
-* Default function to generate asar signature, returns generated signature
-* @param buffer file buffer
-* @param privateKey primary key
-* @param cert certificate
-* @param version target version
-*/
-function defaultSignature(buffer, privateKey, cert, version) {
-	return aesEncrypt(`${crypto.createSign("RSA-SHA256").update(buffer).sign(crypto.createPrivateKey(privateKey), "base64")}%${version}`, hashBuffer(cert, 32), hashBuffer(buffer, 16));
-}
-function aesDecrypt(encryptedText, key, iv) {
-	const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
-	return decipher.update(encryptedText, "base64url", "utf8") + decipher.final("utf8");
-}
-/**
-* Default function to verify asar signature,
-* if signature is valid, returns the version, otherwise returns `undefined`
-* @param buffer file buffer
-* @param version target version
-* @param signature signature
-* @param cert certificate
-*/
-function defaultVerifySignature(buffer, version, signature, cert) {
-	try {
-		const [sig, ver] = aesDecrypt(signature, hashBuffer(cert, 32), hashBuffer(buffer, 16)).split("%");
-		if (ver !== version) return false;
-		return crypto.createVerify("RSA-SHA256").update(buffer).verify(cert, sig, "base64");
-	} catch {
-		return false;
-	}
-}
-
-//#endregion
 //#region src/utils/download.ts
 /**
 * Safe get value from header
@@ -59,6 +14,19 @@ function getHeader(headers, key) {
 async function downloadUtil(url, headers, onResponse) {
 	await app.whenReady();
 	return new Promise((resolve, reject) => {
+		const rejectUnexpectedStatus = (resp) => {
+			const statusCode = resp.statusCode ?? 0;
+			if (statusCode >= 200 && statusCode < 300) return false;
+			let data = "";
+			resp.on("data", (chunk) => {
+				data += chunk;
+				data = trimData(data);
+			});
+			resp.on("end", () => {
+				reject(/* @__PURE__ */ new Error(`Unexpected response status ${statusCode}${resp.statusMessage ? ` ${resp.statusMessage}` : ""} from ${url}: "${data}"`));
+			});
+			return true;
+		};
 		const request = net.request({
 			cache: "no-cache",
 			headers,
@@ -69,6 +37,7 @@ async function downloadUtil(url, headers, onResponse) {
 		request.on("response", (resp) => {
 			resp.on("aborted", () => reject(/* @__PURE__ */ new Error("Aborted")));
 			resp.on("error", reject);
+			if (rejectUnexpectedStatus(resp)) return;
 			onResponse(request, resp, resolve, reject);
 		});
 		request.on("error", reject);
@@ -159,27 +128,5 @@ async function defaultDownloadAsar(url, headers, signal, onDownloading) {
 		}, { once: true });
 	});
 }
-
-//#endregion
-//#region src/utils/zip.ts
-/**
-* Default function to compress file using brotli
-* @param buffer uncompressed file buffer
-*/
-async function defaultZipFile(buffer) {
-	return new Promise((resolve, reject) => {
-		zlib.brotliCompress(buffer, (err, buffer) => err ? reject(err) : resolve(buffer));
-	});
-}
-/**
-* Default function to decompress file using brotli
-* @param buffer compressed file buffer
-*/
-async function defaultUnzipFile(buffer) {
-	return new Promise((resolve, reject) => {
-		zlib.brotliDecompress(buffer, (err, buffer) => err ? reject(err) : resolve(buffer));
-	});
-}
-
 //#endregion
-export { defaultDownloadUpdateJSON as a, resolveJson as c, defaultSignature as d, defaultVerifySignature as f, defaultDownloadText as i, aesDecrypt as l, defaultZipFile as n, downloadUtil as o, hashBuffer as p, defaultDownloadAsar as r, getHeader as s, defaultUnzipFile as t, aesEncrypt as u };
+export { getHeader as a, downloadUtil as i, defaultDownloadText as n, resolveJson as o, defaultDownloadUpdateJSON as r, defaultDownloadAsar as t };

package/dist/download-BYnkme_X.cjs

@@ -0,0 +1,167 @@
+const require_zip = require("./zip-D1dbBzw4.cjs");
+let electron = require("electron");
+//#region src/utils/download.ts
+/**
+* Safe get value from header
+* @param headers response header
+* @param key target header key
+*/
+function getHeader(headers, key) {
+	const value = headers[key];
+	if (Array.isArray(value)) return value.length === 0 ? null : value[value.length - 1];
+	else return value;
+}
+async function downloadUtil(url, headers, onResponse) {
+	await electron.app.whenReady();
+	return new Promise((resolve, reject) => {
+		const rejectUnexpectedStatus = (resp) => {
+			const statusCode = resp.statusCode ?? 0;
+			if (statusCode >= 200 && statusCode < 300) return false;
+			let data = "";
+			resp.on("data", (chunk) => {
+				data += chunk;
+				data = trimData(data);
+			});
+			resp.on("end", () => {
+				reject(/* @__PURE__ */ new Error(`Unexpected response status ${statusCode}${resp.statusMessage ? ` ${resp.statusMessage}` : ""} from ${url}: "${data}"`));
+			});
+			return true;
+		};
+		const request = electron.net.request({
+			cache: "no-cache",
+			headers,
+			method: "GET",
+			redirect: "follow",
+			url
+		});
+		request.on("response", (resp) => {
+			resp.on("aborted", () => reject(/* @__PURE__ */ new Error("Aborted")));
+			resp.on("error", reject);
+			if (rejectUnexpectedStatus(resp)) return;
+			onResponse(request, resp, resolve, reject);
+		});
+		request.on("error", reject);
+		request.end();
+	});
+}
+/**
+* trim length to 5000
+*/
+function trimData(data) {
+	return data.trim().slice(0, 5e3).replace(/\s+/g, " ");
+}
+const resolveJson = (data, resolve, reject) => {
+	try {
+		resolve(JSON.parse(data));
+	} catch {
+		reject(/* @__PURE__ */ new Error(`Invalid json, "${trimData(data)}"`));
+	}
+};
+/**
+* Default function to download json and parse to UpdateJson
+* @param url target url
+* @param headers extra headers
+* @param signal abort signal
+* @param resolveData on resolve
+*/
+async function defaultDownloadText(url, headers, signal, resolveData) {
+	return await downloadUtil(url, headers, (request, resp, resolve, reject) => {
+		let data = "";
+		resp.on("data", (chunk) => data += chunk);
+		resp.on("end", () => resolveData(data, resolve, reject));
+		signal.addEventListener("abort", () => {
+			request.abort();
+			data = null;
+		}, { once: true });
+	});
+}
+/**
+* Default function to download json and parse to UpdateJson
+* @param url target url
+* @param headers extra headers
+* @param signal abort signal
+*/
+async function defaultDownloadUpdateJSON(url, headers, signal) {
+	return await defaultDownloadText(url, headers, signal, (data, resolve, reject) => {
+		try {
+			const json = JSON.parse(data);
+			if (require_zip.isUpdateJSON(json)) resolve(json);
+			else throw Error;
+		} catch {
+			reject(/* @__PURE__ */ new Error(`Invalid update json, "${trimData(data)}"`));
+		}
+	});
+}
+/**
+* Default function to download asar buffer,
+* get total size from `Content-Length` header
+* @param url target url
+* @param headers extra headers
+* @param signal abort signal
+* @param onDownloading on downloading callback
+*/
+async function defaultDownloadAsar(url, headers, signal, onDownloading) {
+	let transferred = 0;
+	let time = Date.now();
+	return await downloadUtil(url, headers, (request, resp, resolve) => {
+		const total = +getHeader(resp.headers, "content-length") || -1;
+		let data = [];
+		resp.on("data", (chunk) => {
+			const delta = chunk.length;
+			transferred += delta;
+			const current = Date.now();
+			onDownloading?.({
+				bps: delta / (current - time),
+				delta,
+				percent: total > 0 ? +(transferred / total).toFixed(2) * 100 : -1,
+				total,
+				transferred
+			});
+			time = current;
+			data.push(chunk);
+		});
+		resp.on("end", () => resolve(Buffer.concat(data)));
+		signal.addEventListener("abort", () => {
+			request.abort();
+			data.length = 0;
+			data = null;
+		}, { once: true });
+	});
+}
+//#endregion
+Object.defineProperty(exports, "defaultDownloadAsar", {
+	enumerable: true,
+	get: function() {
+		return defaultDownloadAsar;
+	}
+});
+Object.defineProperty(exports, "defaultDownloadText", {
+	enumerable: true,
+	get: function() {
+		return defaultDownloadText;
+	}
+});
+Object.defineProperty(exports, "defaultDownloadUpdateJSON", {
+	enumerable: true,
+	get: function() {
+		return defaultDownloadUpdateJSON;
+	}
+});
+Object.defineProperty(exports, "downloadUtil", {
+	enumerable: true,
+	get: function() {
+		return downloadUtil;
+	}
+});
+Object.defineProperty(exports, "getHeader", {
+	enumerable: true,
+	get: function() {
+		return getHeader;
+	}
+});
+Object.defineProperty(exports, "resolveJson", {
+	enumerable: true,
+	get: function() {
+		return resolveJson;
+	}
+});

package/dist/{download-BN4uMS4_.d.mts → download-BjWmHHAu.d.cts}

@@ -1,4 +1,4 @@
-import { p as Arrayable, s as UpdateJSON, t as DownloadingInfo } from "./types-DASqEPXE.mjs";
+import { p as Arrayable, s as UpdateJSON, t as DownloadingInfo } from "./types-BOqQ_r5Q.cjs";
 import { ClientRequest, IncomingMessage } from "electron";
 
 //#region src/utils/download.d.ts

package/dist/{download-DO7iuxEJ.d.cts → download-DVWJfV3S.d.mts}

@@ -1,4 +1,4 @@
-import { p as Arrayable, s as UpdateJSON, t as DownloadingInfo } from "./types-BM9Jfu7q.cjs";
+import { p as Arrayable, s as UpdateJSON, t as DownloadingInfo } from "./types-BOqQ_r5Q.mjs";
 import { ClientRequest, IncomingMessage } from "electron";
 
 //#region src/utils/download.d.ts

package/dist/{electron-BJCk7uxG.mjs → electron-BInvFJ-W.mjs}

@@ -1,7 +1,16 @@
-import { app } from "electron";
 import fs from "node:fs";
 import path from "node:path";
-
+import { app } from "electron";
+import { pathToFileURL } from "node:url";
+//#region src/utils/devtools/font.css?inline
+var font_default = ":root,body{--source-code-font-family:var(--mono)!important;--source-code-font-size:12px!important;--monospace-font-family:var(--mono)!important;--monospace-font-size:12px!important;--default-font-family:var(--sans), sans-serif!important;--default-font-size:12px!important}button,input,select,.undisplayable-text,.expandable-inline-button{font-family:var(--sans)!important}\n";
+//#endregion
+//#region src/utils/devtools/js.ts?inject
+var js_default = "export { };";
+//#endregion
+//#region src/utils/devtools/scrollbar.css?inline
+var scrollbar_default = ":root{--scrollbar-width:max(.85vw, 10px)}@media (prefers-color-scheme:light){:root{--scrollbar-color-rgb:0, 0, 0}}@media (prefers-color-scheme:dark){:root{--scrollbar-color-rgb:255, 255, 255}}::-webkit-scrollbar{width:var(--scrollbar-width)!important;height:var(--scrollbar-width)!important}::-webkit-scrollbar-track{border-radius:var(--scrollbar-width)!important;box-shadow:none!important;background-color:#0000!important}::-webkit-scrollbar-thumb{background-clip:content-box;box-shadow:inset 0 0 0 var(--scrollbar-width)!important;border-radius:var(--scrollbar-width)!important;border:calc(var(--scrollbar-width) * 2 / 9) solid transparent!important;color:rgba(var(--scrollbar-color-rgb), 30%)!important;background-color:#0000!important}::-webkit-scrollbar-thumb:hover{color:rgba(var(--scrollbar-color-rgb), 45%)!important}::-webkit-scrollbar-thumb:active{color:rgba(var(--scrollbar-color-rgb), 60%)!important}@supports not selector(::-webkit-scrollbar){html{scrollbar-color:rgb(var(--scrollbar-color-rgb));scrollbar-width:thin}}\n";
+//#endregion
 //#region src/utils/electron.ts
 /**
 * Compile time dev check
@@ -16,13 +25,19 @@ const isLinux = process.platform === "linux";
 * If is in dev, **always** return `'DEV.asar'`
 */
 function getPathFromAppNameAsar(...paths) {
-	return isDev ? "DEV.asar" : path.join(path.dirname(app.getAppPath()), `${app.name}.asar`, ...paths);
+	return isDev ? path.join(__EIU_LOCAL_DEV_UPDATE_ASAR_PATH__ || "DEV.asar", ...paths) : path.join(path.dirname(app.getAppPath()), `${app.name}.asar`, ...paths);
 }
 /**
 * Get app version, if is in dev, return `getEntryVersion()`
 */
 function getAppVersion() {
-	return isDev ? getEntryVersion() : fs.readFileSync(getPathFromAppNameAsar("version"), "utf-8");
+	if (!isDev) return fs.readFileSync(getPathFromAppNameAsar("version"), "utf-8");
+	if (!__EIU_LOCAL_DEV_UPDATE__) return getEntryVersion();
+	try {
+		return fs.readFileSync(getPathFromAppNameAsar("version"), "utf-8").trim();
+	} catch {
+		return getEntryVersion();
+	}
 }
 /**
 * Get entry version
@@ -38,7 +53,7 @@ function getEntryVersion() {
 */
 function requireNative(moduleName) {
 	const m = getPathFromEntryAsar(moduleName);
-	if (__EIU_IS_ESM__) throw new Error(`Cannot require "${m}", \`requireNative\` only support CommonJS, use \`importNative\` instead`);
+	if (__EIU_IS_ESM__) throw new Error(`Cannot require "${m}", \`requireNative\` only supports CommonJS. Use \`importNative\` instead`);
 	return require(m);
 }
 /**
@@ -49,13 +64,24 @@ function requireNative(moduleName) {
 */
 async function importNative(moduleName) {
 	const m = getPathFromEntryAsar(moduleName);
-	if (!__EIU_IS_ESM__) throw new Error(`Cannot import "${m}", \`importNative\` only support ESModule, use \`requireNative\` instead`);
-	return await import(`file://${m}.js`);
+	if (!__EIU_IS_ESM__) throw new Error(`Cannot import "${m}", \`importNative\` only supports ESModule. Use \`requireNative\` instead`);
+	return await import(pathToFileURL(path.extname(m) ? m : `${m}.mjs`).href);
 }
 /**
 * Restarts the Electron app.
 */
 function restartApp() {
+	if (isDev && __EIU_LOCAL_DEV_UPDATE__ && process.send) {
+		const forceExit = setTimeout(() => app.exit(0), 5e3);
+		process.once("message", (message) => {
+			if (message === "eiu:restart-ready") {
+				clearTimeout(forceExit);
+				app.exit(0);
+			}
+		});
+		process.send("eiu:restart");
+		return;
+	}
 	app.relaunch();
 	app.quit();
 }
@@ -128,10 +154,10 @@ function loadPage(win, htmlFilePath = "index.html") {
 function beautifyDevTools(win, options) {
 	const { mono, sans, scrollbar = true } = options;
 	win.webContents.on("devtools-opened", async () => {
-		let css = `:root{--sans:${sans};--mono:${mono}}:root, body { --source-code-font-family: var(--mono) !important; --source-code-font-size: 12px !important; --monospace-font-family: var(--mono) !important; --monospace-font-size: 12px !important; --default-font-family: var(--sans), sans-serif !important; --default-font-size: 12px !important; } button, input, select, .undisplayable-text, .expandable-inline-button { font-family: var(--sans) !important; } `;
-		if (scrollbar) css += ":root { --scrollbar-width: max(0.85vw, 10px); } @media (prefers-color-scheme: light) { :root { --scrollbar-color-rgb: 0, 0, 0; } } @media (prefers-color-scheme: dark) { :root { --scrollbar-color-rgb: 255, 255, 255; } } *::-webkit-scrollbar { width: var(--scrollbar-width) !important; height: var(--scrollbar-width) !important; } *::-webkit-scrollbar-track { background-color: transparent !important; border-radius: var(--scrollbar-width) !important; box-shadow: none !important; } *::-webkit-scrollbar-thumb { box-shadow: inset 0 0 0 var(--scrollbar-width) !important; border-radius: var(--scrollbar-width) !important; border: calc(var(--scrollbar-width) * 2 / 9) solid transparent !important; background-clip: content-box; background-color: transparent !important; color: rgba(var(--scrollbar-color-rgb), 30%) !important; } *::-webkit-scrollbar-thumb:hover { color: rgba(var(--scrollbar-color-rgb), 45%) !important; } *::-webkit-scrollbar-thumb:active { color: rgba(var(--scrollbar-color-rgb), 60%) !important; } @supports not selector(::-webkit-scrollbar) { html { scrollbar-color: rgb(var(--scrollbar-color-rgb)); scrollbar-width: thin; } } ";
-		const js = `const __CSS__='${css}';function e(e){let t=document.createElement(\`style\`);t.innerHTML=e,document.body.append(t),[\`platform-windows\`,\`platform-mac\`,\`platform-linux\`].forEach(e=>document.querySelectorAll(\`.\${e}\`).forEach(t=>t.classList.remove(e))),r();let n=new MutationObserver(e=>{for(let t of e)if(t.type===\`childList\`)for(let e=0;e<t.addedNodes.length;e++)t.addedNodes[e].classList.contains(\`editor-tooltip-host\`)&&r()});n.observe(document.body,{childList:!0});function r(){document.querySelectorAll(\`.editor-tooltip-host\`).forEach(t=>{if(t?.shadowRoot?.querySelectorAll(\`[data-key="overridden-dev-tools-font"]\`).length===0){let n=document.createElement(\`style\`);n.dataset.key=\`overridden-dev-tools-font\`,n.innerHTML=\`\${e}.cm-tooltip-autocomplete ul[role=listbox]{font-family:var(--mono)!important;}\`,t.shadowRoot.append(n)}})}window.onbeforeunload=()=>n.disconnect()}e(__CSS__);`;
-		await win?.webContents.devToolsWebContents?.executeJavaScript(js);
+		let css = `:root{--sans:${sans};--mono:${mono}}${font_default}`;
+		if (scrollbar) css += scrollbar_default;
+		const js = `const __CSS__=\`${css}\`;${js_default}`;
+		await win?.webContents.devToolsWebContents?.executeJavaScript(js).catch((e) => console.log(`Failed to execute js: ${js}.\n`, e));
 	});
 }
 /**
@@ -176,6 +202,5 @@ function handleUnexpectedErrors(callback) {
 function reloadOnPreloadScriptChanged() {
 	console.warn("`reloadOnPreloadScriptChange()` is no longer needed. It is embeded in `startupWithUpdater()`");
 }
-
 //#endregion
-export { singleInstance as C, setPortableDataPath as S, reloadOnPreloadScriptChanged as _, getPathFromAppNameAsar as a, setAppUserModelId as b, getPathFromPreload as c, importNative as d, isDev as f, loadPage as g, isWin as h, getEntryVersion as i, getPathFromPublic as l, isMac as m, disableHWAccForWin7 as n, getPathFromEntryAsar as o, isLinux as p, getAppVersion as r, getPathFromMain as s, beautifyDevTools as t, handleUnexpectedErrors as u, requireNative as v, setPortableAppDataPath as x, restartApp as y };
+export { singleInstance as C, setPortableDataPath as S, reloadOnPreloadScriptChanged as _, getPathFromAppNameAsar as a, setAppUserModelId as b, getPathFromPreload as c, importNative as d, isDev as f, loadPage as g, isWin as h, getEntryVersion as i, getPathFromPublic as l, isMac as m, disableHWAccForWin7 as n, getPathFromEntryAsar as o, isLinux as p, getAppVersion as r, getPathFromMain as s, beautifyDevTools as t, handleUnexpectedErrors as u, requireNative as v, setPortableAppDataPath as x, restartApp as y };