cnpmcore 3.42.2 → 3.43.1
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/dist/app/common/PackageUtil.d.ts +3 -1
- package/dist/app/common/PackageUtil.js +13 -2
- package/dist/app/common/typing.d.ts +6 -0
- package/dist/app/core/event/SyncESPackage.d.ts +35 -0
- package/dist/app/core/event/SyncESPackage.js +114 -0
- package/dist/app/core/service/PackageSearchService.d.ts +17 -0
- package/dist/app/core/service/PackageSearchService.js +222 -0
- package/dist/app/core/service/PackageSyncerService.js +1 -1
- package/dist/app/infra/SearchAdapter.d.ts +12 -0
- package/dist/app/infra/SearchAdapter.js +60 -0
- package/dist/app/port/config.d.ts +8 -0
- package/dist/app/port/controller/package/SearchPackageController.d.ts +16 -0
- package/dist/app/port/controller/package/SearchPackageController.js +87 -0
- package/dist/app/port/typebox.d.ts +5 -0
- package/dist/app/port/typebox.js +19 -2
- package/dist/app/repository/PackageRepository.d.ts +2 -2
- package/dist/app/repository/SearchRepository.d.ts +27 -0
- package/dist/app/repository/SearchRepository.js +35 -0
- package/dist/config/config.default.js +15 -1
- package/dist/config/config.unittest.d.ts +2 -0
- package/dist/config/config.unittest.js +13 -1
- package/dist/config/plugin.js +5 -1
- package/package.json +4 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { PackageJSONType } from '../repository/PackageRepository';
|
|
2
|
+
import { AuthorType, PackageJSONType } from '../repository/PackageRepository';
|
|
3
3
|
export declare const FULLNAME_REG_STRING = "@[^/]{1,220}/[^/]{1,220}|@[^%]+%2[fF][^/]{1,220}|[^@/]{1,220}";
|
|
4
4
|
export declare function getScopeAndName(fullname: string): string[];
|
|
5
5
|
export declare function getFullname(scope: string, name: string): string;
|
|
@@ -13,4 +13,6 @@ export declare function formatTarball(registry: string, scope: string, name: str
|
|
|
13
13
|
export declare function detectInstallScript(manifest: any): boolean;
|
|
14
14
|
/** 判断一个版本压缩包中是否包含 npm-shrinkwrap.json */
|
|
15
15
|
export declare function hasShrinkWrapInTgz(contentOrFile: Uint8Array | string): Promise<boolean>;
|
|
16
|
+
/** 写入 ES 时,格式化 author */
|
|
17
|
+
export declare function formatAuthor(author: string | AuthorType | undefined): AuthorType | undefined;
|
|
16
18
|
export declare function extractPackageJSON(tarballBytes: Buffer): Promise<PackageJSONType>;
|
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.extractPackageJSON = exports.hasShrinkWrapInTgz = exports.detectInstallScript = exports.formatTarball = exports.calculateIntegrity = exports.getPrefixedName = exports.cleanUserPrefix = exports.getFullname = exports.getScopeAndName = exports.FULLNAME_REG_STRING = void 0;
|
|
29
|
+
exports.extractPackageJSON = exports.formatAuthor = exports.hasShrinkWrapInTgz = exports.detectInstallScript = exports.formatTarball = exports.calculateIntegrity = exports.getPrefixedName = exports.cleanUserPrefix = exports.getFullname = exports.getScopeAndName = exports.FULLNAME_REG_STRING = void 0;
|
|
30
30
|
const node_fs_1 = require("node:fs");
|
|
31
31
|
const node_stream_1 = require("node:stream");
|
|
32
32
|
const promises_1 = require("node:stream/promises");
|
|
@@ -131,6 +131,17 @@ async function hasShrinkWrapInTgz(contentOrFile) {
|
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
133
|
exports.hasShrinkWrapInTgz = hasShrinkWrapInTgz;
|
|
134
|
+
/** 写入 ES 时,格式化 author */
|
|
135
|
+
function formatAuthor(author) {
|
|
136
|
+
if (author === undefined) {
|
|
137
|
+
return author;
|
|
138
|
+
}
|
|
139
|
+
if (typeof author === 'string') {
|
|
140
|
+
return { name: author };
|
|
141
|
+
}
|
|
142
|
+
return author;
|
|
143
|
+
}
|
|
144
|
+
exports.formatAuthor = formatAuthor;
|
|
134
145
|
async function extractPackageJSON(tarballBytes) {
|
|
135
146
|
return new Promise((resolve, reject) => {
|
|
136
147
|
node_stream_1.Readable.from(tarballBytes)
|
|
@@ -153,4 +164,4 @@ async function extractPackageJSON(tarballBytes) {
|
|
|
153
164
|
});
|
|
154
165
|
}
|
|
155
166
|
exports.extractPackageJSON = extractPackageJSON;
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvY29tbW9uL1BhY2thZ2VVdGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUNBQTJDO0FBQzNDLDZDQUF1QztBQUN2QyxtREFBZ0Q7QUFDaEQsMkNBQTZCO0FBQzdCLDhDQUFzQjtBQUl0QixlQUFlO0FBQ2YsZUFBZTtBQUNmLGFBQWE7QUFDYixPQUFPO0FBQ1AsK0JBQStCO0FBQy9CLDBFQUEwRTtBQUM3RCxRQUFBLG1CQUFtQixHQUFHLGlFQUFpRSxDQUFDO0FBRXJHLFNBQWdCLGVBQWUsQ0FBQyxRQUFnQjtJQUM5QyxJQUFJLFFBQVEsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDNUIsT0FBTyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQztLQUMvQjtJQUNELE9BQU8sQ0FBRSxFQUFFLEVBQUUsUUFBUSxDQUFFLENBQUM7QUFDMUIsQ0FBQztBQUxELDBDQUtDO0FBRUQsU0FBZ0IsV0FBVyxDQUFDLEtBQWEsRUFBRSxJQUFZO0lBQ3JELE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0FBQzNDLENBQUM7QUFGRCxrQ0FFQztBQUVELFNBQWdCLGVBQWUsQ0FBQyxRQUFnQjtJQUM5QyxPQUFPLFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3RDLENBQUM7QUFGRCwwQ0FFQztBQUVELFNBQWdCLGVBQWUsQ0FBQyxNQUFjLEVBQUUsUUFBZ0I7SUFDOUQsT0FBTyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsTUFBTSxHQUFHLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUM7QUFDcEQsQ0FBQztBQUZELDBDQUVD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
|
|
@@ -4,6 +4,7 @@ import { CnpmcoreConfig } from '../port/config';
|
|
|
4
4
|
import { Readable } from 'stream';
|
|
5
5
|
import { IncomingHttpHeaders } from 'http';
|
|
6
6
|
import { EggContext } from '@eggjs/tegg';
|
|
7
|
+
import { estypes } from '@elastic/elasticsearch';
|
|
7
8
|
export interface UploadResult {
|
|
8
9
|
key: string;
|
|
9
10
|
}
|
|
@@ -37,6 +38,11 @@ export interface QueueAdapter {
|
|
|
37
38
|
pop<T>(key: string): Promise<T | null>;
|
|
38
39
|
length(key: string): Promise<number>;
|
|
39
40
|
}
|
|
41
|
+
export interface SearchAdapter {
|
|
42
|
+
search<T>(query: any): Promise<estypes.SearchHitsMetadata<T>>;
|
|
43
|
+
upsert<T>(id: string, document: T): Promise<string>;
|
|
44
|
+
delete(id: string): Promise<string>;
|
|
45
|
+
}
|
|
40
46
|
export interface AuthUrlResult {
|
|
41
47
|
loginUrl: string;
|
|
42
48
|
doneUrl: string;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { EggAppConfig } from 'egg';
|
|
2
|
+
import { PackageSearchService } from '../service/PackageSearchService';
|
|
3
|
+
declare class SyncESPackage {
|
|
4
|
+
protected readonly packageSearchService: PackageSearchService;
|
|
5
|
+
protected readonly config: EggAppConfig;
|
|
6
|
+
protected syncPackage(fullname: string): Promise<void>;
|
|
7
|
+
}
|
|
8
|
+
export declare class PackageUnpublished extends SyncESPackage {
|
|
9
|
+
handle(fullname: string): Promise<void>;
|
|
10
|
+
}
|
|
11
|
+
export declare class PackageVersionAdded extends SyncESPackage {
|
|
12
|
+
handle(fullname: string): Promise<void>;
|
|
13
|
+
}
|
|
14
|
+
export declare class PackageVersionRemoved extends SyncESPackage {
|
|
15
|
+
handle(fullname: string): Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
export declare class PackageTagAdded extends SyncESPackage {
|
|
18
|
+
handle(fullname: string): Promise<void>;
|
|
19
|
+
}
|
|
20
|
+
export declare class PackageTagChanged extends SyncESPackage {
|
|
21
|
+
handle(fullname: string): Promise<void>;
|
|
22
|
+
}
|
|
23
|
+
export declare class PackageTagRemoved extends SyncESPackage {
|
|
24
|
+
handle(fullname: string): Promise<void>;
|
|
25
|
+
}
|
|
26
|
+
export declare class PackageMaintainerChanged extends SyncESPackage {
|
|
27
|
+
handle(fullname: string): Promise<void>;
|
|
28
|
+
}
|
|
29
|
+
export declare class PackageMaintainerRemoved extends SyncESPackage {
|
|
30
|
+
handle(fullname: string): Promise<void>;
|
|
31
|
+
}
|
|
32
|
+
export declare class PackageMetaChanged extends SyncESPackage {
|
|
33
|
+
handle(fullname: string): Promise<void>;
|
|
34
|
+
}
|
|
35
|
+
export {};
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.PackageMetaChanged = exports.PackageMaintainerRemoved = exports.PackageMaintainerChanged = exports.PackageTagRemoved = exports.PackageTagChanged = exports.PackageTagAdded = exports.PackageVersionRemoved = exports.PackageVersionAdded = exports.PackageUnpublished = void 0;
|
|
13
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
14
|
+
const index_1 = require("./index");
|
|
15
|
+
const PackageSearchService_1 = require("../service/PackageSearchService");
|
|
16
|
+
class SyncESPackage {
|
|
17
|
+
async syncPackage(fullname) {
|
|
18
|
+
if (!this.config.cnpmcore.enableElasticsearch)
|
|
19
|
+
return;
|
|
20
|
+
await this.packageSearchService.syncPackage(fullname, true);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
__decorate([
|
|
24
|
+
(0, tegg_1.Inject)(),
|
|
25
|
+
__metadata("design:type", PackageSearchService_1.PackageSearchService)
|
|
26
|
+
], SyncESPackage.prototype, "packageSearchService", void 0);
|
|
27
|
+
__decorate([
|
|
28
|
+
(0, tegg_1.Inject)(),
|
|
29
|
+
__metadata("design:type", Object)
|
|
30
|
+
], SyncESPackage.prototype, "config", void 0);
|
|
31
|
+
let PackageUnpublished = class PackageUnpublished extends SyncESPackage {
|
|
32
|
+
async handle(fullname) {
|
|
33
|
+
if (!this.config.cnpmcore.enableElasticsearch)
|
|
34
|
+
return;
|
|
35
|
+
await this.packageSearchService.removePackage(fullname);
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
exports.PackageUnpublished = PackageUnpublished;
|
|
39
|
+
exports.PackageUnpublished = PackageUnpublished = __decorate([
|
|
40
|
+
(0, tegg_1.Event)(index_1.PACKAGE_UNPUBLISHED)
|
|
41
|
+
], PackageUnpublished);
|
|
42
|
+
let PackageVersionAdded = class PackageVersionAdded extends SyncESPackage {
|
|
43
|
+
async handle(fullname) {
|
|
44
|
+
await this.syncPackage(fullname);
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
exports.PackageVersionAdded = PackageVersionAdded;
|
|
48
|
+
exports.PackageVersionAdded = PackageVersionAdded = __decorate([
|
|
49
|
+
(0, tegg_1.Event)(index_1.PACKAGE_VERSION_ADDED)
|
|
50
|
+
], PackageVersionAdded);
|
|
51
|
+
let PackageVersionRemoved = class PackageVersionRemoved extends SyncESPackage {
|
|
52
|
+
async handle(fullname) {
|
|
53
|
+
await this.syncPackage(fullname);
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
exports.PackageVersionRemoved = PackageVersionRemoved;
|
|
57
|
+
exports.PackageVersionRemoved = PackageVersionRemoved = __decorate([
|
|
58
|
+
(0, tegg_1.Event)(index_1.PACKAGE_VERSION_REMOVED)
|
|
59
|
+
], PackageVersionRemoved);
|
|
60
|
+
let PackageTagAdded = class PackageTagAdded extends SyncESPackage {
|
|
61
|
+
async handle(fullname) {
|
|
62
|
+
await this.syncPackage(fullname);
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
exports.PackageTagAdded = PackageTagAdded;
|
|
66
|
+
exports.PackageTagAdded = PackageTagAdded = __decorate([
|
|
67
|
+
(0, tegg_1.Event)(index_1.PACKAGE_TAG_ADDED)
|
|
68
|
+
], PackageTagAdded);
|
|
69
|
+
let PackageTagChanged = class PackageTagChanged extends SyncESPackage {
|
|
70
|
+
async handle(fullname) {
|
|
71
|
+
await this.syncPackage(fullname);
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
exports.PackageTagChanged = PackageTagChanged;
|
|
75
|
+
exports.PackageTagChanged = PackageTagChanged = __decorate([
|
|
76
|
+
(0, tegg_1.Event)(index_1.PACKAGE_TAG_CHANGED)
|
|
77
|
+
], PackageTagChanged);
|
|
78
|
+
let PackageTagRemoved = class PackageTagRemoved extends SyncESPackage {
|
|
79
|
+
async handle(fullname) {
|
|
80
|
+
await this.syncPackage(fullname);
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
exports.PackageTagRemoved = PackageTagRemoved;
|
|
84
|
+
exports.PackageTagRemoved = PackageTagRemoved = __decorate([
|
|
85
|
+
(0, tegg_1.Event)(index_1.PACKAGE_TAG_REMOVED)
|
|
86
|
+
], PackageTagRemoved);
|
|
87
|
+
let PackageMaintainerChanged = class PackageMaintainerChanged extends SyncESPackage {
|
|
88
|
+
async handle(fullname) {
|
|
89
|
+
await this.syncPackage(fullname);
|
|
90
|
+
}
|
|
91
|
+
};
|
|
92
|
+
exports.PackageMaintainerChanged = PackageMaintainerChanged;
|
|
93
|
+
exports.PackageMaintainerChanged = PackageMaintainerChanged = __decorate([
|
|
94
|
+
(0, tegg_1.Event)(index_1.PACKAGE_MAINTAINER_CHANGED)
|
|
95
|
+
], PackageMaintainerChanged);
|
|
96
|
+
let PackageMaintainerRemoved = class PackageMaintainerRemoved extends SyncESPackage {
|
|
97
|
+
async handle(fullname) {
|
|
98
|
+
await this.syncPackage(fullname);
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
exports.PackageMaintainerRemoved = PackageMaintainerRemoved;
|
|
102
|
+
exports.PackageMaintainerRemoved = PackageMaintainerRemoved = __decorate([
|
|
103
|
+
(0, tegg_1.Event)(index_1.PACKAGE_MAINTAINER_REMOVED)
|
|
104
|
+
], PackageMaintainerRemoved);
|
|
105
|
+
let PackageMetaChanged = class PackageMetaChanged extends SyncESPackage {
|
|
106
|
+
async handle(fullname) {
|
|
107
|
+
await this.syncPackage(fullname);
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
exports.PackageMetaChanged = PackageMetaChanged;
|
|
111
|
+
exports.PackageMetaChanged = PackageMetaChanged = __decorate([
|
|
112
|
+
(0, tegg_1.Event)(index_1.PACKAGE_META_CHANGED)
|
|
113
|
+
], PackageMetaChanged);
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3luY0VTUGFja2FnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb3JlL2V2ZW50L1N5bmNFU1BhY2thZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBR0Esc0NBQTRDO0FBQzVDLG1DQVVpQjtBQUVqQiwwRUFBdUU7QUFFdkUsTUFBTSxhQUFhO0lBT1AsS0FBSyxDQUFDLFdBQVcsQ0FBQyxRQUFnQjtRQUMxQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsbUJBQW1CO1lBQUUsT0FBTztRQUN0RCxNQUFNLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzlELENBQUM7Q0FDRjtBQVRvQjtJQURsQixJQUFBLGFBQU0sR0FBRTs4QkFDZ0MsMkNBQW9COzJEQUFDO0FBRzNDO0lBRGxCLElBQUEsYUFBTSxHQUFFOzs2Q0FDK0I7QUFTbkMsSUFBTSxrQkFBa0IsR0FBeEIsTUFBTSxrQkFBbUIsU0FBUSxhQUFhO0lBQ25ELEtBQUssQ0FBQyxNQUFNLENBQUMsUUFBZ0I7UUFDM0IsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLG1CQUFtQjtZQUFFLE9BQU87UUFDdEQsTUFBTSxJQUFJLENBQUMsb0JBQW9CLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzFELENBQUM7Q0FDRixDQUFBO0FBTFksZ0RBQWtCOzZCQUFsQixrQkFBa0I7SUFEOUIsSUFBQSxZQUFLLEVBQUMsMkJBQW1CLENBQUM7R0FDZCxrQkFBa0IsQ0FLOUI7QUFHTSxJQUFNLG1CQUFtQixHQUF6QixNQUFNLG1CQUFvQixTQUFRLGFBQWE7SUFDcEQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxRQUFnQjtRQUMzQixNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDbkMsQ0FBQztDQUNGLENB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
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { AbstractService } from '../../common/AbstractService';
|
|
2
|
+
import { SearchManifestType } from '../../repository/SearchRepository';
|
|
3
|
+
import { PackageRepository } from '../../repository/PackageRepository';
|
|
4
|
+
export declare class PackageSearchService extends AbstractService {
|
|
5
|
+
private readonly packageManagerService;
|
|
6
|
+
private readonly searchRepository;
|
|
7
|
+
private packageVersionDownloadRepository;
|
|
8
|
+
protected packageRepository: PackageRepository;
|
|
9
|
+
syncPackage(fullname: string, isSync?: boolean): Promise<string | undefined>;
|
|
10
|
+
searchPackage(text: string, from: number, size: number): Promise<{
|
|
11
|
+
objects: (SearchManifestType | undefined)[];
|
|
12
|
+
total: number;
|
|
13
|
+
}>;
|
|
14
|
+
removePackage(fullname: string): Promise<string>;
|
|
15
|
+
private _buildMatchQueries;
|
|
16
|
+
private _buildScriptScore;
|
|
17
|
+
}
|
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.PackageSearchService = void 0;
|
|
16
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
17
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
18
|
+
const AbstractService_1 = require("../../common/AbstractService");
|
|
19
|
+
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
20
|
+
const PackageManagerService_1 = require("./PackageManagerService");
|
|
21
|
+
const SearchRepository_1 = require("../../repository/SearchRepository");
|
|
22
|
+
const PackageVersionDownloadRepository_1 = require("../../repository/PackageVersionDownloadRepository");
|
|
23
|
+
const PackageRepository_1 = require("../../repository/PackageRepository");
|
|
24
|
+
let PackageSearchService = class PackageSearchService extends AbstractService_1.AbstractService {
|
|
25
|
+
async syncPackage(fullname, isSync = true) {
|
|
26
|
+
const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
|
|
27
|
+
const fullManifests = await this.packageManagerService.listPackageFullManifests(scope, name, isSync);
|
|
28
|
+
if (!fullManifests.data) {
|
|
29
|
+
this.logger.warn('[PackageSearchService.syncPackage] save package:%s not found', fullname);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
const pkg = await this.packageRepository.findPackage(scope, name);
|
|
33
|
+
if (!pkg) {
|
|
34
|
+
this.logger.warn('[PackageSearchService.syncPackage] findPackage:%s not found', fullname);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
// get last year download data
|
|
38
|
+
const startDate = (0, dayjs_1.default)().subtract(1, 'year');
|
|
39
|
+
const endDate = (0, dayjs_1.default)();
|
|
40
|
+
const entities = await this.packageVersionDownloadRepository.query(pkg.packageId, startDate.toDate(), endDate.toDate());
|
|
41
|
+
let downloadsAll = 0;
|
|
42
|
+
for (const entity of entities) {
|
|
43
|
+
for (let i = 1; i <= 31; i++) {
|
|
44
|
+
const day = String(i).padStart(2, '0');
|
|
45
|
+
const field = `d${day}`;
|
|
46
|
+
const counter = entity[field];
|
|
47
|
+
if (!counter)
|
|
48
|
+
continue;
|
|
49
|
+
downloadsAll += counter;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
const { data: manifest } = fullManifests;
|
|
53
|
+
const latestVersion = manifest['dist-tags'].latest;
|
|
54
|
+
const latestManifest = manifest.versions[latestVersion];
|
|
55
|
+
const packageDoc = {
|
|
56
|
+
name: manifest.name,
|
|
57
|
+
version: latestVersion,
|
|
58
|
+
_rev: manifest._rev,
|
|
59
|
+
scope: scope ? scope.replace('@', '') : 'unscoped',
|
|
60
|
+
keywords: manifest.keywords || [],
|
|
61
|
+
versions: Object.keys(manifest.versions),
|
|
62
|
+
description: manifest.description,
|
|
63
|
+
license: manifest.license,
|
|
64
|
+
maintainers: manifest.maintainers,
|
|
65
|
+
author: (0, PackageUtil_1.formatAuthor)(manifest.author),
|
|
66
|
+
'dist-tags': manifest['dist-tags'],
|
|
67
|
+
date: manifest.time[latestVersion],
|
|
68
|
+
created: manifest.time.created,
|
|
69
|
+
modified: manifest.time.modified,
|
|
70
|
+
// 归属 registry,keywords 枚举值
|
|
71
|
+
_source_registry_name: manifest._source_registry_name,
|
|
72
|
+
// 最新版本发布人 _npmUser:
|
|
73
|
+
_npmUser: latestManifest?._npmUser,
|
|
74
|
+
// 最新版本发布信息
|
|
75
|
+
publish_time: latestManifest?.publish_time,
|
|
76
|
+
};
|
|
77
|
+
const document = {
|
|
78
|
+
package: packageDoc,
|
|
79
|
+
downloads: {
|
|
80
|
+
all: downloadsAll,
|
|
81
|
+
},
|
|
82
|
+
};
|
|
83
|
+
return await this.searchRepository.upsertPackage(document);
|
|
84
|
+
}
|
|
85
|
+
async searchPackage(text, from, size) {
|
|
86
|
+
const matchQueries = this._buildMatchQueries(text);
|
|
87
|
+
const scriptScore = this._buildScriptScore({
|
|
88
|
+
text,
|
|
89
|
+
scoreEffect: 0.25,
|
|
90
|
+
});
|
|
91
|
+
const res = await this.searchRepository.searchPackage({
|
|
92
|
+
body: {
|
|
93
|
+
size,
|
|
94
|
+
from,
|
|
95
|
+
query: {
|
|
96
|
+
function_score: {
|
|
97
|
+
boost_mode: 'replace',
|
|
98
|
+
query: {
|
|
99
|
+
bool: {
|
|
100
|
+
should: matchQueries,
|
|
101
|
+
minimum_should_match: matchQueries.length ? 1 : 0,
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
script_score: scriptScore,
|
|
105
|
+
},
|
|
106
|
+
},
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
const { hits, total } = res;
|
|
110
|
+
return {
|
|
111
|
+
objects: hits?.map(item => {
|
|
112
|
+
return item._source;
|
|
113
|
+
}),
|
|
114
|
+
total: total.value,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
async removePackage(fullname) {
|
|
118
|
+
return await this.searchRepository.removePackage(fullname);
|
|
119
|
+
}
|
|
120
|
+
// https://github.com/npms-io/queries/blob/master/lib/search.js#L8C1-L78C2
|
|
121
|
+
_buildMatchQueries(text) {
|
|
122
|
+
return [
|
|
123
|
+
// Standard match using cross_fields
|
|
124
|
+
{
|
|
125
|
+
multi_match: {
|
|
126
|
+
query: text,
|
|
127
|
+
operator: 'and',
|
|
128
|
+
fields: [
|
|
129
|
+
'package.name.standard^4',
|
|
130
|
+
'package.description.standard',
|
|
131
|
+
'package.keywords.standard^2',
|
|
132
|
+
],
|
|
133
|
+
type: 'cross_fields',
|
|
134
|
+
boost: 6,
|
|
135
|
+
tie_breaker: 0.5,
|
|
136
|
+
},
|
|
137
|
+
},
|
|
138
|
+
// Partial match using edge-ngram
|
|
139
|
+
{
|
|
140
|
+
multi_match: {
|
|
141
|
+
query: text,
|
|
142
|
+
operator: 'and',
|
|
143
|
+
fields: [
|
|
144
|
+
'package.name.edge_ngram^4',
|
|
145
|
+
'package.description.edge_ngram',
|
|
146
|
+
'package.keywords.edge_ngram^2',
|
|
147
|
+
],
|
|
148
|
+
type: 'phrase',
|
|
149
|
+
slop: 3,
|
|
150
|
+
boost: 3,
|
|
151
|
+
tie_breaker: 0.5,
|
|
152
|
+
},
|
|
153
|
+
},
|
|
154
|
+
// Normal term match with an english stemmer
|
|
155
|
+
{
|
|
156
|
+
multi_match: {
|
|
157
|
+
query: text,
|
|
158
|
+
operator: 'and',
|
|
159
|
+
fields: [
|
|
160
|
+
'package.name.english_docs^4',
|
|
161
|
+
'package.description.english_docs',
|
|
162
|
+
'package.keywords.english_docs^2',
|
|
163
|
+
],
|
|
164
|
+
type: 'cross_fields',
|
|
165
|
+
boost: 3,
|
|
166
|
+
tie_breaker: 0.5,
|
|
167
|
+
},
|
|
168
|
+
},
|
|
169
|
+
// Normal term match with a more aggressive english stemmer (not so important)
|
|
170
|
+
{
|
|
171
|
+
multi_match: {
|
|
172
|
+
query: text,
|
|
173
|
+
operator: 'and',
|
|
174
|
+
fields: [
|
|
175
|
+
'package.name.english_aggressive_docs^4',
|
|
176
|
+
'package.description.english_aggressive_docs',
|
|
177
|
+
'package.keywords.english_aggressive_docs^2',
|
|
178
|
+
],
|
|
179
|
+
type: 'cross_fields',
|
|
180
|
+
tie_breaker: 0.5,
|
|
181
|
+
},
|
|
182
|
+
},
|
|
183
|
+
];
|
|
184
|
+
}
|
|
185
|
+
_buildScriptScore(params) {
|
|
186
|
+
// keep search simple, only download(popularity)
|
|
187
|
+
const downloads = 'doc["downloads.all"].value';
|
|
188
|
+
const source = `doc["package.name.raw"].value.equals("${params.text}") ? 100000 + ${downloads} : _score * Math.pow(${downloads}, ${params.scoreEffect})`;
|
|
189
|
+
return {
|
|
190
|
+
script: {
|
|
191
|
+
source,
|
|
192
|
+
params: {
|
|
193
|
+
text: params.text || '',
|
|
194
|
+
scoreEffect: params.scoreEffect,
|
|
195
|
+
},
|
|
196
|
+
},
|
|
197
|
+
};
|
|
198
|
+
}
|
|
199
|
+
};
|
|
200
|
+
exports.PackageSearchService = PackageSearchService;
|
|
201
|
+
__decorate([
|
|
202
|
+
(0, tegg_1.Inject)(),
|
|
203
|
+
__metadata("design:type", PackageManagerService_1.PackageManagerService)
|
|
204
|
+
], PackageSearchService.prototype, "packageManagerService", void 0);
|
|
205
|
+
__decorate([
|
|
206
|
+
(0, tegg_1.Inject)(),
|
|
207
|
+
__metadata("design:type", SearchRepository_1.SearchRepository)
|
|
208
|
+
], PackageSearchService.prototype, "searchRepository", void 0);
|
|
209
|
+
__decorate([
|
|
210
|
+
(0, tegg_1.Inject)(),
|
|
211
|
+
__metadata("design:type", PackageVersionDownloadRepository_1.PackageVersionDownloadRepository)
|
|
212
|
+
], PackageSearchService.prototype, "packageVersionDownloadRepository", void 0);
|
|
213
|
+
__decorate([
|
|
214
|
+
(0, tegg_1.Inject)(),
|
|
215
|
+
__metadata("design:type", PackageRepository_1.PackageRepository)
|
|
216
|
+
], PackageSearchService.prototype, "packageRepository", void 0);
|
|
217
|
+
exports.PackageSearchService = PackageSearchService = __decorate([
|
|
218
|
+
(0, tegg_1.SingletonProto)({
|
|
219
|
+
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
220
|
+
})
|
|
221
|
+
], PackageSearchService);
|
|
222
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVNlYXJjaFNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1BhY2thZ2VTZWFyY2hTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUFrRTtBQUVsRSxrREFBMEI7QUFFMUIsa0VBQStEO0FBQy9ELDBEQUF5RTtBQUN6RSxtRUFBZ0U7QUFDaEUsd0VBQTRHO0FBQzVHLHdHQUFxRztBQUNyRywwRUFBdUU7QUFNaEUsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSxpQ0FBZTtJQVV2RCxLQUFLLENBQUMsV0FBVyxDQUFDLFFBQWdCLEVBQUUsTUFBTSxHQUFHLElBQUk7UUFDL0MsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMscUJBQXFCLENBQUMsd0JBQXdCLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVyRyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRTtZQUN2QixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyw4REFBOEQsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUMzRixPQUFPO1NBQ1I7UUFFRCxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxHQUFHLEVBQUU7WUFDUixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyw2REFBNkQsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUMxRixPQUFPO1NBQ1I7UUFFRCw4QkFBOEI7UUFDOUIsTUFBTSxTQUFTLEdBQUcsSUFBQSxlQUFLLEdBQUUsQ0FBQyxRQUFRLENBQUMs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
|
|
@@ -870,4 +870,4 @@ exports.PackageSyncerService = PackageSyncerService = __decorate([
|
|
|
870
870
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
871
871
|
})
|
|
872
872
|
], PackageSyncerService);
|
|
873
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
|
|
873
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { estypes } from '@elastic/elasticsearch';
|
|
2
|
+
import { SearchAdapter } from '../common/typing';
|
|
3
|
+
/**
|
|
4
|
+
* Use elasticsearch to search the huge npm packages.
|
|
5
|
+
*/
|
|
6
|
+
export declare class ESSearchAdapter implements SearchAdapter {
|
|
7
|
+
private config;
|
|
8
|
+
private readonly elasticsearch;
|
|
9
|
+
search<T>(query: any): Promise<estypes.SearchHitsMetadata<T>>;
|
|
10
|
+
upsert<T>(id: string, document: T): Promise<string>;
|
|
11
|
+
delete(id: string): Promise<string>;
|
|
12
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ESSearchAdapter = void 0;
|
|
13
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
14
|
+
const elasticsearch_1 = require("@elastic/elasticsearch");
|
|
15
|
+
/**
|
|
16
|
+
* Use elasticsearch to search the huge npm packages.
|
|
17
|
+
*/
|
|
18
|
+
let ESSearchAdapter = class ESSearchAdapter {
|
|
19
|
+
async search(query) {
|
|
20
|
+
const { cnpmcore: { elasticsearchIndex: index } } = this.config;
|
|
21
|
+
const result = await this.elasticsearch.search({
|
|
22
|
+
index,
|
|
23
|
+
...query,
|
|
24
|
+
});
|
|
25
|
+
return result.hits;
|
|
26
|
+
}
|
|
27
|
+
async upsert(id, document) {
|
|
28
|
+
const { cnpmcore: { elasticsearchIndex: index } } = this.config;
|
|
29
|
+
const res = await this.elasticsearch.index({
|
|
30
|
+
id,
|
|
31
|
+
index,
|
|
32
|
+
document,
|
|
33
|
+
});
|
|
34
|
+
return res._id;
|
|
35
|
+
}
|
|
36
|
+
async delete(id) {
|
|
37
|
+
const { cnpmcore: { elasticsearchIndex: index } } = this.config;
|
|
38
|
+
const res = await this.elasticsearch.delete({
|
|
39
|
+
index,
|
|
40
|
+
id,
|
|
41
|
+
});
|
|
42
|
+
return res._id;
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
exports.ESSearchAdapter = ESSearchAdapter;
|
|
46
|
+
__decorate([
|
|
47
|
+
(0, tegg_1.Inject)(),
|
|
48
|
+
__metadata("design:type", Object)
|
|
49
|
+
], ESSearchAdapter.prototype, "config", void 0);
|
|
50
|
+
__decorate([
|
|
51
|
+
(0, tegg_1.Inject)(),
|
|
52
|
+
__metadata("design:type", elasticsearch_1.Client)
|
|
53
|
+
], ESSearchAdapter.prototype, "elasticsearch", void 0);
|
|
54
|
+
exports.ESSearchAdapter = ESSearchAdapter = __decorate([
|
|
55
|
+
(0, tegg_1.SingletonProto)({
|
|
56
|
+
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
57
|
+
name: 'searchAdapter',
|
|
58
|
+
})
|
|
59
|
+
], ESSearchAdapter);
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoQWRhcHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9pbmZyYS9TZWFyY2hBZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUlxQjtBQUdyQiwwREFBZ0Y7QUFHaEY7O0dBRUc7QUFLSSxJQUFNLGVBQWUsR0FBckIsTUFBTSxlQUFlO0lBTzFCLEtBQUssQ0FBQyxNQUFNLENBQUksS0FBVTtRQUN4QixNQUFNLEVBQUUsUUFBUSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2hFLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUk7WUFDaEQsS0FBSztZQUNMLEdBQUcsS0FBSztTQUNULENBQUMsQ0FBQztRQUNILE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQztJQUNyQixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBSSxFQUFVLEVBQUUsUUFBVztRQUNyQyxNQUFNLEVBQUUsUUFBUSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2hFLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUM7WUFDekMsRUFBRTtZQUNGLEtBQUs7WUFDTCxRQUFRO1NBQ1QsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQVU7UUFDckIsTUFBTSxFQUFFLFFBQVEsRUFBRSxFQUFFLGtCQUFrQixFQUFFLEtBQUssRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUNoRSxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDO1lBQzFDLEtBQUs7WUFDTCxFQUFFO1NBQ0gsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDO0lBQ2pCLENBQUM7Q0FDRixDQUFBO0FBbENZLDBDQUFlO0FBRWxCO0lBRFAsSUFBQSxhQUFNLEdBQUU7OytDQUNvQjtBQUdaO0lBRGhCLElBQUEsYUFBTSxHQUFFOzhCQUN1QixzQkFBbUI7c0RBQUM7MEJBTHpDLGVBQWU7SUFKM0IsSUFBQSxxQkFBYyxFQUFDO1FBQ2QsV0FBVyxFQUFFLGtCQUFXLENBQUMsTUFBTTtRQUMvQixJQUFJLEVBQUUsZUFBZTtLQUN0QixDQUFDO0dBQ1csZUFBZSxDQWtDM0IifQ==
|
|
@@ -148,6 +148,14 @@ export type CnpmcoreConfig = {
|
|
|
148
148
|
* in most cases, you should set to false to keep the same behavior as source registry.
|
|
149
149
|
*/
|
|
150
150
|
strictSyncSpecivicVersion: boolean;
|
|
151
|
+
/**
|
|
152
|
+
* enable elasticsearch
|
|
153
|
+
*/
|
|
154
|
+
enableElasticsearch: boolean;
|
|
155
|
+
/**
|
|
156
|
+
* elasticsearch index. if enableElasticsearch is true, you must set a index to write es doc.
|
|
157
|
+
*/
|
|
158
|
+
elasticsearchIndex: string;
|
|
151
159
|
/**
|
|
152
160
|
* strictly enforces/validates manifest and tgz when publish, https://github.com/cnpm/cnpmcore/issues/542
|
|
153
161
|
*/
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Static } from 'egg-typebox-validate/typebox';
|
|
2
|
+
import { AbstractController } from '../AbstractController';
|
|
3
|
+
import { SearchQueryOptions } from '../../typebox';
|
|
4
|
+
export declare class SearchPackageController extends AbstractController {
|
|
5
|
+
private readonly packageSearchService;
|
|
6
|
+
search(text: Static<typeof SearchQueryOptions>['text'], from: Static<typeof SearchQueryOptions>['from'], size: Static<typeof SearchQueryOptions>['size']): Promise<{
|
|
7
|
+
objects: (import("../../../repository/SearchRepository").SearchManifestType | undefined)[];
|
|
8
|
+
total: number;
|
|
9
|
+
}>;
|
|
10
|
+
sync(fullname: string): Promise<{
|
|
11
|
+
package: string | undefined;
|
|
12
|
+
}>;
|
|
13
|
+
delete(fullname: string): Promise<{
|
|
14
|
+
package: string;
|
|
15
|
+
}>;
|
|
16
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.SearchPackageController = void 0;
|
|
16
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
17
|
+
const egg_errors_1 = require("egg-errors");
|
|
18
|
+
const AbstractController_1 = require("../AbstractController");
|
|
19
|
+
const PackageSearchService_1 = require("../../../core/service/PackageSearchService");
|
|
20
|
+
const PackageUtil_1 = require("../../../common/PackageUtil");
|
|
21
|
+
const AdminAccess_1 = require("../../middleware/AdminAccess");
|
|
22
|
+
let SearchPackageController = class SearchPackageController extends AbstractController_1.AbstractController {
|
|
23
|
+
async search(text, from, size) {
|
|
24
|
+
if (!this.config.cnpmcore.enableElasticsearch) {
|
|
25
|
+
throw new egg_errors_1.E451('search feature not enabled in `config.cnpmcore.enableElasticsearch`');
|
|
26
|
+
}
|
|
27
|
+
const data = await this.packageSearchService.searchPackage(text, from, size);
|
|
28
|
+
return data;
|
|
29
|
+
}
|
|
30
|
+
async sync(fullname) {
|
|
31
|
+
if (!this.config.cnpmcore.enableElasticsearch) {
|
|
32
|
+
throw new egg_errors_1.E451('search feature not enabled in `config.cnpmcore.enableElasticsearch`');
|
|
33
|
+
}
|
|
34
|
+
const name = await this.packageSearchService.syncPackage(fullname, true);
|
|
35
|
+
return { package: name };
|
|
36
|
+
}
|
|
37
|
+
async delete(fullname) {
|
|
38
|
+
if (!this.config.cnpmcore.enableElasticsearch) {
|
|
39
|
+
throw new egg_errors_1.E451('search feature not enabled in `config.cnpmcore.enableElasticsearch`');
|
|
40
|
+
}
|
|
41
|
+
const name = await this.packageSearchService.removePackage(fullname);
|
|
42
|
+
return { package: name };
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
exports.SearchPackageController = SearchPackageController;
|
|
46
|
+
__decorate([
|
|
47
|
+
(0, tegg_1.Inject)(),
|
|
48
|
+
__metadata("design:type", PackageSearchService_1.PackageSearchService)
|
|
49
|
+
], SearchPackageController.prototype, "packageSearchService", void 0);
|
|
50
|
+
__decorate([
|
|
51
|
+
(0, tegg_1.HTTPMethod)({
|
|
52
|
+
// GET /-/v1/search?text=react&size=20&from=0&quality=0.65&popularity=0.98&maintenance=0.5
|
|
53
|
+
path: '/-/v1/search',
|
|
54
|
+
method: tegg_1.HTTPMethodEnum.GET,
|
|
55
|
+
}),
|
|
56
|
+
__param(0, (0, tegg_1.HTTPQuery)()),
|
|
57
|
+
__param(1, (0, tegg_1.HTTPQuery)()),
|
|
58
|
+
__param(2, (0, tegg_1.HTTPQuery)()),
|
|
59
|
+
__metadata("design:type", Function),
|
|
60
|
+
__metadata("design:paramtypes", [Object, Object, Object]),
|
|
61
|
+
__metadata("design:returntype", Promise)
|
|
62
|
+
], SearchPackageController.prototype, "search", null);
|
|
63
|
+
__decorate([
|
|
64
|
+
(0, tegg_1.HTTPMethod)({
|
|
65
|
+
path: `/-/v1/search/sync/:fullname(${PackageUtil_1.FULLNAME_REG_STRING})`,
|
|
66
|
+
method: tegg_1.HTTPMethodEnum.PUT,
|
|
67
|
+
}),
|
|
68
|
+
__param(0, (0, tegg_1.HTTPParam)()),
|
|
69
|
+
__metadata("design:type", Function),
|
|
70
|
+
__metadata("design:paramtypes", [String]),
|
|
71
|
+
__metadata("design:returntype", Promise)
|
|
72
|
+
], SearchPackageController.prototype, "sync", null);
|
|
73
|
+
__decorate([
|
|
74
|
+
(0, tegg_1.HTTPMethod)({
|
|
75
|
+
path: `/-/v1/search/sync/:fullname(${PackageUtil_1.FULLNAME_REG_STRING})`,
|
|
76
|
+
method: tegg_1.HTTPMethodEnum.DELETE,
|
|
77
|
+
}),
|
|
78
|
+
(0, tegg_1.Middleware)(AdminAccess_1.AdminAccess),
|
|
79
|
+
__param(0, (0, tegg_1.HTTPParam)()),
|
|
80
|
+
__metadata("design:type", Function),
|
|
81
|
+
__metadata("design:paramtypes", [String]),
|
|
82
|
+
__metadata("design:returntype", Promise)
|
|
83
|
+
], SearchPackageController.prototype, "delete", null);
|
|
84
|
+
exports.SearchPackageController = SearchPackageController = __decorate([
|
|
85
|
+
(0, tegg_1.HTTPController)()
|
|
86
|
+
], SearchPackageController);
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoUGFja2FnZUNvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL3BhY2thZ2UvU2VhcmNoUGFja2FnZUNvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0NBUXFCO0FBRXJCLDJDQUFrQztBQUVsQyw4REFBMkQ7QUFFM0QscUZBQWtGO0FBQ2xGLDZEQUFrRTtBQUNsRSw4REFBMkQ7QUFHcEQsSUFBTSx1QkFBdUIsR0FBN0IsTUFBTSx1QkFBd0IsU0FBUSx1Q0FBa0I7SUFTdkQsQUFBTixLQUFLLENBQUMsTUFBTSxDQUNHLElBQStDLEVBQy9DLElBQStDLEVBQy9DLElBQStDO1FBRTVELElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRTtZQUM3QyxNQUFNLElBQUksaUJBQUksQ0FBQyxxRUFBcUUsQ0FBQyxDQUFDO1NBQ3ZGO1FBQ0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsb0JBQW9CLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDN0UsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBTUssQUFBTixLQUFLLENBQUMsSUFBSSxDQUFjLFFBQWdCO1FBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRTtZQUM3QyxNQUFNLElBQUksaUJBQUksQ0FBQyxxRUFBcUUsQ0FBQyxDQUFDO1NBQ3ZGO1FBQ0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN6RSxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFPSyxBQUFOLEtBQUssQ0FBQyxNQUFNLENBQWMsUUFBZ0I7UUFDeEMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLG1CQUFtQixFQUFFO1lBQzdDLE1BQU0sSUFBSSxpQkFBSSxDQUFDLHFFQUFxRSxDQUFDLENBQUM7U0FDdkY7UUFDRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDckUsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUMzQixDQUFDO0NBQ0YsQ0FBQTtBQTdDWSwwREFBdUI7QUFFakI7SUFEaEIsSUFBQSxhQUFNLEdBQUU7OEJBQzhCLDJDQUFvQjtxRUFBQztBQU90RDtJQUxMLElBQUEsaUJBQVUsRUFBQztRQUNWLDBGQUEwRjtRQUMxRixJQUFJLEVBQUUsY0FBYztRQUNwQixNQUFNLEVBQUUscUJBQWMsQ0FBQyxHQUFHO0tBQzNCLENBQUM7SUFFQyxXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBO0lBQ1gsV0FBQSxJQUFBLGdCQUFTLEdBQUUsQ0FBQTtJQUNYLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7Ozs7cURBT2I7QUFNSztJQUpMLElBQUEsaUJBQVUsRUFBQztRQUNWLElBQUksRUFBRSwrQkFBK0IsaUNBQW1CLEdBQUc7UUFDM0QsTUFBTSxFQUFFLHFCQUFjLENBQUMsR0FBRztLQUMzQixDQUFDO0lBQ1UsV0FBQSxJQUFBLGdCQUFTLEdBQUUsQ0FBQTs7OzttREFNdEI7QUFPSztJQUxMLElBQUEsaUJBQVUsRUFBQztRQUNWLElBQUksRUFBRSwrQkFBK0IsaUNBQW1CLEdBQUc7UUFDM0QsTUFBTSxFQUFFLHFCQUFjLENBQUMsTUFBTTtLQUM5QixDQUFDO0lBQ0QsSUFBQSxpQkFBVSxFQUFDLHlCQUFXLENBQUM7SUFDVixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBOzs7O3FEQU14QjtrQ0E1Q1UsdUJBQXVCO0lBRG5DLElBQUEscUJBQWMsR0FBRTtHQUNKLHVCQUF1QixDQTZDbkMifQ==
|
|
@@ -82,3 +82,8 @@ export declare const ScopeUpdateOptions: import("@sinclair/typebox").TObject<{
|
|
|
82
82
|
registryId: import("@sinclair/typebox").TString;
|
|
83
83
|
scopeId: import("@sinclair/typebox").TString;
|
|
84
84
|
}>;
|
|
85
|
+
export declare const SearchQueryOptions: import("@sinclair/typebox").TObject<{
|
|
86
|
+
from: import("@sinclair/typebox").TNumber;
|
|
87
|
+
size: import("@sinclair/typebox").TNumber;
|
|
88
|
+
text: import("@sinclair/typebox").TString;
|
|
89
|
+
}>;
|
package/dist/app/port/typebox.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ScopeUpdateOptions = exports.ScopeCreateOptions = exports.RegistryUpdateOptions = exports.RegistryCreateOptions = exports.RegistryCreateSyncOptions = exports.QueryPageOptions = exports.patchAjv = exports.CreateHookRequestRule = exports.UpdateHookRequestRule = exports.BlockPackageRule = exports.SyncPackageTaskRule = exports.TagWithVersionRule = exports.VersionRule = exports.TagRule = exports.Description = exports.Spec = exports.VersionStringArray = exports.Version = exports.Tag = exports.BinarySubpathRule = exports.BinaryNameRule = exports.HookTypeType = exports.HookName = exports.Secret = exports.Url = exports.Name = void 0;
|
|
6
|
+
exports.SearchQueryOptions = exports.ScopeUpdateOptions = exports.ScopeCreateOptions = exports.RegistryUpdateOptions = exports.RegistryCreateOptions = exports.RegistryCreateSyncOptions = exports.QueryPageOptions = exports.patchAjv = exports.CreateHookRequestRule = exports.UpdateHookRequestRule = exports.BlockPackageRule = exports.SyncPackageTaskRule = exports.TagWithVersionRule = exports.VersionRule = exports.TagRule = exports.Description = exports.Spec = exports.VersionStringArray = exports.Version = exports.Tag = exports.BinarySubpathRule = exports.BinaryNameRule = exports.HookTypeType = exports.HookName = exports.Secret = exports.Url = exports.Name = void 0;
|
|
7
7
|
const typebox_1 = require("@sinclair/typebox");
|
|
8
8
|
const Registry_1 = require("../common/enum/Registry");
|
|
9
9
|
const semver_1 = __importDefault(require("semver"));
|
|
@@ -253,4 +253,21 @@ exports.ScopeUpdateOptions = typebox_1.Type.Object({
|
|
|
253
253
|
maxLength: 256,
|
|
254
254
|
}),
|
|
255
255
|
});
|
|
256
|
-
|
|
256
|
+
exports.SearchQueryOptions = typebox_1.Type.Object({
|
|
257
|
+
from: typebox_1.Type.Number({
|
|
258
|
+
transform: ['trim'],
|
|
259
|
+
minimum: 0,
|
|
260
|
+
default: 0,
|
|
261
|
+
}),
|
|
262
|
+
size: typebox_1.Type.Number({
|
|
263
|
+
transform: ['trim'],
|
|
264
|
+
minimum: 1,
|
|
265
|
+
default: 20,
|
|
266
|
+
}),
|
|
267
|
+
text: typebox_1.Type.String({
|
|
268
|
+
transform: ['trim'],
|
|
269
|
+
minLength: 1,
|
|
270
|
+
maxLength: 256,
|
|
271
|
+
}),
|
|
272
|
+
});
|
|
273
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"typebox.js","sourceRoot":"","sources":["../../../app/port/typebox.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,7 +89,7 @@ export type PackageJSONType = CnpmcorePatchInfo & {
|
|
|
89
89
|
[key: string]: unknown;
|
|
90
90
|
};
|
|
91
91
|
type PackageJSONPickKey = 'name' | 'author' | 'bugs' | 'description' | 'homepage' | 'keywords' | 'license' | 'readme' | 'readmeFilename' | 'repository' | 'versions' | 'contributors';
|
|
92
|
-
type CnpmcorePatchInfo = {
|
|
92
|
+
export type CnpmcorePatchInfo = {
|
|
93
93
|
_cnpmcore_publish_time?: Date;
|
|
94
94
|
publish_time?: number;
|
|
95
95
|
_source_registry_name?: string;
|
|
@@ -103,7 +103,7 @@ type DistType = {
|
|
|
103
103
|
integrity: string;
|
|
104
104
|
[key: string]: unknown;
|
|
105
105
|
};
|
|
106
|
-
type AuthorType = {
|
|
106
|
+
export type AuthorType = {
|
|
107
107
|
name: string;
|
|
108
108
|
email?: string;
|
|
109
109
|
url?: string;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { AuthorType, CnpmcorePatchInfo, PackageManifestType } from './PackageRepository';
|
|
2
|
+
export type SearchJSONPickKey = '_rev' | 'name' | 'description' | 'keywords' | 'license' | 'maintainers' | 'dist-tags' | '_source_registry_name';
|
|
3
|
+
export type SearchMappingType = Pick<PackageManifestType, SearchJSONPickKey> & CnpmcorePatchInfo & {
|
|
4
|
+
scope: string;
|
|
5
|
+
version: string;
|
|
6
|
+
versions: string[];
|
|
7
|
+
date: Date;
|
|
8
|
+
created: Date;
|
|
9
|
+
modified: Date;
|
|
10
|
+
author?: AuthorType | undefined;
|
|
11
|
+
_npmUser?: {
|
|
12
|
+
name: string;
|
|
13
|
+
email: string;
|
|
14
|
+
};
|
|
15
|
+
};
|
|
16
|
+
export type SearchManifestType = {
|
|
17
|
+
package: SearchMappingType;
|
|
18
|
+
downloads: {
|
|
19
|
+
all: number;
|
|
20
|
+
};
|
|
21
|
+
};
|
|
22
|
+
export declare class SearchRepository {
|
|
23
|
+
private readonly searchAdapter;
|
|
24
|
+
searchPackage(query: any): Promise<import("@elastic/elasticsearch/lib/api/types").SearchHitsMetadata<SearchManifestType>>;
|
|
25
|
+
upsertPackage(document: SearchManifestType): Promise<string>;
|
|
26
|
+
removePackage(fullname: string): Promise<string>;
|
|
27
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.SearchRepository = void 0;
|
|
13
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
14
|
+
let SearchRepository = class SearchRepository {
|
|
15
|
+
async searchPackage(query) {
|
|
16
|
+
return await this.searchAdapter.search(query);
|
|
17
|
+
}
|
|
18
|
+
async upsertPackage(document) {
|
|
19
|
+
return await this.searchAdapter.upsert(document.package.name, document);
|
|
20
|
+
}
|
|
21
|
+
async removePackage(fullname) {
|
|
22
|
+
return await this.searchAdapter.delete(fullname);
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
exports.SearchRepository = SearchRepository;
|
|
26
|
+
__decorate([
|
|
27
|
+
(0, tegg_1.Inject)(),
|
|
28
|
+
__metadata("design:type", Object)
|
|
29
|
+
], SearchRepository.prototype, "searchAdapter", void 0);
|
|
30
|
+
exports.SearchRepository = SearchRepository = __decorate([
|
|
31
|
+
(0, tegg_1.SingletonProto)({
|
|
32
|
+
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
33
|
+
})
|
|
34
|
+
], SearchRepository);
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L1NlYXJjaFJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsc0NBQWtFO0FBK0IzRCxJQUFNLGdCQUFnQixHQUF0QixNQUFNLGdCQUFnQjtJQUszQixLQUFLLENBQUMsYUFBYSxDQUFDLEtBQUs7UUFDdkIsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFxQixLQUFLLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxRQUE0QjtRQUM5QyxPQUFPLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsUUFBZ0I7UUFDbEMsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ25ELENBQUM7Q0FDRixDQUFBO0FBaEJZLDRDQUFnQjtBQUVWO0lBRGhCLElBQUEsYUFBTSxHQUFFOzt1REFDcUM7MkJBRm5DLGdCQUFnQjtJQUg1QixJQUFBLHFCQUFjLEVBQUM7UUFDZCxXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxnQkFBZ0IsQ0FnQjVCIn0=
|
|
@@ -57,6 +57,8 @@ exports.cnpmcoreConfig = {
|
|
|
57
57
|
redirectNotFound: true,
|
|
58
58
|
enableUnpkg: true,
|
|
59
59
|
strictSyncSpecivicVersion: false,
|
|
60
|
+
enableElasticsearch: !!process.env.CNPMCORE_CONFIG_ENABLE_ES,
|
|
61
|
+
elasticsearchIndex: 'cnpmcore_packages',
|
|
60
62
|
strictValidateTarballPkg: false,
|
|
61
63
|
};
|
|
62
64
|
exports.default = (appInfo) => {
|
|
@@ -177,6 +179,18 @@ exports.default = (appInfo) => {
|
|
|
177
179
|
file: 'sql.log',
|
|
178
180
|
},
|
|
179
181
|
};
|
|
182
|
+
// more options: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/configuration.html
|
|
183
|
+
if (config.cnpmcore.enableElasticsearch) {
|
|
184
|
+
config.elasticsearch = {
|
|
185
|
+
client: {
|
|
186
|
+
node: process.env.CNPMCORE_CONFIG_ES_CLIENT_NODE,
|
|
187
|
+
auth: {
|
|
188
|
+
username: process.env.CNPMCORE_CONFIG_ES_CLIENT_AUTH_USERNAME,
|
|
189
|
+
password: process.env.CNPMCORE_CONFIG_ES_CLIENT_AUTH_PASSWORD,
|
|
190
|
+
},
|
|
191
|
+
},
|
|
192
|
+
};
|
|
193
|
+
}
|
|
180
194
|
return config;
|
|
181
195
|
};
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
196
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvY29uZmlnLmRlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLG1DQUFvQztBQUNwQywrQkFBNEI7QUFFNUIsd0RBQWlDO0FBQ2pDLGlEQUErQztBQUMvQyx1REFBNEc7QUFHL0YsUUFBQSxjQUFjLEdBQW1CO0lBQzVDLElBQUksRUFBRSxNQUFNO0lBQ1osVUFBVSxFQUFFLEtBQUs7SUFDakIsVUFBVSxFQUFFLEVBQUU7SUFDZCxjQUFjLEVBQUUsNEJBQTRCO0lBQzVDLG9CQUFvQixFQUFFLEtBQUs7SUFDM0IsaUJBQWlCLEVBQUUsS0FBSztJQUN4Qix5QkFBeUIsRUFBRSxNQUFNO0lBQ2pDLHNCQUFzQixFQUFFLEdBQUc7SUFDM0IsUUFBUSxFQUFFLG9CQUFRLENBQUMsSUFBSTtJQUN2QixjQUFjLEVBQUUsMEJBQWMsQ0FBQyxNQUFNO0lBQ3JDLG1DQUFtQyxFQUFFLEVBQUU7SUFDdkMsbUNBQW1DLEVBQUUsRUFBRTtJQUN2Qyx5Q0FBeUMsRUFBRSxFQUFFO0lBQzdDLG9CQUFvQixFQUFFLEVBQUU7SUFDeEIsMEJBQTBCLEVBQUUsSUFBSTtJQUNoQyxnQkFBZ0IsRUFBRSxLQUFLO0lBQ3ZCLHVCQUF1QixFQUFFLEVBQUU7SUFDM0Isc0JBQXNCLEVBQUUsS0FBSztJQUM3Qiw4QkFBOEIsRUFBRSxFQUFFO0lBQ2xDLHVCQUF1QixFQUFFLEVBQUU7SUFDM0IsbUJBQW1CLEVBQUUsS0FBSztJQUMxQiwwQkFBMEIsRUFBRSxHQUFHO0lBQy9CLHFCQUFxQixFQUFFLDZCQUE2QjtJQUNwRCx5QkFBeUIsRUFBRSw2QkFBaUIsQ0FBQyxTQUFTO0lBQ3RELFFBQVEsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixJQUFJLHVCQUF1QjtJQUN6RSxVQUFVLEVBQUUsS0FBSztJQUNqQixXQUFXLEVBQUU7UUFD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
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.mockES = void 0;
|
|
3
7
|
const path_1 = require("path");
|
|
8
|
+
const elasticsearch_mock_1 = __importDefault(require("@elastic/elasticsearch-mock"));
|
|
9
|
+
exports.mockES = new elasticsearch_mock_1.default();
|
|
4
10
|
exports.default = (appInfo) => {
|
|
5
11
|
const config = {};
|
|
6
12
|
config.dataDir = (0, path_1.join)(appInfo.root, '.cnpmcore_unittest');
|
|
@@ -13,6 +19,12 @@ exports.default = (appInfo) => {
|
|
|
13
19
|
config.cnpmcore = {
|
|
14
20
|
checkChangesStreamInterval: 10,
|
|
15
21
|
};
|
|
22
|
+
config.elasticsearch = {
|
|
23
|
+
client: {
|
|
24
|
+
node: 'http://localhost:9200',
|
|
25
|
+
Connection: exports.mockES.getConnection(),
|
|
26
|
+
},
|
|
27
|
+
};
|
|
16
28
|
return config;
|
|
17
29
|
};
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLnVuaXR0ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vY29uZmlnL2NvbmZpZy51bml0dGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwrQkFBNEI7QUFFNUIscUZBQStDO0FBRWxDLFFBQUEsTUFBTSxHQUFHLElBQUksNEJBQUksRUFBRSxDQUFDO0FBRWpDLGtCQUFlLENBQUMsT0FBcUIsRUFBRSxFQUFFO0lBQ3ZDLE1BQU0sTUFBTSxHQUFHLEVBQWdDLENBQUM7SUFDaEQsTUFBTSxDQUFDLE9BQU8sR0FBRyxJQUFBLFdBQUksRUFBQyxPQUFPLENBQUMsSUFBSSxFQUFFLG9CQUFvQixDQUFDLENBQUM7SUFFMUQsTUFBTSxDQUFDLEdBQUcsR0FBRztRQUNYLFFBQVEsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsSUFBSSxtQkFBbUI7S0FDNUQsQ0FBQztJQUVGLE1BQU0sQ0FBQyxHQUFHLEdBQUc7UUFDWCxHQUFHLEVBQUUsSUFBQSxXQUFJLEVBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUM7S0FDakMsQ0FBQztJQUVGLE1BQU0sQ0FBQyxRQUFRLEdBQUc7UUFDaEIsMEJBQTBCLEVBQUUsRUFBRTtLQUMvQixDQUFDO0lBRUYsTUFBTSxDQUFDLGFBQWEsR0FBRztRQUNyQixNQUFNLEVBQUU7WUFDTixJQUFJLEVBQUUsdUJBQXVCO1lBQzdCLFVBQVUsRUFBRSxjQUFNLENBQUMsYUFBYSxFQUFFO1NBQ25DO0tBQ0YsQ0FBQztJQUVGLE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMsQ0FBQyJ9
|
package/dist/config/plugin.js
CHANGED
|
@@ -56,6 +56,10 @@ const plugin = {
|
|
|
56
56
|
enable: true,
|
|
57
57
|
package: 'egg-status',
|
|
58
58
|
},
|
|
59
|
+
elasticsearch: {
|
|
60
|
+
enable: true,
|
|
61
|
+
package: 'eggjs-elasticsearch',
|
|
62
|
+
},
|
|
59
63
|
};
|
|
60
64
|
exports.default = plugin;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vY29uZmlnL3BsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE1BQU0sTUFBTSxHQUFjO0lBQ3hCLElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLG9CQUFvQjtLQUM5QjtJQUNELFVBQVUsRUFBRTtRQUNWLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLG9CQUFvQjtLQUM5QjtJQUNELGNBQWMsRUFBRTtRQUNkLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLCtCQUErQjtLQUN6QztJQUNELFlBQVksRUFBRTtRQUNaLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLDZCQUE2QjtLQUN2QztJQUNELE9BQU8sRUFBRTtRQUNQLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLHdCQUF3QjtLQUNsQztJQUNELGNBQWMsRUFBRTtRQUNkLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLDZCQUE2QjtLQUN2QztJQUNELFNBQVMsRUFBRTtRQUNULE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLHdCQUF3QjtLQUNsQztJQUNELElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO0tBQ2I7SUFDRCxRQUFRLEVBQUU7UUFDUixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxtQkFBbUI7S0FDN0I7SUFDRCxNQUFNLEVBQUU7UUFDTixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxZQUFZO0tBQ3RCO0lBQ0QsZUFBZSxFQUFFO1FBQ2YsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsc0JBQXNCO0tBQ2hDO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsV0FBVztLQUNyQjtJQUNELElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLFVBQVU7S0FDcEI7SUFDRCxNQUFNLEVBQUU7UUFDTixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxZQUFZO0tBQ3RCO0lBQ0QsYUFBYSxFQUFFO1FBQ2IsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUscUJBQXFCO0tBQy9CO0NBQ0YsQ0FBQztBQUVGLGtCQUFlLE1BQU0sQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cnpmcore",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.43.1",
|
|
4
4
|
"description": "npm core",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist/**/*"
|
|
@@ -77,6 +77,7 @@
|
|
|
77
77
|
"@eggjs/tegg-plugin": "^3.12.0",
|
|
78
78
|
"@eggjs/tegg-schedule-plugin": "^3.12.0",
|
|
79
79
|
"@eggjs/tsconfig": "^1.0.0",
|
|
80
|
+
"@elastic/elasticsearch": "^8.8.1",
|
|
80
81
|
"@node-rs/crc32": "^1.2.2",
|
|
81
82
|
"@simplewebauthn/server": "^7.0.1",
|
|
82
83
|
"@sinclair/typebox": "^0.23.0",
|
|
@@ -93,6 +94,7 @@
|
|
|
93
94
|
"egg-tracer": "^1.1.0",
|
|
94
95
|
"egg-typebox-validate": "^2.0.0",
|
|
95
96
|
"egg-view-nunjucks": "^2.3.0",
|
|
97
|
+
"eggjs-elasticsearch": "^0.0.6",
|
|
96
98
|
"fs-cnpm": "^2.4.0",
|
|
97
99
|
"ioredis": "^5.3.1",
|
|
98
100
|
"leoric": "^2.6.2",
|
|
@@ -116,6 +118,7 @@
|
|
|
116
118
|
},
|
|
117
119
|
"devDependencies": {
|
|
118
120
|
"@cnpmjs/npm-cli-login": "^1.1.0",
|
|
121
|
+
"@elastic/elasticsearch-mock": "^2.0.0",
|
|
119
122
|
"@simplewebauthn/typescript-types": "^7.0.0",
|
|
120
123
|
"@types/mime-types": "^2.1.1",
|
|
121
124
|
"@types/mocha": "^10.0.1",
|