fix: issue on package not found

verdaccio · Jul 31, 2019 · 944e1a5 · 944e1a5
1 parent 4d7848d
commit 944e1a5
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 279 deletions.
diff --git a/plugins/memory/package.json b/plugins/memory/package.json
@@ -36,7 +36,6 @@
     "cross-env": "5.1.3",
     "eslint": "4.16.0",
     "eslint-config-google": "0.9.1",
-    "express": "4.16.3",
     "eslint-plugin-flowtype": "2.42.0",
     "eslint-config-prettier": "2.9.0",
     "eslint-plugin-jest": "21.7.0",

diff --git a/plugins/memory/src/memory-handler.js b/plugins/memory/src/memory-handler.js
@@ -10,7 +10,7 @@ import type { HttpError } from 'http-errors';
 import type { StorageList, Package, Callback, Logger } from '@verdaccio/types';
 import type { ILocalPackageManager } from '@verdaccio/local-storage';
 
-const noSuchFile: string = 'ENOENT';
+export const noSuchFile: string = 'ENOENT';
 export const fileExist: string = 'EEXISTS';
 
 const fSError = function(message: string, code: number = 404): HttpError {
@@ -22,7 +22,7 @@ const fSError = function(message: string, code: number = 404): HttpError {
 };
 
 const noPackageFoundError = function(message = 'no such package') {
-  const err = new Error(message);
+  const err: HttpError = createError(404, message);
   // $FlowFixMe
   err.code = noSuchFile;
   return err;
@@ -90,11 +90,12 @@ class MemoryHandler implements ILocalPackageManager {
 
   readPackage(name: string, cb: Function): void {
     const json = this._getStorage(name);
+    const isJson = typeof json === 'undefined';
 
     try {
-      cb(typeof json === 'undefined' ? noPackageFoundError() : null, JSON.parse(json));
+      cb(isJson ? noPackageFoundError() : null, JSON.parse(json));
     } catch (err) {
-      cb(fSError('package not found', 404));
+      cb(noPackageFoundError());
     }
   }
 

diff --git a/plugins/memory/test/memory.spec.js b/plugins/memory/test/memory.spec.js
@@ -3,7 +3,7 @@
 import LocalMemory from '../src/index';
 import config from './partials/config';
 import pkgExample from './partials/pkg';
-import MemoryHandler from '../src/memory-handler';
+import MemoryHandler, { noSuchFile } from '../src/memory-handler';
 
 import type { Logger } from '@verdaccio/types';
 import type { ILocalData, IPackageStorage } from '@verdaccio/local-storage';
@@ -21,29 +21,29 @@ const logger: Logger = {
 describe('memory unit test .', () => {
   describe('LocalMemory', () => {
     test('should create an LocalMemory instance', () => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
 
       expect(localMemory).toBeDefined();
     });
 
     test('should create add a package', () => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       localMemory.add('test');
 
       expect(localMemory.get()).toHaveLength(1);
     });
 
     test('should reach max limit', () => {
       config.limit = 2;
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       expect(localMemory.add('test1')).toBeUndefined();
       expect(localMemory.add('test2')).toBeUndefined();
       expect(localMemory.add('test3')).not.toBeNull();
     });
 
     test('should remove a package', () => {
       const pkgName: string = 'test';
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       localMemory.add(pkgName);
       localMemory.remove(pkgName);
 
@@ -53,13 +53,13 @@ describe('memory unit test .', () => {
 
   describe('MemoryHandler', () => {
     test('should create an MemoryHandler instance', () => {
-      const memoryHandler: ILocalPackageManager = new MemoryHandler('test', pkgExample, logger);
+      const memoryHandler: ILocalPackageManager = new MemoryHandler('test', pkgExample, { logger });
 
       expect(memoryHandler).toBeDefined();
     });
 
     test('should save a package', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test';
 
       const handler = localMemory.getPackageStorage(pkgName);
@@ -77,8 +77,24 @@ describe('memory unit test .', () => {
       }
     });
 
+    test('should fails on read a package', done => {
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
+      const pkgName: string = 'test';
+
+      const handler = localMemory.getPackageStorage(pkgName);
+      expect(handler).toBeDefined();
+
+      if (handler) {
+        handler.readPackage(pkgName, (err, data) => {
+          expect(err).not.toBeNull();
+          expect(err.code).toBe(noSuchFile);
+          done();
+        });
+      }
+    });
+
     test('should update a package', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test';
 
       const handler = localMemory.getPackageStorage(pkgName);
@@ -115,7 +131,7 @@ describe('memory unit test .', () => {
     });
 
     test('should write a tarball', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test';
       const dataTarball: string = '12345';
 
@@ -139,7 +155,7 @@ describe('memory unit test .', () => {
     });
 
     test('should read a tarball', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test.tar.gz';
       const dataTarball: string = '12345';
 
@@ -163,7 +179,7 @@ describe('memory unit test .', () => {
     });
 
     test('should abort read a tarball', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test2.tar.gz';
       const dataTarball: string = '12345';
 
@@ -191,7 +207,7 @@ describe('memory unit test .', () => {
     });
 
     test('should fails read a tarball not found', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test2.tar.gz';
       const handler = localMemory.getPackageStorage(pkgName);
 
@@ -206,7 +222,7 @@ describe('memory unit test .', () => {
     });
 
     test('should abort while write a tarball', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test-abort.tar.gz';
       const dataTarball: string = '12345';
 
@@ -228,7 +244,7 @@ describe('memory unit test .', () => {
     });
 
     test('should delete a package', done => {
-      const localMemory: ILocalData = new LocalMemory(config, logger);
+      const localMemory: ILocalData = new LocalMemory(config, { logger });
       const pkgName: string = 'test2';
 
       const handler: IPackageStorage = localMemory.getPackageStorage(pkgName);
@@ -240,7 +256,7 @@ describe('memory unit test .', () => {
             expect(err).toBeNull();
             handler.readPackage(pkgName, (err, data) => {
               expect(err).not.toBeNull();
-              expect(err.message).toMatch(/package not found/);
+              expect(err.message).toMatch(/no such package/);
               done();
             });
           });