Skip to content

refactor: separate concerns in insertTemplateIntoTab #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JuliaKalder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: separate concerns in insertTemplateIntoTab #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 33 additions & 23 deletions modules/template-insert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,30 +413,40 @@ export async function insertTemplateIntoTab(tabId, template) {

await messenger.compose.setComposeDetails(tabId, details);

// Per-file decode error handling — failures collected, not fatal
if (template.attachments && template.attachments.length > 0) {
const attachmentErrors = [];
for (const att of template.attachments) {
try {
const binary = atob(att.data);
const bytes = new Uint8Array(binary.length);
for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
// Sanitize filename: strip path separators, null bytes, and control chars
const safeName = (att.name || "attachment")
.replace(/[/\\:\x00-\x1f]/g, "_")
.replace(/^\.+/, "_");
const file = new File([bytes], safeName, { type: att.type });
await messenger.compose.addAttachment(tabId, { file, name: safeName });
} catch (err) {
console.error("TemplateWing: failed to attach:", JSON.stringify(att.name), err);
attachmentErrors.push(att.name);
}
}
if (attachmentErrors.length > 0) {
const err = new Error(`Could not attach: ${attachmentErrors.join(", ")}`);
err.code = "ATTACHMENT_FAILED";
err.failedNames = attachmentErrors;
throw err;
await decodeAndAttach(tabId, template.attachments);
}
}

/**
* Decode base64-encoded attachments and add them to a compose tab.
* Failures are collected per-file; a single error is thrown at the end
* listing all filenames that could not be attached.
* @param {number} tabId - The compose tab ID
* @param {Array<{name: string, data: string, type: string}>} attachments
*/
export async function decodeAndAttach(tabId, attachments) {
const attachmentErrors = [];
for (const att of attachments) {
try {
const binary = atob(att.data);
const bytes = new Uint8Array(binary.length);
for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
// Sanitize filename: strip path separators, null bytes, and control chars
const safeName = (att.name || "attachment")
.replace(/[/\\:\x00-\x1f]/g, "_")
.replace(/^\.+/, "_");
const file = new File([bytes], safeName, { type: att.type });
await messenger.compose.addAttachment(tabId, { file, name: safeName });
} catch (err) {
console.error("TemplateWing: failed to attach:", JSON.stringify(att.name), err);
attachmentErrors.push(att.name);
}
}
if (attachmentErrors.length > 0) {
const err = new Error(`Could not attach: ${attachmentErrors.join(", ")}`);
err.code = "ATTACHMENT_FAILED";
err.failedNames = attachmentErrors;
throw err;
}
}
Loading