mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-08-27 04:07:05 +00:00
🗜️ fix: Support Windows ZIP MIME Uploads (#13794)
This commit is contained in:
parent
b91c1c2508
commit
d0f659fa75
5 changed files with 61 additions and 6 deletions
|
|
@ -5,6 +5,7 @@ const multer = require('multer');
|
|||
const { sanitizeFilename } = require('@librechat/api');
|
||||
const {
|
||||
mergeFileConfig,
|
||||
inferMimeType,
|
||||
getEndpointFileConfig,
|
||||
fileConfig: defaultFileConfig,
|
||||
} = require('librechat-data-provider');
|
||||
|
|
@ -37,6 +38,14 @@ const importFileFilter = (req, file, cb) => {
|
|||
}
|
||||
};
|
||||
|
||||
const normalizeUploadMimeType = (file) => {
|
||||
const mimeType = inferMimeType(file.originalname || '', file.mimetype || '');
|
||||
if (mimeType && file.mimetype !== mimeType) {
|
||||
file.mimetype = mimeType;
|
||||
}
|
||||
return mimeType;
|
||||
};
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {import('librechat-data-provider').FileConfig | undefined} customFileConfig
|
||||
|
|
@ -52,7 +61,9 @@ const createFileFilter = (customFileConfig) => {
|
|||
return cb(new Error('No file provided'), false);
|
||||
}
|
||||
|
||||
if (req.originalUrl.endsWith('/speech/stt') && file.mimetype.startsWith('audio/')) {
|
||||
const mimeType = normalizeUploadMimeType(file);
|
||||
|
||||
if (req.originalUrl.endsWith('/speech/stt') && mimeType.startsWith('audio/')) {
|
||||
return cb(null, true);
|
||||
}
|
||||
|
||||
|
|
@ -64,8 +75,8 @@ const createFileFilter = (customFileConfig) => {
|
|||
endpointType,
|
||||
});
|
||||
|
||||
if (!defaultFileConfig.checkType(file.mimetype, endpointFileConfig.supportedMimeTypes)) {
|
||||
return cb(new Error('Unsupported file type: ' + file.mimetype), false);
|
||||
if (!defaultFileConfig.checkType(mimeType, endpointFileConfig.supportedMimeTypes)) {
|
||||
return cb(new Error('Unsupported file type: ' + (file.mimetype || mimeType)), false);
|
||||
}
|
||||
|
||||
cb(null, true);
|
||||
|
|
@ -85,4 +96,4 @@ const createMulterInstance = async () => {
|
|||
});
|
||||
};
|
||||
|
||||
module.exports = { createMulterInstance, storage, importFileFilter };
|
||||
module.exports = { createMulterInstance, storage, importFileFilter, createFileFilter };
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ const fs = require('fs');
|
|||
const os = require('os');
|
||||
const path = require('path');
|
||||
const crypto = require('crypto');
|
||||
const { createMulterInstance, storage, importFileFilter } = require('./multer');
|
||||
const { createMulterInstance, storage, importFileFilter, createFileFilter } = require('./multer');
|
||||
|
||||
// Mock only the config service that requires external dependencies
|
||||
jest.mock('~/server/services/Config', () => ({
|
||||
|
|
@ -281,6 +281,25 @@ describe('Multer Configuration', () => {
|
|||
}
|
||||
});
|
||||
|
||||
it('should infer ZIP MIME type when multipart upload omits it', (done) => {
|
||||
const { mergeFileConfig } = require('librechat-data-provider');
|
||||
const fileFilter = createFileFilter(mergeFileConfig());
|
||||
const zipFile = {
|
||||
...mockFile,
|
||||
originalname: 'archive.zip',
|
||||
mimetype: '',
|
||||
};
|
||||
|
||||
const cb = jest.fn((err, result) => {
|
||||
expect(err).toBeNull();
|
||||
expect(result).toBe(true);
|
||||
expect(zipFile.mimetype).toBe('application/zip');
|
||||
done();
|
||||
});
|
||||
|
||||
fileFilter(mockReq, zipFile, cb);
|
||||
});
|
||||
|
||||
it('should use real mergeFileConfig function', async () => {
|
||||
const { mergeFileConfig, mbToBytes } = require('librechat-data-provider');
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue