harish2704/npm-offline-registry
1
0
Fork 0
mirror of https://github.com/harish2704/npm-offline-registry.git synced 2026-09-10 06:21:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix underlying file access error for 404s when in offline mode

Browse Source
This commit is contained in:
Wes Mason
2016-05-05 22:56:36 +01:00
parent 1f980e6738
commit 4d4fa45266
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.js
+23 -12
View File
@@ -35,23 +35,30 @@ app.get( '/:package', function( req, res, next ){
var cacheFile = [ NPM_PATH, REGISTRY_NAME, packageName, '.cache.json' ].join( '/' ); var cacheFile = [ NPM_PATH, REGISTRY_NAME, packageName, '.cache.json' ].join( '/' );
return fileExists( cacheFile ) return fileExists( cacheFile )
.tap( function( isExists ){ .then( function( isExists ){
if( !isExists ){ if( !isExists ){
if ( ENABLE_NPM_FAILOVER ) { if ( !ENABLE_NPM_FAILOVER ) {
return false;
}
res._log.cacheHit = '---'; res._log.cacheHit = '---';
return fetchAndCacheMetadata( packageName, cacheFile ); return fetchAndCacheMetadata( packageName, cacheFile );
} else {
return res.status( 404 ).json( {} );
}
} }
}) })
.then( function( ){ .then( function( isExists ){
if ( !isExists ) {
return false;
}
res._log.cacheFile = cacheFile; res._log.cacheFile = cacheFile;
return readFile( cacheFile, 'utf-8' ); return readFile( cacheFile, 'utf-8' );
}) })
.then( function( cacheData ){ .then( function( cacheData ){
cacheData = JSON.parse( cacheData ); cacheData = JSON.parse( cacheData );
if ( cacheData ) {
patchData( cacheData ); patchData( cacheData );
} else {
res.status( 404 );
cacheData = {};
}
return res.send( cacheData ); return res.send( cacheData );
}) })
.catch( next ); .catch( next );
@@ -63,19 +70,23 @@ app.get( '/:package/-/:tarball', function( req, res, next ){
var packagePath = [ NPM_PATH , packageName, version, 'package.tgz'].join( '/' ); var packagePath = [ NPM_PATH , packageName, version, 'package.tgz'].join( '/' );
fileExists( packagePath ) fileExists( packagePath )
.tap( function( isExists ){ .then( function( isExists ){
if( !isExists ){ if( !isExists ){
if ( ENABLE_NPM_FAILOVER ) { if ( !ENABLE_NPM_FAILOVER ) {
return false;
}
res._log.cacheHit = '---'; res._log.cacheHit = '---';
return fetchAndCacheTarball( packageName, version, packagePath ); return fetchAndCacheTarball( packageName, version, packagePath );
} else {
return res.status( 404 ).json( {} );
}
} }
}) })
.then( function(){ .then( function( isExists ){
res._log.cacheFile = packagePath; res._log.cacheFile = packagePath;
if ( isExists ) {
return res.sendFile( packagePath ); return res.sendFile( packagePath );
} else {
res.status( 404 );
return res.end();
}
}) })
.catch( next ); .catch( next );
}); });