mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-14 14:17:25 -05:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dfb0893316 |
@@ -20,11 +20,13 @@ const REPO_CONFIG = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function clonePrivateRepo(repoConfig, targetDir) {
|
function clonePrivateRepo(repoConfig, targetDir) {
|
||||||
const repoUrl = `https://gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
|
const token = process.env.GITLAB_TOKEN || process.env.VYLA_GITLAB_TOKEN;
|
||||||
|
const auth = token ? `oauth2:${token}@` : '';
|
||||||
|
const repoUrl = `https://${auth}gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (fs.existsSync(targetDir)) {
|
if (fs.existsSync(targetDir)) {
|
||||||
fs.rmSync(targetDir, { recursive: true, force: true });
|
fs.rmSync(targetDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
||||||
}
|
}
|
||||||
|
|
||||||
execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, {
|
execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, {
|
||||||
@@ -332,6 +334,9 @@ async function build() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const zipPath = path.join(__dirname, 'update-payload.zip');
|
const zipPath = path.join(__dirname, 'update-payload.zip');
|
||||||
|
if (fs.existsSync(zipPath)) {
|
||||||
|
fs.rmSync(zipPath, { force: true });
|
||||||
|
}
|
||||||
zip.writeZip(zipPath);
|
zip.writeZip(zipPath);
|
||||||
|
|
||||||
const checksum = validatePayload(zipPath);
|
const checksum = validatePayload(zipPath);
|
||||||
|
|||||||
12
main.js
12
main.js
@@ -243,6 +243,18 @@ async function start() {
|
|||||||
sendToTauri('status', { message: 'Loading credentials...' });
|
sendToTauri('status', { message: 'Loading credentials...' });
|
||||||
serviceManager.credentialManager.loadCredentials();
|
serviceManager.credentialManager.loadCredentials();
|
||||||
|
|
||||||
|
sendToTauri('status', { message: 'Installing the Vyla SDK to latest version...' });
|
||||||
|
try {
|
||||||
|
require('child_process').execSync('npm install @vyla-entertainment/sdk@latest --no-save --no-audit --no-fund', {
|
||||||
|
cwd: APPDATA_DIR,
|
||||||
|
stdio: 'ignore',
|
||||||
|
windowsHide: true
|
||||||
|
});
|
||||||
|
debugLog("Vyla SDK updated to latest successfully.");
|
||||||
|
} catch (e) {
|
||||||
|
debugLog(`Failed to install Vyla SDK: ${e.message}`);
|
||||||
|
}
|
||||||
|
|
||||||
sendToTauri('status', { message: 'Starting backend services...' });
|
sendToTauri('status', { message: 'Starting backend services...' });
|
||||||
await serviceManager.startServices([
|
await serviceManager.startServices([
|
||||||
{ name: 'auth-proxy', relativeDir: 'auth-proxy' },
|
{ name: 'auth-proxy', relativeDir: 'auth-proxy' },
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vyla-home",
|
"name": "vyla-home",
|
||||||
"version": "1.1.4",
|
"version": "1.1.5",
|
||||||
"description": "Vyla Home Desktop App Launcher",
|
"description": "Vyla Home Desktop App Launcher",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
"@tauri-apps/api": "^2.0.0",
|
"@tauri-apps/api": "^2.0.0",
|
||||||
"@tauri-apps/plugin-shell": "^2.0.0",
|
"@tauri-apps/plugin-shell": "^2.0.0",
|
||||||
"@tauri-apps/plugin-process": "^2.0.0",
|
"@tauri-apps/plugin-process": "^2.0.0",
|
||||||
"@vyla-entertainment/sdk": "^1.10.0",
|
"@vyla-entertainment/sdk": "^1.11.0",
|
||||||
"adm-zip": "^0.6.0",
|
"adm-zip": "^0.6.0",
|
||||||
"express": "^4.19.2"
|
"express": "^4.19.2"
|
||||||
},
|
},
|
||||||
|
|||||||
72
release.js
72
release.js
@@ -78,42 +78,38 @@ function uploadFileToGitLabPackage(filePath, packageName, version, fileName) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createGitLabRelease(tag, releaseLinks) {
|
function createGitLabRelease(tag, releaseLinks) {
|
||||||
const sendRequest = (method, path) => {
|
const sendRequest = (method, path, data = null) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let currentRef = 'main';
|
const options = {
|
||||||
try {
|
|
||||||
currentRef = execSync('git rev-parse HEAD').toString().trim();
|
|
||||||
} catch (e) { }
|
|
||||||
|
|
||||||
const postData = JSON.stringify({
|
|
||||||
name: `Vyla Home Release ${tag}`,
|
|
||||||
tag_name: tag,
|
|
||||||
ref: currentRef,
|
|
||||||
description: `Automated local release ${tag}`,
|
|
||||||
assets: {
|
|
||||||
links: releaseLinks
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const req = https.request({
|
|
||||||
hostname: 'gitlab.com',
|
hostname: 'gitlab.com',
|
||||||
port: 443,
|
port: 443,
|
||||||
path: path,
|
path: path,
|
||||||
method: method,
|
method: method,
|
||||||
headers: {
|
headers: {
|
||||||
'PRIVATE-TOKEN': TOKEN,
|
'PRIVATE-TOKEN': TOKEN,
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json'
|
||||||
'Content-Length': Buffer.byteLength(postData)
|
|
||||||
}
|
}
|
||||||
}, (res) => {
|
};
|
||||||
|
let postData = '';
|
||||||
|
if (data) {
|
||||||
|
postData = JSON.stringify(data);
|
||||||
|
options.headers['Content-Length'] = Buffer.byteLength(postData);
|
||||||
|
}
|
||||||
|
|
||||||
|
const req = https.request(options, (res) => {
|
||||||
let body = '';
|
let body = '';
|
||||||
res.on('data', chunk => body += chunk);
|
res.on('data', chunk => body += chunk);
|
||||||
res.on('end', () => {
|
res.on('end', () => {
|
||||||
if (res.statusCode === 200 || res.statusCode === 201) {
|
if (res.statusCode >= 200 && res.statusCode < 300) {
|
||||||
resolve(JSON.parse(body));
|
try {
|
||||||
|
resolve(body ? JSON.parse(body) : {});
|
||||||
|
} catch (e) {
|
||||||
|
resolve({});
|
||||||
|
}
|
||||||
} else if (res.statusCode === 409 && method === 'POST') {
|
} else if (res.statusCode === 409 && method === 'POST') {
|
||||||
console.log(`Release ${tag} already exists, updating assets...`);
|
console.log(`Release ${tag} already exists, deleting and recreating...`);
|
||||||
sendRequest('PUT', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}`)
|
sendRequest('DELETE', `/api/v4/projects/${PROJECT_ID}/releases/${encodeURIComponent(tag)}`)
|
||||||
|
.then(() => sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, data))
|
||||||
.then(resolve)
|
.then(resolve)
|
||||||
.catch(reject);
|
.catch(reject);
|
||||||
} else {
|
} else {
|
||||||
@@ -123,12 +119,27 @@ function createGitLabRelease(tag, releaseLinks) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
req.on('error', reject);
|
req.on('error', reject);
|
||||||
req.write(postData);
|
if (data) req.write(postData);
|
||||||
req.end();
|
req.end();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`);
|
let currentRef = 'main';
|
||||||
|
try {
|
||||||
|
currentRef = execSync('git rev-parse HEAD').toString().trim();
|
||||||
|
} catch (e) { }
|
||||||
|
|
||||||
|
const releaseData = {
|
||||||
|
name: `Vyla Home Release ${tag}`,
|
||||||
|
tag_name: tag,
|
||||||
|
ref: currentRef,
|
||||||
|
description: `Automated local release ${tag}`,
|
||||||
|
assets: {
|
||||||
|
links: releaseLinks
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return sendRequest('POST', `/api/v4/projects/${PROJECT_ID}/releases`, releaseData);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
@@ -182,11 +193,13 @@ async function main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.log('[2/4] Uploading artifacts to GitLab Package Registry...');
|
console.log('[2/4] Uploading artifacts to GitLab Package Registry...');
|
||||||
|
const timestamp = Date.now();
|
||||||
|
|
||||||
console.log('Uploading update-payload.zip...');
|
console.log('Uploading update-payload.zip...');
|
||||||
const payloadUrl = await uploadFileToGitLabPackage(payloadPath, 'vyla-home', version, 'update-payload.zip');
|
const payloadUrl = await uploadFileToGitLabPackage(payloadPath, 'vyla-home', version, `update-payload-${timestamp}.zip`);
|
||||||
|
|
||||||
console.log('Uploading manifest.json...');
|
console.log('Uploading manifest.json...');
|
||||||
const manifestUrl = await uploadFileToGitLabPackage(manifestPath, 'vyla-home', version, 'manifest.json');
|
const manifestUrl = await uploadFileToGitLabPackage(manifestPath, 'vyla-home', version, `manifest-${timestamp}.json`);
|
||||||
|
|
||||||
const releaseLinks = [
|
const releaseLinks = [
|
||||||
{ name: 'update-payload.zip', url: payloadUrl, link_type: 'other' },
|
{ name: 'update-payload.zip', url: payloadUrl, link_type: 'other' },
|
||||||
@@ -195,7 +208,8 @@ async function main() {
|
|||||||
|
|
||||||
if (installerPath && installerUploadName) {
|
if (installerPath && installerUploadName) {
|
||||||
console.log(`Uploading installer ${installerUploadName}...`);
|
console.log(`Uploading installer ${installerUploadName}...`);
|
||||||
const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUploadName);
|
const installerUnique = installerUploadName.replace('.exe', `-${timestamp}.exe`);
|
||||||
|
const installerUrl = await uploadFileToGitLabPackage(installerPath, 'vyla-home', version, installerUnique);
|
||||||
releaseLinks.push({ name: installerUploadName, url: installerUrl, link_type: 'package' });
|
releaseLinks.push({ name: installerUploadName, url: installerUrl, link_type: 'package' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
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.4"
|
version = "1.1.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "vyla-home"
|
name = "vyla-home"
|
||||||
version = "1.1.4"
|
version = "1.1.5"
|
||||||
description = "Vyla Home Desktop App Launcher"
|
description = "Vyla Home Desktop App Launcher"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
|
|||||||
@@ -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.4",
|
"version": "1.1.5",
|
||||||
"identifier": "com.vyla.home",
|
"identifier": "com.vyla.home",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../ui"
|
"frontendDist": "../ui"
|
||||||
|
|||||||
Reference in New Issue
Block a user