From 95cb5bad271cf2cd2ac0b097e66179436e1c7c7c Mon Sep 17 00:00:00 2001 From: advplyr Date: Thu, 22 Oct 2026 17:34:09 -0500 Subject: [PATCH] Remove fs-extra sync updates --- server/libs/fsExtra/copy/copy-sync.js | 45 +-------------------------- server/libs/fsExtra/move/move-sync.js | 2 +- test/server/fsExtraCopy.test.js | 29 ----------------- 3 files changed, 2 insertions(+), 74 deletions(-) diff --git a/server/libs/fsExtra/copy/copy-sync.js b/server/libs/fsExtra/copy/copy-sync.js index ec744edf0..551abe0ca 100644 --- a/server/libs/fsExtra/copy/copy-sync.js +++ b/server/libs/fsExtra/copy/copy-sync.js @@ -70,54 +70,11 @@ function mayCopyFile (srcStat, src, dest, opts) { } function copyFile (srcStat, src, dest, opts) { - try { - fs.copyFileSync(src, dest) - } catch (err) { - if (err.code !== 'EPERM' || !srcStat.isFile()) throw err - copyFileWithReadWrite(src, dest) - } + fs.copyFileSync(src, dest) if (opts.preserveTimestamps) handleTimestamps(srcStat.mode, src, dest) return setDestMode(dest, srcStat.mode) } -function copyFileWithReadWrite (src, dest) { - const buffer = Buffer.allocUnsafe(1024 * 1024) - const sourceFd = fs.openSync(src, 'r') - let destFd - let copyError - try { - destFd = fs.openSync(dest, 'w') - let bytesRead - while ((bytesRead = fs.readSync(sourceFd, buffer, 0, buffer.length, null)) > 0) { - let offset = 0 - while (offset < bytesRead) { - const written = fs.writeSync(destFd, buffer, offset, bytesRead - offset) - if (written === 0) throw new Error('Failed to write file while copying') - offset += written - } - } - } catch (err) { - copyError = err - } finally { - try { - if (destFd !== undefined) fs.closeSync(destFd) - } catch (err) { - copyError ||= err - } - try { - fs.closeSync(sourceFd) - } catch (err) { - copyError ||= err - } - } - if (copyError) { - if (destFd !== undefined) { - try { fs.unlinkSync(dest) } catch (_) {} - } - throw copyError - } -} - function handleTimestamps (srcMode, src, dest) { // Make sure the file is writable before setting the timestamp // otherwise open fails with EPERM when invoked with 'r+' diff --git a/server/libs/fsExtra/move/move-sync.js b/server/libs/fsExtra/move/move-sync.js index b8e7e211e..84533664e 100644 --- a/server/libs/fsExtra/move/move-sync.js +++ b/server/libs/fsExtra/move/move-sync.js @@ -37,7 +37,7 @@ function rename (src, dest, overwrite) { try { fs.renameSync(src, dest) } catch (err) { - if (err.code !== 'EXDEV' && err.code !== 'EPERM') throw err + if (err.code !== 'EXDEV') throw err return moveAcrossDevice(src, dest, overwrite) } } diff --git a/test/server/fsExtraCopy.test.js b/test/server/fsExtraCopy.test.js index b355694c7..c1ceee049 100644 --- a/test/server/fsExtraCopy.test.js +++ b/test/server/fsExtraCopy.test.js @@ -34,14 +34,6 @@ describe('fsExtra copy fallback', () => { expect(fs.readFileSync(dest).equals(contents)).to.be.true }) - it('copies in chunks when synchronous copyFile is denied', () => { - sinon.stub(fs, 'copyFileSync').throws(Object.assign(new Error('copyfile denied'), { code: 'EPERM' })) - - fsExtra.copySync(source, dest) - - expect(fs.readFileSync(dest).equals(contents)).to.be.true - }) - it('moves across devices when asynchronous copyFile is denied', async () => { sinon.stub(fs, 'rename').callsFake((src, target, callback) => { callback(Object.assign(new Error('cross-device link'), { code: 'EXDEV' })) @@ -56,16 +48,6 @@ describe('fsExtra copy fallback', () => { expect(fs.readFileSync(dest).equals(contents)).to.be.true }) - it('moves across devices when synchronous copyFile is denied', () => { - sinon.stub(fs, 'renameSync').throws(Object.assign(new Error('cross-device link'), { code: 'EXDEV' })) - sinon.stub(fs, 'copyFileSync').throws(Object.assign(new Error('copyfile denied'), { code: 'EPERM' })) - - fsExtra.moveSync(source, dest) - - expect(fs.existsSync(source)).to.be.false - expect(fs.readFileSync(dest).equals(contents)).to.be.true - }) - it('moves over an existing file when asynchronous rename and copyFile are denied', async () => { fs.writeFileSync(dest, 'old database') sinon.stub(fs, 'rename').callsFake((src, target, callback) => { @@ -81,17 +63,6 @@ describe('fsExtra copy fallback', () => { expect(fs.readFileSync(dest).equals(contents)).to.be.true }) - it('moves over an existing file when synchronous rename and copyFile are denied', () => { - fs.writeFileSync(dest, 'old database') - sinon.stub(fs, 'renameSync').throws(Object.assign(new Error('rename denied'), { code: 'EPERM' })) - sinon.stub(fs, 'copyFileSync').throws(Object.assign(new Error('copyfile denied'), { code: 'EPERM' })) - - fsExtra.moveSync(source, dest, { overwrite: true }) - - expect(fs.existsSync(source)).to.be.false - expect(fs.readFileSync(dest).equals(contents)).to.be.true - }) - it('keeps the source when a move cannot copy it', async () => { sinon.stub(fs, 'rename').callsFake((src, target, callback) => { callback(Object.assign(new Error('rename denied'), { code: 'EPERM' }))