mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-14 06:07:23 -05:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 08c70a2c6d | |||
| 1092d359ab | |||
| dcba2a2438 | |||
| 8f99096bfb |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vyla-home",
|
"name": "vyla-home",
|
||||||
"version": "1.1.1",
|
"version": "1.1.4",
|
||||||
"description": "Vyla Home Desktop App Launcher",
|
"description": "Vyla Home Desktop App Launcher",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -54,4 +54,4 @@
|
|||||||
"installerHeaderIcon": "build/icon.ico"
|
"installerHeaderIcon": "build/icon.ico"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
67
release.js
67
release.js
@@ -156,15 +156,23 @@ async function main() {
|
|||||||
console.log('Ensuring bundled Node.js runtime...');
|
console.log('Ensuring bundled Node.js runtime...');
|
||||||
await ensureBundledNode();
|
await ensureBundledNode();
|
||||||
|
|
||||||
|
await ensureWebView2Loader();
|
||||||
|
|
||||||
|
const bundleDir = path.join(__dirname, 'src-tauri', 'target', 'release', 'bundle');
|
||||||
|
if (fs.existsSync(bundleDir)) {
|
||||||
|
fs.rmSync(bundleDir, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
|
||||||
console.log('Compiling Windows Tauri installer locally...');
|
console.log('Compiling Windows Tauri installer locally...');
|
||||||
execSync('npm run build', {
|
execSync('npm run build', {
|
||||||
stdio: 'inherit',
|
stdio: 'inherit'
|
||||||
env: Object.assign({}, process.env, { WEBVIEW2_STATIC_LIB: '1' })
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const nsisDir = path.join(__dirname, 'src-tauri/target/release/bundle/nsis');
|
const nsisDir = path.join(__dirname, 'src-tauri/target/release/bundle/nsis');
|
||||||
if (fs.existsSync(nsisDir)) {
|
if (fs.existsSync(nsisDir)) {
|
||||||
const files = fs.readdirSync(nsisDir).filter(f => f.endsWith('.exe'));
|
const targetVersion = version.startsWith('v') ? version.substring(1) : version;
|
||||||
|
const files = fs.readdirSync(nsisDir).filter(f => f.endsWith('.exe') && f.includes(targetVersion));
|
||||||
|
|
||||||
if (files.length > 0) {
|
if (files.length > 0) {
|
||||||
const originalName = files[0];
|
const originalName = files[0];
|
||||||
installerPath = path.join(nsisDir, originalName);
|
installerPath = path.join(nsisDir, originalName);
|
||||||
@@ -238,6 +246,59 @@ function ensureBundledNode() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ensureWebView2Loader() {
|
||||||
|
const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release');
|
||||||
|
const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll');
|
||||||
|
fs.mkdirSync(releaseDir, { recursive: true });
|
||||||
|
|
||||||
|
const targetDllPath = path.join(releaseDir, 'WebView2Loader.dll');
|
||||||
|
|
||||||
|
if (fs.existsSync(rootDllPath) && fs.existsSync(targetDllPath)) {
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
const AdmZip = require('adm-zip');
|
||||||
|
const tempNupkg = path.join(__dirname, 'temp-wv2.zip');
|
||||||
|
const nupkgUrl = 'https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/1.0.2903.40';
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const fileStream = fs.createWriteStream(tempNupkg);
|
||||||
|
const request = (url) => {
|
||||||
|
https.get(url, (res) => {
|
||||||
|
if (res.statusCode === 301 || res.statusCode === 302) {
|
||||||
|
return request(res.headers.location);
|
||||||
|
}
|
||||||
|
res.pipe(fileStream);
|
||||||
|
fileStream.on('finish', () => {
|
||||||
|
fileStream.close();
|
||||||
|
try {
|
||||||
|
const zip = new AdmZip(tempNupkg);
|
||||||
|
const zipEntries = zip.getEntries();
|
||||||
|
const dllEntry = zipEntries.find(e =>
|
||||||
|
e.entryName.includes('x64/WebView2Loader.dll') ||
|
||||||
|
e.entryName.includes('x64\\WebView2Loader.dll')
|
||||||
|
);
|
||||||
|
if (dllEntry) {
|
||||||
|
const buffer = dllEntry.getData();
|
||||||
|
fs.writeFileSync(targetDllPath, buffer);
|
||||||
|
fs.writeFileSync(rootDllPath, buffer);
|
||||||
|
}
|
||||||
|
try { fs.unlinkSync(tempNupkg); } catch (_) { }
|
||||||
|
resolve();
|
||||||
|
} catch (e) {
|
||||||
|
try { fs.unlinkSync(tempNupkg); } catch (_) { }
|
||||||
|
reject(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}).on('error', (err) => {
|
||||||
|
try { fs.unlinkSync(tempNupkg); } catch (_) { }
|
||||||
|
reject(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
request(nupkgUrl);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
main().catch(err => {
|
main().catch(err => {
|
||||||
console.error('Release failed:', err.message);
|
console.error('Release failed:', err.message);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
|
|||||||
2
src-tauri/Cargo.lock
generated
2
src-tauri/Cargo.lock
generated
@@ -4222,7 +4222,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.1.1"
|
version = "1.1.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.1.1"
|
version = "1.1.4"
|
||||||
description = "Vyla Home Desktop App Launcher"
|
description = "Vyla Home Desktop App Launcher"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
|
|||||||
BIN
src-tauri/WebView2Loader.dll
Normal file
BIN
src-tauri/WebView2Loader.dll
Normal file
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "Vyla Home",
|
"productName": "Vyla Home",
|
||||||
"version": "1.1.1",
|
"version": "1.1.4",
|
||||||
"identifier": "com.vyla.home",
|
"identifier": "com.vyla.home",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../ui"
|
"frontendDist": "../ui"
|
||||||
@@ -28,6 +28,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
|
"WebView2Loader.dll",
|
||||||
"../bin/*",
|
"../bin/*",
|
||||||
"../main.js",
|
"../main.js",
|
||||||
"../service-manager.js",
|
"../service-manager.js",
|
||||||
|
|||||||
Reference in New Issue
Block a user