Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d17c1bc0a2 | |||
| b968ace8fa | |||
| 2cf5623186 | |||
| 5e7786d66e | |||
| 9a52d6b8fc | |||
| 255befd1b8 | |||
| 691b363f88 | |||
| 8972c3e363 | |||
| 5a8d77c494 |
@@ -75,7 +75,7 @@ jobs:
|
|||||||
CHANGED=$(git diff --name-only "$PREV_TAG"..HEAD)
|
CHANGED=$(git diff --name-only "$PREV_TAG"..HEAD)
|
||||||
echo "$CHANGED"
|
echo "$CHANGED"
|
||||||
|
|
||||||
# Files that require a full (installer) build
|
# Files that require a full (installer-only) release
|
||||||
FULL_TRIGGERS="electron-builder.yml|scripts/download-electron.js"
|
FULL_TRIGGERS="electron-builder.yml|scripts/download-electron.js"
|
||||||
|
|
||||||
if echo "$CHANGED" | grep -qE "^($FULL_TRIGGERS)$"; then
|
if echo "$CHANGED" | grep -qE "^($FULL_TRIGGERS)$"; then
|
||||||
@@ -105,13 +105,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: '22'
|
node-version: '22'
|
||||||
|
|
||||||
# Full build needs wine + system deps for electron-builder
|
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: |
|
run: |
|
||||||
sudo dpkg --add-architecture i386
|
dpkg --add-architecture i386
|
||||||
sudo apt-get update -qq
|
apt-get update -qq
|
||||||
sudo apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
wine wine32 wine64 \
|
wine wine32 wine64 \
|
||||||
libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2t64 \
|
libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2t64 \
|
||||||
libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 \
|
libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 \
|
||||||
@@ -123,39 +122,37 @@ jobs:
|
|||||||
if: steps.version-check.outputs.SKIP == 'false'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: npm ci --legacy-peer-deps
|
run: npm ci --legacy-peer-deps
|
||||||
|
|
||||||
# ── Patch release: asar only ──
|
|
||||||
|
|
||||||
- name: Build asar
|
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'patch'
|
|
||||||
run: npm run build:asar
|
|
||||||
|
|
||||||
# ── Full release: installer + asar ──
|
|
||||||
|
|
||||||
- name: Build source
|
- name: Build source
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|
||||||
- name: Build Windows distributables
|
- name: Build Windows distributables
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
env:
|
env:
|
||||||
WINEDEBUG: "-all"
|
WINEDEBUG: "-all"
|
||||||
run: npx electron-builder --win -c.electronDist=node_modules/electron/dist-win --publish never
|
run: npx electron-builder --win -c.electronDist=node_modules/electron/dist-win --publish never
|
||||||
|
|
||||||
- name: Build Linux distributables
|
- name: Build Linux distributables
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: npx electron-builder --linux -c.electronDist=node_modules/electron/dist-linux --publish never
|
run: npx electron-builder --linux -c.electronDist=node_modules/electron/dist-linux --publish never
|
||||||
|
|
||||||
- name: Build asar for full release
|
- name: Extract asar for patch updates
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'patch'
|
||||||
run: npm run build:asar
|
run: |
|
||||||
|
# The asar is a byproduct of the Linux build — platform-independent (just JS)
|
||||||
|
ASAR_SRC="out/linux-unpacked/resources/app.asar"
|
||||||
|
ASAR_DIR="out/asar"
|
||||||
|
mkdir -p "$ASAR_DIR"
|
||||||
|
cp "$ASAR_SRC" "$ASAR_DIR/app.asar"
|
||||||
|
sha256sum "$ASAR_DIR/app.asar" | awk '{print $1 " app.asar"}' > "$ASAR_DIR/checksums.sha256"
|
||||||
|
echo "Extracted asar: $(du -h "$ASAR_DIR/app.asar" | cut -f1)"
|
||||||
|
cat "$ASAR_DIR/checksums.sha256"
|
||||||
|
|
||||||
- name: Report build sizes
|
- name: Report build sizes
|
||||||
if: steps.version-check.outputs.SKIP == 'false'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: |
|
run: |
|
||||||
echo "=== Release type: ${{ steps.release-type.outputs.TYPE }} ==="
|
echo "=== Release type: ${{ steps.release-type.outputs.TYPE }} ==="
|
||||||
if [ "${{ steps.release-type.outputs.TYPE }}" = "full" ]; then
|
ls -lh out/*.exe out/*.AppImage out/*.deb 2>/dev/null || true
|
||||||
ls -lh out/*.exe out/*.AppImage out/*.deb 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
ls -lh out/asar/* 2>/dev/null || true
|
ls -lh out/asar/* 2>/dev/null || true
|
||||||
|
|
||||||
- name: Generate release notes
|
- name: Generate release notes
|
||||||
@@ -215,34 +212,36 @@ jobs:
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Upload asar + checksums (both patch and full releases)
|
# Upload asar + checksums (patch releases only — signals client to use fast path)
|
||||||
for file in out/asar/app.asar out/asar/checksums.sha256; do
|
if [ "$RELEASE_TYPE" = "patch" ]; then
|
||||||
|
for file in out/asar/app.asar out/asar/checksums.sha256; do
|
||||||
|
[ -f "$file" ] || continue
|
||||||
|
FILENAME=$(basename "$file")
|
||||||
|
echo "Uploading: $FILENAME ($(du -h "$file" | cut -f1))"
|
||||||
|
curl -s -X POST \
|
||||||
|
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$FILENAME" \
|
||||||
|
-H "Authorization: token $GITEA_TOKEN" \
|
||||||
|
-F "attachment=@$file" \
|
||||||
|
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo "Full release — skipping asar upload (forces installer update)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Upload installers (always — for new users and major updates)
|
||||||
|
for file in out/*.exe out/*.AppImage out/*.deb; do
|
||||||
[ -f "$file" ] || continue
|
[ -f "$file" ] || continue
|
||||||
FILENAME=$(basename "$file")
|
FILENAME=$(basename "$file")
|
||||||
echo "Uploading: $FILENAME ($(du -h "$file" | cut -f1))"
|
SAFE_NAME=$(echo "$FILENAME" | tr ' ' '_')
|
||||||
|
echo "Uploading: $SAFE_NAME ($(du -h "$file" | cut -f1))"
|
||||||
curl -s -X POST \
|
curl -s -X POST \
|
||||||
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$FILENAME" \
|
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$SAFE_NAME" \
|
||||||
-H "Authorization: token $GITEA_TOKEN" \
|
-H "Authorization: token $GITEA_TOKEN" \
|
||||||
-F "attachment=@$file" \
|
-F "attachment=@$file" \
|
||||||
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
||||||
done
|
done
|
||||||
|
|
||||||
# Upload installer artifacts (full release only)
|
echo "All assets uploaded"
|
||||||
if [ "$RELEASE_TYPE" = "full" ]; then
|
|
||||||
for file in out/*.exe out/*.AppImage out/*.deb; do
|
|
||||||
[ -f "$file" ] || continue
|
|
||||||
FILENAME=$(basename "$file")
|
|
||||||
SAFE_NAME=$(echo "$FILENAME" | tr ' ' '_')
|
|
||||||
echo "Uploading: $SAFE_NAME ($(du -h "$file" | cut -f1))"
|
|
||||||
curl -s -X POST \
|
|
||||||
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$SAFE_NAME" \
|
|
||||||
-H "Authorization: token $GITEA_TOKEN" \
|
|
||||||
-F "attachment=@$file" \
|
|
||||||
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "All assets uploaded (release type: $RELEASE_TYPE)"
|
|
||||||
|
|
||||||
- name: Prune old releases
|
- name: Prune old releases
|
||||||
if: steps.version-check.outputs.SKIP == 'false'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
|
|||||||
Generated
+2
-76
@@ -1,19 +1,18 @@
|
|||||||
{
|
{
|
||||||
"name": "krunker-civilian-client",
|
"name": "krunker-civilian-client",
|
||||||
"version": "0.7.5",
|
"version": "0.7.9",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "krunker-civilian-client",
|
"name": "krunker-civilian-client",
|
||||||
"version": "0.7.5",
|
"version": "0.7.9",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"electron-store": "^8.2.0"
|
"electron-store": "^8.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@electron/asar": "^4.2.0",
|
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^10.0.1",
|
||||||
"@types/node": "^22.0.0",
|
"@types/node": "^22.0.0",
|
||||||
"electron": "npm:electron-nightly@42.0.0-nightly.20260227",
|
"electron": "npm:electron-nightly@42.0.0-nightly.20260227",
|
||||||
@@ -45,69 +44,6 @@
|
|||||||
"url": "https://opencollective.com/webpack"
|
"url": "https://opencollective.com/webpack"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@electron/asar": {
|
|
||||||
"version": "4.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@electron/asar/-/asar-4.2.0.tgz",
|
|
||||||
"integrity": "sha512-npW1NW5yy8EB9XY/vEw9sUdgmq0sJEhmSBb6bqyFOAw1CSkrhvAvO6QWlW8CdIMo8VN1lkdF345l/MeW0LrY0Q==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"commander": "^13.1.0",
|
|
||||||
"glob": "^13.0.2",
|
|
||||||
"minimatch": "^10.0.1"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"asar": "bin/asar.mjs"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=22.12.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@electron/asar/node_modules/glob": {
|
|
||||||
"version": "13.0.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
|
|
||||||
"integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"dependencies": {
|
|
||||||
"minimatch": "^10.2.2",
|
|
||||||
"minipass": "^7.1.3",
|
|
||||||
"path-scurry": "^2.0.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@electron/asar/node_modules/lru-cache": {
|
|
||||||
"version": "11.3.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.3.5.tgz",
|
|
||||||
"integrity": "sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"engines": {
|
|
||||||
"node": "20 || >=22"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@electron/asar/node_modules/path-scurry": {
|
|
||||||
"version": "2.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
|
|
||||||
"integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"dependencies": {
|
|
||||||
"lru-cache": "^11.0.0",
|
|
||||||
"minipass": "^7.1.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@electron/fuses": {
|
"node_modules/@electron/fuses": {
|
||||||
"version": "1.8.0",
|
"version": "1.8.0",
|
||||||
"resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz",
|
||||||
@@ -3157,16 +3093,6 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/commander": {
|
|
||||||
"version": "13.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
|
|
||||||
"integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/compare-version": {
|
"node_modules/compare-version": {
|
||||||
"version": "0.1.2",
|
"version": "0.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
|
||||||
|
|||||||
+1
-3
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "krunker-civilian-client",
|
"name": "krunker-civilian-client",
|
||||||
"version": "0.7.6",
|
"version": "0.8.0",
|
||||||
"description": "Cross-platform Krunker game client",
|
"description": "Cross-platform Krunker game client",
|
||||||
"main": "dist/main/index.js",
|
"main": "dist/main/index.js",
|
||||||
"homepage": "https://github.com/bigjakk/Krunker-Civilian-Client",
|
"homepage": "https://github.com/bigjakk/Krunker-Civilian-Client",
|
||||||
@@ -17,7 +17,6 @@
|
|||||||
"dist:win": "npm run build && electron-builder --win",
|
"dist:win": "npm run build && electron-builder --win",
|
||||||
"dist:linux": "npm run build && electron-builder --linux",
|
"dist:linux": "npm run build && electron-builder --linux",
|
||||||
"dist:all": "npm run build && electron-builder --win --linux",
|
"dist:all": "npm run build && electron-builder --win --linux",
|
||||||
"build:asar": "node scripts/build-asar.js",
|
|
||||||
"clean": "rimraf dist out",
|
"clean": "rimraf dist out",
|
||||||
"lint": "eslint src/",
|
"lint": "eslint src/",
|
||||||
"prepare": "husky"
|
"prepare": "husky"
|
||||||
@@ -29,7 +28,6 @@
|
|||||||
"electron-store": "^8.2.0"
|
"electron-store": "^8.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@electron/asar": "^4.2.0",
|
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^10.0.1",
|
||||||
"@types/node": "^22.0.0",
|
"@types/node": "^22.0.0",
|
||||||
"electron": "npm:electron-nightly@42.0.0-nightly.20260227",
|
"electron": "npm:electron-nightly@42.0.0-nightly.20260227",
|
||||||
|
|||||||
@@ -1,96 +0,0 @@
|
|||||||
/**
|
|
||||||
* Build a standalone app.asar + checksums.sha256 for minor (patch) updates.
|
|
||||||
*
|
|
||||||
* Replicates what electron-builder packs into the asar (dist/ + package.json +
|
|
||||||
* required node_modules) without running the full installer build.
|
|
||||||
*
|
|
||||||
* Usage:
|
|
||||||
* npm run build:asar # default (github) update source
|
|
||||||
* UPDATE_SOURCE=gitea npm run build:asar # gitea update source
|
|
||||||
*/
|
|
||||||
|
|
||||||
const { execSync } = require('child_process');
|
|
||||||
const { cpSync, mkdirSync, rmSync, readFileSync, writeFileSync, createReadStream } = require('fs');
|
|
||||||
const { join } = require('path');
|
|
||||||
const { createHash } = require('crypto');
|
|
||||||
const asar = require('@electron/asar');
|
|
||||||
|
|
||||||
const ROOT = join(__dirname, '..');
|
|
||||||
const STAGING = join(ROOT, 'out', 'asar-staging');
|
|
||||||
const OUTPUT = join(ROOT, 'out', 'asar');
|
|
||||||
|
|
||||||
// Same node_modules list as electron-builder.yml
|
|
||||||
const NODE_MODULES = [
|
|
||||||
'electron-store', 'conf', 'dot-prop', 'type-fest', 'pkg-up',
|
|
||||||
'find-up', 'locate-path', 'p-locate', 'p-limit', 'yocto-queue',
|
|
||||||
'path-exists', 'env-paths', 'json-schema-typed', 'ajv', 'ajv-formats',
|
|
||||||
'atomically', 'debounce-fn', 'mimic-fn', 'semver', 'onetime',
|
|
||||||
];
|
|
||||||
|
|
||||||
function shouldExclude(src) {
|
|
||||||
return src.endsWith('.ts') || src.endsWith('.map');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function main() {
|
|
||||||
// 1. Run Vite build (pass UPDATE_SOURCE through env)
|
|
||||||
const env = { ...process.env };
|
|
||||||
if (env.UPDATE_SOURCE) {
|
|
||||||
console.log(`Building with UPDATE_SOURCE=${env.UPDATE_SOURCE}`);
|
|
||||||
}
|
|
||||||
execSync('npm run build', { cwd: ROOT, stdio: 'inherit', env });
|
|
||||||
|
|
||||||
// 2. Prepare staging directory
|
|
||||||
rmSync(STAGING, { recursive: true, force: true });
|
|
||||||
mkdirSync(STAGING, { recursive: true });
|
|
||||||
|
|
||||||
// Copy dist/
|
|
||||||
cpSync(join(ROOT, 'dist'), join(STAGING, 'dist'), { recursive: true });
|
|
||||||
|
|
||||||
// Copy package.json (Electron reads "main" from it)
|
|
||||||
cpSync(join(ROOT, 'package.json'), join(STAGING, 'package.json'));
|
|
||||||
|
|
||||||
// Copy required node_modules (excluding .ts and .map files)
|
|
||||||
for (const mod of NODE_MODULES) {
|
|
||||||
const src = join(ROOT, 'node_modules', mod);
|
|
||||||
const dest = join(STAGING, 'node_modules', mod);
|
|
||||||
cpSync(src, dest, {
|
|
||||||
recursive: true,
|
|
||||||
filter: (s) => !shouldExclude(s),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3. Pack into asar
|
|
||||||
mkdirSync(OUTPUT, { recursive: true });
|
|
||||||
const asarPath = join(OUTPUT, 'app.asar');
|
|
||||||
await asar.createPackage(STAGING, asarPath);
|
|
||||||
console.log('Created:', asarPath);
|
|
||||||
|
|
||||||
// 4. Generate checksums.sha256
|
|
||||||
const hex = await fileHash(asarPath);
|
|
||||||
const checksumsPath = join(OUTPUT, 'checksums.sha256');
|
|
||||||
writeFileSync(checksumsPath, `${hex} app.asar\n`);
|
|
||||||
console.log(`SHA-256: ${hex}`);
|
|
||||||
console.log('Created:', checksumsPath);
|
|
||||||
|
|
||||||
// 5. Cleanup staging
|
|
||||||
rmSync(STAGING, { recursive: true, force: true });
|
|
||||||
|
|
||||||
// Print size
|
|
||||||
const size = readFileSync(asarPath).length;
|
|
||||||
console.log(`\napp.asar size: ${(size / 1024).toFixed(1)} KB`);
|
|
||||||
}
|
|
||||||
|
|
||||||
function fileHash(filePath) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
const hash = createHash('sha256');
|
|
||||||
const stream = createReadStream(filePath);
|
|
||||||
stream.on('data', (chunk) => hash.update(chunk));
|
|
||||||
stream.on('end', () => resolve(hash.digest('hex')));
|
|
||||||
stream.on('error', reject);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
main().catch((err) => {
|
|
||||||
console.error('build-asar failed:', err);
|
|
||||||
process.exit(1);
|
|
||||||
});
|
|
||||||
+6
-5
@@ -1,6 +1,7 @@
|
|||||||
import { app, BrowserWindow, Menu, clipboard, ipcMain, safeStorage, session, shell } from 'electron';
|
import { app, BrowserWindow, Menu, clipboard, ipcMain, safeStorage, session, shell } from 'electron';
|
||||||
import { join, dirname } from 'path';
|
import { join, dirname } from 'path';
|
||||||
import { existsSync, mkdirSync, unlinkSync, promises as fsp } from 'fs';
|
import { existsSync, mkdirSync, promises as fsp } from 'fs';
|
||||||
|
import { existsSync as origExistsSync, unlinkSync as origUnlinkSync } from 'original-fs';
|
||||||
import { get as httpsGet } from 'https';
|
import { get as httpsGet } from 'https';
|
||||||
import { execFile } from 'child_process';
|
import { execFile } from 'child_process';
|
||||||
import * as os from 'os';
|
import * as os from 'os';
|
||||||
@@ -179,8 +180,8 @@ app.whenReady().then(async () => {
|
|||||||
// Clean up stale pending asar from a previous failed swap
|
// Clean up stale pending asar from a previous failed swap
|
||||||
const resourcesDir = join(dirname(app.getPath('exe')), 'resources');
|
const resourcesDir = join(dirname(app.getPath('exe')), 'resources');
|
||||||
const stalePending = join(resourcesDir, 'app-pending.asar');
|
const stalePending = join(resourcesDir, 'app-pending.asar');
|
||||||
if (existsSync(stalePending)) {
|
if (origExistsSync(stalePending)) {
|
||||||
try { unlinkSync(stalePending); } catch { /* ignore */ }
|
try { origUnlinkSync(stalePending); } catch { /* ignore */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -213,8 +214,8 @@ app.whenReady().then(async () => {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
electronLog.error('[KCC] Patch download failed:', err);
|
electronLog.error('[KCC] Patch download failed:', err);
|
||||||
// Clean up failed download
|
// Clean up failed download
|
||||||
if (existsSync(pendingPath)) {
|
if (origExistsSync(pendingPath)) {
|
||||||
try { unlinkSync(pendingPath); } catch { /* ignore */ }
|
try { origUnlinkSync(pendingPath); } catch { /* ignore */ }
|
||||||
}
|
}
|
||||||
if (!updateWin.isDestroyed()) updateWin.close();
|
if (!updateWin.isDestroyed()) updateWin.close();
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-4
@@ -1,5 +1,7 @@
|
|||||||
import { get as httpsGet } from 'https';
|
import { get as httpsGet } from 'https';
|
||||||
import { createReadStream, createWriteStream, writeFileSync, renameSync, unlinkSync, existsSync, mkdirSync } from 'fs';
|
// Use original-fs to bypass Electron's asar interception — required for
|
||||||
|
// writing/renaming .asar files in the resources directory.
|
||||||
|
import { createReadStream, createWriteStream, writeFileSync, renameSync, unlinkSync, existsSync, mkdirSync } from 'original-fs';
|
||||||
import { join, dirname } from 'path';
|
import { join, dirname } from 'path';
|
||||||
import { createHash } from 'crypto';
|
import { createHash } from 'crypto';
|
||||||
import { spawn } from 'child_process';
|
import { spawn } from 'child_process';
|
||||||
@@ -78,12 +80,12 @@ if (-not (Test-Path $pending)) { exit 1 }
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (Test-Path $backup) { Remove-Item $backup -Force }
|
if (Test-Path $backup) { Remove-Item $backup -Force }
|
||||||
Rename-Item $asar $backup -Force
|
Move-Item $asar $backup -Force
|
||||||
Rename-Item $pending $asar -Force
|
Move-Item $pending $asar -Force
|
||||||
if (Test-Path $backup) { Remove-Item $backup -Force }
|
if (Test-Path $backup) { Remove-Item $backup -Force }
|
||||||
} catch {
|
} catch {
|
||||||
if ((Test-Path $backup) -and -not (Test-Path $asar)) {
|
if ((Test-Path $backup) -and -not (Test-Path $asar)) {
|
||||||
Rename-Item $backup $asar -Force
|
Move-Item $backup $asar -Force
|
||||||
}
|
}
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ export default defineConfig({
|
|||||||
outDir: 'dist/main',
|
outDir: 'dist/main',
|
||||||
emptyDirBefore: true,
|
emptyDirBefore: true,
|
||||||
rollupOptions: {
|
rollupOptions: {
|
||||||
external: ['electron', 'electron-store', ...nodeBuiltins],
|
external: ['electron', 'electron-store', 'original-fs', ...nodeBuiltins],
|
||||||
},
|
},
|
||||||
target: 'node20',
|
target: 'node20',
|
||||||
minify: isProd,
|
minify: isProd,
|
||||||
|
|||||||
Reference in New Issue
Block a user