@verdaccio/node-api 6.0.0-6-next.36 → 6.0.0-6-next.48

package/CHANGELOG.md

@@ -1,5 +1,86 @@
 # @verdaccio/node-api
 
+## 6.0.0-6-next.48
+
+### Major Changes
+
+- 9fc2e796: feat(plugins): improve plugin loader
+
+  ### Changes
+
+  - Add scope plugin support to 6.x https://github.com/verdaccio/verdaccio/pull/3227
+  - Avoid config collisions https://github.com/verdaccio/verdaccio/issues/928
+  - https://github.com/verdaccio/verdaccio/issues/1394
+  - `config.plugins` plugin path validations
+  - Updated algorithm for plugin loader.
+  - improved documentation (included dev)
+
+  ## Features
+
+  - Add scope plugin support to 6.x https://github.com/verdaccio/verdaccio/pull/3227
+  - Custom prefix:
+
+  ```
+  // config.yaml
+  server:
+    pluginPrefix: mycompany
+  middleware:
+    audit:
+        foo: 1
+  ```
+
+  This configuration will look up for `mycompany-audit` instead `Verdaccio-audit`.
+
+  ## Breaking Changes
+
+  ### sinopia plugins
+
+  - `sinopia` fallback support is removed, but can be restored using `pluginPrefix`
+
+  ### plugin filter
+
+  - method rename `filter_metadata`->`filterMetadata`
+
+  ### Plugin constructor does not merge configs anymore https://github.com/verdaccio/verdaccio/issues/928
+
+  The plugin receives as first argument `config`, which represents the config of the plugin. Example:
+
+  ```
+  // config.yaml
+  auth:
+    plugin:
+       foo: 1
+       bar: 2
+
+  export class Plugin<T> {
+    public constructor(config: T, options: PluginOptions) {
+      console.log(config);
+      // {foo:1, bar: 2}
+   }
+  }
+  ```
+
+### Patch Changes
+
+- Updated dependencies [43f32687]
+- Updated dependencies [9fc2e796]
+- Updated dependencies [62c24b63]
+  - @verdaccio/core@6.0.0-6-next.48
+  - @verdaccio/server-fastify@6.0.0-6-next.29
+  - @verdaccio/config@6.0.0-6-next.48
+  - @verdaccio/server@6.0.0-6-next.37
+  - @verdaccio/logger@6.0.0-6-next.16
+
+## 6.0.0-6-next.47
+
+### Patch Changes
+
+- @verdaccio/core@6.0.0-6-next.47
+- @verdaccio/config@6.0.0-6-next.47
+- @verdaccio/logger@6.0.0-6-next.15
+- @verdaccio/server@6.0.0-6-next.36
+- @verdaccio/server-fastify@6.0.0-6-next.28
+
 ## 6.0.0-6-next.36
 
 ### Patch Changes

package/build/server.js

