pixivflow 2.18.0 → 2.18.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/commands/SchedulerCommand.d.ts.map +1 -1
- package/dist/commands/SchedulerCommand.js +63 -38
- package/dist/commands/SchedulerCommand.js.map +1 -1
- package/dist/commands/scheduler-runtime.d.ts +6 -0
- package/dist/commands/scheduler-runtime.d.ts.map +1 -1
- package/dist/commands/scheduler-runtime.js +77 -9
- package/dist/commands/scheduler-runtime.js.map +1 -1
- package/dist/download/DownloadManager.d.ts +9 -0
- package/dist/download/DownloadManager.d.ts.map +1 -1
- package/dist/download/DownloadManager.js +18 -1
- package/dist/download/DownloadManager.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/pixiv-client/PixivFlowPixivClient.d.ts +7 -1
- package/dist/pixiv-client/PixivFlowPixivClient.d.ts.map +1 -1
- package/dist/pixiv-client/PixivFlowPixivClient.js +14 -8
- package/dist/pixiv-client/PixivFlowPixivClient.js.map +1 -1
- package/dist/pixiv-client/TargetSearchRunner.d.ts +2 -2
- package/dist/pixiv-client/TargetSearchRunner.d.ts.map +1 -1
- package/dist/pixiv-client/TargetSearchRunner.js +21 -14
- package/dist/pixiv-client/TargetSearchRunner.js.map +1 -1
- package/dist/scheduler/MultiScheduleManager.d.ts +33 -1
- package/dist/scheduler/MultiScheduleManager.d.ts.map +1 -1
- package/dist/scheduler/MultiScheduleManager.js +115 -2
- package/dist/scheduler/MultiScheduleManager.js.map +1 -1
- package/dist/scheduler/ScheduleTriggerServer.d.ts +32 -9
- package/dist/scheduler/ScheduleTriggerServer.d.ts.map +1 -1
- package/dist/scheduler/ScheduleTriggerServer.js +34 -6
- package/dist/scheduler/ScheduleTriggerServer.js.map +1 -1
- package/dist/scheduler/Scheduler.d.ts +28 -1
- package/dist/scheduler/Scheduler.d.ts.map +1 -1
- package/dist/scheduler/Scheduler.js +82 -7
- package/dist/scheduler/Scheduler.js.map +1 -1
- package/dist/scheduler/SlotCoordinator.d.ts +28 -3
- package/dist/scheduler/SlotCoordinator.d.ts.map +1 -1
- package/dist/scheduler/SlotCoordinator.js +31 -5
- package/dist/scheduler/SlotCoordinator.js.map +1 -1
- package/dist/storage/repositories/SlotRepository.d.ts +17 -0
- package/dist/storage/repositories/SlotRepository.d.ts.map +1 -1
- package/dist/storage/repositories/SlotRepository.js +26 -4
- package/dist/storage/repositories/SlotRepository.js.map +1 -1
- package/dist/topic/TopicPipeline.d.ts +15 -1
- package/dist/topic/TopicPipeline.d.ts.map +1 -1
- package/dist/topic/TopicPipeline.js +18 -2
- package/dist/topic/TopicPipeline.js.map +1 -1
- package/dist/topic/TopicResolver.d.ts +5 -1
- package/dist/topic/TopicResolver.d.ts.map +1 -1
- package/dist/topic/TopicResolver.js +32 -6
- package/dist/topic/TopicResolver.js.map +1 -1
- package/dist/topic/createTopicPipeline.d.ts +2 -2
- package/dist/topic/createTopicPipeline.d.ts.map +1 -1
- package/dist/topic/createTopicPipeline.js +5 -5
- package/dist/topic/createTopicPipeline.js.map +1 -1
- package/dist/topic/types.d.ts +5 -1
- package/dist/topic/types.d.ts.map +1 -1
- package/dist/utils/errors.d.ts +18 -0
- package/dist/utils/errors.d.ts.map +1 -1
- package/dist/utils/errors.js +30 -0
- package/dist/utils/errors.js.map +1 -1
- package/dist/version.js +1 -1
- package/dist/webui/package.json +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SlotRepository.js","sourceRoot":"","sources":["../../../src/storage/repositories/SlotRepository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SlotRepository.js","sourceRoot":"","sources":["../../../src/storage/repositories/SlotRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,21 @@ export declare class TopicPipeline {
|
|
|
21
21
|
private readonly client;
|
|
22
22
|
private readonly resolver;
|
|
23
23
|
private readonly requestDelayMs;
|
|
24
|
-
|
|
24
|
+
/**
|
|
25
|
+
* Run-scoped cancellation. Candidate acquisition is the longest stretch of
|
|
26
|
+
* network work in a run, so it must observe the same abort as the download
|
|
27
|
+
* pipeline; otherwise a cancelled run keeps searching tags and can never
|
|
28
|
+
* settle, which is what let a timed-out run hold its slot lease forever.
|
|
29
|
+
*/
|
|
30
|
+
private readonly signal?;
|
|
31
|
+
constructor(client: TopicClient, resolver: TopicResolver, requestDelayMs?: number,
|
|
32
|
+
/**
|
|
33
|
+
* Run-scoped cancellation. Candidate acquisition is the longest stretch of
|
|
34
|
+
* network work in a run, so it must observe the same abort as the download
|
|
35
|
+
* pipeline; otherwise a cancelled run keeps searching tags and can never
|
|
36
|
+
* settle, which is what let a timed-out run hold its slot lease forever.
|
|
37
|
+
*/
|
|
38
|
+
signal?: AbortSignal | undefined);
|
|
25
39
|
selectWorks<T extends WorkLike>(target: TargetConfig, contentType: TopicContentType, day: string, limit: number, discovery: TopicDiscoveryOptions, collect: TopicCollectOptions): Promise<{
|
|
26
40
|
works: T[];
|
|
27
41
|
selection: TopicSelection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TopicPipeline.d.ts","sourceRoot":"","sources":["../../src/topic/TopicPipeline.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TopicPipeline.d.ts","sourceRoot":"","sources":["../../src/topic/TopicPipeline.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,QAAQ,EACT,MAAM,SAAS,CAAC;AAYjB,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;GAMG;AACH,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;gBATP,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,aAAa,EACvB,cAAc,SAAM;IACrC;;;;;OAKG;IACc,MAAM,CAAC,EAAE,WAAW,YAAA;IAGjC,WAAW,CAAC,CAAC,SAAS,QAAQ,EAClC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,gBAAgB,EAC7B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,qBAAqB,EAChC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;QAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAAC,SAAS,EAAE,cAAc,CAAA;KAAE,CAAC;YA0EvC,SAAS;IAuBvB,OAAO,CAAC,WAAW;IAgBnB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAoCrB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,KAAK;CAKd"}
|
|
@@ -5,6 +5,7 @@ const promises_1 = require("node:timers/promises");
|
|
|
5
5
|
const logger_1 = require("../logger");
|
|
6
6
|
const pixiv_utils_1 = require("../utils/pixiv-utils");
|
|
7
7
|
const ai_detection_1 = require("../utils/ai-detection");
|
|
8
|
+
const errors_1 = require("../utils/errors");
|
|
8
9
|
const COLLECT_DEFAULTS = { maxPerTag: 40, maxCandidates: 250, minMetadataScore: 0.35 };
|
|
9
10
|
/** Small, platform-level tags that are never evidence of topic membership. */
|
|
10
11
|
const STOP_TAGS = new Set([
|
|
@@ -24,10 +25,19 @@ class TopicPipeline {
|
|
|
24
25
|
client;
|
|
25
26
|
resolver;
|
|
26
27
|
requestDelayMs;
|
|
27
|
-
|
|
28
|
+
signal;
|
|
29
|
+
constructor(client, resolver, requestDelayMs = 500,
|
|
30
|
+
/**
|
|
31
|
+
* Run-scoped cancellation. Candidate acquisition is the longest stretch of
|
|
32
|
+
* network work in a run, so it must observe the same abort as the download
|
|
33
|
+
* pipeline; otherwise a cancelled run keeps searching tags and can never
|
|
34
|
+
* settle, which is what let a timed-out run hold its slot lease forever.
|
|
35
|
+
*/
|
|
36
|
+
signal) {
|
|
28
37
|
this.client = client;
|
|
29
38
|
this.resolver = resolver;
|
|
30
39
|
this.requestDelayMs = requestDelayMs;
|
|
40
|
+
this.signal = signal;
|
|
31
41
|
}
|
|
32
42
|
async selectWorks(target, contentType, day, limit, discovery, collect) {
|
|
33
43
|
const topic = (target.topic ?? '').trim();
|
|
@@ -44,6 +54,9 @@ class TopicPipeline {
|
|
|
44
54
|
for (let i = 0; i < tagNames.length; i++) {
|
|
45
55
|
if (byId.size >= maxCandidates)
|
|
46
56
|
break;
|
|
57
|
+
// Cancellation is checked between tags, so a cancelled run stops issuing
|
|
58
|
+
// new searches even when the aborted request itself had already returned.
|
|
59
|
+
(0, errors_1.throwIfAborted)(this.signal, 'topic collection cancelled');
|
|
47
60
|
const tag = tagNames[i];
|
|
48
61
|
const works = await this.searchDay(contentType, tag, day, maxPerTag, includeR18);
|
|
49
62
|
rawCount += works.length;
|
|
@@ -99,7 +112,7 @@ class TopicPipeline {
|
|
|
99
112
|
}
|
|
100
113
|
async searchDay(contentType, tag, day, limit, includeR18) {
|
|
101
114
|
try {
|
|
102
|
-
const opts = { startDate: day, endDate: day, includeR18 };
|
|
115
|
+
const opts = { startDate: day, endDate: day, includeR18, signal: this.signal };
|
|
103
116
|
const works = contentType === 'illustration'
|
|
104
117
|
? await this.client.searchIllustrationsForTags(tag, limit, opts)
|
|
105
118
|
: await this.client.searchNovelsForTags(tag, limit, opts);
|
|
@@ -107,6 +120,9 @@ class TopicPipeline {
|
|
|
107
120
|
return works.filter((w) => this.onDay(w.create_date, day));
|
|
108
121
|
}
|
|
109
122
|
catch (error) {
|
|
123
|
+
// A cancellation must not be degraded into "no results for this tag": that
|
|
124
|
+
// would silently continue the cancelled run across the remaining tags.
|
|
125
|
+
(0, errors_1.rethrowIfCancelled)(error, this.signal);
|
|
110
126
|
logger_1.logger.warn('[TopicCollector] search failed tag=' + tag + ' type=' + contentType + ': ' + (error instanceof Error ? error.message : String(error)));
|
|
111
127
|
return [];
|
|
112
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TopicPipeline.js","sourceRoot":"","sources":["../../src/topic/TopicPipeline.ts"],"names":[],"mappings":";;;AAAA,mDAA2D;AAE3D,sCAAmC;AACnC,sDAAgE;AAChE,wDAAyD;
|
|
1
|
+
{"version":3,"file":"TopicPipeline.js","sourceRoot":"","sources":["../../src/topic/TopicPipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,12 @@ export declare class TopicResolver {
|
|
|
12
12
|
private readonly client;
|
|
13
13
|
private readonly cache;
|
|
14
14
|
private readonly requestDelayMs;
|
|
15
|
+
/** Run-scoped cancellation, forwarded to every discovery request. */
|
|
16
|
+
private readonly signal?;
|
|
15
17
|
private readonly scorer;
|
|
16
|
-
constructor(client: TopicClient, cache: TopicCache, requestDelayMs?: number
|
|
18
|
+
constructor(client: TopicClient, cache: TopicCache, requestDelayMs?: number,
|
|
19
|
+
/** Run-scoped cancellation, forwarded to every discovery request. */
|
|
20
|
+
signal?: AbortSignal | undefined);
|
|
17
21
|
/** Resolve tags for a topic+type, using cache when fresh. Never throws for
|
|
18
22
|
* discovery errors: it always returns at least the seed tag. */
|
|
19
23
|
resolve(topic: string, contentType: TopicContentType, options?: TopicDiscoveryOptions): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TopicResolver.d.ts","sourceRoot":"","sources":["../../src/topic/TopicResolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TopicResolver.d.ts","sourceRoot":"","sources":["../../src/topic/TopicResolver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,EAEV,WAAW,EACX,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EAEX,MAAM,SAAS,CAAC;AAiBjB;;;;;;;GAOG;AACH,qBAAa,aAAa;IAItB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,qEAAqE;IACrE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAP1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;gBAG5B,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,EACjB,cAAc,SAAM;IACrC,qEAAqE;IACpD,MAAM,CAAC,EAAE,WAAW,YAAA;IAGvC;qEACiE;IAC3D,OAAO,CACX,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,gBAAgB,EAC7B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;YAyC1D,QAAQ;IAgDtB,+EAA+E;YACjE,aAAa;IA4C3B,OAAO,CAAC,QAAQ;IAchB,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,KAAK;CAOd"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TopicResolver = void 0;
|
|
4
4
|
const promises_1 = require("node:timers/promises");
|
|
5
5
|
const logger_1 = require("../logger");
|
|
6
|
+
const errors_1 = require("../utils/errors");
|
|
6
7
|
const TopicTagScorer_1 = require("./TopicTagScorer");
|
|
7
8
|
/** Platform-wide tags never worth searching as topic keys or scoring metadata. */
|
|
8
9
|
const STOP_TAGS = new Set([
|
|
@@ -29,11 +30,15 @@ class TopicResolver {
|
|
|
29
30
|
client;
|
|
30
31
|
cache;
|
|
31
32
|
requestDelayMs;
|
|
33
|
+
signal;
|
|
32
34
|
scorer = new TopicTagScorer_1.TopicTagScorer();
|
|
33
|
-
constructor(client, cache, requestDelayMs = 500
|
|
35
|
+
constructor(client, cache, requestDelayMs = 500,
|
|
36
|
+
/** Run-scoped cancellation, forwarded to every discovery request. */
|
|
37
|
+
signal) {
|
|
34
38
|
this.client = client;
|
|
35
39
|
this.cache = cache;
|
|
36
40
|
this.requestDelayMs = requestDelayMs;
|
|
41
|
+
this.signal = signal;
|
|
37
42
|
}
|
|
38
43
|
/** Resolve tags for a topic+type, using cache when fresh. Never throws for
|
|
39
44
|
* discovery errors: it always returns at least the seed tag. */
|
|
@@ -117,19 +122,40 @@ class TopicResolver {
|
|
|
117
122
|
}
|
|
118
123
|
/** Serial, bounded fetches: autocomplete → topic sample → small background. */
|
|
119
124
|
async gatherSamples(seed, contentType, sampleWorks, includeR18) {
|
|
120
|
-
|
|
125
|
+
(0, errors_1.throwIfAborted)(this.signal, 'topic resolution cancelled');
|
|
126
|
+
// Discovery degrades to "no suggestions" / "no background" on ordinary
|
|
127
|
+
// failures, but a cancellation must abort the run rather than quietly
|
|
128
|
+
// continue against a stopped pipeline.
|
|
129
|
+
const suggested = await this.client
|
|
130
|
+
.getTagAutocomplete(seed, { signal: this.signal })
|
|
131
|
+
.catch((error) => {
|
|
132
|
+
(0, errors_1.rethrowIfCancelled)(error, this.signal);
|
|
133
|
+
return [];
|
|
134
|
+
});
|
|
121
135
|
if (this.requestDelayMs > 0)
|
|
122
136
|
await (0, promises_1.setTimeout)(this.requestDelayMs);
|
|
137
|
+
(0, errors_1.throwIfAborted)(this.signal, 'topic resolution cancelled');
|
|
123
138
|
const topicWorks = contentType === 'illustration'
|
|
124
|
-
? await this.client.searchIllustrationsForTags(seed, sampleWorks, { includeR18 })
|
|
125
|
-
: await this.client.searchNovelsForTags(seed, sampleWorks, { includeR18 });
|
|
139
|
+
? await this.client.searchIllustrationsForTags(seed, sampleWorks, { includeR18, signal: this.signal })
|
|
140
|
+
: await this.client.searchNovelsForTags(seed, sampleWorks, { includeR18, signal: this.signal });
|
|
126
141
|
// A small, cheap background sample (a common platform tag) estimates how
|
|
127
142
|
// generic a co-occurring tag is. Bounded to keep requests/memory low.
|
|
128
143
|
if (this.requestDelayMs > 0)
|
|
129
144
|
await (0, promises_1.setTimeout)(this.requestDelayMs);
|
|
145
|
+
(0, errors_1.throwIfAborted)(this.signal, 'topic resolution cancelled');
|
|
130
146
|
const backgroundWorks = contentType === 'illustration'
|
|
131
|
-
? await this.client
|
|
132
|
-
|
|
147
|
+
? await this.client
|
|
148
|
+
.searchIllustrationsForTags('イラスト', 40, { includeR18, signal: this.signal })
|
|
149
|
+
.catch((error) => {
|
|
150
|
+
(0, errors_1.rethrowIfCancelled)(error, this.signal);
|
|
151
|
+
return [];
|
|
152
|
+
})
|
|
153
|
+
: await this.client
|
|
154
|
+
.searchNovelsForTags('小説', 40, { includeR18, signal: this.signal })
|
|
155
|
+
.catch((error) => {
|
|
156
|
+
(0, errors_1.rethrowIfCancelled)(error, this.signal);
|
|
157
|
+
return [];
|
|
158
|
+
});
|
|
133
159
|
return [suggested, topicWorks, backgroundWorks];
|
|
134
160
|
}
|
|
135
161
|
seedOnly(seed, contentType, cacheDays) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TopicResolver.js","sourceRoot":"","sources":["../../src/topic/TopicResolver.ts"],"names":[],"mappings":";;;AAAA,mDAA2D;AAE3D,sCAAmC;
|
|
1
|
+
{"version":3,"file":"TopicResolver.js","sourceRoot":"","sources":["../../src/topic/TopicResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,8 @@ export type TopicPipelineFactory = () => TopicPipeline;
|
|
|
9
9
|
type DbPathSource = string | {
|
|
10
10
|
getDatabasePath(): string;
|
|
11
11
|
} | undefined;
|
|
12
|
-
export declare function createTopicPipeline(client: IPixivClient, databasePath: DbPathSource, requestDelayMs?: number): TopicPipeline;
|
|
12
|
+
export declare function createTopicPipeline(client: IPixivClient, databasePath: DbPathSource, requestDelayMs?: number, signal?: AbortSignal): TopicPipeline;
|
|
13
13
|
/** Lazily builds one shared pipeline per download run (cache + resolver). */
|
|
14
|
-
export declare function createTopicPipelineFactory(client: IPixivClient, databasePath: DbPathSource, requestDelayMs?: number): TopicPipelineFactory;
|
|
14
|
+
export declare function createTopicPipelineFactory(client: IPixivClient, databasePath: DbPathSource, requestDelayMs?: number, signal?: AbortSignal): TopicPipelineFactory;
|
|
15
15
|
export {};
|
|
16
16
|
//# sourceMappingURL=createTopicPipeline.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTopicPipeline.d.ts","sourceRoot":"","sources":["../../src/topic/createTopicPipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,MAAM,oBAAoB,GAAG,MAAM,aAAa,CAAC;AAEvD;;;;GAIG;AACH,KAAK,YAAY,GAAG,MAAM,GAAG;IAAE,eAAe,IAAI,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC;AAYvE,wBAAgB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"createTopicPipeline.d.ts","sourceRoot":"","sources":["../../src/topic/createTopicPipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,MAAM,oBAAoB,GAAG,MAAM,aAAa,CAAC;AAEvD;;;;GAIG;AACH,KAAK,YAAY,GAAG,MAAM,GAAG;IAAE,eAAe,IAAI,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC;AAYvE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,EAC1B,cAAc,SAAM,EACpB,MAAM,CAAC,EAAE,WAAW,GACnB,aAAa,CAKf;AAED,6EAA6E;AAC7E,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,YAAY,EAC1B,cAAc,SAAM,EACpB,MAAM,CAAC,EAAE,WAAW,GACnB,oBAAoB,CAMtB"}
|
|
@@ -15,18 +15,18 @@ function resolveDbPath(source) {
|
|
|
15
15
|
const absolute = raw && (0, node_path_1.isAbsolute)(raw) ? raw : (0, node_path_1.resolve)(process.cwd(), raw ?? 'data/pixiv-downloader.db');
|
|
16
16
|
return absolute;
|
|
17
17
|
}
|
|
18
|
-
function createTopicPipeline(client, databasePath, requestDelayMs = 500) {
|
|
18
|
+
function createTopicPipeline(client, databasePath, requestDelayMs = 500, signal) {
|
|
19
19
|
const resolved = resolveDbPath(databasePath);
|
|
20
20
|
const cache = new TopicCache_1.TopicCache((0, node_path_1.resolve)((0, node_path_1.dirname)(resolved), 'topic-cache'));
|
|
21
|
-
const resolver = new TopicResolver_1.TopicResolver(client, cache, requestDelayMs);
|
|
22
|
-
return new TopicPipeline_1.TopicPipeline(client, resolver, requestDelayMs);
|
|
21
|
+
const resolver = new TopicResolver_1.TopicResolver(client, cache, requestDelayMs, signal);
|
|
22
|
+
return new TopicPipeline_1.TopicPipeline(client, resolver, requestDelayMs, signal);
|
|
23
23
|
}
|
|
24
24
|
/** Lazily builds one shared pipeline per download run (cache + resolver). */
|
|
25
|
-
function createTopicPipelineFactory(client, databasePath, requestDelayMs = 500) {
|
|
25
|
+
function createTopicPipelineFactory(client, databasePath, requestDelayMs = 500, signal) {
|
|
26
26
|
let instance;
|
|
27
27
|
return () => {
|
|
28
28
|
if (!instance)
|
|
29
|
-
instance = createTopicPipeline(client, databasePath, requestDelayMs);
|
|
29
|
+
instance = createTopicPipeline(client, databasePath, requestDelayMs, signal);
|
|
30
30
|
return instance;
|
|
31
31
|
};
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTopicPipeline.js","sourceRoot":"","sources":["../../src/topic/createTopicPipeline.ts"],"names":[],"mappings":";;AA4BA,
|
|
1
|
+
{"version":3,"file":"createTopicPipeline.js","sourceRoot":"","sources":["../../src/topic/createTopicPipeline.ts"],"names":[],"mappings":";;AA4BA,kDAUC;AAGD,gEAWC;AAnDD,yCAAwE;AAIxE,6CAA0C;AAC1C,mDAAgD;AAChD,mDAAgD;AAWhD,SAAS,aAAa,CAAC,MAAoB;IACzC,MAAM,GAAG,GAAG,OAAO,MAAM,KAAK,UAAU;QACtC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;YACpC,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE;YAC1B,CAAC,CAAC,MAAM,CAAC;IACb,MAAM,QAAQ,GAAG,GAAG,IAAI,IAAA,sBAAU,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,0BAA0B,CAAC,CAAC;IAC9G,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,mBAAmB,CACjC,MAAoB,EACpB,YAA0B,EAC1B,cAAc,GAAG,GAAG,EACpB,MAAoB;IAEpB,MAAM,QAAQ,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,uBAAU,CAAC,IAAA,mBAAW,EAAC,IAAA,mBAAO,EAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAI,6BAAa,CAAC,MAAe,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IACnF,OAAO,IAAI,6BAAa,CAAC,MAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;AAC9E,CAAC;AAED,6EAA6E;AAC7E,SAAgB,0BAA0B,CACxC,MAAoB,EACpB,YAA0B,EAC1B,cAAc,GAAG,GAAG,EACpB,MAAoB;IAEpB,IAAI,QAAmC,CAAC;IACxC,OAAO,GAAG,EAAE;QACV,IAAI,CAAC,QAAQ;YAAE,QAAQ,GAAG,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;QAC5F,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/topic/types.d.ts
CHANGED
|
@@ -67,7 +67,9 @@ export interface TopicCandidate {
|
|
|
67
67
|
}
|
|
68
68
|
/** Minimal surface the resolver/collector need from the Pixiv client. */
|
|
69
69
|
export interface TopicClient {
|
|
70
|
-
getTagAutocomplete(seed: string
|
|
70
|
+
getTagAutocomplete(seed: string, options?: {
|
|
71
|
+
signal?: AbortSignal;
|
|
72
|
+
}): Promise<Array<{
|
|
71
73
|
name: string;
|
|
72
74
|
translated_name?: string;
|
|
73
75
|
}>>;
|
|
@@ -75,11 +77,13 @@ export interface TopicClient {
|
|
|
75
77
|
startDate?: string;
|
|
76
78
|
endDate?: string;
|
|
77
79
|
includeR18?: boolean;
|
|
80
|
+
signal?: AbortSignal;
|
|
78
81
|
}): Promise<Array<WorkLike>>;
|
|
79
82
|
searchNovelsForTags(seed: string, limit: number, options?: {
|
|
80
83
|
startDate?: string;
|
|
81
84
|
endDate?: string;
|
|
82
85
|
includeR18?: boolean;
|
|
86
|
+
signal?: AbortSignal;
|
|
83
87
|
}): Promise<Array<WorkLike>>;
|
|
84
88
|
}
|
|
85
89
|
export interface WorkLike {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/topic/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,OAAO,CAAC;AAExD,yEAAyE;AACzE,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6EAA6E;IAC7E,KAAK,EAAE,MAAM,CAAC;IACd,oEAAoE;IACpE,WAAW,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,WAAW,EAAE,MAAM,CAAC;IACpB,kDAAkD;IAClD,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,gBAAgB,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,WAAW,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,2EAA2E;IAC3E,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qEAAqE;AACrE,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,gBAAgB,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,UAAU,EAAE,MAAM,CAAC;IACnB,mEAAmE;IACnE,aAAa,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,yEAAyE;AACzE,MAAM,WAAW,WAAW;IAC1B,kBAAkB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/topic/types.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/errors.d.ts
CHANGED
|
@@ -58,6 +58,24 @@ export declare class OperationCancelledError extends PixivFlowError {
|
|
|
58
58
|
constructor(message: string, cause?: Error);
|
|
59
59
|
}
|
|
60
60
|
export declare function isOperationCancelled(error: unknown): error is OperationCancelledError;
|
|
61
|
+
/**
|
|
62
|
+
* Raise the app's cancellation error when `signal` has been aborted.
|
|
63
|
+
*
|
|
64
|
+
* Standard `signal.throwIfAborted()` rejects with a DOMException, which the
|
|
65
|
+
* scheduler does not recognise as a cooperative cancel (it would be recorded as
|
|
66
|
+
* a hard failure and lose the timeout accounting). Every loop that can outlive a
|
|
67
|
+
* scheduler timeout checks this instead, so a cancellation is observable on the
|
|
68
|
+
* same error channel as the rest of the download pipeline.
|
|
69
|
+
*/
|
|
70
|
+
export declare function throwIfAborted(signal?: AbortSignal, message?: string): void;
|
|
71
|
+
/**
|
|
72
|
+
* Re-raise an error that is a cancellation instead of swallowing it.
|
|
73
|
+
*
|
|
74
|
+
* Loops around network calls legitimately degrade on failure (`catch → []`), but
|
|
75
|
+
* swallowing a cancellation there would let a cancelled run keep working through
|
|
76
|
+
* the remaining tags. Returns normally only for genuine failures.
|
|
77
|
+
*/
|
|
78
|
+
export declare function rethrowIfCancelled(error: unknown, signal?: AbortSignal): void;
|
|
61
79
|
/**
|
|
62
80
|
* A special error-like class to signal a version request.
|
|
63
81
|
* This is used for early exit without a full error stack.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAEnE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,YAAY,CAgB9D;AAED,OAAO,EACL,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,GAClB,CAAC;AAEF,qBAAa,cAAe,SAAQ,KAAK;aAGrB,IAAI,EAAE,MAAM;aACZ,UAAU,CAAC,EAAE,MAAM;aACnB,KAAK,CAAC,EAAE,KAAK;gBAH7B,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,YAAA,EACnB,KAAK,CAAC,EAAE,KAAK,YAAA;CAShC;AAED,qBAAa,WAAY,SAAQ,cAAc;gBACjC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,qBAAa,mBAAoB,SAAQ,cAAc;gBACzC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,qBAAa,YAAa,SAAQ,cAAc;aAM5B,GAAG,CAAC,EAAE,MAAM;IAL9B,SAAgB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAGhC,OAAO,EAAE,MAAM,EACC,GAAG,CAAC,EAAE,MAAM,YAAA,EAC5B,KAAK,CAAC,EAAE,KAAK,EACb,QAAQ,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;CAO1D;AAED,qBAAa,aAAc,SAAQ,cAAc;aAG7B,MAAM,CAAC,EAAE,MAAM;aACf,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO;gBAFnD,OAAO,EAAE,MAAM,EACC,MAAM,CAAC,EAAE,MAAM,YAAA,EACf,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO,YAAA,EACnD,KAAK,CAAC,EAAE,KAAK;CAKhB;AAED;;;;GAIG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;gBAC1C,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,qBAAa,aAAc,SAAQ,cAAc;gBACnC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,cAAc;gBAC7C,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,uBAAuB,CAErF;AAED;;;GAGG;AACH,qBAAa,cAAe,SAAQ,KAAK;;CAKxC;AAED;;GAEG;AACH,qBAAa,WAAY,SAAQ,KAAK;aACR,OAAO,CAAC,EAAE,MAAM;gBAAhB,OAAO,CAAC,EAAE,MAAM,YAAA;CAI7C;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQlD;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAO/D;AAED,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAIlE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CA2BvD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAQtD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,CAmCA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAKhE;AAED;;GAEG;AACH,oBAAY,qBAAqB;IAC/B,IAAI,SAAS;IACb,cAAc,mBAAmB;IACjC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,qBAAqB,CAiB9E;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,CAAC,EAC/B,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAC1C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD,GACA,OAAO,CAAC,CAAC,CAAC,CAkCZ;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,IAChB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAC3B;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAErC,wBAAsB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAQ1E"}
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/errors.js
CHANGED
|
@@ -8,6 +8,8 @@ exports.ErrorRecoveryStrategy = exports.HelpRequest = exports.VersionRequest = e
|
|
|
8
8
|
exports.isPixivKitError = isPixivKitError;
|
|
9
9
|
exports.toNetworkError = toNetworkError;
|
|
10
10
|
exports.isOperationCancelled = isOperationCancelled;
|
|
11
|
+
exports.throwIfAborted = throwIfAborted;
|
|
12
|
+
exports.rethrowIfCancelled = rethrowIfCancelled;
|
|
11
13
|
exports.is404Error = is404Error;
|
|
12
14
|
exports.isRetryableNetworkError = isRetryableNetworkError;
|
|
13
15
|
exports.rateLimitWaitMs = rateLimitWaitMs;
|
|
@@ -135,6 +137,34 @@ exports.OperationCancelledError = OperationCancelledError;
|
|
|
135
137
|
function isOperationCancelled(error) {
|
|
136
138
|
return error instanceof OperationCancelledError;
|
|
137
139
|
}
|
|
140
|
+
/**
|
|
141
|
+
* Raise the app's cancellation error when `signal` has been aborted.
|
|
142
|
+
*
|
|
143
|
+
* Standard `signal.throwIfAborted()` rejects with a DOMException, which the
|
|
144
|
+
* scheduler does not recognise as a cooperative cancel (it would be recorded as
|
|
145
|
+
* a hard failure and lose the timeout accounting). Every loop that can outlive a
|
|
146
|
+
* scheduler timeout checks this instead, so a cancellation is observable on the
|
|
147
|
+
* same error channel as the rest of the download pipeline.
|
|
148
|
+
*/
|
|
149
|
+
function throwIfAborted(signal, message = 'operation cancelled') {
|
|
150
|
+
if (signal?.aborted) {
|
|
151
|
+
throw new OperationCancelledError(message);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* Re-raise an error that is a cancellation instead of swallowing it.
|
|
156
|
+
*
|
|
157
|
+
* Loops around network calls legitimately degrade on failure (`catch → []`), but
|
|
158
|
+
* swallowing a cancellation there would let a cancelled run keep working through
|
|
159
|
+
* the remaining tags. Returns normally only for genuine failures.
|
|
160
|
+
*/
|
|
161
|
+
function rethrowIfCancelled(error, signal) {
|
|
162
|
+
if (isOperationCancelled(error) || signal?.aborted || error?.name === 'AbortError') {
|
|
163
|
+
throw isOperationCancelled(error)
|
|
164
|
+
? error
|
|
165
|
+
: new OperationCancelledError(error instanceof Error ? error.message : 'operation cancelled');
|
|
166
|
+
}
|
|
167
|
+
}
|
|
138
168
|
/**
|
|
139
169
|
* A special error-like class to signal a version request.
|
|
140
170
|
* This is used for early exit without a full error stack.
|
package/dist/utils/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAYH,0CAEC;AAOD,wCAgBC;AAqGD,oDAEC;AA0BD,gCAQC;AASD,0DAOC;AAGD,0CAIC;AAKD,0CA2BC;AAKD,0CAQC;AAKD,oDAwCC;AAKD,sCAKC;AAeD,4DAiBC;AAKD,8BA0CC;AAMD,4BAQC;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/version.js
CHANGED
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BUILD = void 0;
|
|
4
4
|
// GENERATED by scripts/write-version.js — do not edit manually.
|
|
5
|
-
exports.BUILD = { version: '2.18.
|
|
5
|
+
exports.BUILD = { version: '2.18.1', commit: 'f40b8c467f17' };
|
|
6
6
|
//# sourceMappingURL=version.js.map
|
package/dist/webui/package.json
CHANGED
package/package.json
CHANGED