mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-20 09:07:23 -05:00
Fix Mac Node architecture and resources bundle
This commit is contained in:
65
release.js
65
release.js
@@ -247,8 +247,11 @@ async function main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function ensureBundledNode() {
|
function ensureBundledNode() {
|
||||||
|
const os = require('os');
|
||||||
const binDir = path.join(__dirname, 'bin');
|
const binDir = path.join(__dirname, 'bin');
|
||||||
const nodeExePath = path.join(binDir, 'node.exe');
|
const isWin = os.platform() === 'win32';
|
||||||
|
const nodeExeName = isWin ? 'node.exe' : 'node';
|
||||||
|
const nodeExePath = path.join(binDir, nodeExeName);
|
||||||
|
|
||||||
const nodeVersion = 'v22.14.0';
|
const nodeVersion = 'v22.14.0';
|
||||||
const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`);
|
const versionMarker = path.join(binDir, `node-${nodeVersion}.marker`);
|
||||||
@@ -260,35 +263,53 @@ function ensureBundledNode() {
|
|||||||
fs.mkdirSync(binDir, { recursive: true });
|
fs.mkdirSync(binDir, { recursive: true });
|
||||||
console.log(`Downloading standalone Node.js ${nodeVersion} runtime for bundling...`);
|
console.log(`Downloading standalone Node.js ${nodeVersion} runtime for bundling...`);
|
||||||
|
|
||||||
const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const fileStream = fs.createWriteStream(nodeExePath);
|
const download = (url, dest, cb) => {
|
||||||
https.get(nodeUrl, (res) => {
|
https.get(url, (res) => {
|
||||||
if (res.statusCode === 302 || res.statusCode === 301) {
|
if (res.statusCode === 302 || res.statusCode === 301) {
|
||||||
https.get(res.headers.location, (redirectRes) => {
|
return download(res.headers.location, dest, cb);
|
||||||
redirectRes.pipe(fileStream);
|
}
|
||||||
fileStream.on('finish', () => {
|
const fileStream = fs.createWriteStream(dest);
|
||||||
fileStream.close();
|
res.pipe(fileStream);
|
||||||
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
fileStream.on('finish', () => {
|
||||||
resolve();
|
fileStream.close();
|
||||||
});
|
cb();
|
||||||
}).on('error', reject);
|
});
|
||||||
return;
|
}).on('error', reject);
|
||||||
}
|
};
|
||||||
res.pipe(fileStream);
|
|
||||||
fileStream.on('finish', () => {
|
if (isWin) {
|
||||||
fileStream.close();
|
const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/win-x64/node.exe`;
|
||||||
|
download(nodeUrl, nodeExePath, () => {
|
||||||
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
}).on('error', (err) => {
|
} else {
|
||||||
try { fs.unlinkSync(nodeExePath); } catch (e) { }
|
const arch = os.arch() === 'arm64' ? 'arm64' : 'x64';
|
||||||
reject(err);
|
const platform = os.platform() === 'darwin' ? 'darwin' : 'linux';
|
||||||
});
|
const tarName = `node-${nodeVersion}-${platform}-${arch}`;
|
||||||
|
const nodeUrl = `https://nodejs.org/dist/${nodeVersion}/${tarName}.tar.gz`;
|
||||||
|
const tarPath = path.join(binDir, 'node.tar.gz');
|
||||||
|
|
||||||
|
download(nodeUrl, tarPath, () => {
|
||||||
|
try {
|
||||||
|
execSync(`tar -xzf node.tar.gz ${tarName}/bin/node --strip-components=2`, { cwd: binDir });
|
||||||
|
fs.unlinkSync(tarPath);
|
||||||
|
execSync(`chmod +x node`, { cwd: binDir });
|
||||||
|
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
||||||
|
resolve();
|
||||||
|
} catch (e) {
|
||||||
|
reject(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensureWebView2Loader() {
|
function ensureWebView2Loader() {
|
||||||
|
const os = require('os');
|
||||||
|
if (os.platform() !== 'win32') return Promise.resolve();
|
||||||
|
|
||||||
const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release');
|
const releaseDir = path.join(__dirname, 'src-tauri', 'target', 'release');
|
||||||
const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll');
|
const rootDllPath = path.join(__dirname, 'src-tauri', 'WebView2Loader.dll');
|
||||||
fs.mkdirSync(releaseDir, { recursive: true });
|
fs.mkdirSync(releaseDir, { recursive: true });
|
||||||
|
|||||||
@@ -29,8 +29,9 @@
|
|||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
"WebView2Loader.dll",
|
"WebView2Loader.dll",
|
||||||
"../bin/*",
|
"../bin/**/*",
|
||||||
"../main.js",
|
"../main.js",
|
||||||
|
"../preload.js",
|
||||||
"../service-manager.js",
|
"../service-manager.js",
|
||||||
"../patcher.js",
|
"../patcher.js",
|
||||||
"../crypto-utils.js",
|
"../crypto-utils.js",
|
||||||
@@ -40,4 +41,4 @@
|
|||||||
"../node_modules/**/*"
|
"../node_modules/**/*"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user