@@ -180,7 +180,7 @@ async function initServer(config, port, version, pkgName) {
       });
 
       function handleShutdownGracefully() {
-        logger.warn('received shutdown signal - closing server gracefully...');
+        logger.info('received shutdown signal - closing server gracefully...');
         serverFactory.close(() => {
           logger.info('server closed.');
           process.exit(0);

package/build/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","names":["debug","buildDebug","unlinkAddressPath","addr","path","fs","existsSync","unlinkSync","createServerFactory","config","app","serverFactory","proto","httpsOptions","secureOptions","constants","SSL_OP_NO_SSLv2","SSL_OP_NO_SSLv3","keyCertConfig","https","pfxConfig","key","cert","pfx","Error","passphrase","assign","readFileSync","ca","createServer","err","message","http","server","keepAliveTimeout","initServer","port","version","pkgName","Promise","resolve","reject","getListListenAddresses","listen","logger","setup","log","displayExperimentsInfoBox","flags","process","env","VERDACCIO_SERVER","fastifyServer","host","isFunction","send","verdaccio_started","addressServer","url","format","protocol","pathname","hostname","info","on","exitCode","handleShutdownGracefully","warn","close","exit","signal","once","runServer","configurationParsed","undefined","configPathLocation","findConfigFile","parseConfigFile","_","isObject","API_ERROR","CONFIG_BAD_FORMAT"],"sources":["../src/server.ts"],"sourcesContent":["/* eslint-disable */\nimport constants from 'constants';\nimport buildDebug from 'debug';\nimport fs from 'fs';\nimport http from 'http';\nimport https from 'https';\nimport _, { assign, isFunction } from 'lodash';\nimport url from 'url';\n\nimport { findConfigFile, parseConfigFile } from '@verdaccio/config';\nimport { API_ERROR } from '@verdaccio/core';\nimport { setup } from '@verdaccio/logger';\nimport server from '@verdaccio/server';\nimport fastifyServer from '@verdaccio/server-fastify';\nimport { ConfigYaml, HttpsConfKeyCert, HttpsConfPfx } from '@verdaccio/types';\n\nimport { getListListenAddresses } from './cli-utils';\nimport { displayExperimentsInfoBox } from './experiments';\n\nconst debug = buildDebug('verdaccio:node-api');\n\nfunction unlinkAddressPath(addr) {\n  if (addr.path && fs.existsSync(addr.path)) {\n    fs.unlinkSync(addr.path);\n  }\n}\n\n/**\n * Return a native HTTP/HTTPS server instance\n * @param config\n * @param addr\n * @param app\n */\nexport function createServerFactory(config: ConfigYaml, addr, app) {\n  let serverFactory;\n  if (addr.proto === 'https') {\n    debug('https enabled');\n    try {\n      let httpsOptions = {\n        // disable insecure SSLv2 and SSLv3\n        secureOptions: constants.SSL_OP_NO_SSLv2 | constants.SSL_OP_NO_SSLv3,\n      };\n\n      const keyCertConfig = config.https as HttpsConfKeyCert;\n      const pfxConfig = config.https as HttpsConfPfx;\n\n      // https must either have key and cert or a pfx and (optionally) a passphrase\n      if (!((keyCertConfig.key && keyCertConfig.cert) || pfxConfig.pfx)) {\n        // logHTTPSError(configPath);\n        throw Error('bad format https configuration');\n      }\n\n      if (pfxConfig.pfx) {\n        const { pfx, passphrase } = pfxConfig;\n        httpsOptions = assign(httpsOptions, {\n          pfx: fs.readFileSync(pfx),\n          passphrase: passphrase || '',\n        });\n      } else {\n        const { key, cert, ca } = keyCertConfig;\n        httpsOptions = assign(httpsOptions, {\n          key: fs.readFileSync(key),\n          cert: fs.readFileSync(cert),\n          ...(ca && {\n            ca: fs.readFileSync(ca),\n          }),\n        });\n      }\n      // TODO: enable http2 as feature\n      // if (config.server.http2) <-- check if force http2\n      serverFactory = https.createServer(httpsOptions, app);\n    } catch (err: any) {\n      throw new Error(`cannot create https server: ${err.message}`);\n    }\n  } else {\n    // http\n    debug('http enabled');\n    serverFactory = http.createServer(app);\n  }\n\n  if (\n    config.server &&\n    typeof config.server.keepAliveTimeout !== 'undefined' &&\n    // @ts-ignore\n    config.server.keepAliveTimeout !== 'null'\n  ) {\n    // library definition for node is not up to date (doesn't contain recent 8.0 changes)\n    serverFactory.keepAliveTimeout = config.server.keepAliveTimeout * 1000;\n  }\n  // FIXE: I could not find the reason of this code.\n  unlinkAddressPath(addr);\n\n  return serverFactory;\n}\n\n/**\n * Start the server on the port defined\n * @param config\n * @param port\n * @param version\n * @param pkgName\n */\nexport async function initServer(\n  config: ConfigYaml,\n  port: string | void,\n  version: string,\n  pkgName: string\n): Promise<void> {\n  return new Promise(async (resolve, reject) => {\n    // FIXME: get only the first match, the multiple address will be removed\n    const [addr] = getListListenAddresses(port, config.listen);\n    const logger = setup(config?.log as any);\n    displayExperimentsInfoBox(config.flags);\n\n    let app;\n    if (process.env.VERDACCIO_SERVER === 'fastify') {\n      app = await fastifyServer(config);\n      app.listen({ port: addr.port, host: addr.host }, (err) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve();\n        }\n      });\n    } else {\n      app = await server(config);\n      const serverFactory = createServerFactory(config, addr, app);\n      serverFactory\n        .listen(addr.port || addr.path, addr.host, (): void => {\n          // send a message for test\n          if (isFunction(process.send)) {\n            process.send({\n              verdaccio_started: true,\n            });\n          }\n          const addressServer = `${\n            addr.path\n              ? url.format({\n                  protocol: 'unix',\n                  pathname: addr.path,\n                })\n              : url.format({\n                  protocol: addr.proto,\n                  hostname: addr.host,\n                  port: addr.port,\n                  pathname: '/',\n                })\n          }`;\n          logger.info(`http address ${addressServer}`);\n          logger.info(`version: ${version}`);\n          resolve();\n        })\n        .on('error', function (err): void {\n          reject(err);\n          process.exitCode = 1;\n        });\n      function handleShutdownGracefully() {\n        logger.warn('received shutdown signal - closing server gracefully...');\n        serverFactory.close(() => {\n          logger.info('server closed.');\n          process.exit(0);\n        });\n      }\n\n      for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP']) {\n        // Use once() so that receiving double signals exit the app.\n        process.once(signal, handleShutdownGracefully);\n      }\n    }\n  });\n}\n\n/**\n * Exposes a server factory to be instantiated programmatically.\n *\n    const app = await runServer(); // default configuration\n    const app = await runServer('./config/config.yaml');\n    const app = await runServer({ configuration });\n    app.listen(4000, (event) => {\n    // do something\n    });\n * @param config\n */\nexport async function runServer(config?: string | ConfigYaml): Promise<any> {\n  let configurationParsed: ConfigYaml;\n  if (config === undefined || typeof config === 'string') {\n    const configPathLocation = findConfigFile(config);\n    configurationParsed = parseConfigFile(configPathLocation);\n  } else if (_.isObject(config)) {\n    configurationParsed = config;\n  } else {\n    throw new Error(API_ERROR.CONFIG_BAD_FORMAT);\n  }\n\n  setup(configurationParsed.log as any);\n  displayExperimentsInfoBox(configurationParsed.flags);\n  // FIXME: get only the first match, the multiple address will be removed\n  const [addr] = getListListenAddresses(undefined, configurationParsed.listen);\n  const app = await server(configurationParsed);\n  return createServerFactory(configurationParsed, addr, app);\n}\n"],"mappings":"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"}
+{"version":3,"file":"server.js","names":["debug","buildDebug","unlinkAddressPath","addr","path","fs","existsSync","unlinkSync","createServerFactory","config","app","serverFactory","proto","httpsOptions","secureOptions","constants","SSL_OP_NO_SSLv2","SSL_OP_NO_SSLv3","keyCertConfig","https","pfxConfig","key","cert","pfx","Error","passphrase","assign","readFileSync","ca","createServer","err","message","http","server","keepAliveTimeout","initServer","port","version","pkgName","Promise","resolve","reject","getListListenAddresses","listen","logger","setup","log","displayExperimentsInfoBox","flags","process","env","VERDACCIO_SERVER","fastifyServer","host","expressServer","isFunction","send","verdaccio_started","addressServer","url","format","protocol","pathname","hostname","info","on","exitCode","handleShutdownGracefully","close","exit","signal","once","runServer","configurationParsed","undefined","configPathLocation","findConfigFile","parseConfigFile","_","isObject","API_ERROR","CONFIG_BAD_FORMAT"],"sources":["../src/server.ts"],"sourcesContent":["/* eslint-disable */\nimport constants from 'constants';\nimport buildDebug from 'debug';\nimport fs from 'fs';\nimport http from 'http';\nimport https from 'https';\nimport _, { assign, isFunction } from 'lodash';\nimport url from 'url';\n\nimport { findConfigFile, parseConfigFile } from '@verdaccio/config';\nimport { API_ERROR } from '@verdaccio/core';\nimport { setup } from '@verdaccio/logger';\nimport expressServer from '@verdaccio/server';\nimport fastifyServer from '@verdaccio/server-fastify';\nimport { ConfigYaml, HttpsConfKeyCert, HttpsConfPfx } from '@verdaccio/types';\n\nimport { getListListenAddresses } from './cli-utils';\nimport { displayExperimentsInfoBox } from './experiments';\n\nconst debug = buildDebug('verdaccio:node-api');\n\nfunction unlinkAddressPath(addr) {\n  if (addr.path && fs.existsSync(addr.path)) {\n    fs.unlinkSync(addr.path);\n  }\n}\n\n/**\n * Return a native HTTP/HTTPS server instance\n * @param config\n * @param addr\n * @param app\n */\nexport function createServerFactory(config: ConfigYaml, addr, app) {\n  let serverFactory;\n  if (addr.proto === 'https') {\n    debug('https enabled');\n    try {\n      let httpsOptions = {\n        // disable insecure SSLv2 and SSLv3\n        secureOptions: constants.SSL_OP_NO_SSLv2 | constants.SSL_OP_NO_SSLv3,\n      };\n\n      const keyCertConfig = config.https as HttpsConfKeyCert;\n      const pfxConfig = config.https as HttpsConfPfx;\n\n      // https must either have key and cert or a pfx and (optionally) a passphrase\n      if (!((keyCertConfig.key && keyCertConfig.cert) || pfxConfig.pfx)) {\n        // logHTTPSError(configPath);\n        throw Error('bad format https configuration');\n      }\n\n      if (pfxConfig.pfx) {\n        const { pfx, passphrase } = pfxConfig;\n        httpsOptions = assign(httpsOptions, {\n          pfx: fs.readFileSync(pfx),\n          passphrase: passphrase || '',\n        });\n      } else {\n        const { key, cert, ca } = keyCertConfig;\n        httpsOptions = assign(httpsOptions, {\n          key: fs.readFileSync(key),\n          cert: fs.readFileSync(cert),\n          ...(ca && {\n            ca: fs.readFileSync(ca),\n          }),\n        });\n      }\n      // TODO: enable http2 as feature\n      // if (config.server.http2) <-- check if force http2\n      serverFactory = https.createServer(httpsOptions, app);\n    } catch (err: any) {\n      throw new Error(`cannot create https server: ${err.message}`);\n    }\n  } else {\n    // http\n    debug('http enabled');\n    serverFactory = http.createServer(app);\n  }\n\n  if (\n    config.server &&\n    typeof config.server.keepAliveTimeout !== 'undefined' &&\n    // @ts-ignore\n    config.server.keepAliveTimeout !== 'null'\n  ) {\n    // library definition for node is not up to date (doesn't contain recent 8.0 changes)\n    serverFactory.keepAliveTimeout = config.server.keepAliveTimeout * 1000;\n  }\n  // FIXE: I could not find the reason of this code.\n  unlinkAddressPath(addr);\n\n  return serverFactory;\n}\n\n/**\n * Start the server on the port defined\n * @param config\n * @param port\n * @param version\n * @param pkgName\n */\nexport async function initServer(\n  config: ConfigYaml,\n  port: string | void,\n  version: string,\n  pkgName: string\n): Promise<void> {\n  return new Promise(async (resolve, reject) => {\n    // FIXME: get only the first match, the multiple address will be removed\n    const [addr] = getListListenAddresses(port, config.listen);\n    const logger = setup(config?.log as any);\n    displayExperimentsInfoBox(config.flags);\n\n    let app;\n    if (process.env.VERDACCIO_SERVER === 'fastify') {\n      app = await fastifyServer(config);\n      app.listen({ port: addr.port, host: addr.host }, (err) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve();\n        }\n      });\n    } else {\n      app = await expressServer(config);\n      const serverFactory = createServerFactory(config, addr, app);\n      serverFactory\n        .listen(addr.port || addr.path, addr.host, (): void => {\n          // send a message for test\n          if (isFunction(process.send)) {\n            process.send({\n              verdaccio_started: true,\n            });\n          }\n          const addressServer = `${\n            addr.path\n              ? url.format({\n                  protocol: 'unix',\n                  pathname: addr.path,\n                })\n              : url.format({\n                  protocol: addr.proto,\n                  hostname: addr.host,\n                  port: addr.port,\n                  pathname: '/',\n                })\n          }`;\n          logger.info(`http address ${addressServer}`);\n          logger.info(`version: ${version}`);\n          resolve();\n        })\n        .on('error', function (err): void {\n          reject(err);\n          process.exitCode = 1;\n        });\n      function handleShutdownGracefully() {\n        logger.info('received shutdown signal - closing server gracefully...');\n        serverFactory.close(() => {\n          logger.info('server closed.');\n          process.exit(0);\n        });\n      }\n\n      for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP']) {\n        // Use once() so that receiving double signals exit the app.\n        process.once(signal, handleShutdownGracefully);\n      }\n    }\n  });\n}\n\n/**\n * Exposes a server factory to be instantiated programmatically.\n *\n    const app = await runServer(); // default configuration\n    const app = await runServer('./config/config.yaml');\n    const app = await runServer({ configuration });\n    app.listen(4000, (event) => {\n    // do something\n    });\n * @param config\n */\nexport async function runServer(config?: string | ConfigYaml): Promise<any> {\n  let configurationParsed: ConfigYaml;\n  if (config === undefined || typeof config === 'string') {\n    const configPathLocation = findConfigFile(config);\n    configurationParsed = parseConfigFile(configPathLocation);\n  } else if (_.isObject(config)) {\n    configurationParsed = config;\n  } else {\n    throw new Error(API_ERROR.CONFIG_BAD_FORMAT);\n  }\n\n  setup(configurationParsed.log as any);\n  displayExperimentsInfoBox(configurationParsed.flags);\n  // FIXME: get only the first match, the multiple address will be removed\n  const [addr] = getListListenAddresses(undefined, configurationParsed.listen);\n  const app = await expressServer(configurationParsed);\n  return createServerFactory(configurationParsed, addr, app);\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/node-api",
-  "version": "6.0.0-6-next.36",
+  "version": "6.0.0-6-next.48",
   "description": "node API",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -30,18 +30,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@verdaccio/core": "6.0.0-6-next.8",
-    "@verdaccio/config": "6.0.0-6-next.17",
-    "@verdaccio/logger": "6.0.0-6-next.14",
-    "@verdaccio/server": "6.0.0-6-next.35",
-    "@verdaccio/server-fastify": "6.0.0-6-next.27",
-    "core-js": "3.25.0",
+    "@verdaccio/core": "6.0.0-6-next.48",
+    "@verdaccio/config": "6.0.0-6-next.48",
+    "@verdaccio/logger": "6.0.0-6-next.16",
+    "@verdaccio/server": "6.0.0-6-next.37",
+    "@verdaccio/server-fastify": "6.0.0-6-next.29",
+    "core-js": "3.25.2",
     "debug": "4.3.4",
     "lodash": "4.17.21"
   },
   "devDependencies": {
-    "@types/node": "16.11.56",
-    "@verdaccio/types": "11.0.0-6-next.16",
+    "@types/node": "16.11.60",
+    "@verdaccio/types": "11.0.0-6-next.17",
     "jest-mock-process": "1.5.1",
     "selfsigned": "1.10.14",
     "supertest": "6.2.4"

package/src/server.ts

@@ -10,7 +10,7 @@ import url from 'url';
 import { findConfigFile, parseConfigFile } from '@verdaccio/config';
 import { API_ERROR } from '@verdaccio/core';
 import { setup } from '@verdaccio/logger';
-import server from '@verdaccio/server';
+import expressServer from '@verdaccio/server';
 import fastifyServer from '@verdaccio/server-fastify';
 import { ConfigYaml, HttpsConfKeyCert, HttpsConfPfx } from '@verdaccio/types';
 
@@ -123,7 +123,7 @@ export async function initServer(
         }
       });
     } else {
-      app = await server(config);
+      app = await expressServer(config);
       const serverFactory = createServerFactory(config, addr, app);
       serverFactory
         .listen(addr.port || addr.path, addr.host, (): void => {
@@ -155,7 +155,7 @@ export async function initServer(
           process.exitCode = 1;
         });
       function handleShutdownGracefully() {
-        logger.warn('received shutdown signal - closing server gracefully...');
+        logger.info('received shutdown signal - closing server gracefully...');
         serverFactory.close(() => {
           logger.info('server closed.');
           process.exit(0);
@@ -196,6 +196,6 @@ export async function runServer(config?: string | ConfigYaml): Promise<any> {
   displayExperimentsInfoBox(configurationParsed.flags);
   // FIXME: get only the first match, the multiple address will be removed
   const [addr] = getListListenAddresses(undefined, configurationParsed.listen);
-  const app = await server(configurationParsed);
+  const app = await expressServer(configurationParsed);
   return createServerFactory(configurationParsed, addr, app);
 }