Browse Source

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

pull/2/head
Wes Mason 9 years ago
parent
commit
4d4fa45266
No known key found for this signature in database GPG Key ID: 121DB7952C93970C
  1. 35
      app.js

35
app.js

@ -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 );
}); });

Loading…
Cancel
Save