mirror of
https://gitlab.com/vyla-entertainment/go.git
synced 2026-11-14 07:27:23 -05:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f7a969698 | ||
|
|
fd738eeba5 | ||
|
|
a28239cf60 | ||
|
|
966115c456 | ||
| 2c0cc5c933 | |||
| 0e385aae9e | |||
|
cd18f09142
|
|||
| bd321520c9 | |||
| c869101923 | |||
| feccab9aa1 | |||
| 82c91334f6 |
BIN
assets/logos/white_logo.png
Normal file
BIN
assets/logos/white_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
@@ -20,33 +20,91 @@ function cleanBuildDir() {
|
||||
fs.mkdirSync(BUILD_DIR, { recursive: true });
|
||||
}
|
||||
|
||||
function removeSensitiveFiles(dir) {
|
||||
if (!fs.existsSync(dir)) return;
|
||||
|
||||
const gitDir = path.join(dir, '.git');
|
||||
if (fs.existsSync(gitDir)) {
|
||||
fs.rmSync(gitDir, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
const entries = fs.readdirSync(dir, { withFileTypes: true });
|
||||
for (const entry of entries) {
|
||||
const fullPath = path.join(dir, entry.name);
|
||||
if (entry.isDirectory()) {
|
||||
if (entry.name === '.git') {
|
||||
fs.rmSync(fullPath, { recursive: true, force: true });
|
||||
} else {
|
||||
removeSensitiveFiles(fullPath);
|
||||
}
|
||||
} else {
|
||||
if (
|
||||
entry.name.startsWith('.env') ||
|
||||
entry.name.endsWith('.key') ||
|
||||
entry.name.endsWith('.pem') ||
|
||||
entry.name === 'credentials.json' ||
|
||||
entry.name === '.gitlab-ci.yml'
|
||||
) {
|
||||
fs.rmSync(fullPath, { force: true });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function clonePrivateRepo(repoConfig, targetDir) {
|
||||
if (fs.existsSync(targetDir)) {
|
||||
fs.rmSync(targetDir, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
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`;
|
||||
execSync(`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} ${targetDir}`, { stdio: 'inherit' });
|
||||
const repoUrl = `https://gitlab.com/${GITLAB_GROUP}/${repoConfig.name}.git`;
|
||||
|
||||
try {
|
||||
if (token) {
|
||||
const authHeader = Buffer.from(`oauth2:${token.trim()}`).toString('base64');
|
||||
execSync(
|
||||
`git -c "http.extraHeader=Authorization: Basic ${authHeader}" clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} "${targetDir}"`,
|
||||
{ stdio: 'inherit' }
|
||||
);
|
||||
} else {
|
||||
execSync(
|
||||
`git clone --depth 1 --branch ${repoConfig.branch} ${repoUrl} "${targetDir}"`,
|
||||
{ stdio: 'inherit' }
|
||||
);
|
||||
}
|
||||
} finally {
|
||||
const gitFolder = path.join(targetDir, '.git');
|
||||
if (fs.existsSync(gitFolder)) {
|
||||
fs.rmSync(gitFolder, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function build() {
|
||||
cleanBuildDir();
|
||||
|
||||
for (const [key, config] of Object.entries(REPO_CONFIG)) {
|
||||
const targetDir = path.join(__dirname, key);
|
||||
console.log(`Cloning ${config.name}...`);
|
||||
clonePrivateRepo(config, targetDir);
|
||||
|
||||
console.log(`Installing production dependencies for ${config.name}...`);
|
||||
execSync('npm install --omit=dev', { cwd: targetDir, stdio: 'inherit' });
|
||||
|
||||
removeSensitiveFiles(targetDir);
|
||||
}
|
||||
|
||||
const zip = new AdmZip();
|
||||
|
||||
const configDir = path.join(__dirname, 'config');
|
||||
if (fs.existsSync(configDir)) {
|
||||
removeSensitiveFiles(configDir);
|
||||
zip.addLocalFolder(configDir, 'config');
|
||||
}
|
||||
|
||||
for (const repo of REPOS) {
|
||||
const srcRepo = path.join(__dirname, repo);
|
||||
removeSensitiveFiles(srcRepo);
|
||||
zip.addLocalFolder(srcRepo, repo);
|
||||
}
|
||||
|
||||
@@ -54,6 +112,20 @@ async function build() {
|
||||
if (fs.existsSync(zipPath)) fs.rmSync(zipPath, { force: true });
|
||||
zip.writeZip(zipPath);
|
||||
|
||||
const verificationZip = new AdmZip(zipPath);
|
||||
const leakedEntries = verificationZip.getEntries().filter(e =>
|
||||
e.entryName.includes('.git/') ||
|
||||
e.entryName.includes('.git\\') ||
|
||||
e.entryName.startsWith('.env') ||
|
||||
e.entryName.includes('/.env') ||
|
||||
e.entryName.endsWith('config/encrypted-credentials.json')
|
||||
);
|
||||
|
||||
if (leakedEntries.length > 0) {
|
||||
fs.rmSync(zipPath, { force: true });
|
||||
throw new Error(`SECURITY ABORT: Archive contains forbidden files:\n${leakedEntries.map(e => e.entryName).join('\n')}`);
|
||||
}
|
||||
|
||||
const hash = crypto.createHash('sha256');
|
||||
hash.update(fs.readFileSync(zipPath));
|
||||
const checksum = hash.digest('hex');
|
||||
@@ -68,6 +140,8 @@ async function build() {
|
||||
for (const repo of REPOS) {
|
||||
fs.rmSync(path.join(__dirname, repo), { recursive: true, force: true });
|
||||
}
|
||||
|
||||
console.log('Build complete and verified clean.');
|
||||
}
|
||||
|
||||
build().catch(err => {
|
||||
|
||||
1
frontend
1
frontend
Submodule frontend deleted from e23979cbe0
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vyla-go",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.10",
|
||||
"description": "Vyla Go Mobile Launcher",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
@@ -16,7 +16,7 @@
|
||||
"@tauri-apps/plugin-opener": "^2.0.0",
|
||||
"@tauri-apps/plugin-process": "^2.0.0",
|
||||
"@tauri-apps/plugin-shell": "^2.0.0",
|
||||
"@vyla-entertainment/sdk": "^1.11.0",
|
||||
"@vyla-entertainment/sdk": "^1.18.0",
|
||||
"adm-zip": "^0.6.0",
|
||||
"express": "^4.19.2"
|
||||
},
|
||||
|
||||
22
release.js
22
release.js
@@ -32,11 +32,21 @@ function incrementVersion() {
|
||||
function gitCommitAndTag(version) {
|
||||
try {
|
||||
execSync('git add package.json src-tauri/tauri.conf.json', { stdio: 'inherit' });
|
||||
execSync(`git commit -m "chore: release ${version}"`, { stdio: 'inherit' });
|
||||
execSync(`git tag -a ${version} -m "Release ${version}"`, { stdio: 'inherit' });
|
||||
try {
|
||||
execSync(`git commit -m "chore: release ${version}"`, { stdio: 'inherit' });
|
||||
} catch (_) {
|
||||
console.log('Working tree clean, skipping commit.');
|
||||
}
|
||||
|
||||
try {
|
||||
execSync(`git tag -a ${version} -m "Release ${version}"`, { stdio: 'inherit' });
|
||||
} catch (_) {
|
||||
console.log(`Tag ${version} already exists locally.`);
|
||||
}
|
||||
|
||||
execSync('git push origin HEAD --tags', { stdio: 'inherit' });
|
||||
} catch (e) {
|
||||
console.warn('Git operations failed (non-fatal):', e.message);
|
||||
console.warn('Git push failed (will fallback to GitLab API ref):', e.message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,6 +104,11 @@ async function createRelease(version, assets) {
|
||||
const payload = assets.payload;
|
||||
const manifest = assets.manifest;
|
||||
|
||||
let branch = 'main';
|
||||
try {
|
||||
branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim() || 'main';
|
||||
} catch (_) { }
|
||||
|
||||
const description = [
|
||||
`## Automated Release ${version}`,
|
||||
'',
|
||||
@@ -110,6 +125,7 @@ async function createRelease(version, assets) {
|
||||
const body = JSON.stringify({
|
||||
name: `Vyla Go Release ${version}`,
|
||||
tag_name: tag,
|
||||
ref: branch,
|
||||
description,
|
||||
assets: {
|
||||
links: [
|
||||
|
||||
@@ -13,6 +13,14 @@ val tauriProperties = Properties().apply {
|
||||
}
|
||||
}
|
||||
|
||||
configurations.all {
|
||||
resolutionStrategy {
|
||||
force("com.fasterxml.jackson.core:jackson-databind:2.13.5")
|
||||
force("com.fasterxml.jackson.core:jackson-core:2.13.5")
|
||||
force("com.fasterxml.jackson.core:jackson-annotations:2.13.5")
|
||||
}
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdk = 36
|
||||
namespace = "com.vyla.go"
|
||||
@@ -23,6 +31,9 @@ android {
|
||||
targetSdk = 36
|
||||
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
|
||||
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
|
||||
ndk {
|
||||
abiFilters.addAll(listOf("arm64-v8a", "armeabi-v7a", "x86_64"))
|
||||
}
|
||||
}
|
||||
signingConfigs {
|
||||
create("release") {
|
||||
@@ -59,6 +70,11 @@ android {
|
||||
useLegacyPackaging = true
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
}
|
||||
}
|
||||
|
||||
rust {
|
||||
@@ -74,6 +90,7 @@ dependencies {
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
androidTestImplementation("androidx.test.ext:junit:1.1.4")
|
||||
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
|
||||
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
|
||||
}
|
||||
|
||||
apply(from = "tauri.build.gradle.kts")
|
||||
@@ -2,15 +2,19 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
|
||||
<uses-feature android:name="android.software.leanback" android:required="false" />
|
||||
|
||||
<application
|
||||
android:label="@string/app_name"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:banner="@drawable/tv_banner"
|
||||
android:usesCleartextTraffic="true"
|
||||
android:networkSecurityConfig="@xml/network_security_config"
|
||||
android:largeHeap="true"
|
||||
android:extractNativeLibs="true"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.vyla_go">
|
||||
<activity
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
|
||||
@@ -22,6 +26,10 @@
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
</manifest>
|
||||
BIN
src-tauri/gen/android/app/src/main/res/drawable/tv_banner.png
Normal file
BIN
src-tauri/gen/android/app/src/main/res/drawable/tv_banner.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.6 KiB |
@@ -21,7 +21,6 @@ open class BuildTask : DefaultTask() {
|
||||
runTauriCli(executable)
|
||||
} catch (e: Exception) {
|
||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
||||
// Try different Windows-specific extensions
|
||||
val fallbacks = listOf(
|
||||
"$executable.exe",
|
||||
"$executable.cmd",
|
||||
|
||||
2875
src-tauri/gen/schemas/desktop-schema.json
Normal file
2875
src-tauri/gen/schemas/desktop-schema.json
Normal file
File diff suppressed because it is too large
Load Diff
2875
src-tauri/gen/schemas/windows-schema.json
Normal file
2875
src-tauri/gen/schemas/windows-schema.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -25,6 +25,113 @@ const RUNTIME_INTERCEPT_SCRIPT: &str = r#"
|
||||
})();
|
||||
"#;
|
||||
|
||||
const NODE_PRELOAD_SCRIPT: &str = r#"
|
||||
const Module = require('module');
|
||||
const origLoad = Module._load;
|
||||
|
||||
const stub = new Proxy(function () {}, {
|
||||
get: (t, k) => (typeof k === 'symbol' || k === 'then' ? undefined : stub),
|
||||
apply: () => stub,
|
||||
construct: () => stub,
|
||||
});
|
||||
|
||||
function buildTlsShim() {
|
||||
class Session {
|
||||
constructor(opts) {
|
||||
this.opts = opts || {};
|
||||
this.headers = this.opts.headers || {};
|
||||
}
|
||||
async request(method, url, options) {
|
||||
options = options || {};
|
||||
const headers = Object.assign({}, this.headers, options.headers || {});
|
||||
const init = {
|
||||
method,
|
||||
headers,
|
||||
redirect: options.followRedirects === false ? 'manual' : 'follow',
|
||||
};
|
||||
let body = options.body !== undefined ? options.body : options.data;
|
||||
if (options.json !== undefined) {
|
||||
body = JSON.stringify(options.json);
|
||||
if (!headers['content-type'] && !headers['Content-Type']) {
|
||||
headers['content-type'] = 'application/json';
|
||||
}
|
||||
} else if (body !== undefined && body !== null && typeof body === 'object' && !Buffer.isBuffer(body) && !(body instanceof URLSearchParams)) {
|
||||
body = new URLSearchParams(body).toString();
|
||||
if (!headers['content-type'] && !headers['Content-Type']) {
|
||||
headers['content-type'] = 'application/x-www-form-urlencoded';
|
||||
}
|
||||
}
|
||||
if (body !== undefined && body !== null && method !== 'GET' && method !== 'HEAD') {
|
||||
init.body = body;
|
||||
}
|
||||
let ms = Number(options.timeout || this.opts.timeout || 30000);
|
||||
if (ms < 1000) ms = ms * 1000;
|
||||
init.signal = AbortSignal.timeout(ms);
|
||||
const res = await fetch(url, init);
|
||||
const text = await res.text();
|
||||
const outHeaders = {};
|
||||
res.headers.forEach((v, k) => { outHeaders[k] = v; });
|
||||
return {
|
||||
id: String(Date.now()),
|
||||
status: res.status,
|
||||
ok: res.ok,
|
||||
success: res.ok,
|
||||
url: res.url,
|
||||
target: res.url,
|
||||
headers: outHeaders,
|
||||
cookies: {},
|
||||
body: text,
|
||||
text: async () => text,
|
||||
json: async () => JSON.parse(text),
|
||||
};
|
||||
}
|
||||
get(url, o) { return this.request('GET', url, o); }
|
||||
post(url, o) { return this.request('POST', url, o); }
|
||||
put(url, o) { return this.request('PUT', url, o); }
|
||||
patch(url, o) { return this.request('PATCH', url, o); }
|
||||
delete(url, o) { return this.request('DELETE', url, o); }
|
||||
head(url, o) { return this.request('HEAD', url, o); }
|
||||
options(url, o) { return this.request('OPTIONS', url, o); }
|
||||
async close() {}
|
||||
async free() {}
|
||||
}
|
||||
const ClientIdentifier = new Proxy({}, { get: (t, k) => (typeof k === 'symbol' ? undefined : String(k)) });
|
||||
const mod = {
|
||||
Session,
|
||||
ClientIdentifier,
|
||||
initTLS: async () => {},
|
||||
destroyTLS: async () => {},
|
||||
};
|
||||
mod.default = mod;
|
||||
return mod;
|
||||
}
|
||||
|
||||
let tlsShim = null;
|
||||
|
||||
Module._load = function (request) {
|
||||
if (request === 'node-tls-client') {
|
||||
if (!tlsShim) {
|
||||
tlsShim = buildTlsShim();
|
||||
console.error('node-tls-client replaced with fetch shim');
|
||||
}
|
||||
return tlsShim;
|
||||
}
|
||||
try {
|
||||
return origLoad.apply(this, arguments);
|
||||
} catch (e) {
|
||||
const msg = String(e && e.message);
|
||||
if (/koffi/i.test(request) || /koffi/i.test(msg)) {
|
||||
console.error('stubbed native module: ' + request + ' (' + msg + ')');
|
||||
return stub;
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
};
|
||||
|
||||
process.on('uncaughtException', (e) => console.error('uncaughtException', e && e.stack || e));
|
||||
process.on('unhandledRejection', (e) => console.error('unhandledRejection', e && e.stack || e));
|
||||
"#;
|
||||
|
||||
fn android_log(msg: &str) {
|
||||
#[cfg(target_os = "android")]
|
||||
{
|
||||
@@ -135,6 +242,13 @@ fn spawn_service_manager(base_dir: &std::path::Path) {
|
||||
.map(|d| d.to_string_lossy().to_string())
|
||||
.unwrap_or_default();
|
||||
|
||||
let tmp_dir = base_dir.join("tmp");
|
||||
let _ = std::fs::create_dir_all(&tmp_dir);
|
||||
std::env::set_var("HOME", base_dir.to_string_lossy().to_string());
|
||||
std::env::set_var("TMPDIR", tmp_dir.to_string_lossy().to_string());
|
||||
let preload_path = base_dir.join("preload.js");
|
||||
let _ = std::fs::write(&preload_path, NODE_PRELOAD_SCRIPT);
|
||||
let preload_str = preload_path.to_string_lossy().to_string();
|
||||
std::env::set_var("PORT", "3000");
|
||||
std::env::set_var("NODE_ENV", "production");
|
||||
std::env::set_var("TMDB_API_KEY", "3f6703f3e2a0b2b40fe4fbb3e1546244");
|
||||
@@ -150,26 +264,33 @@ fn spawn_service_manager(base_dir: &std::path::Path) {
|
||||
let server_js = server_script.to_string_lossy().to_string();
|
||||
let player_dir_str = player_dir.to_string_lossy().to_string();
|
||||
|
||||
std::thread::spawn(move || {
|
||||
let _ = std::thread::Builder::new().stack_size(16 * 1024 * 1024).spawn(move || {
|
||||
#[cfg(target_os = "android")]
|
||||
{
|
||||
let _ = std::env::set_current_dir(&player_dir_str);
|
||||
|
||||
let arg0 = std::ffi::CString::new("node").unwrap();
|
||||
let arg1 = std::ffi::CString::new(server_js.as_str()).unwrap();
|
||||
let parts: [&str; 4] = ["node", "--require", preload_str.as_str(), server_js.as_str()];
|
||||
let mut buf: Vec<u8> = Vec::new();
|
||||
let mut offsets: Vec<usize> = Vec::new();
|
||||
for p in parts.iter() {
|
||||
offsets.push(buf.len());
|
||||
buf.extend_from_slice(p.as_bytes());
|
||||
buf.push(0);
|
||||
}
|
||||
buf.shrink_to_fit();
|
||||
|
||||
let mut argv: Vec<*mut std::os::raw::c_char> = vec![
|
||||
arg0.as_ptr() as *mut _,
|
||||
arg1.as_ptr() as *mut _,
|
||||
std::ptr::null_mut(),
|
||||
];
|
||||
let base = buf.as_mut_ptr() as *mut std::os::raw::c_char;
|
||||
let mut argv: Vec<*mut std::os::raw::c_char> = offsets
|
||||
.iter()
|
||||
.map(|o| unsafe { base.add(*o) })
|
||||
.collect();
|
||||
argv.push(std::ptr::null_mut());
|
||||
|
||||
std::mem::forget(buf);
|
||||
|
||||
android_log("calling node::Start via FFI");
|
||||
let ret = unsafe { node_ffi::_ZN4node5StartEiPPc(2, argv.as_mut_ptr()) };
|
||||
let ret = unsafe { node_ffi::_ZN4node5StartEiPPc(4, argv.as_mut_ptr()) };
|
||||
android_log(&format!("node::Start returned: {}", ret));
|
||||
|
||||
drop(arg0);
|
||||
drop(arg1);
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "Vyla Go",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.10",
|
||||
"identifier": "com.vyla.go",
|
||||
"build": {
|
||||
"beforeDevCommand": "",
|
||||
|
||||
@@ -122,7 +122,7 @@
|
||||
</div>
|
||||
|
||||
<div class="center-brand">
|
||||
<img src="https://gitlab.com/vyla-entertainment/home-frontend/-/raw/main/assets/images/logo.png" alt="Logo" />
|
||||
<img src="https://gitlab.com/vyla-entertainment/go/-/raw/main/assets/logos/white_logo.png" alt="Logo" />
|
||||
</div>
|
||||
|
||||
<div class="bottom-dock">
|
||||
|
||||
Reference in New Issue
Block a user