@verdaccio/search 8.0.0-next-8.1 → 8.0.0-next-8.2
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 +14 -0
- package/build/search-utils.js +2 -3
- package/build/search-utils.js.map +1 -1
- package/build/search.js +3 -4
- package/build/search.js.map +1 -1
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @verdaccio/search
|
|
2
2
|
|
|
3
|
+
## 8.0.0-next-8.2
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 6a8154c: feat: update logger pino to latest
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [6a8154c]
|
|
12
|
+
- @verdaccio/config@8.0.0-next-8.2
|
|
13
|
+
- @verdaccio/core@8.0.0-next-8.2
|
|
14
|
+
- @verdaccio/logger@8.0.0-next-8.2
|
|
15
|
+
- @verdaccio/proxy@8.0.0-next-8.2
|
|
16
|
+
|
|
3
17
|
## 8.0.0-next-8.1
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
package/build/search-utils.js
CHANGED
|
@@ -9,11 +9,10 @@ function removeDuplicates(results) {
|
|
|
9
9
|
const pkgNames = [];
|
|
10
10
|
const orderByResults = (0, _lodash.orderBy)(results, ['verdaccioPrivate', 'asc']);
|
|
11
11
|
return orderByResults.filter(pkg => {
|
|
12
|
-
|
|
13
|
-
if (pkgNames.includes(pkg === null || pkg === void 0 || (_pkg$package = pkg.package) === null || _pkg$package === void 0 ? void 0 : _pkg$package.name)) {
|
|
12
|
+
if (pkgNames.includes(pkg?.package?.name)) {
|
|
14
13
|
return false;
|
|
15
14
|
}
|
|
16
|
-
pkgNames.push(pkg
|
|
15
|
+
pkgNames.push(pkg?.package?.name);
|
|
17
16
|
return true;
|
|
18
17
|
});
|
|
19
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-utils.js","names":["_lodash","require","removeDuplicates","results","pkgNames","orderByResults","orderBy","filter","pkg","
|
|
1
|
+
{"version":3,"file":"search-utils.js","names":["_lodash","require","removeDuplicates","results","pkgNames","orderByResults","orderBy","filter","pkg","includes","package","name","push"],"sources":["../src/search-utils.ts"],"sourcesContent":["import { orderBy } from 'lodash';\n\nimport { searchUtils } from '@verdaccio/core';\n\nexport function removeDuplicates(results: searchUtils.SearchPackageItem[]) {\n const pkgNames: any[] = [];\n const orderByResults = orderBy(results, ['verdaccioPrivate', 'asc']);\n return orderByResults.filter((pkg) => {\n if (pkgNames.includes(pkg?.package?.name)) {\n return false;\n }\n pkgNames.push(pkg?.package?.name);\n return true;\n });\n}\n"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAIO,SAASC,gBAAgBA,CAACC,OAAwC,EAAE;EACzE,MAAMC,QAAe,GAAG,EAAE;EAC1B,MAAMC,cAAc,GAAG,IAAAC,eAAO,EAACH,OAAO,EAAE,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;EACpE,OAAOE,cAAc,CAACE,MAAM,CAAEC,GAAG,IAAK;IACpC,IAAIJ,QAAQ,CAACK,QAAQ,CAACD,GAAG,EAAEE,OAAO,EAAEC,IAAI,CAAC,EAAE;MACzC,OAAO,KAAK;IACd;IACAP,QAAQ,CAACQ,IAAI,CAACJ,GAAG,EAAEE,OAAO,EAAEC,IAAI,CAAC;IACjC,OAAO,IAAI;EACb,CAAC,CAAC;AACJ","ignoreList":[]}
|
package/build/search.js
CHANGED
|
@@ -48,7 +48,7 @@ class Search {
|
|
|
48
48
|
return this.consumeSearchStream(uplinkId, uplink, options, streamPassThrough);
|
|
49
49
|
});
|
|
50
50
|
try {
|
|
51
|
-
debug('searching on %s uplinks...', searchUplinksStreams
|
|
51
|
+
debug('searching on %s uplinks...', searchUplinksStreams?.length);
|
|
52
52
|
// only process those streams end successfully, if all request fails
|
|
53
53
|
// just include local storage results (if local fails then return 500)
|
|
54
54
|
await Promise.allSettled([...searchUplinksStreams]);
|
|
@@ -56,8 +56,7 @@ class Search {
|
|
|
56
56
|
for await (const chunk of streamPassThrough) {
|
|
57
57
|
if (_lodash.default.isArray(chunk)) {
|
|
58
58
|
chunk.filter(pkgItem => {
|
|
59
|
-
|
|
60
|
-
debug(`streaming remote pkg name ${pkgItem === null || pkgItem === void 0 || (_pkgItem$package = pkgItem.package) === null || _pkgItem$package === void 0 ? void 0 : _pkgItem$package.name}`);
|
|
59
|
+
debug(`streaming remote pkg name ${pkgItem?.package?.name}`);
|
|
61
60
|
return true;
|
|
62
61
|
}).forEach(pkgItem => {
|
|
63
62
|
// @ts-ignore
|
|
@@ -72,7 +71,7 @@ class Search {
|
|
|
72
71
|
debug('searching all uplinks done');
|
|
73
72
|
} catch (err) {
|
|
74
73
|
this.logger.error({
|
|
75
|
-
err: err
|
|
74
|
+
err: err?.message
|
|
76
75
|
}, ' error on uplinks search @{err}');
|
|
77
76
|
throw err;
|
|
78
77
|
}
|
package/build/search.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","names":["_debug","_interopRequireDefault","require","_lodash","_stream","_proxy","_searchUtils","e","__esModule","default","debug","buildDebug","Search","constructor","config","logger","child","module","uplinks","setupUpLinks","getProxyList","uplinksList","Object","keys","search","options","results","upLinkList","streamPassThrough","PassThrough","objectMode","length","searchUplinksStreams","map","uplinkId","uplink","error","consumeSearchStream","Promise","allSettled","end","chunk","_","isArray","filter","pkgItem","
|
|
1
|
+
{"version":3,"file":"search.js","names":["_debug","_interopRequireDefault","require","_lodash","_stream","_proxy","_searchUtils","e","__esModule","default","debug","buildDebug","Search","constructor","config","logger","child","module","uplinks","setupUpLinks","getProxyList","uplinksList","Object","keys","search","options","results","upLinkList","streamPassThrough","PassThrough","objectMode","length","searchUplinksStreams","map","uplinkId","uplink","error","consumeSearchStream","Promise","allSettled","end","chunk","_","isArray","filter","pkgItem","package","name","forEach","push","verdaccioPkgCached","verdaccioPrivate","err","message","removeDuplicates","searchPassThrough","then","bodyStream","pipe","on","resolve","exports"],"sources":["../src/search.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport _ from 'lodash';\nimport { PassThrough } from 'stream';\n\nimport { searchUtils } from '@verdaccio/core';\nimport { IProxy, ProxyInstanceList, ProxySearchParams, setupUpLinks } from '@verdaccio/proxy';\nimport { Config, Logger } from '@verdaccio/types';\n\nimport { removeDuplicates } from './search-utils';\n\nconst debug = buildDebug('verdaccio:search');\n\nclass Search {\n public readonly uplinks: ProxyInstanceList;\n public readonly logger: Logger;\n constructor(config: Config, logger: Logger) {\n this.logger = logger.child({ module: 'proxy' });\n this.uplinks = setupUpLinks(config, this.logger);\n }\n\n private getProxyList() {\n const uplinksList = Object.keys(this.uplinks);\n\n return uplinksList;\n }\n\n /**\n * Handle search on packages and proxies.\n * Iterate all proxies configured and search in all endpoints in v2 and pipe all responses\n * to a stream, once the proxies request has finished search in local storage for all packages\n * (privated and cached).\n */\n public async search(options: ProxySearchParams): Promise<searchUtils.SearchPackageItem[]> {\n const results: searchUtils.SearchPackageItem[] = [];\n const upLinkList = this.getProxyList();\n // const transformResults = new TransFormResults({ objectMode: true });\n const streamPassThrough = new PassThrough({ objectMode: true });\n debug('uplinks found %s', upLinkList.length);\n const searchUplinksStreams = upLinkList.map((uplinkId: string) => {\n const uplink = this.uplinks[uplinkId];\n if (!uplink) {\n // this line should never happens\n this.logger.error({ uplinkId }, 'uplink @upLinkId not found');\n }\n return this.consumeSearchStream(uplinkId, uplink, options, streamPassThrough);\n });\n\n try {\n debug('searching on %s uplinks...', searchUplinksStreams?.length);\n // only process those streams end successfully, if all request fails\n // just include local storage results (if local fails then return 500)\n await Promise.allSettled([...searchUplinksStreams]);\n streamPassThrough.end();\n\n for await (const chunk of streamPassThrough) {\n if (_.isArray(chunk)) {\n (chunk as searchUtils.SearchItem[])\n .filter((pkgItem) => {\n debug(`streaming remote pkg name ${pkgItem?.package?.name}`);\n return true;\n })\n .forEach((pkgItem) => {\n // @ts-ignore\n return results.push({\n ...pkgItem,\n verdaccioPkgCached: false,\n verdaccioPrivate: false,\n });\n });\n }\n }\n debug('searching all uplinks done');\n } catch (err: any) {\n this.logger.error({ err: err?.message }, ' error on uplinks search @{err}');\n throw err;\n }\n\n return removeDuplicates(results);\n }\n\n /**\n * Consume the upstream and pipe it to a transformable stream.\n */\n private consumeSearchStream(\n uplinkId: string,\n uplink: IProxy,\n options: ProxySearchParams,\n searchPassThrough: PassThrough\n ): Promise<any> {\n return uplink.search({ ...options }).then((bodyStream) => {\n bodyStream.pipe(searchPassThrough, { end: false });\n bodyStream.on('error', (err: any): void => {\n this.logger.error(\n { uplinkId, err: err },\n 'search error for uplink @{uplinkId}: @{err?.message}'\n );\n searchPassThrough.end();\n });\n return new Promise((resolve) => bodyStream.on('end', resolve));\n });\n }\n}\n\nexport { Search };\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@verdaccio/search",
|
|
3
|
-
"version": "8.0.0-next-8.
|
|
3
|
+
"version": "8.0.0-next-8.2",
|
|
4
4
|
"description": "verdaccio search proxy",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"debug": "4.3.7",
|
|
33
33
|
"lodash": "4.17.21",
|
|
34
|
-
"@verdaccio/config": "8.0.0-next-8.
|
|
35
|
-
"@verdaccio/core": "8.0.0-next-8.
|
|
36
|
-
"@verdaccio/logger": "8.0.0-next-8.
|
|
37
|
-
"@verdaccio/proxy": "8.0.0-next-8.
|
|
34
|
+
"@verdaccio/config": "8.0.0-next-8.2",
|
|
35
|
+
"@verdaccio/core": "8.0.0-next-8.2",
|
|
36
|
+
"@verdaccio/logger": "8.0.0-next-8.2",
|
|
37
|
+
"@verdaccio/proxy": "8.0.0-next-8.2"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@verdaccio/types": "13.0.0-next-8.
|
|
40
|
+
"@verdaccio/types": "13.0.0-next-8.1",
|
|
41
41
|
"mockdate": "3.0.5",
|
|
42
42
|
"nock": "13.5.1",
|
|
43
43
|
"node-mocks-http": "1.14.1"
|