External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(upload-automation): harden android and electron failure handling

Browse Source 
Updated Android/Electron upload paths to fail deterministically and report consistent stage details, while removing unsafe stage casting and path/package mismatches. This keeps postimages automation behavior intact and makes failures easier to diagnose.
This commit is contained in:
plebeius
2026-02-20 16:52:35 +08:00
parent 15d608764b
commit b20aae8244
12 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electron/media-upload-automation.js
+19 -9
View File
@@ -19,7 +19,7 @@ const DIRECT_MEDIA_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.web
/** Returns true if the URL appears to point to a direct media file. Exported for tests. */
export function isDirectMediaUrl(url) {
try {
const normalized = url.split('?')[0].toLowerCase();
const normalized = url.split('?')[0].split('#')[0].toLowerCase();
return DIRECT_MEDIA_EXTENSIONS.some((ext) => normalized.endsWith(ext));
} catch {
return false;
@@ -67,14 +67,23 @@ export async function automateUploadMedia(options) {
await sendCommand('DOM.enable');
await sendCommand('Page.enable');
const PAGE_LOAD_TIMEOUT_MS = 30_000;
await new Promise((resolve, reject) => {
let settled = false;
const settle = (fn, arg) => {
if (settled) return;
settled = true;
clearTimeout(timer);
win.webContents.removeListener('did-finish-load', onLoad);
win.webContents.removeListener('did-fail-load', onFail);
fn(arg);
};
const onLoad = () => settle(resolve);
const onFail = (_, code, desc) => settle(reject, new Error(`Page load failed: ${code} ${desc}`));
const timer = setTimeout(() => settle(reject, new Error(`Page load timed out after ${PAGE_LOAD_TIMEOUT_MS}ms for ${recipe.uploadUrl}`)), PAGE_LOAD_TIMEOUT_MS);
win.webContents.once('did-finish-load', onLoad);
win.webContents.once('did-fail-load', onFail);
win.loadURL(recipe.uploadUrl);
win.webContents.once('did-finish-load', () => {
resolve();
});
win.webContents.once('did-fail-load', (_, code, desc) => {
reject(new Error(`Page load failed: ${code} ${desc}`));
});
});
// Small delay for SPA/JS to settle
@@ -132,9 +141,10 @@ export async function automateUploadMedia(options) {
const clickNode = async (nodeId) => {
const { model } = await sendCommand('DOM.getBoxModel', { nodeId });
if (!model?.content) return;
if (!model?.content || model.content.length < 8) {
throw new Error('Cannot click node: box model unavailable (element may be hidden or zero-size)');
}
const content = model.content;
if (content.length < 8) return;
const x = (content[0] + content[2] + content[4] + content[6]) / 4;
const y = (content[1] + content[3] + content[5] + content[7]) / 4;
await sendCommand('Input.dispatchMouseEvent', {
electron/media-upload-automation.test.js
+3 -1
View File
@@ -19,9 +19,11 @@ describe('media-upload-automation', () => {
expect(isDirectMediaUrl('https://example.com/video.mp4')).toBe(true);
});
it('strips query strings before checking', () => {
it('strips query strings and fragments before checking', () => {
expect(isDirectMediaUrl('https://i.imgur.com/abc.png?size=large')).toBe(true);
expect(isDirectMediaUrl('https://imgur.com/page.html?img=photo.jpg')).toBe(false);
expect(isDirectMediaUrl('https://i.imgur.com/abc.png#fragment')).toBe(true);
expect(isDirectMediaUrl('https://i.postimg.cc/xyz.webp#')).toBe(true);
});
it('returns false for non-direct URLs (guards against non-media pages)', () => {
electron/media-upload-recipes.js
+3
View File
@@ -85,6 +85,9 @@ function validateRecipes() {
if (!Array.isArray(recipe.blockedIndicators) || recipe.blockedIndicators.length === 0) {
throw new Error(`Recipe validation failed: ${provider} blockedIndicators must be non-empty array`);
}
if (!Array.isArray(recipe.submitSelectorCandidates) || recipe.submitSelectorCandidates.length === 0) {
throw new Error(`Recipe validation failed: ${provider} submitSelectorCandidates must be non-empty array`);
}
if (typeof recipe.timeoutMs !== 'number' || recipe.timeoutMs <= 0) {
throw new Error(`Recipe validation failed: ${provider} timeoutMs must be positive number`);
}