From 37943b145c8ea13ebbdffe8c0adbcb84a5274f52 Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Wed, 18 Aug 2021 16:12:52 -0400 Subject: [PATCH] Avoid race conditions from writing res status twi --- src/routes.js | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/routes.js b/src/routes.js index d8affb4b..df13cd88 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2463,14 +2463,15 @@ module.exports = async ( const epubForDecryption = req.header(EPUB_FOR_DECRYPT_HEADER) const { path } = req.params logger.info(`gun otheruser ONCE: ${path}`) + const data = await handleGunFetch({ + path, + startFromUserGraph: true, + type: 'once', + publicKeyForDecryption, + epubForDecryption + }) res.status(200).json({ - data: await handleGunFetch({ - path, - startFromUserGraph: true, - type: 'once', - publicKeyForDecryption, - epubForDecryption - }) + data }) } catch (e) { logger.error(e) @@ -2486,14 +2487,15 @@ module.exports = async ( const epubForDecryption = req.header(EPUB_FOR_DECRYPT_HEADER) const { path } = req.params logger.info(`gun self user LOAD: ${path}`) + const data = await handleGunFetch({ + path, + startFromUserGraph: true, + type: 'load', + publicKeyForDecryption, + epubForDecryption + }) res.status(200).json({ - data: await handleGunFetch({ - path, - startFromUserGraph: true, - type: 'load', - publicKeyForDecryption, - epubForDecryption - }) + data }) } catch (e) { logger.error(e) @@ -2524,16 +2526,17 @@ module.exports = async ( }) return } + const data = await handleGunFetch({ + path, + startFromUserGraph: false, + type, + publicKey, + publicKeyForDecryption, + epubForDecryption + }) try { res.status(200).json({ - data: await handleGunFetch({ - path, - startFromUserGraph: false, - type, - publicKey, - publicKeyForDecryption, - epubForDecryption - }) + data }) } catch (err) { res