@verdaccio/web 6.0.0-6-next.29 → 6.0.0-6-next.32

package/src/api/sidebar.ts

@@ -1,22 +1,21 @@
 import buildDebug from 'debug';
 import { Router } from 'express';
-import _ from 'lodash';
 
 import { IAuth } from '@verdaccio/auth';
 import { DIST_TAGS, HTTP_STATUS } from '@verdaccio/core';
 import { $NextFunctionVer, $RequestExtend, $ResponseExtend, allow } from '@verdaccio/middleware';
 import { Storage } from '@verdaccio/store';
 import { convertDistRemoteToLocalTarballUrls } from '@verdaccio/tarball';
-import { Config, Package, Version } from '@verdaccio/types';
+import { Config, Manifest, Version } from '@verdaccio/types';
 import { addGravatarSupport, formatAuthor, isVersionValid } from '@verdaccio/utils';
 
 import { AuthorAvatar, addScope, deleteProperties } from '../utils/web-utils';
 
 export { $RequestExtend, $ResponseExtend, $NextFunctionVer }; // Was required by other packages
 
-export type PackageExt = Package & { author: AuthorAvatar; dist?: { tarball: string } };
+export type PackageExt = Manifest & { author: AuthorAvatar; dist?: { tarball: string } };
 
-export type $SidebarPackage = Package & { latest: Version };
+export type $SidebarPackage = Manifest & { latest: Version };
 const debug = buildDebug('verdaccio:web:api:sidebar');
 
 function addSidebarWebApi(config: Config, storage: Storage, auth: IAuth): Router {
@@ -27,43 +26,56 @@ function addSidebarWebApi(config: Config, storage: Storage, auth: IAuth): Router
   router.get(
     '/sidebar/(@:scope/)?:package',
     can('access'),
-    function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {
-      const packageName: string = req.params.scope
+    async function (
+      req: $RequestExtend,
+      res: $ResponseExtend,
+      next: $NextFunctionVer
+    ): Promise<void> {
+      const name: string = req.params.scope
         ? addScope(req.params.scope, req.params.package)
         : req.params.package;
-
-      storage.getPackage({
-        name: packageName,
-        uplinksLook: true,
-        keepUpLinkData: true,
-        req,
-        callback: function (err: Error, info: $SidebarPackage): void {
-          if (_.isNil(err)) {
-            const { v } = req.query;
-            let sideBarInfo = _.clone(info);
-            sideBarInfo.versions = convertDistRemoteToLocalTarballUrls(
-              info,
-              { protocol: req.protocol, headers: req.headers as any, host: req.hostname },
-              config.url_prefix
-            ).versions;
-            if (typeof v === 'string' && isVersionValid(info, v)) {
-              sideBarInfo.latest = sideBarInfo.versions[v];
-              sideBarInfo.latest.author = formatAuthor(sideBarInfo.latest.author);
-            } else {
-              sideBarInfo.latest = sideBarInfo.versions[info[DIST_TAGS].latest];
-              sideBarInfo.latest.author = formatAuthor(sideBarInfo.latest.author);
-            }
-            sideBarInfo = deleteProperties(['readme', '_attachments', '_rev', 'name'], sideBarInfo);
-            const authorAvatar = config.web
-              ? addGravatarSupport(sideBarInfo, config.web.gravatar)
-              : addGravatarSupport(sideBarInfo);
-            next(authorAvatar);
-          } else {
-            res.status(HTTP_STATUS.NOT_FOUND);
-            res.end();
-          }
-        },
-      });
+      const requestOptions = {
+        protocol: req.protocol,
+        headers: req.headers as any,
+        // FIXME: if we migrate to req.hostname, the port is not longer included.
+        host: req.host,
+        remoteAddress: req.socket.remoteAddress,
+      };
+      try {
+        const info = (await storage.getPackageByOptions({
+          name,
+          uplinksLook: true,
+          keepUpLinkData: true,
+          requestOptions,
+        })) as Manifest;
+        const { v } = req.query;
+        let sideBarInfo = { ...info };
+        sideBarInfo.versions = convertDistRemoteToLocalTarballUrls(
+          info,
+          { protocol: req.protocol, headers: req.headers as any, host: req.hostname },
+          config.url_prefix
+        ).versions;
+        // TODO: review this implementation
+        if (typeof v === 'string' && isVersionValid(info, v)) {
+          // @ts-ignore
+          sideBarInfo.latest = sideBarInfo.versions[v];
+          // @ts-ignore
+          sideBarInfo.latest.author = formatAuthor(sideBarInfo.latest.author);
+        } else {
+          // @ts-ignore
+          sideBarInfo.latest = sideBarInfo.versions[info[DIST_TAGS].latest];
+          // @ts-ignore
+          sideBarInfo.latest.author = formatAuthor(sideBarInfo.latest.author);
+        }
+        sideBarInfo = deleteProperties(['readme', '_attachments', '_rev', 'name'], sideBarInfo);
+        const authorAvatar = config.web
+          ? addGravatarSupport(sideBarInfo, config.web.gravatar)
+          : addGravatarSupport(sideBarInfo);
+        next(authorAvatar);
+      } catch (err) {
+        res.status(HTTP_STATUS.NOT_FOUND);
+        res.end();
+      }
     }
   );
 

package/test/api.readme.test.ts

@@ -38,7 +38,7 @@ describe('readme api', () => {
       .expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.TEXT_PLAIN_UTF8)
       .expect(HTTP_STATUS.OK);
     expect(response.text).toMatch('my readme scoped');
-  });
+  }, 70000);
 
   test('should fetch readme scoped package with not found message', async () => {
     const app = await initializeServer('default-test.yaml');

package/test/render.test.ts

@@ -69,8 +69,8 @@ describe('test web server', () => {
         );
       });
 
-      test.todo('test default title');
-      test.todo('test need html cache');
+      test.todo('should default title');
+      test.todo('should need html cache');
     });
 
     describe('status', () => {

package/tsconfig.json

@@ -13,9 +13,6 @@
     {
       "path": "../config"
     },
-    {
-      "path": "../core/commons-api"
-    },
     {
       "path": "../core/readme"
     },