@verdaccio/node-api 6.0.0-6-next.29 → 6.0.0-6-next.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +36 -0
- package/build/server.js +2 -2
- package/build/server.js.map +1 -1
- package/package.json +7 -7
- package/src/server.ts +5 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,41 @@
|
|
|
1
1
|
# @verdaccio/node-api
|
|
2
2
|
|
|
3
|
+
## 6.0.0-6-next.30
|
|
4
|
+
|
|
5
|
+
### Major Changes
|
|
6
|
+
|
|
7
|
+
- 82cb0f2b: feat!: config.logs throw an error, logging config not longer accept array or logs property
|
|
8
|
+
|
|
9
|
+
### 💥 Breaking change
|
|
10
|
+
|
|
11
|
+
This is valid
|
|
12
|
+
|
|
13
|
+
```yaml
|
|
14
|
+
log: { type: stdout, format: pretty, level: http }
|
|
15
|
+
```
|
|
16
|
+
|
|
17
|
+
This is invalid
|
|
18
|
+
|
|
19
|
+
```yaml
|
|
20
|
+
logs: { type: stdout, format: pretty, level: http }
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
or
|
|
24
|
+
|
|
25
|
+
```yaml
|
|
26
|
+
logs:
|
|
27
|
+
- [{ type: stdout, format: pretty, level: http }]
|
|
28
|
+
```
|
|
29
|
+
|
|
30
|
+
### Patch Changes
|
|
31
|
+
|
|
32
|
+
- Updated dependencies [82cb0f2b]
|
|
33
|
+
- Updated dependencies [5167bb52]
|
|
34
|
+
- @verdaccio/config@6.0.0-6-next.13
|
|
35
|
+
- @verdaccio/core@6.0.0-6-next.5
|
|
36
|
+
- @verdaccio/logger@6.0.0-6-next.11
|
|
37
|
+
- @verdaccio/server@6.0.0-6-next.29
|
|
38
|
+
|
|
3
39
|
## 6.0.0-6-next.29
|
|
4
40
|
|
|
5
41
|
### Patch Changes
|
package/build/server.js
CHANGED
|
@@ -133,7 +133,7 @@ async function initServer(config, port, version, pkgName) {
|
|
|
133
133
|
return new Promise(async (resolve, reject) => {
|
|
134
134
|
// FIXME: get only the first match, the multiple address will be removed
|
|
135
135
|
const [addr] = (0, _cliUtils.getListListenAddresses)(port, config.listen);
|
|
136
|
-
const logger = (0, _logger.setup)(config.
|
|
136
|
+
const logger = (0, _logger.setup)(config === null || config === void 0 ? void 0 : config.log);
|
|
137
137
|
(0, _experiments.displayExperimentsInfoBox)(config.flags);
|
|
138
138
|
const app = await (0, _server.default)(config);
|
|
139
139
|
const serverFactory = createServerFactory(config, addr, app);
|
|
@@ -201,7 +201,7 @@ async function runServer(config) {
|
|
|
201
201
|
throw new Error(_core.API_ERROR.CONFIG_BAD_FORMAT);
|
|
202
202
|
}
|
|
203
203
|
|
|
204
|
-
(0, _logger.setup)(configurationParsed.
|
|
204
|
+
(0, _logger.setup)(configurationParsed.log);
|
|
205
205
|
(0, _experiments.displayExperimentsInfoBox)(configurationParsed.flags); // FIXME: get only the first match, the multiple address will be removed
|
|
206
206
|
|
|
207
207
|
const [addr] = (0, _cliUtils.getListListenAddresses)(undefined, configurationParsed.listen);
|
package/build/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.ts"],"names":["debug","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","readFileSync","ca","createServer","err","message","http","server","keepAliveTimeout","initServer","port","version","pkgName","Promise","resolve","reject","listen","logger","logs","flags","host","process","send","verdaccio_started","addressServer","url","format","protocol","pathname","hostname","info","on","exitCode","handleShutdownGracefully","fatal","close","exit","signal","once","runServer","configurationParsed","undefined","configPathLocation","_","isObject","API_ERROR","CONFIG_BAD_FORMAT"],"mappings":"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","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 { logger, setup } from '@verdaccio/logger';\nimport server from '@verdaccio/server';\nimport { ConfigRuntime, 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: ConfigRuntime, 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: ConfigRuntime,\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 as ConfigRuntime).logs);\n displayExperimentsInfoBox(config.flags);\n const 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\n function handleShutdownGracefully() {\n logger.fatal('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 * 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 | ConfigRuntime): Promise<any> {\n let configurationParsed: ConfigRuntime;\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.logs);\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"],"file":"server.js"}
|
|
1
|
+
{"version":3,"sources":["../src/server.ts"],"names":["debug","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","readFileSync","ca","createServer","err","message","http","server","keepAliveTimeout","initServer","port","version","pkgName","Promise","resolve","reject","listen","logger","log","flags","host","process","send","verdaccio_started","addressServer","url","format","protocol","pathname","hostname","info","on","exitCode","handleShutdownGracefully","fatal","close","exit","signal","once","runServer","configurationParsed","undefined","configPathLocation","_","isObject","API_ERROR","CONFIG_BAD_FORMAT"],"mappings":"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","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 { LoggerConfigItem } from '@verdaccio/logger/src/logger';\nimport server from '@verdaccio/server';\nimport { ConfigRuntime, 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: ConfigRuntime, 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: ConfigRuntime,\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 LoggerConfigItem);\n displayExperimentsInfoBox(config.flags);\n const 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\n function handleShutdownGracefully() {\n logger.fatal('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 * 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 | ConfigRuntime): Promise<any> {\n let configurationParsed: ConfigRuntime;\n if (config === undefined || typeof config === 'string') {\n const configPathLocation = findConfigFile(config);\n configurationParsed = parseConfigFile(configPathLocation) as ConfigRuntime;\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 LoggerConfigItem);\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"],"file":"server.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@verdaccio/node-api",
|
|
3
|
-
"version": "6.0.0-6-next.
|
|
3
|
+
"version": "6.0.0-6-next.30",
|
|
4
4
|
"description": "node API",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -30,18 +30,18 @@
|
|
|
30
30
|
},
|
|
31
31
|
"license": "MIT",
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@verdaccio/core": "6.0.0-6-next.
|
|
34
|
-
"@verdaccio/config": "6.0.0-6-next.
|
|
35
|
-
"@verdaccio/logger": "6.0.0-6-next.
|
|
36
|
-
"@verdaccio/server": "6.0.0-6-next.
|
|
33
|
+
"@verdaccio/core": "6.0.0-6-next.5",
|
|
34
|
+
"@verdaccio/config": "6.0.0-6-next.13",
|
|
35
|
+
"@verdaccio/logger": "6.0.0-6-next.11",
|
|
36
|
+
"@verdaccio/server": "6.0.0-6-next.29",
|
|
37
37
|
"core-js": "3.20.3",
|
|
38
38
|
"debug": "4.3.3",
|
|
39
39
|
"lodash": "4.17.21"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/node": "16.11.21",
|
|
43
|
-
"@verdaccio/mock": "6.0.0-6-next.
|
|
44
|
-
"@verdaccio/types": "11.0.0-6-next.
|
|
43
|
+
"@verdaccio/mock": "6.0.0-6-next.14",
|
|
44
|
+
"@verdaccio/types": "11.0.0-6-next.11",
|
|
45
45
|
"jest-mock-process": "1.4.1",
|
|
46
46
|
"selfsigned": "1.10.14",
|
|
47
47
|
"supertest": "6.2.2"
|
package/src/server.ts
CHANGED
|
@@ -9,7 +9,8 @@ import url from 'url';
|
|
|
9
9
|
|
|
10
10
|
import { findConfigFile, parseConfigFile } from '@verdaccio/config';
|
|
11
11
|
import { API_ERROR } from '@verdaccio/core';
|
|
12
|
-
import {
|
|
12
|
+
import { setup } from '@verdaccio/logger';
|
|
13
|
+
import { LoggerConfigItem } from '@verdaccio/logger/src/logger';
|
|
13
14
|
import server from '@verdaccio/server';
|
|
14
15
|
import { ConfigRuntime, HttpsConfKeyCert, HttpsConfPfx } from '@verdaccio/types';
|
|
15
16
|
|
|
@@ -108,7 +109,7 @@ export async function initServer(
|
|
|
108
109
|
return new Promise(async (resolve, reject) => {
|
|
109
110
|
// FIXME: get only the first match, the multiple address will be removed
|
|
110
111
|
const [addr] = getListListenAddresses(port, config.listen);
|
|
111
|
-
const logger = setup(
|
|
112
|
+
const logger = setup(config?.log as LoggerConfigItem);
|
|
112
113
|
displayExperimentsInfoBox(config.flags);
|
|
113
114
|
const app = await server(config);
|
|
114
115
|
const serverFactory = createServerFactory(config, addr, app);
|
|
@@ -172,14 +173,14 @@ export async function runServer(config?: string | ConfigRuntime): Promise<any> {
|
|
|
172
173
|
let configurationParsed: ConfigRuntime;
|
|
173
174
|
if (config === undefined || typeof config === 'string') {
|
|
174
175
|
const configPathLocation = findConfigFile(config);
|
|
175
|
-
configurationParsed = parseConfigFile(configPathLocation);
|
|
176
|
+
configurationParsed = parseConfigFile(configPathLocation) as ConfigRuntime;
|
|
176
177
|
} else if (_.isObject(config)) {
|
|
177
178
|
configurationParsed = config;
|
|
178
179
|
} else {
|
|
179
180
|
throw new Error(API_ERROR.CONFIG_BAD_FORMAT);
|
|
180
181
|
}
|
|
181
182
|
|
|
182
|
-
setup(configurationParsed.
|
|
183
|
+
setup(configurationParsed.log as LoggerConfigItem);
|
|
183
184
|
displayExperimentsInfoBox(configurationParsed.flags);
|
|
184
185
|
// FIXME: get only the first match, the multiple address will be removed
|
|
185
186
|
const [addr] = getListListenAddresses(undefined, configurationParsed.listen);
|