Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ function sendToWS(message) {
return true;
}
// Queue important messages during reconnect
if (message.type === 'CLIP_META' || message.type === 'FORM_SAVE') {
if (message.type === 'CLIP_META') {
if (messageQueue.length < 50) {
messageQueue.push(message);
}
Expand Down
160 changes: 142 additions & 18 deletions extension/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,132 @@ function collectSubmittableFields(form) {
return fields;
}

function getBridgeTimeoutSignal(timeoutMs) {
if (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function') {
return AbortSignal.timeout(timeoutMs);
}
return undefined;
}

async function postBridgeJson(path, payload, timeoutMs = 2500) {
const response = await fetch(`${BRIDGE_URL}${path}`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(payload),
signal: getBridgeTimeoutSignal(timeoutMs),
});

let data = {};
try {
data = await response.json();
} catch {
data = {};
}

return { response, data };
}

function mapFormSaveReason(reason) {
const normalized = String(reason || '').toLowerCase();
if (!normalized) return null;
if (normalized.includes('blocked')) {
return t('content.formBlocked', 'Form Memory is blocked for this site');
}
if (normalized.includes('disabled')) {
return t('content.formDisabled', 'Form Memory is currently disabled');
}
return t('content.formSaveFailed', 'Could not save form');
}

async function saveFormCapture(url, formName, fields) {
const requestId = crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`;

try {
const response = await chrome.runtime.sendMessage({
type: 'clipnova-form-submit',
request_id: requestId,
url,
form_name: formName,
fields,
});
if (response?.ok) {
return { ok: true, transport: 'ws', requestId, reason: null, sessionId: null };
}
} catch {
// Fall through to HTTP bridge fallback.
}

try {
const { response, data } = await postBridgeJson('/form-save', {
request_id: requestId,
url,
form_name: formName,
fields,
}, 3000);

if (response.ok && data?.ok !== false) {
return {
ok: true,
transport: 'http',
requestId,
reason: null,
sessionId: data?.session_id || null,
};
}

return {
ok: false,
transport: 'http',
requestId,
reason: typeof data?.reason === 'string' ? data.reason : null,
sessionId: null,
};
} catch {
return {
ok: false,
transport: 'none',
requestId,
reason: null,
sessionId: null,
};
}
}

async function requestSavedForms(url, forms) {
const requestId = crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`;

try {
const response = await chrome.runtime.sendMessage({
type: 'clipnova-form-request',
request_id: requestId,
url,
forms,
});
if (response?.ok) {
return { ok: true, transport: 'ws', requestId, sessions: [] };
}
} catch {
// Fall through to HTTP bridge fallback.
}

try {
const { response, data } = await postBridgeJson('/form-request', {
request_id: requestId,
url,
forms,
}, 3000);

return {
ok: response.ok && data?.ok !== false,
transport: response.ok ? 'http' : 'none',
requestId,
sessions: Array.isArray(data?.sessions) ? data.sessions : [],
};
} catch {
return { ok: false, transport: 'none', requestId, sessions: [] };
}
}

function describePageForms(root = document) {
return Array.from(root.querySelectorAll('form')).map((form) => {
const fieldNames = Array.from(form.querySelectorAll('input, select, textarea'))
Expand Down Expand Up @@ -728,19 +854,16 @@ document.addEventListener('submit', (event) => {
const fields = collectSubmittableFields(form);
if (fields.length === 0) return;

const requestId = crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`;
chrome.runtime.sendMessage({
type: 'clipnova-form-submit',
request_id: requestId,
url: window.location.href,
form_name: deriveFormName(form),
fields,
}).then((response) => {
if (response && response.ok === false) {
showPageToast(t('content.formSaveFailed', 'Could not save form'), 'error');
void saveFormCapture(window.location.href, deriveFormName(form), fields).then((result) => {
if (result.ok && result.transport === 'http') {
showPageToast(t('content.formSaved', 'Form saved'), 'success');
return;
}

const errorMessage = mapFormSaveReason(result.reason);
if (errorMessage) {
showPageToast(errorMessage, 'error');
}
}).catch(() => {
showPageToast(t('content.formSaveFailed', 'Could not save form'), 'error');
});
}, true);

Expand Down Expand Up @@ -855,12 +978,11 @@ function showFormMemoryPanel(sessions) {
setTimeout(() => {
const forms = describePageForms();
if (forms.length > 0) {
chrome.runtime.sendMessage({
type: 'clipnova-form-request',
request_id: crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`,
url: window.location.href,
forms,
}).catch(() => { });
void requestSavedForms(window.location.href, forms).then((result) => {
if (result.ok && result.transport === 'http') {
showFormMemoryPanel(result.sessions || []);
}
});
}
}, 1500);

Expand All @@ -873,4 +995,6 @@ globalThis.__clipnovaFormMemoryTestApi = {
pickBestFormElement,
applySessionToRoot,
deriveFormName,
saveFormCapture,
requestSavedForms,
};
Loading