Skip to content

fix(upload): remove artificial signMessage timeout #133

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

Merged
0xCardiE merged 1 commit into from
Apr 29, 2026
Merged

fix(upload): remove artificial signMessage timeout #133

Show file tree
Hide file tree
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
106 changes: 3 additions & 103 deletions src/app/components/FileUploadUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,39 +364,7 @@ export const handleFileUpload = async (params: FileUploadParams): Promise<string

const messageToSign = `${processedFile.name}:${postageBatchId}`;

// Helper function to sign with timeout
const signWithTimeout = async (message: string, timeoutMs: number = 5000): Promise<string> => {
return new Promise(async (resolve, reject) => {
const timeout = setTimeout(() => {
reject(new Error('WALLET_UNLOCK_REQUIRED'));
}, timeoutMs);

try {
const signature = await walletClient.signMessage({ message });
clearTimeout(timeout);
resolve(signature);
} catch (error) {
clearTimeout(timeout);
reject(error);
}
});
};

let signedMessage: string;
try {
signedMessage = await signWithTimeout(messageToSign);
} catch (error: any) {
if (error.message === 'WALLET_UNLOCK_REQUIRED') {
setStatusMessage({
step: 'Wallet Locked',
message: 'Please unlock your wallet to sign the message',
error: 'Your wallet appears to be locked. Please unlock your wallet and try again.',
isError: true,
});
throw new Error('Wallet unlock required - please unlock your wallet and try again');
}
throw error;
}
const signedMessage = await walletClient.signMessage({ message: messageToSign });

// Determine Content-Type with fallback for unsupported file types
let contentType: string;
Expand Down Expand Up @@ -682,41 +650,7 @@ export const handleMultiFileUpload = async (
// Only sign message for the very first file
let signedMessage = '';
if (fileIndex === 0) {
// Helper function to sign with timeout
const signWithTimeout = async (
message: string,
timeoutMs: number = 5000
): Promise<string> => {
return new Promise(async (resolve, reject) => {
const timeout = setTimeout(() => {
reject(new Error('WALLET_UNLOCK_REQUIRED'));
}, timeoutMs);

try {
const signature = await walletClient.signMessage({ message });
clearTimeout(timeout);
resolve(signature);
} catch (error) {
clearTimeout(timeout);
reject(error);
}
});
};

try {
signedMessage = await signWithTimeout(messageToSign);
} catch (error: any) {
if (error.message === 'WALLET_UNLOCK_REQUIRED') {
setStatusMessage({
step: 'Wallet Locked',
message: 'Please unlock your wallet to sign the message',
error: 'Your wallet appears to be locked. Please unlock your wallet and try again.',
isError: true,
});
throw new Error('Wallet unlock required - please unlock your wallet and try again');
}
throw error;
}
signedMessage = await walletClient.signMessage({ message: messageToSign });
}

// Determine Content-Type with fallback for unsupported file types
Expand Down Expand Up @@ -766,41 +700,7 @@ export const handleMultiFileUpload = async (
`❌ File ${fileIndex + 1}: No session token available, falling back to signature (this should not happen)`
);

// Helper function to sign with timeout
const signWithTimeout = async (
message: string,
timeoutMs: number = 5000
): Promise<string> => {
return new Promise(async (resolve, reject) => {
const timeout = setTimeout(() => {
reject(new Error('WALLET_UNLOCK_REQUIRED'));
}, timeoutMs);

try {
const signature = await walletClient.signMessage({ message });
clearTimeout(timeout);
resolve(signature);
} catch (error) {
clearTimeout(timeout);
reject(error);
}
});
};

try {
signedMessage = await signWithTimeout(messageToSign);
} catch (error: any) {
if (error.message === 'WALLET_UNLOCK_REQUIRED') {
setStatusMessage({
step: 'Wallet Locked',
message: 'Please unlock your wallet to sign the message',
error: 'Your wallet appears to be locked. Please unlock your wallet and try again.',
isError: true,
});
throw new Error('Wallet unlock required - please unlock your wallet and try again');
}
throw error;
}
signedMessage = await walletClient.signMessage({ message: messageToSign });
baseHeaders['x-upload-signed-message'] = signedMessage;
}
}
Expand Down
28 changes: 1 addition & 27 deletions src/app/components/NFTCollectionProcessor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,33 +212,7 @@ const uploadFile = async (
// Sign message for upload authorization
const messageToSign = `${file.name}:${postageBatchId}`;

// Helper function to sign with timeout
const signWithTimeout = async (message: string, timeoutMs: number = 5000): Promise<string> => {
return new Promise(async (resolve, reject) => {
const timeout = setTimeout(() => {
reject(new Error('WALLET_UNLOCK_REQUIRED'));
}, timeoutMs);

try {
const signature = await walletClient.signMessage({ message });
clearTimeout(timeout);
resolve(signature);
} catch (error) {
clearTimeout(timeout);
reject(error);
}
});
};

let signedMessage: string;
try {
signedMessage = await signWithTimeout(messageToSign);
} catch (error: any) {
if (error.message === 'WALLET_UNLOCK_REQUIRED') {
throw new Error('Wallet unlock required - please unlock your wallet and try again');
}
throw error;
}
const signedMessage = await walletClient.signMessage({ message: messageToSign });

// Setup headers
const headers: Record<string, string> = {
Expand Down
Loading