@verdaccio/api 6.0.0-6-next.16 → 6.0.0-6-next.20

package/src/dist-tags.ts

@@ -1,12 +1,13 @@
-import mime from 'mime';
-import _ from 'lodash';
 import { Router } from 'express';
+import _ from 'lodash';
+import mime from 'mime';
 
-import { media, allow } from '@verdaccio/middleware';
-import { constants, VerdaccioError } from '@verdaccio/core';
-import { Package } from '@verdaccio/types';
-import { Storage } from '@verdaccio/store';
 import { IAuth } from '@verdaccio/auth';
+import { VerdaccioError, constants } from '@verdaccio/core';
+import { allow, media } from '@verdaccio/middleware';
+import { Storage } from '@verdaccio/store';
+import { Package } from '@verdaccio/types';
+
 import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';
 
 export default function (route: Router, auth: IAuth, storage: Storage): void {

package/src/index.ts

@@ -1,28 +1,29 @@
+import bodyParser from 'body-parser';
 import express, { Router } from 'express';
+import semver from 'semver';
+
+import { IAuth } from '@verdaccio/auth';
 import {
+  antiLoop,
+  encodeScopePackage,
   match,
   validateName,
   validatePackage,
-  encodeScopePackage,
-  antiLoop,
 } from '@verdaccio/middleware';
-import { IAuth } from '@verdaccio/auth';
 import { Storage } from '@verdaccio/store';
 import { Config } from '@verdaccio/types';
-import bodyParser from 'body-parser';
-import semver from 'semver';
 
-import whoami from './whoami';
-import ping from './ping';
-import user from './user';
 import distTags from './dist-tags';
+import pkg from './package';
+import ping from './ping';
 import publish from './publish';
 import search from './search';
-import pkg from './package';
 import stars from './stars';
+import user from './user';
 import profile from './v1/profile';
-import token from './v1/token';
 import v1Search from './v1/search';
+import token from './v1/token';
+import whoami from './whoami';
 
 if (semver.lte(process.version, 'v15.0.0')) {
   global.AbortController = require('abortcontroller-polyfill/dist/cjs-ponyfill').AbortController;
@@ -55,7 +56,7 @@ export default function (config: Config, auth: IAuth, storage: Storage): Router
   app.use(encodeScopePackage);
   // for "npm whoami"
   whoami(app);
-  pkg(app, auth, storage, config);
+  pkg(app, auth, storage);
   profile(app, auth);
   // @deprecated endpoint, 404 by default
   search(app);

package/src/package.ts

@@ -1,15 +1,12 @@
-import _ from 'lodash';
-import { Router } from 'express';
 import buildDebug from 'debug';
+import { Router } from 'express';
 
-import { allow } from '@verdaccio/middleware';
-import { getVersion } from '@verdaccio/utils';
-import { HEADERS, DIST_TAGS, API_ERROR, errorUtils } from '@verdaccio/core';
-import { Config, Package } from '@verdaccio/types';
 import { IAuth } from '@verdaccio/auth';
+import { HEADERS, errorUtils } from '@verdaccio/core';
+import { allow } from '@verdaccio/middleware';
 import { Storage } from '@verdaccio/store';
-import { convertDistRemoteToLocalTarballUrls } from '@verdaccio/tarball';
-import { $RequestExtend, $ResponseExtend, $NextFunctionVer } from '../types/custom';
+
+import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';
 
 const debug = buildDebug('verdaccio:api:package');
 
@@ -17,7 +14,7 @@ const downloadStream = (
   packageName: string,
   filename: string,
   storage: any,
-  req: $RequestExtend,
+  _req: $RequestExtend,
   res: $ResponseExtend
 ): void => {
   const stream = storage.getTarball(packageName, filename);
@@ -34,63 +31,47 @@ const downloadStream = (
   stream.pipe(res);
 };
 
-export default function (route: Router, auth: IAuth, storage: Storage, config: Config): void {
+export default function (route: Router, auth: IAuth, storage: Storage): void {
   const can = allow(auth);
-  // TODO: anonymous user?
+
   route.get(
     '/:package/:version?',
     can('access'),
-    function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {
+    async function (
+      req: $RequestExtend,
+      _res: $ResponseExtend,
+      next: $NextFunctionVer
+    ): Promise<void> {
       debug('init package by version');
       const name = req.params.package;
-      const getPackageMetaCallback = function (err, metadata: Package): void {
-        if (err) {
-          debug('error on fetch metadata for %o with error %o', name, err.message);
-          return next(err);
-        }
-        debug('convert dist remote to local with prefix %o', config?.url_prefix);
-        metadata = convertDistRemoteToLocalTarballUrls(metadata, req, config?.url_prefix);
-
-        let queryVersion = req.params.version;
-        debug('query by param version: %o', queryVersion);
-        if (_.isNil(queryVersion)) {
-          debug('param %o version found', queryVersion);
-          return next(metadata);
-        }
-
-        let version = getVersion(metadata, queryVersion);
-        debug('query by latest version %o and result %o', queryVersion, version);
-        if (_.isNil(version) === false) {
-          debug('latest version found %o', version);
-          return next(version);
-        }
+      let queryVersion = req.params.version;
+      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,
+      };
 
-        if (_.isNil(metadata[DIST_TAGS]) === false) {
-          if (_.isNil(metadata[DIST_TAGS][queryVersion]) === false) {
-            queryVersion = metadata[DIST_TAGS][queryVersion];
-            debug('dist-tag version found %o', queryVersion);
-            version = getVersion(metadata, queryVersion);
-            if (_.isNil(version) === false) {
-              debug('dist-tag found %o', version);
-              return next(version);
-            }
-          }
-        } else {
-          debug('dist tag not detected');
+      try {
+        // TODO: this is just temporary while I migrate all plugins to use the new API
+        // the method will be renamed to getPackage again but Promise Based.
+        if (!storage.getPackageNext) {
+          throw errorUtils.getInternalError(
+            'getPackageNext not implemented, check pr-2750 for more details'
+          );
         }
 
-        debug('package version not found %o', queryVersion);
-        return next(errorUtils.getNotFound(`${API_ERROR.VERSION_NOT_EXIST}: ${queryVersion}`));
-      };
-
-      debug('get package name %o', name);
-      debug('uplinks look up enabled');
-      storage.getPackage({
-        name,
-        uplinksLook: true,
-        req,
-        callback: getPackageMetaCallback,
-      });
+        const manifest = await storage.getPackageNext({
+          name,
+          uplinksLook: true,
+          req,
+          version: queryVersion,
+          requestOptions,
+        });
+        next(manifest);
+      } catch (err) {
+        next(err);
+      }
     }
   );
 

package/src/ping.ts

@@ -1,5 +1,6 @@
 import { Router } from 'express';
-import { $RequestExtend, $ResponseExtend, $NextFunctionVer } from '../types/custom';
+
+import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';
 
 export default function (route: Router): void {
   route.get(

package/src/publish.ts

@@ -1,26 +1,26 @@
-import Path from 'path';
+import buildDebug from 'debug';
+import { Router } from 'express';
 import _ from 'lodash';
 import mime from 'mime';
-import { Router } from 'express';
-import buildDebug from 'debug';
+import Path from 'path';
 
+import { IAuth } from '@verdaccio/auth';
 import {
+  API_ERROR,
   API_MESSAGE,
-  HEADERS,
   DIST_TAGS,
-  API_ERROR,
+  HEADERS,
   HTTP_STATUS,
   errorUtils,
 } from '@verdaccio/core';
-import { validateMetadata, isObject, hasDiffOneKey } from '@verdaccio/utils';
-import { media, expectJson, allow } from '@verdaccio/middleware';
 import { notify } from '@verdaccio/hooks';
-import { Config, Callback, MergeTags, Version, Package, CallbackAction } from '@verdaccio/types';
 import { logger } from '@verdaccio/logger';
-import { IAuth } from '@verdaccio/auth';
+import { allow, expectJson, media } from '@verdaccio/middleware';
 import { Storage } from '@verdaccio/store';
-import { $RequestExtend, $ResponseExtend, $NextFunctionVer } from '../types/custom';
+import { Callback, CallbackAction, Config, MergeTags, Package, Version } from '@verdaccio/types';
+import { hasDiffOneKey, isObject, validateMetadata } from '@verdaccio/utils';
 
+import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';
 import star from './star';
 import { isPublishablePackage, isRelatedToDeprecation } from './utils';
 

package/src/star.ts

@@ -1,10 +1,11 @@
-import { USERS, HTTP_STATUS } from '@verdaccio/core';
+import buildDebug from 'debug';
 import { Response } from 'express';
 import _ from 'lodash';
-import buildDebug from 'debug';
 
+import { HTTP_STATUS, USERS } from '@verdaccio/core';
 import { Storage } from '@verdaccio/store';
-import { $RequestExtend, $NextFunctionVer } from '../types/custom';
+
+import { $NextFunctionVer, $RequestExtend } from '../types/custom';
 
 const debug = buildDebug('verdaccio:api:publish:star');
 

package/src/stars.ts

@@ -1,11 +1,11 @@
-import _ from 'lodash';
 import { Response, Router } from 'express';
+import _ from 'lodash';
 
-import { USERS, HTTP_STATUS } from '@verdaccio/core';
+import { HTTP_STATUS, USERS } from '@verdaccio/core';
+import { Storage } from '@verdaccio/store';
 import { Package } from '@verdaccio/types';
 
-import { Storage } from '@verdaccio/store';
-import { $RequestExtend, $NextFunctionVer } from '../types/custom';
+import { $NextFunctionVer, $RequestExtend } from '../types/custom';
 
 type Packages = Package[];
 

package/src/user.ts

@@ -1,16 +1,16 @@
-import _ from 'lodash';
-import { Response, Router } from 'express';
 import buildDebug from 'debug';
+import { Response, Router } from 'express';
+import _ from 'lodash';
 
-import { getAuthenticatedMessage, validatePassword } from '@verdaccio/utils';
 import { getApiToken } from '@verdaccio/auth';
-import { logger } from '@verdaccio/logger';
-import { createRemoteUser } from '@verdaccio/config';
-
-import { Config, RemoteUser } from '@verdaccio/types';
 import { IAuth } from '@verdaccio/auth';
+import { createRemoteUser } from '@verdaccio/config';
 import { API_ERROR, API_MESSAGE, HTTP_STATUS, errorUtils } from '@verdaccio/core';
-import { $RequestExtend, $NextFunctionVer } from '../types/custom';
+import { logger } from '@verdaccio/logger';
+import { Config, RemoteUser } from '@verdaccio/types';
+import { getAuthenticatedMessage, validatePassword } from '@verdaccio/utils';
+
+import { $NextFunctionVer, $RequestExtend } from '../types/custom';
 
 const debug = buildDebug('verdaccio:api:user');
 

package/src/utils.ts

@@ -1,6 +1,7 @@
-import { Package } from '@verdaccio/types';
 import _ from 'lodash';
 
+import { Package } from '@verdaccio/types';
+
 /**
  * Check whether the package metadta has enough data to be published
  * @param pkg metadata

package/src/v1/profile.ts

@@ -1,10 +1,11 @@
-import _ from 'lodash';
 import { Response, Router } from 'express';
+import _ from 'lodash';
 
+import { IAuth } from '@verdaccio/auth';
 import { API_ERROR, APP_ERROR, HTTP_STATUS, SUPPORT_ERRORS, errorUtils } from '@verdaccio/core';
 import { validatePassword } from '@verdaccio/utils';
-import { IAuth } from '@verdaccio/auth';
-import { $RequestExtend, $NextFunctionVer } from '../../types/custom';
+
+import { $NextFunctionVer, $RequestExtend } from '../../types/custom';
 
 export interface Profile {
   tfa: boolean;

package/src/v1/search.ts

@@ -1,8 +1,9 @@
-import _ from 'lodash';
 import buildDebug from 'debug';
-import { logger } from '@verdaccio/logger';
+import _ from 'lodash';
+
 import { IAuth } from '@verdaccio/auth';
 import { HTTP_STATUS, searchUtils } from '@verdaccio/core';
+import { logger } from '@verdaccio/logger';
 import { Storage } from '@verdaccio/store';
 import { Package } from '@verdaccio/types';
 

package/src/v1/token.ts

@@ -1,14 +1,15 @@
-import _ from 'lodash';
-import { errorUtils, HTTP_STATUS, SUPPORT_ERRORS } from '@verdaccio/core';
-import { stringToMD5, mask } from '@verdaccio/utils';
-import { getApiToken } from '@verdaccio/auth';
-import { logger } from '@verdaccio/logger';
 import { Response, Router } from 'express';
+import _ from 'lodash';
 
-import { Config, RemoteUser, Token } from '@verdaccio/types';
+import { getApiToken } from '@verdaccio/auth';
 import { IAuth } from '@verdaccio/auth';
+import { HTTP_STATUS, SUPPORT_ERRORS, errorUtils } from '@verdaccio/core';
+import { logger } from '@verdaccio/logger';
 import { Storage } from '@verdaccio/store';
-import { $RequestExtend, $NextFunctionVer } from '../../types/custom';
+import { Config, RemoteUser, Token } from '@verdaccio/types';
+import { mask, stringToMD5 } from '@verdaccio/utils';
+
+import { $NextFunctionVer, $RequestExtend } from '../../types/custom';
 
 export type NormalizeToken = Token & {
   created: string;

package/src/whoami.ts

@@ -1,6 +1,7 @@
-import { Response, Router } from 'express';
 import buildDebug from 'debug';
-import { $RequestExtend, $NextFunctionVer } from '../types/custom';
+import { Response, Router } from 'express';
+
+import { $NextFunctionVer, $RequestExtend } from '../types/custom';
 
 const debug = buildDebug('verdaccio:api:user');
 

package/test/integration/_helper.ts

@@ -1,14 +1,15 @@
-import path from 'path';
+import bodyParser from 'body-parser';
 import express, { Application } from 'express';
+import path from 'path';
 import supertest from 'supertest';
-import bodyParser from 'body-parser';
 
-import { Config, parseConfigFile } from '@verdaccio/config';
-import { Storage } from '@verdaccio/store';
-import { generatePackageMetadata } from '@verdaccio/helper';
-import { final, handleError, errorReportingMiddleware } from '@verdaccio/middleware';
 import { Auth, IAuth } from '@verdaccio/auth';
+import { Config, parseConfigFile } from '@verdaccio/config';
 import { HEADERS, HEADER_TYPE, HTTP_STATUS } from '@verdaccio/core';
+import { generatePackageMetadata } from '@verdaccio/helper';
+import { errorReportingMiddleware, final, handleError } from '@verdaccio/middleware';
+import { Storage } from '@verdaccio/store';
+
 import apiEndpoints from '../../src';
 
 const getConf = (conf) => {

package/test/integration/package.spec.ts

@@ -1,7 +1,8 @@
 import supertest from 'supertest';
 
-import { HEADER_TYPE, HEADERS, HTTP_STATUS } from '@verdaccio/core';
-import { $ResponseExtend, $RequestExtend } from '../../types/custom';
+import { HEADERS, HEADER_TYPE, HTTP_STATUS } from '@verdaccio/core';
+
+import { $RequestExtend, $ResponseExtend } from '../../types/custom';
 import { initializeServer, publishTaggedVersion, publishVersion } from './_helper';
 
 const mockApiJWTmiddleware = jest.fn(

package/test/integration/ping.spec.ts

@@ -1,6 +1,7 @@
 import supertest from 'supertest';
 
-import { HEADER_TYPE, HEADERS, HTTP_STATUS } from '@verdaccio/core';
+import { HEADERS, HEADER_TYPE, HTTP_STATUS } from '@verdaccio/core';
+
 import { initializeServer } from './_helper';
 
 describe('ping', () => {

package/test/integration/publish.spec.ts

@@ -1,8 +1,10 @@
-import { HTTP_STATUS } from '@verdaccio/core';
 import supertest from 'supertest';
-import { API_ERROR, API_MESSAGE, HEADER_TYPE, HEADERS } from '@verdaccio/core';
+
+import { HTTP_STATUS } from '@verdaccio/core';
+import { API_ERROR, API_MESSAGE, HEADERS, HEADER_TYPE } from '@verdaccio/core';
 import { generatePackageMetadata } from '@verdaccio/helper';
-import { $ResponseExtend, $RequestExtend } from '../../types/custom';
+
+import { $RequestExtend, $ResponseExtend } from '../../types/custom';
 import { initializeServer, publishVersion } from './_helper';
 
 const mockApiJWTmiddleware = jest.fn(

package/test/integration/user.spec.ts

@@ -1,13 +1,13 @@
-import supertest from 'supertest';
 import _ from 'lodash';
+import supertest from 'supertest';
 
 import {
-  errorUtils,
+  API_ERROR,
+  API_MESSAGE,
   HEADERS,
   HEADER_TYPE,
-  API_MESSAGE,
   HTTP_STATUS,
-  API_ERROR,
+  errorUtils,
 } from '@verdaccio/core';
 
 import { $RequestExtend, $ResponseExtend } from '../../types/custom';

package/test/unit/publish.spec.ts

@@ -1,10 +1,11 @@
-import { errorUtils, HTTP_STATUS, API_ERROR } from '@verdaccio/core';
+import { API_ERROR, HTTP_STATUS, errorUtils } from '@verdaccio/core';
+
 import {
   addVersion,
-  uploadPackageTarball,
+  publishPackage,
   removeTarball,
   unPublishPackage,
-  publishPackage,
+  uploadPackageTarball,
 } from '../../src/publish';
 
 const REVISION_MOCK = '15-e53a77096b0ee33e';

package/test/unit/validate.api.params.middleware.spec.ts

@@ -1,7 +1,7 @@
 /* eslint-disable curly */
 // ensure that all arguments are validated
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
 
 /**
  * Validate.

package/types/custom.d.ts

@@ -1,6 +1,7 @@
-import { Logger, RemoteUser } from '@verdaccio/types';
 import { NextFunction, Request, Response } from 'express';
 
+import { Logger, RemoteUser } from '@verdaccio/types';
+
 export type $RequestExtend = Request & { remote_user?: any; log: Logger };
 export type $ResponseExtend = Response & { cookies?: any };
 export type $NextFunctionVer = NextFunction & any;