@delali/narsil 0.3.0 → 0.3.1-next.102
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/README.md +9 -8
- package/dist/adapters/filesystem.d.ts +1 -1
- package/dist/adapters/filesystem.mjs +1 -1
- package/dist/adapters/indexeddb.d.ts +1 -1
- package/dist/adapters/indexeddb.mjs +1 -1
- package/dist/adapters/memory.d.ts +1 -1
- package/dist/{adapters-79OIa4xm.d.ts → adapters-BQFQ4PRz.d.ts} +27 -1
- package/dist/browser/chunk-BDOSMEEP.mjs +493 -0
- package/dist/browser/chunk-EJDUFWSO.mjs +602 -0
- package/dist/browser/chunk-HOZW3PKP.mjs +9 -0
- package/dist/browser/chunk-JOVZ6HMT.mjs +4358 -0
- package/dist/browser/chunk-JPTQZWJQ.mjs +10 -0
- package/dist/browser/chunk-KPJMDPHG.mjs +24558 -0
- package/dist/browser/chunk-PGIM3HIM.mjs +2743 -0
- package/dist/browser/chunk-RHG4O77A.mjs +206 -0
- package/dist/browser/chunk-RIJSLY2I.mjs +360 -0
- package/dist/browser/durability-wiring-SRUYT3VV.mjs +3875 -0
- package/dist/browser/module-CBB2ETYP.mjs +3111 -0
- package/dist/browser/release-76MXRPGV.mjs +33 -0
- package/dist/browser/replace-RURXTGVG.mjs +57 -0
- package/dist/browser/restore-queue-EEZQO6RF.mjs +35 -0
- package/dist/browser/runtime-7ZAHCHWR.mjs +557 -0
- package/dist/browser/snapshot-OAAA5UJ7.mjs +1210 -0
- package/dist/browser/write-7D6VIK6O.mjs +208 -0
- package/dist/{capabilities-DSsOGz6F.d.ts → capabilities-ByQRMOx-.d.ts} +68 -7
- package/dist/chunk-2RIRGOUL.mjs +113 -0
- package/dist/chunk-37CD3OKS.mjs +87 -0
- package/dist/chunk-44W3CBNG.mjs +7 -0
- package/dist/chunk-46D6JQIG.mjs +426 -0
- package/dist/{chunk-VMRR3DQU.mjs → chunk-5JNA5SKS.mjs} +546 -35
- package/dist/chunk-747OHOUA.mjs +11 -0
- package/dist/chunk-75XIEF6H.mjs +126 -0
- package/dist/chunk-7X5JST5L.mjs +114 -0
- package/dist/chunk-BOFBLJFZ.mjs +209 -0
- package/dist/{chunk-USKFU7J5.mjs → chunk-BWJVNZPR.mjs} +8 -1
- package/dist/chunk-C7SLA6CM.mjs +19 -0
- package/dist/{chunk-POWOTUKJ.mjs → chunk-CQUMNIIG.mjs} +3 -6
- package/dist/chunk-CVXLLEQ3.mjs +1011 -0
- package/dist/chunk-DJHHF2L5.mjs +17 -0
- package/dist/chunk-E74YLAIG.mjs +24 -0
- package/dist/{chunk-UXNWQZST.mjs → chunk-EMRMGYRE.mjs} +236 -18
- package/dist/chunk-EWZLIYHV.mjs +57 -0
- package/dist/chunk-GBEEG5AN.mjs +35 -0
- package/dist/chunk-GES7U2PM.mjs +68 -0
- package/dist/chunk-HJSN7UYG.mjs +10 -0
- package/dist/chunk-HLPRHOSO.mjs +17 -0
- package/dist/chunk-HMFNFVP7.mjs +14 -0
- package/dist/chunk-J5QP52HA.mjs +1751 -0
- package/dist/{chunk-YNVIUGF5.mjs → chunk-JZVARCRZ.mjs} +3 -28
- package/dist/chunk-KOKM4PQN.mjs +52 -0
- package/dist/{chunk-B2TFROFX.mjs → chunk-KWTW6VTG.mjs} +465 -250
- package/dist/chunk-KZ3NX2P7.mjs +21 -0
- package/dist/chunk-L5ORED7V.mjs +25 -0
- package/dist/{chunk-THYRHHO2.mjs → chunk-LGAMKHA2.mjs} +2009 -2351
- package/dist/chunk-LKOB5COA.mjs +117 -0
- package/dist/chunk-LPQOEU5M.mjs +96 -0
- package/dist/{chunk-3LHGNRYE.mjs → chunk-LXWDQLTW.mjs} +7 -2
- package/dist/{chunk-L6TNPLAR.mjs → chunk-OEYI3KRB.mjs} +270 -108
- package/dist/chunk-OM362BRO.mjs +948 -0
- package/dist/chunk-OZDFA4WC.mjs +67 -0
- package/dist/chunk-P36MUFEJ.mjs +10 -0
- package/dist/chunk-PC2G76VW.mjs +2540 -0
- package/dist/{chunk-GCM3JFVA.mjs → chunk-PNEYIHA4.mjs} +11 -2
- package/dist/chunk-PNFKUCG3.mjs +1130 -0
- package/dist/chunk-Q6XWVUZX.mjs +44 -0
- package/dist/chunk-R27EMH5M.mjs +617 -0
- package/dist/{chunk-YMZCMH5M.mjs → chunk-R6A773WK.mjs} +19 -24
- package/dist/chunk-RF7PLG43.mjs +106 -0
- package/dist/chunk-RFBLQLLZ.mjs +16 -0
- package/dist/{chunk-Y3L5MDRV.mjs → chunk-RFVUDM5E.mjs} +17 -2
- package/dist/chunk-S7FL6UAH.mjs +521 -0
- package/dist/chunk-S7GNDRPS.mjs +651 -0
- package/dist/chunk-SP3NM3ZG.mjs +3537 -0
- package/dist/chunk-U476IXKQ.mjs +10 -0
- package/dist/chunk-UA3AUGNV.mjs +462 -0
- package/dist/chunk-UTG5YNXV.mjs +507 -0
- package/dist/chunk-VI4R6W25.mjs +8484 -0
- package/dist/chunk-WQBCBKY3.mjs +8 -0
- package/dist/{chunk-24RXHMEL.mjs → chunk-WVCOCKBU.mjs} +3794 -7570
- package/dist/chunk-X5CV2E2B.mjs +1 -0
- package/dist/chunk-XADZPPZI.mjs +614 -0
- package/dist/chunk-YEEQHT4V.mjs +212 -0
- package/dist/chunk-YTJCGKM4.mjs +56 -0
- package/dist/chunk-YYQIODMF.mjs +275 -0
- package/dist/chunk-ZI34TVOA.mjs +144 -0
- package/dist/{chunk-OOSIDHA3.mjs → chunk-ZKWYWW4Y.mjs} +1 -1
- package/dist/chunk-ZM7KU4YW.mjs +35 -0
- package/dist/{client-BQK6Tf6A.d.ts → client-BOStAkc5.d.ts} +160 -37
- package/dist/client.d.ts +11 -10
- package/dist/client.mjs +209 -45
- package/dist/{config-DmXULPa-.d.ts → config-Cjvzbs_j.d.ts} +51 -3
- package/dist/config-H6SGzbPH.d.ts +421 -0
- package/dist/direct-executor-ZD64PPEZ.mjs +24 -0
- package/dist/distribution/coordinator/etcd.d.ts +79 -18
- package/dist/distribution/coordinator/etcd.mjs +553 -109
- package/dist/distribution/coordinator/in-memory.d.ts +4 -3
- package/dist/distribution/coordinator/in-memory.mjs +22 -3
- package/dist/distribution/transport/grpc.d.ts +2 -2
- package/dist/distribution/transport/grpc.mjs +79 -14
- package/dist/distribution/transport/in-memory.d.ts +2 -2
- package/dist/distribution/transport/in-memory.mjs +12 -7
- package/dist/distribution/transport/tcp.d.ts +2 -2
- package/dist/distribution/transport/tcp.mjs +50 -28
- package/dist/distribution.d.ts +144 -23
- package/dist/distribution.mjs +14479 -8173
- package/dist/durability-wiring-FEUBR5BT.mjs +3330 -0
- package/dist/embeddings/openai.d.ts +2 -2
- package/dist/embeddings/openai.mjs +22 -133
- package/dist/{engine-CIOyFozK.d.ts → engine-rC0vjjY-.d.ts} +165 -141
- package/dist/{memory-yFaVn2xZ.d.ts → events-DqOIg5xa.d.ts} +645 -136
- package/dist/{types-DAK7mnUZ.d.ts → index-Bkdt8nDw.d.ts} +182 -45
- package/dist/index.browser.mjs +4 -32180
- package/dist/index.d.ts +91 -20
- package/dist/index.mjs +33 -16
- package/dist/invalidation/broadcast-channel.d.ts +1 -1
- package/dist/invalidation/filesystem.d.ts +1 -1
- package/dist/invalidation/filesystem.mjs +2 -1
- package/dist/invalidation/noop.d.ts +1 -1
- package/dist/module-3S65MVCM.mjs +2151 -0
- package/dist/partial-words-DTIHO8G4.d.ts +19 -0
- package/dist/partial-words.d.ts +22 -0
- package/dist/partial-words.mjs +17 -0
- package/dist/pattern-Cledccbl.d.ts +18 -0
- package/dist/pattern.d.ts +22 -0
- package/dist/pattern.mjs +12 -0
- package/dist/persistence/durability/checkpoint-worker.d.ts +119 -72
- package/dist/persistence/durability/checkpoint-worker.mjs +51 -18
- package/dist/react.d.ts +279 -183
- package/dist/react.mjs +201 -48
- package/dist/release-BH3DKW3T.mjs +33 -0
- package/dist/replace-CEO5KJJ3.mjs +57 -0
- package/dist/rerank-K7C4WZFG.mjs +60 -0
- package/dist/rerankers/http.d.ts +50 -0
- package/dist/rerankers/http.mjs +104 -0
- package/dist/restore-queue-KQHA7ZV2.mjs +35 -0
- package/dist/runtime-6Y4ZYXOG.mjs +177 -0
- package/dist/{schema-d5Afu03A.d.ts → schema-4W_7tk1f.d.ts} +81 -11
- package/dist/server.d.ts +13 -12
- package/dist/server.mjs +611 -80
- package/dist/snapshot-QGZPODM5.mjs +799 -0
- package/dist/synonyms-CpOAHPa-.d.ts +52 -0
- package/dist/synonyms.d.ts +22 -0
- package/dist/synonyms.mjs +12 -0
- package/dist/{tasks-CH2Dod8w.d.ts → tasks-CwPTz-tP.d.ts} +10 -3
- package/dist/thread-N3IUGUS3.mjs +697 -0
- package/dist/{types-BQDlIvfS.d.ts → types-2qoitTXg.d.ts} +1 -1
- package/dist/{types-D5OwhtsQ.d.ts → types-Cz5okLml.d.ts} +2 -2
- package/dist/vector/search-worker.d.ts +46 -4
- package/dist/vector/search-worker.mjs +21 -11
- package/dist/workers/entry.mjs +9 -6
- package/dist/write-U5RI7MAX.mjs +241 -0
- package/package.json +55 -9
- package/dist/chunk-3L4U6EJQ.mjs +0 -49
- package/dist/chunk-IFBKLBGB.mjs +0 -7
- package/dist/chunk-ORBLD3EL.mjs +0 -6
- package/dist/chunk-U7KYW4BA.mjs +0 -135
- package/dist/chunk-ZJ4CSAB2.mjs +0 -13
- package/dist/chunk-ZNZBXMP5.mjs +0 -2117
- package/dist/chunk-ZZT3EAUC.mjs +0 -11168
- package/dist/config-BhldZgaK.d.ts +0 -194
- package/dist/direct-executor-ALAVE7FC.mjs +0 -12
- package/dist/serialization/crc32-worker.d.ts +0 -20
- package/dist/serialization/crc32-worker.mjs +0 -62
- package/dist/simd-DW5AtJ6B.d.ts +0 -41
- package/dist/thread-DYHEQRVY.mjs +0 -402
package/dist/server.mjs
CHANGED
|
@@ -1,18 +1,38 @@
|
|
|
1
|
-
import { DEFAULT_MAX_RETAINED_TASKS, loadUWebSockets, resolveCors, authorizerFor, createSharedGateBuffer, gateSlotOfWorker, createRouteRunner, corsHeaderReader,
|
|
2
|
-
export { ASYNC_IMPORT_CAPABILITY, INDEX_LIFECYCLE_CAPABILITY, REBUILD_ANALYSIS_CAPABILITY, SERVER_CAPABILITIES, TASK_CANCEL_CAPABILITY, TASK_FILTER_CAPABILITY, httpStatusForNarsilError } from './chunk-
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import { DEFAULT_MAX_RETAINED_TASKS, loadUWebSockets, resolveCors, authorizerFor, createSharedGateBuffer, gateSlotOfWorker, createBodyBudgetBuffer, createRouteRunner, corsHeaderReader, createSharedBodyBudget, MAIN_THREAD_GATE_SLOT, createSharedRequestGate, registerServerRoutes, DEFAULT_MAX_CONCURRENT_TASKS, DEFAULT_MAX_TASK_PAGE_SIZE, DEFAULT_MAX_IMPORT_ERRORS, DEFAULT_MAX_FETCH_DOCUMENTS, DEFAULT_MAX_RESULT_WINDOW, DEFAULT_MAX_CONCURRENT_REQUESTS, DEFAULT_IMPORT_BATCH_SIZE, DEFAULT_MAX_LINE_BYTES, DEFAULT_MAX_RESTORE_BYTES, DEFAULT_MAX_IMPORT_BYTES, DEFAULT_MAX_BODY_BYTES, DEFAULT_MAX_RERANK_WINDOW, DEFAULT_MAX_BODY_BYTES_IN_FLIGHT_FRACTION, RUNNING_TASK_TTL_MS, DEFAULT_TASK_PAGE_SIZE, TERMINAL_TASK_TTL_MS, TASK_PROGRESS_WRITE_INTERVAL_MS, serializeNarsilError, createVersionHandler, acceptorOf, MAX_BODY_BYTES_IN_FLIGHT_FRACTION, createDocumentReadHandlers, sendError, respondError, respondJson, sendText, MAX_INDEX_TOUCH_INTERVAL_MS, INDEX_TOUCH_INTERVALS_PER_IDLE_TIMEOUT, clearGateSlot, clearBodyBudgetSlot, createDepartureWord, departureConfirmed, parseJson, validateCreateIndex, rejectInvalid, validateBatch, serializeBatchResult, parseWriteJson, validateDocumentBody, validateSuggest, validateQuery, refuseRegex, withServerRerankWindow, parseTaskListQuery, parseJsonOptional, validateRebalance, badRequest, sendStream, SNAPSHOT_ARCHIVE_CONTENT_TYPE, DOCUMENT_EXPORT_CONTENT_TYPE, parseRefusalOf, IMPORT_FLUSHES_IN_FLIGHT, confirmDeparture, closingQuoteOf, SERVER_CAPABILITIES, toHttpError, RELAY_STREAM_CHUNKS_IN_FLIGHT, MIN_UNBOUNDED_SERVER_LIMIT, MIN_COUNTED_SERVER_LIMIT } from './chunk-5JNA5SKS.mjs';
|
|
2
|
+
export { ASYNC_IMPORT_CAPABILITY, DOCUMENT_EXPORT_CAPABILITY, INDEX_LIFECYCLE_CAPABILITY, REBUILD_ANALYSIS_CAPABILITY, SERVER_CAPABILITIES, SYNONYMS_CAPABILITY, TASK_CANCEL_CAPABILITY, TASK_FILTER_CAPABILITY, httpStatusForNarsilError } from './chunk-5JNA5SKS.mjs';
|
|
3
|
+
import { rerankOnHost } from './chunk-2RIRGOUL.mjs';
|
|
4
|
+
import { writeBlockLookupOf, indexReadsOf, isRecord, validateIndexName } from './chunk-S7FL6UAH.mjs';
|
|
5
|
+
import { readMemoryFigures } from './chunk-BOFBLJFZ.mjs';
|
|
6
|
+
import './chunk-DJHHF2L5.mjs';
|
|
7
|
+
import './chunk-P36MUFEJ.mjs';
|
|
8
|
+
import { rerankWindowCapOf, engineCoreOf, providedDocId, resolveVectorText } from './chunk-EMRMGYRE.mjs';
|
|
5
9
|
import { detectRuntime } from './chunk-AV4IJKD2.mjs';
|
|
6
|
-
import './chunk-
|
|
7
|
-
import './chunk-
|
|
8
|
-
import './chunk-
|
|
9
|
-
import
|
|
10
|
-
import
|
|
11
|
-
|
|
10
|
+
import './chunk-ZM7KU4YW.mjs';
|
|
11
|
+
import './chunk-LPQOEU5M.mjs';
|
|
12
|
+
import { MAX_RERANK_WINDOW } from './chunk-HJSN7UYG.mjs';
|
|
13
|
+
import './chunk-LXWDQLTW.mjs';
|
|
14
|
+
import './chunk-TGP5M5R7.mjs';
|
|
15
|
+
import './chunk-U2BKYEC7.mjs';
|
|
16
|
+
import './chunk-JZVARCRZ.mjs';
|
|
17
|
+
import './chunk-WQBCBKY3.mjs';
|
|
18
|
+
import './chunk-OEYI3KRB.mjs';
|
|
19
|
+
import './chunk-U476IXKQ.mjs';
|
|
20
|
+
import './chunk-E74YLAIG.mjs';
|
|
21
|
+
import './chunk-HMFNFVP7.mjs';
|
|
22
|
+
import './chunk-LKOB5COA.mjs';
|
|
23
|
+
import './chunk-7X5JST5L.mjs';
|
|
24
|
+
import './chunk-R6A773WK.mjs';
|
|
25
|
+
import './chunk-YTJCGKM4.mjs';
|
|
26
|
+
import { startIdleHeapCleanup } from './chunk-RFVUDM5E.mjs';
|
|
27
|
+
import './chunk-L5ORED7V.mjs';
|
|
28
|
+
import { NarsilError, ErrorCodes, ServerErrorCodes, isNarsilError } from './chunk-BWJVNZPR.mjs';
|
|
29
|
+
export { ClientErrorCodes, ErrorCodes, NarsilError, ServerErrorCodes, isNarsilError } from './chunk-BWJVNZPR.mjs';
|
|
12
30
|
import { randomUUID } from 'crypto';
|
|
31
|
+
import { createReadStream } from 'fs';
|
|
32
|
+
import { rm } from 'fs/promises';
|
|
33
|
+
import path from 'path';
|
|
13
34
|
import { MessageChannel } from 'worker_threads';
|
|
14
35
|
|
|
15
|
-
// src/server/handlers/admin.ts
|
|
16
36
|
function createAdminHandlers(deps) {
|
|
17
37
|
const { engine, tasks, limits } = deps;
|
|
18
38
|
async function checkpoint(ctx) {
|
|
@@ -25,9 +45,12 @@ function createAdminHandlers(deps) {
|
|
|
25
45
|
}
|
|
26
46
|
async function snapshot(ctx) {
|
|
27
47
|
try {
|
|
28
|
-
const
|
|
29
|
-
if (ctx.abort.aborted)
|
|
30
|
-
|
|
48
|
+
const archive = await engine.snapshot(ctx.params[0]);
|
|
49
|
+
if (ctx.abort.aborted) {
|
|
50
|
+
await archive.cancel();
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
await sendStream(ctx.res, ctx.abort, archive, [["Content-Type", SNAPSHOT_ARCHIVE_CONTENT_TYPE]]);
|
|
31
54
|
} catch (err) {
|
|
32
55
|
respondError(ctx, err);
|
|
33
56
|
}
|
|
@@ -59,6 +82,27 @@ function createAdminHandlers(deps) {
|
|
|
59
82
|
respondError(ctx, err);
|
|
60
83
|
}
|
|
61
84
|
}
|
|
85
|
+
async function readSynonyms(ctx) {
|
|
86
|
+
try {
|
|
87
|
+
respondJson(ctx, { synonyms: await engine.getSynonyms(ctx.params[0]) });
|
|
88
|
+
} catch (err) {
|
|
89
|
+
respondError(ctx, err);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
async function replaceSynonyms(ctx) {
|
|
93
|
+
const body = parseJson(ctx);
|
|
94
|
+
if (body === void 0) return;
|
|
95
|
+
if (body === null || typeof body !== "object" || Array.isArray(body) || !Object.hasOwn(body, "synonyms")) {
|
|
96
|
+
if (!ctx.abort.aborted) badRequest(ctx.res, 'Send the synonym set as { "synonyms": [ ...rules ] }');
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
try {
|
|
100
|
+
await engine.updateSynonyms(ctx.params[0], Reflect.get(body, "synonyms"));
|
|
101
|
+
respondJson(ctx, { ok: true });
|
|
102
|
+
} catch (err) {
|
|
103
|
+
respondError(ctx, err);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
62
106
|
async function memory(ctx) {
|
|
63
107
|
try {
|
|
64
108
|
const stats = await engine.getMemoryStats();
|
|
@@ -68,15 +112,15 @@ function createAdminHandlers(deps) {
|
|
|
68
112
|
respondError(ctx, err);
|
|
69
113
|
}
|
|
70
114
|
}
|
|
71
|
-
function requireIndexExists(name) {
|
|
72
|
-
engine.getStats(name);
|
|
115
|
+
async function requireIndexExists(name) {
|
|
116
|
+
await indexReadsOf(engine).getStats(name);
|
|
73
117
|
}
|
|
74
118
|
async function optimize(ctx) {
|
|
75
119
|
const body = parseJsonOptional(ctx);
|
|
76
120
|
if (!body) return;
|
|
77
121
|
const name = ctx.params[0];
|
|
78
122
|
try {
|
|
79
|
-
requireIndexExists(name);
|
|
123
|
+
await requireIndexExists(name);
|
|
80
124
|
} catch (err) {
|
|
81
125
|
respondError(ctx, err);
|
|
82
126
|
return;
|
|
@@ -87,7 +131,7 @@ function createAdminHandlers(deps) {
|
|
|
87
131
|
async function rebuildAnalysis(ctx) {
|
|
88
132
|
const name = ctx.params[0];
|
|
89
133
|
try {
|
|
90
|
-
requireIndexExists(name);
|
|
134
|
+
await requireIndexExists(name);
|
|
91
135
|
} catch (err) {
|
|
92
136
|
respondError(ctx, err);
|
|
93
137
|
return;
|
|
@@ -106,7 +150,7 @@ function createAdminHandlers(deps) {
|
|
|
106
150
|
const target = body.targetPartitionCount;
|
|
107
151
|
const name = ctx.params[0];
|
|
108
152
|
try {
|
|
109
|
-
requireIndexExists(name);
|
|
153
|
+
await requireIndexExists(name);
|
|
110
154
|
} catch (err) {
|
|
111
155
|
respondError(ctx, err);
|
|
112
156
|
return;
|
|
@@ -115,15 +159,26 @@ function createAdminHandlers(deps) {
|
|
|
115
159
|
respondJson(ctx, record, 202);
|
|
116
160
|
}
|
|
117
161
|
async function restore(ctx) {
|
|
118
|
-
const
|
|
119
|
-
if (
|
|
162
|
+
const spooled = ctx.spooledBody;
|
|
163
|
+
if (spooled === null || spooled.bytes === 0) {
|
|
164
|
+
await spooled?.remove();
|
|
120
165
|
sendError(ctx.res, 400, ServerErrorCodes.EMPTY_BODY, "Request body is empty");
|
|
121
166
|
return;
|
|
122
167
|
}
|
|
123
168
|
const name = ctx.params[0];
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
169
|
+
try {
|
|
170
|
+
const record = await tasks.start("restore", name, async () => {
|
|
171
|
+
try {
|
|
172
|
+
await engine.restore(name, createReadStream(spooled.path));
|
|
173
|
+
} finally {
|
|
174
|
+
await spooled.remove();
|
|
175
|
+
}
|
|
176
|
+
});
|
|
177
|
+
respondJson(ctx, record, 202);
|
|
178
|
+
} catch (err) {
|
|
179
|
+
await spooled.remove();
|
|
180
|
+
respondError(ctx, err);
|
|
181
|
+
}
|
|
127
182
|
}
|
|
128
183
|
async function getTask(ctx) {
|
|
129
184
|
const record = await tasks.get(ctx.params[0]);
|
|
@@ -176,6 +231,8 @@ function createAdminHandlers(deps) {
|
|
|
176
231
|
vectorMaintenance,
|
|
177
232
|
compact,
|
|
178
233
|
partitionConfig,
|
|
234
|
+
readSynonyms,
|
|
235
|
+
replaceSynonyms,
|
|
179
236
|
memory,
|
|
180
237
|
optimize,
|
|
181
238
|
rebalance,
|
|
@@ -225,7 +282,12 @@ function createClusterHandlers(deps) {
|
|
|
225
282
|
respondJson(ctx, {
|
|
226
283
|
node: describeNode(cluster),
|
|
227
284
|
controllerNodeId,
|
|
228
|
-
nodes: nodes.map((node) => ({
|
|
285
|
+
nodes: nodes.map((node) => ({
|
|
286
|
+
nodeId: node.nodeId,
|
|
287
|
+
address: node.address,
|
|
288
|
+
roles: [...node.roles],
|
|
289
|
+
memory: node.memory ?? null
|
|
290
|
+
}))
|
|
229
291
|
});
|
|
230
292
|
} catch (err) {
|
|
231
293
|
respondError(ctx, err);
|
|
@@ -265,15 +327,149 @@ function createClusterHandlers(deps) {
|
|
|
265
327
|
respondError(ctx, err);
|
|
266
328
|
}
|
|
267
329
|
}
|
|
268
|
-
|
|
330
|
+
async function replicationFactor(ctx) {
|
|
331
|
+
try {
|
|
332
|
+
const cluster = requireCluster(deps);
|
|
333
|
+
const indexName = ctx.params[0] ?? "";
|
|
334
|
+
const malformed = malformedIndexName(indexName);
|
|
335
|
+
if (malformed !== null) {
|
|
336
|
+
badRequest(ctx.res, malformed, { indexName });
|
|
337
|
+
return;
|
|
338
|
+
}
|
|
339
|
+
const body = parseJson(ctx);
|
|
340
|
+
if (body === void 0) return;
|
|
341
|
+
const factor = isRecord(body) ? body.replicationFactor : void 0;
|
|
342
|
+
if (typeof factor !== "number") {
|
|
343
|
+
badRequest(ctx.res, "The body must carry a numeric replicationFactor", { indexName });
|
|
344
|
+
return;
|
|
345
|
+
}
|
|
346
|
+
await cluster.setReplicationFactor(indexName, factor);
|
|
347
|
+
respondJson(ctx, { indexName, replicationFactor: factor });
|
|
348
|
+
} catch (err) {
|
|
349
|
+
respondError(ctx, err);
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
async function health(ctx) {
|
|
353
|
+
try {
|
|
354
|
+
respondJson(ctx, await requireCluster(deps).getHealth());
|
|
355
|
+
} catch (err) {
|
|
356
|
+
respondError(ctx, err);
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
return { topology, allocation, replicationFactor, health };
|
|
360
|
+
}
|
|
361
|
+
function importResultOf(result, maxErrors) {
|
|
362
|
+
const errors = result.refused.slice(0, maxErrors);
|
|
363
|
+
return {
|
|
364
|
+
indexed: result.imported,
|
|
365
|
+
failed: result.refusedCount,
|
|
366
|
+
errors,
|
|
367
|
+
errorsTruncated: result.refusedCount > errors.length
|
|
368
|
+
};
|
|
369
|
+
}
|
|
370
|
+
function createDocumentExportHandlers(deps) {
|
|
371
|
+
const { engine, tasks, limits } = deps;
|
|
372
|
+
async function exportDocuments(ctx) {
|
|
373
|
+
try {
|
|
374
|
+
const lines = await engine.exportDocuments(ctx.params[0]);
|
|
375
|
+
if (ctx.abort.aborted) {
|
|
376
|
+
await lines.cancel();
|
|
377
|
+
return;
|
|
378
|
+
}
|
|
379
|
+
await sendStream(ctx.res, ctx.abort, lines, [["Content-Type", DOCUMENT_EXPORT_CONTENT_TYPE]]);
|
|
380
|
+
} catch (err) {
|
|
381
|
+
respondError(ctx, err);
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
async function importExport(ctx) {
|
|
385
|
+
const spooled = ctx.spooledBody;
|
|
386
|
+
if (spooled === null || spooled.bytes === 0) {
|
|
387
|
+
await spooled?.remove();
|
|
388
|
+
sendError(ctx.res, 400, ServerErrorCodes.EMPTY_BODY, "Request body is empty");
|
|
389
|
+
return;
|
|
390
|
+
}
|
|
391
|
+
const name = ctx.params[0];
|
|
392
|
+
try {
|
|
393
|
+
const record = await tasks.start("importExport", name, async (context) => {
|
|
394
|
+
try {
|
|
395
|
+
const result = await engine.importDocumentExport(name, createReadStream(spooled.path));
|
|
396
|
+
context.reportResult(importResultOf(result, limits.maxImportErrors));
|
|
397
|
+
} finally {
|
|
398
|
+
await spooled.remove();
|
|
399
|
+
}
|
|
400
|
+
});
|
|
401
|
+
respondJson(ctx, record, 202);
|
|
402
|
+
} catch (err) {
|
|
403
|
+
await spooled.remove();
|
|
404
|
+
respondError(ctx, err);
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
return { exportDocuments, importExport };
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
// src/server/batch-scan.ts
|
|
411
|
+
var QUOTE = 34;
|
|
412
|
+
var BACKSLASH = 92;
|
|
413
|
+
var OPEN_OBJECT = 123;
|
|
414
|
+
var CLOSE_OBJECT = 125;
|
|
415
|
+
var OPEN_ARRAY = 91;
|
|
416
|
+
var CLOSE_ARRAY = 93;
|
|
417
|
+
var COLON = 58;
|
|
418
|
+
var REMOVE_BATCH_KEYS = /* @__PURE__ */ new Set(["action", "docIds", "options"]);
|
|
419
|
+
var REMOVE_ACTION = "delete";
|
|
420
|
+
function isWhitespace(byte) {
|
|
421
|
+
return byte === 32 || byte === 9 || byte === 10 || byte === 13;
|
|
422
|
+
}
|
|
423
|
+
function nextByteAt(raw, from) {
|
|
424
|
+
let at = from;
|
|
425
|
+
while (at < raw.length && isWhitespace(raw[at])) at++;
|
|
426
|
+
return at;
|
|
427
|
+
}
|
|
428
|
+
function plainStringOf(raw, open, close) {
|
|
429
|
+
const content = raw.subarray(open + 1, close);
|
|
430
|
+
if (content.includes(BACKSLASH)) return null;
|
|
431
|
+
return new TextDecoder().decode(content);
|
|
432
|
+
}
|
|
433
|
+
function isRemoveOnlyBatch(raw) {
|
|
434
|
+
const start = nextByteAt(raw, 0);
|
|
435
|
+
if (raw[start] !== OPEN_OBJECT) return false;
|
|
436
|
+
let depth = 0;
|
|
437
|
+
let action = null;
|
|
438
|
+
for (let at = start; at < raw.length; at++) {
|
|
439
|
+
const byte = raw[at];
|
|
440
|
+
if (byte === OPEN_OBJECT || byte === OPEN_ARRAY) depth++;
|
|
441
|
+
else if (byte === CLOSE_OBJECT || byte === CLOSE_ARRAY) depth--;
|
|
442
|
+
else if (byte === QUOTE) {
|
|
443
|
+
const close = closingQuoteOf(raw, at + 1);
|
|
444
|
+
if (close >= raw.length) return false;
|
|
445
|
+
const afterString = nextByteAt(raw, close + 1);
|
|
446
|
+
if (depth === 1 && raw[afterString] === COLON) {
|
|
447
|
+
const key = plainStringOf(raw, at, close);
|
|
448
|
+
if (key === null || !REMOVE_BATCH_KEYS.has(key)) return false;
|
|
449
|
+
if (key === "action") {
|
|
450
|
+
const value = nextByteAt(raw, afterString + 1);
|
|
451
|
+
const valueClose = raw[value] === QUOTE ? closingQuoteOf(raw, value + 1) : raw.length;
|
|
452
|
+
action = valueClose < raw.length ? plainStringOf(raw, value, valueClose) : null;
|
|
453
|
+
if (action === null) return false;
|
|
454
|
+
at = valueClose;
|
|
455
|
+
continue;
|
|
456
|
+
}
|
|
457
|
+
at = afterString;
|
|
458
|
+
continue;
|
|
459
|
+
}
|
|
460
|
+
at = close;
|
|
461
|
+
}
|
|
462
|
+
}
|
|
463
|
+
return action === REMOVE_ACTION;
|
|
269
464
|
}
|
|
270
465
|
|
|
271
466
|
// src/server/handlers/documents.ts
|
|
272
467
|
function createDocumentHandlers(deps) {
|
|
273
468
|
const { engine } = deps;
|
|
469
|
+
const writeBlock = writeBlockLookupOf(engine);
|
|
274
470
|
const reads = createDocumentReadHandlers(deps);
|
|
275
471
|
async function insert(ctx) {
|
|
276
|
-
const body =
|
|
472
|
+
const body = await parseWriteJson(ctx, writeBlock);
|
|
277
473
|
if (!body) return;
|
|
278
474
|
const failure = validateDocumentBody(body);
|
|
279
475
|
if (failure) {
|
|
@@ -288,7 +484,7 @@ function createDocumentHandlers(deps) {
|
|
|
288
484
|
}
|
|
289
485
|
}
|
|
290
486
|
async function put(ctx) {
|
|
291
|
-
const body =
|
|
487
|
+
const body = await parseWriteJson(ctx, writeBlock);
|
|
292
488
|
if (!body) return;
|
|
293
489
|
const failure = validateDocumentBody(body);
|
|
294
490
|
if (failure) {
|
|
@@ -309,7 +505,7 @@ function createDocumentHandlers(deps) {
|
|
|
309
505
|
}
|
|
310
506
|
}
|
|
311
507
|
async function patch(ctx) {
|
|
312
|
-
const body =
|
|
508
|
+
const body = await parseWriteJson(ctx, writeBlock);
|
|
313
509
|
if (!body) return;
|
|
314
510
|
const failure = validateDocumentBody(body);
|
|
315
511
|
if (failure) {
|
|
@@ -340,7 +536,7 @@ function createDocumentHandlers(deps) {
|
|
|
340
536
|
}
|
|
341
537
|
}
|
|
342
538
|
async function batch(ctx) {
|
|
343
|
-
const body = parseJson(ctx);
|
|
539
|
+
const body = parseJson(ctx, ctx.rawBody && isRemoveOnlyBatch(ctx.rawBody) ? "read" : "write");
|
|
344
540
|
if (!body) return;
|
|
345
541
|
const failure = validateBatch(body);
|
|
346
542
|
if (failure) {
|
|
@@ -421,7 +617,7 @@ function* iterateNdjson(buffer, maxLineBytes) {
|
|
|
421
617
|
if (contentEnd > start && buffer[contentEnd - 1] === CARRIAGE_RETURN) contentEnd--;
|
|
422
618
|
if (contentEnd > start) {
|
|
423
619
|
lineNumber++;
|
|
424
|
-
yield { lineNumber,
|
|
620
|
+
yield { lineNumber, bytes: buffer.subarray(start, contentEnd), bytesConsumed: Math.min(end + 1, length) };
|
|
425
621
|
}
|
|
426
622
|
start = end + 1;
|
|
427
623
|
}
|
|
@@ -437,6 +633,7 @@ function isPlainObject(value) {
|
|
|
437
633
|
async function runImport(engine, options) {
|
|
438
634
|
const { indexName, body, maxLineBytes, batchSize, maxErrors, signal, onProgress } = options;
|
|
439
635
|
const bytesTotal = body.length;
|
|
636
|
+
const writeBlock = writeBlockLookupOf(engine);
|
|
440
637
|
const errors = [];
|
|
441
638
|
let indexed = 0;
|
|
442
639
|
let failed = 0;
|
|
@@ -451,7 +648,12 @@ async function runImport(engine, options) {
|
|
|
451
648
|
indexed += result.succeeded.length;
|
|
452
649
|
for (const failure of result.failed) {
|
|
453
650
|
const serialized = failure.error instanceof NarsilError ? serializeNarsilError(failure.error) : { code: ServerErrorCodes.INTERNAL_ERROR, message: String(failure.error) };
|
|
454
|
-
recordFailure({
|
|
651
|
+
recordFailure({
|
|
652
|
+
docId: failure.docId,
|
|
653
|
+
code: serialized.code,
|
|
654
|
+
message: serialized.message,
|
|
655
|
+
...serialized.details === void 0 ? {} : { details: serialized.details }
|
|
656
|
+
});
|
|
455
657
|
}
|
|
456
658
|
};
|
|
457
659
|
const inFlight = /* @__PURE__ */ new Set();
|
|
@@ -477,9 +679,17 @@ async function runImport(engine, options) {
|
|
|
477
679
|
try {
|
|
478
680
|
for (const line of iterateNdjson(body, maxLineBytes)) {
|
|
479
681
|
bytesProcessed = line.bytesConsumed;
|
|
682
|
+
const refusal = parseRefusalOf(line.bytes);
|
|
683
|
+
if (refusal !== null) {
|
|
684
|
+
const block = refusal.status === 429 && writeBlock !== void 0 ? await writeBlock(indexName).catch(() => null) : null;
|
|
685
|
+
recordFailure(
|
|
686
|
+
block === null ? { line: line.lineNumber, code: refusal.code, message: refusal.message, details: refusal.details } : { line: line.lineNumber, ...serializeNarsilError(block) }
|
|
687
|
+
);
|
|
688
|
+
continue;
|
|
689
|
+
}
|
|
480
690
|
let parsed;
|
|
481
691
|
try {
|
|
482
|
-
parsed = JSON.parse(line.
|
|
692
|
+
parsed = JSON.parse(line.bytes.toString("utf8"));
|
|
483
693
|
} catch {
|
|
484
694
|
recordFailure({ line: line.lineNumber, code: ServerErrorCodes.INVALID_JSON, message: "Line is not valid JSON" });
|
|
485
695
|
continue;
|
|
@@ -594,6 +804,8 @@ function mapHttpIndexConfig(http) {
|
|
|
594
804
|
if (http.vectorPromotion !== void 0) config.vectorPromotion = http.vectorPromotion;
|
|
595
805
|
if (http.strict !== void 0) config.strict = http.strict;
|
|
596
806
|
if (http.required !== void 0) config.required = http.required;
|
|
807
|
+
if (http.patternValueLimit !== void 0) config.patternValueLimit = http.patternValueLimit;
|
|
808
|
+
if (http.synonyms !== void 0) config.synonyms = http.synonyms;
|
|
597
809
|
if (http.stopWords !== void 0) {
|
|
598
810
|
if (!Array.isArray(http.stopWords) || http.stopWords.some((w) => typeof w !== "string")) {
|
|
599
811
|
throw new NarsilError(ErrorCodes.CONFIG_INVALID, 'Field "stopWords" must be an array of strings');
|
|
@@ -644,9 +856,9 @@ function createIndexHandlers(deps) {
|
|
|
644
856
|
respondError(ctx, err);
|
|
645
857
|
}
|
|
646
858
|
}
|
|
647
|
-
function list(ctx) {
|
|
859
|
+
async function list(ctx) {
|
|
648
860
|
try {
|
|
649
|
-
respondJson(ctx, { indexes: engine.listIndexes() });
|
|
861
|
+
respondJson(ctx, { indexes: await indexReadsOf(engine).listIndexes() });
|
|
650
862
|
} catch (err) {
|
|
651
863
|
respondError(ctx, err);
|
|
652
864
|
}
|
|
@@ -659,16 +871,16 @@ function createIndexHandlers(deps) {
|
|
|
659
871
|
respondError(ctx, err);
|
|
660
872
|
}
|
|
661
873
|
}
|
|
662
|
-
function stats(ctx) {
|
|
874
|
+
async function stats(ctx) {
|
|
663
875
|
try {
|
|
664
|
-
respondJson(ctx, engine.getStats(ctx.params[0]));
|
|
876
|
+
respondJson(ctx, await indexReadsOf(engine).getStats(ctx.params[0]));
|
|
665
877
|
} catch (err) {
|
|
666
878
|
respondError(ctx, err);
|
|
667
879
|
}
|
|
668
880
|
}
|
|
669
|
-
function partitions(ctx) {
|
|
881
|
+
async function partitions(ctx) {
|
|
670
882
|
try {
|
|
671
|
-
respondJson(ctx, { partitions: engine.getPartitionStats(ctx.params[0]) });
|
|
883
|
+
respondJson(ctx, { partitions: await indexReadsOf(engine).getPartitionStats(ctx.params[0]) });
|
|
672
884
|
} catch (err) {
|
|
673
885
|
respondError(ctx, err);
|
|
674
886
|
}
|
|
@@ -700,31 +912,130 @@ function createIndexHandlers(deps) {
|
|
|
700
912
|
return { create, list, drop, stats, partitions, clear, open, close };
|
|
701
913
|
}
|
|
702
914
|
|
|
915
|
+
// src/server/handlers/metrics.ts
|
|
916
|
+
var PROMETHEUS_TEXT_CONTENT_TYPE = "text/plain; version=0.0.4; charset=utf-8";
|
|
917
|
+
function labelValue(value) {
|
|
918
|
+
return value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("\n", "\\n");
|
|
919
|
+
}
|
|
920
|
+
function labels(pairs) {
|
|
921
|
+
return `{${pairs.map(([name, value]) => `${name}="${labelValue(value)}"`).join(",")}}`;
|
|
922
|
+
}
|
|
923
|
+
function family(name, type, help, samples) {
|
|
924
|
+
return [`# HELP ${name} ${help}`, `# TYPE ${name} ${type}`, ...samples];
|
|
925
|
+
}
|
|
926
|
+
function prometheusText(metrics) {
|
|
927
|
+
const lines = [
|
|
928
|
+
...family(
|
|
929
|
+
"narsil_replication_lag",
|
|
930
|
+
"gauge",
|
|
931
|
+
"Entries that the replica has yet to acknowledge, as the primary's last sequence number minus the replica's.",
|
|
932
|
+
metrics.replicationLag.map(
|
|
933
|
+
(figure) => `narsil_replication_lag${labels([
|
|
934
|
+
["index", figure.indexName],
|
|
935
|
+
["partition", String(figure.partitionId)],
|
|
936
|
+
["replica", figure.replica]
|
|
937
|
+
])} ${figure.lag}`
|
|
938
|
+
)
|
|
939
|
+
),
|
|
940
|
+
...family(
|
|
941
|
+
"narsil_commit_point",
|
|
942
|
+
"gauge",
|
|
943
|
+
"The highest sequence number that the leader of the partition has acknowledged to a client.",
|
|
944
|
+
metrics.commitPoints.map(
|
|
945
|
+
(figure) => `narsil_commit_point${labels([
|
|
946
|
+
["index", figure.indexName],
|
|
947
|
+
["partition", String(figure.partitionId)]
|
|
948
|
+
])} ${figure.commitPoint}`
|
|
949
|
+
)
|
|
950
|
+
),
|
|
951
|
+
...family(
|
|
952
|
+
"narsil_commit_point_floor",
|
|
953
|
+
"gauge",
|
|
954
|
+
"The floor on the commit point that the allocation table stores, raised when the controller admits a replica.",
|
|
955
|
+
metrics.partitions.map(
|
|
956
|
+
(figure) => `narsil_commit_point_floor${labels([
|
|
957
|
+
["index", figure.indexName],
|
|
958
|
+
["partition", String(figure.partitionId)]
|
|
959
|
+
])} ${figure.commitPointFloor}`
|
|
960
|
+
)
|
|
961
|
+
),
|
|
962
|
+
...family(
|
|
963
|
+
"narsil_in_sync_replicas",
|
|
964
|
+
"gauge",
|
|
965
|
+
"The replicas besides the primary that are in the in-sync set of the partition.",
|
|
966
|
+
metrics.partitions.map(
|
|
967
|
+
(figure) => `narsil_in_sync_replicas${labels([
|
|
968
|
+
["index", figure.indexName],
|
|
969
|
+
["partition", String(figure.partitionId)]
|
|
970
|
+
])} ${figure.inSyncReplicas}`
|
|
971
|
+
)
|
|
972
|
+
),
|
|
973
|
+
...family(
|
|
974
|
+
"narsil_coordinator_request_seconds",
|
|
975
|
+
"histogram",
|
|
976
|
+
"How long the calls from this node to the cluster coordinator took.",
|
|
977
|
+
metrics.coordinatorRequests.flatMap((figure) => {
|
|
978
|
+
const operation = ["operation", figure.operation];
|
|
979
|
+
return [
|
|
980
|
+
...figure.bucketBoundsSeconds.map(
|
|
981
|
+
(bound, position) => `narsil_coordinator_request_seconds_bucket${labels([operation, ["le", String(bound)]])} ${figure.bucketCounts[position] ?? 0}`
|
|
982
|
+
),
|
|
983
|
+
`narsil_coordinator_request_seconds_bucket${labels([operation, ["le", "+Inf"]])} ${figure.count}`,
|
|
984
|
+
`narsil_coordinator_request_seconds_sum${labels([operation])} ${figure.sumSeconds}`,
|
|
985
|
+
`narsil_coordinator_request_seconds_count${labels([operation])} ${figure.count}`
|
|
986
|
+
];
|
|
987
|
+
})
|
|
988
|
+
)
|
|
989
|
+
];
|
|
990
|
+
return `${lines.join("\n")}
|
|
991
|
+
`;
|
|
992
|
+
}
|
|
993
|
+
function createMetricsHandler(deps) {
|
|
994
|
+
return async function metrics(ctx) {
|
|
995
|
+
try {
|
|
996
|
+
if (deps.cluster === void 0) {
|
|
997
|
+
throw new NarsilError(
|
|
998
|
+
ErrorCodes.CLUSTER_OPERATION_UNSUPPORTED,
|
|
999
|
+
"This server fronts a single engine, so it reports no cluster metrics",
|
|
1000
|
+
{}
|
|
1001
|
+
);
|
|
1002
|
+
}
|
|
1003
|
+
const text = prometheusText(await deps.cluster.getMetrics());
|
|
1004
|
+
if (ctx.abort.aborted) return;
|
|
1005
|
+
sendText(ctx.res, text, PROMETHEUS_TEXT_CONTENT_TYPE, ctx.abort);
|
|
1006
|
+
} catch (err) {
|
|
1007
|
+
respondError(ctx, err);
|
|
1008
|
+
}
|
|
1009
|
+
};
|
|
1010
|
+
}
|
|
1011
|
+
|
|
703
1012
|
// src/server/handlers/search.ts
|
|
704
1013
|
function createSearchHandlers(deps) {
|
|
705
|
-
const { engine, limits } = deps;
|
|
1014
|
+
const { engine, limits, allowRegex } = deps;
|
|
706
1015
|
async function search(ctx) {
|
|
707
|
-
const params = parseJson(ctx);
|
|
1016
|
+
const params = parseJson(ctx, "read");
|
|
708
1017
|
if (!params) return;
|
|
709
|
-
const failure = validateQuery(params, limits
|
|
1018
|
+
const failure = validateQuery(params, limits);
|
|
710
1019
|
if (failure) {
|
|
711
1020
|
rejectInvalid(ctx, failure);
|
|
712
1021
|
return;
|
|
713
1022
|
}
|
|
1023
|
+
if (refuseRegex(ctx, params.filters, allowRegex)) return;
|
|
714
1024
|
try {
|
|
715
|
-
respondJson(ctx, await engine.query(ctx.params[0], params));
|
|
1025
|
+
respondJson(ctx, await engine.query(ctx.params[0], withServerRerankWindow(params, limits)));
|
|
716
1026
|
} catch (err) {
|
|
717
1027
|
respondError(ctx, err);
|
|
718
1028
|
}
|
|
719
1029
|
}
|
|
720
1030
|
async function preflight(ctx) {
|
|
721
|
-
const params = parseJson(ctx);
|
|
1031
|
+
const params = parseJson(ctx, "read");
|
|
722
1032
|
if (!params) return;
|
|
723
|
-
const failure = validateQuery(params, limits
|
|
1033
|
+
const failure = validateQuery(params, limits);
|
|
724
1034
|
if (failure) {
|
|
725
1035
|
rejectInvalid(ctx, failure);
|
|
726
1036
|
return;
|
|
727
1037
|
}
|
|
1038
|
+
if (refuseRegex(ctx, params.filters, allowRegex)) return;
|
|
728
1039
|
try {
|
|
729
1040
|
respondJson(ctx, await engine.preflight(ctx.params[0], params));
|
|
730
1041
|
} catch (err) {
|
|
@@ -732,7 +1043,7 @@ function createSearchHandlers(deps) {
|
|
|
732
1043
|
}
|
|
733
1044
|
}
|
|
734
1045
|
async function suggest(ctx) {
|
|
735
|
-
const params = parseJson(ctx);
|
|
1046
|
+
const params = parseJson(ctx, "read");
|
|
736
1047
|
if (!params) return;
|
|
737
1048
|
const failure = validateSuggest(params);
|
|
738
1049
|
if (failure) {
|
|
@@ -753,12 +1064,19 @@ var ENGINE_METHOD_SAMPLE = ["createIndex", "listIndexes", "insert", "query", "ge
|
|
|
753
1064
|
var LIMITS_UNBOUNDED_AT_ZERO = [
|
|
754
1065
|
"maxBodyBytes",
|
|
755
1066
|
"maxImportBytes",
|
|
1067
|
+
"maxRestoreBytes",
|
|
756
1068
|
"maxLineBytes",
|
|
757
1069
|
"maxImportErrors",
|
|
758
1070
|
"maxConcurrentRequests",
|
|
759
1071
|
"maxConcurrentTasks"
|
|
760
1072
|
];
|
|
761
|
-
var COUNTED_LIMITS = [
|
|
1073
|
+
var COUNTED_LIMITS = [
|
|
1074
|
+
"importBatchSize",
|
|
1075
|
+
"maxResultWindow",
|
|
1076
|
+
"maxRerankWindow",
|
|
1077
|
+
"maxFetchDocuments",
|
|
1078
|
+
"maxTaskPageSize"
|
|
1079
|
+
];
|
|
762
1080
|
function assertServerEngine(engine) {
|
|
763
1081
|
const candidate = engine;
|
|
764
1082
|
if (typeof candidate !== "object" || candidate === null) {
|
|
@@ -786,10 +1104,39 @@ function assertLimit(field, value, minimum) {
|
|
|
786
1104
|
{ field, value, minimum }
|
|
787
1105
|
);
|
|
788
1106
|
}
|
|
789
|
-
function
|
|
1107
|
+
function assertFraction(field, value) {
|
|
1108
|
+
if (value === void 0) return;
|
|
1109
|
+
if (Number.isFinite(value) && value >= 0 && value <= MAX_BODY_BYTES_IN_FLIGHT_FRACTION) return;
|
|
1110
|
+
throw new NarsilError(
|
|
1111
|
+
ErrorCodes.CONFIG_INVALID,
|
|
1112
|
+
`limits.${field} must be a fraction from 0 to ${MAX_BODY_BYTES_IN_FLIGHT_FRACTION}; however, this configuration sets it to ${String(value)}`,
|
|
1113
|
+
{ field, value, maximum: MAX_BODY_BYTES_IN_FLIGHT_FRACTION }
|
|
1114
|
+
);
|
|
1115
|
+
}
|
|
1116
|
+
function assertRerankWindowCap(value, engineCap) {
|
|
1117
|
+
if (value === void 0) return;
|
|
1118
|
+
const cap = Math.min(MAX_RERANK_WINDOW, engineCap ?? MAX_RERANK_WINDOW);
|
|
1119
|
+
if (value <= cap) return;
|
|
1120
|
+
throw new NarsilError(
|
|
1121
|
+
ErrorCodes.CONFIG_INVALID,
|
|
1122
|
+
`limits.maxRerankWindow must be at most ${cap}, the largest window that the engine accepts; however, this configuration sets it to ${value}`,
|
|
1123
|
+
{ field: "maxRerankWindow", value, maximum: cap }
|
|
1124
|
+
);
|
|
1125
|
+
}
|
|
1126
|
+
function assertServerLimits(limits, engineRerankWindow) {
|
|
790
1127
|
if (limits === void 0) return;
|
|
791
1128
|
for (const field of LIMITS_UNBOUNDED_AT_ZERO) assertLimit(field, limits[field], MIN_UNBOUNDED_SERVER_LIMIT);
|
|
792
1129
|
for (const field of COUNTED_LIMITS) assertLimit(field, limits[field], MIN_COUNTED_SERVER_LIMIT);
|
|
1130
|
+
assertFraction("maxBodyBytesInFlightFraction", limits.maxBodyBytesInFlightFraction);
|
|
1131
|
+
assertRerankWindowCap(limits.maxRerankWindow, engineRerankWindow);
|
|
1132
|
+
}
|
|
1133
|
+
function assertAllowRegex(allowRegex) {
|
|
1134
|
+
if (allowRegex === void 0 || typeof allowRegex === "boolean") return;
|
|
1135
|
+
throw new NarsilError(
|
|
1136
|
+
ErrorCodes.CONFIG_INVALID,
|
|
1137
|
+
`allowRegex must be true or false; however, this configuration sets it to ${String(allowRegex)}`,
|
|
1138
|
+
{ field: "allowRegex", value: String(allowRegex) }
|
|
1139
|
+
);
|
|
793
1140
|
}
|
|
794
1141
|
|
|
795
1142
|
// src/server/request-threads/captured-response.ts
|
|
@@ -804,10 +1151,32 @@ function bodyBytes(body) {
|
|
|
804
1151
|
if (typeof body === "string") return Buffer.from(body, "utf8");
|
|
805
1152
|
return body;
|
|
806
1153
|
}
|
|
807
|
-
function
|
|
1154
|
+
function createRelayAbort() {
|
|
1155
|
+
const listeners = [];
|
|
1156
|
+
let aborted = false;
|
|
1157
|
+
return {
|
|
1158
|
+
get aborted() {
|
|
1159
|
+
return aborted;
|
|
1160
|
+
},
|
|
1161
|
+
onAbort(fn) {
|
|
1162
|
+
if (aborted) fn();
|
|
1163
|
+
else listeners.push(fn);
|
|
1164
|
+
},
|
|
1165
|
+
trigger() {
|
|
1166
|
+
if (aborted) return;
|
|
1167
|
+
aborted = true;
|
|
1168
|
+
for (const fn of listeners) fn();
|
|
1169
|
+
}
|
|
1170
|
+
};
|
|
1171
|
+
}
|
|
1172
|
+
function createCapturingResponse(remoteAddress, requestId, sendPart) {
|
|
808
1173
|
let status = DEFAULT_STATUS;
|
|
809
1174
|
const headers = [];
|
|
810
1175
|
let finished = false;
|
|
1176
|
+
let streaming = false;
|
|
1177
|
+
let inFlight = 0;
|
|
1178
|
+
let writable = null;
|
|
1179
|
+
const abort = createRelayAbort();
|
|
811
1180
|
let resolveDone = () => void 0;
|
|
812
1181
|
const done = new Promise((resolve) => {
|
|
813
1182
|
resolveDone = resolve;
|
|
@@ -815,25 +1184,57 @@ function createCapturingResponse(remoteAddress) {
|
|
|
815
1184
|
function finish(body) {
|
|
816
1185
|
if (finished) return;
|
|
817
1186
|
finished = true;
|
|
1187
|
+
if (streaming) {
|
|
1188
|
+
sendPart({ type: "stream-end", requestId, failed: false }, []);
|
|
1189
|
+
resolveDone(null);
|
|
1190
|
+
return;
|
|
1191
|
+
}
|
|
818
1192
|
resolveDone({ status, headers, body });
|
|
819
1193
|
}
|
|
1194
|
+
function startStreaming() {
|
|
1195
|
+
if (streaming) return;
|
|
1196
|
+
streaming = true;
|
|
1197
|
+
sendPart({ type: "stream-start", requestId, status, headers }, []);
|
|
1198
|
+
}
|
|
820
1199
|
const sink = {
|
|
821
1200
|
cork(callback) {
|
|
822
1201
|
callback();
|
|
823
1202
|
return sink;
|
|
824
1203
|
},
|
|
825
1204
|
writeStatus(line) {
|
|
826
|
-
if (!finished) status = statusOf(line);
|
|
1205
|
+
if (!finished && !streaming) status = statusOf(line);
|
|
827
1206
|
return sink;
|
|
828
1207
|
},
|
|
829
1208
|
writeHeader(key, value) {
|
|
830
|
-
if (!finished) headers.push([key, value]);
|
|
1209
|
+
if (!finished && !streaming) headers.push([key, value]);
|
|
831
1210
|
return sink;
|
|
832
1211
|
},
|
|
833
1212
|
end(body) {
|
|
834
1213
|
finish(bodyBytes(body));
|
|
835
1214
|
return sink;
|
|
836
1215
|
},
|
|
1216
|
+
write(chunk) {
|
|
1217
|
+
if (finished || abort.aborted) return true;
|
|
1218
|
+
startStreaming();
|
|
1219
|
+
const copy = chunk.slice();
|
|
1220
|
+
inFlight += 1;
|
|
1221
|
+
sendPart({ type: "stream-chunk", requestId, chunk: copy }, [copy.buffer]);
|
|
1222
|
+
return inFlight < RELAY_STREAM_CHUNKS_IN_FLIGHT;
|
|
1223
|
+
},
|
|
1224
|
+
pause: () => void 0,
|
|
1225
|
+
resume: () => void 0,
|
|
1226
|
+
close() {
|
|
1227
|
+
if (finished) return sink;
|
|
1228
|
+
finished = true;
|
|
1229
|
+
if (streaming) {
|
|
1230
|
+
sendPart({ type: "stream-end", requestId, failed: true }, []);
|
|
1231
|
+
resolveDone(null);
|
|
1232
|
+
} else {
|
|
1233
|
+
status = NO_RESPONSE_STATUS;
|
|
1234
|
+
resolveDone({ status, headers, body: new Uint8Array(0) });
|
|
1235
|
+
}
|
|
1236
|
+
return sink;
|
|
1237
|
+
},
|
|
837
1238
|
endWithoutBody() {
|
|
838
1239
|
finish(new Uint8Array(0));
|
|
839
1240
|
return sink;
|
|
@@ -843,16 +1244,45 @@ function createCapturingResponse(remoteAddress) {
|
|
|
843
1244
|
return [true, true];
|
|
844
1245
|
},
|
|
845
1246
|
getWriteOffset: () => 0,
|
|
846
|
-
onWritable
|
|
1247
|
+
onWritable(handler) {
|
|
1248
|
+
writable = handler;
|
|
1249
|
+
return sink;
|
|
1250
|
+
},
|
|
847
1251
|
onAborted: () => sink,
|
|
848
1252
|
onData: () => sink,
|
|
849
1253
|
getRemoteAddressAsText: () => new TextEncoder().encode(remoteAddress).buffer
|
|
850
1254
|
};
|
|
851
1255
|
return {
|
|
852
1256
|
sink,
|
|
1257
|
+
abort,
|
|
853
1258
|
done,
|
|
1259
|
+
credit() {
|
|
1260
|
+
inFlight = Math.max(0, inFlight - 1);
|
|
1261
|
+
if (inFlight >= RELAY_STREAM_CHUNKS_IN_FLIGHT || writable === null) return;
|
|
1262
|
+
const handler = writable;
|
|
1263
|
+
writable = null;
|
|
1264
|
+
handler(0);
|
|
1265
|
+
},
|
|
1266
|
+
cancel() {
|
|
1267
|
+
abort.trigger();
|
|
1268
|
+
if (writable !== null) {
|
|
1269
|
+
const handler = writable;
|
|
1270
|
+
writable = null;
|
|
1271
|
+
handler(0);
|
|
1272
|
+
}
|
|
1273
|
+
if (!finished) {
|
|
1274
|
+
finished = true;
|
|
1275
|
+
resolveDone(null);
|
|
1276
|
+
}
|
|
1277
|
+
},
|
|
854
1278
|
finishUnanswered() {
|
|
855
1279
|
if (finished) return;
|
|
1280
|
+
if (streaming) {
|
|
1281
|
+
finished = true;
|
|
1282
|
+
sendPart({ type: "stream-end", requestId, failed: true }, []);
|
|
1283
|
+
resolveDone(null);
|
|
1284
|
+
return;
|
|
1285
|
+
}
|
|
856
1286
|
status = NO_RESPONSE_STATUS;
|
|
857
1287
|
finish(new Uint8Array(0));
|
|
858
1288
|
}
|
|
@@ -863,22 +1293,43 @@ function toRelayedResponse(requestId, captured) {
|
|
|
863
1293
|
}
|
|
864
1294
|
|
|
865
1295
|
// src/server/request-threads/host.ts
|
|
866
|
-
var
|
|
1296
|
+
var RELAYED_TYPES = /* @__PURE__ */ new Set([
|
|
1297
|
+
"request",
|
|
1298
|
+
"authorize",
|
|
1299
|
+
"embed",
|
|
1300
|
+
"rerank",
|
|
1301
|
+
"stream-credit",
|
|
1302
|
+
"stream-cancel"
|
|
1303
|
+
]);
|
|
867
1304
|
function isRelayRequest(message) {
|
|
868
1305
|
if (typeof message !== "object" || message === null) return false;
|
|
869
1306
|
const { type, requestId } = message;
|
|
870
|
-
if (type === "touch") return true;
|
|
871
|
-
return typeof requestId === "number" &&
|
|
1307
|
+
if (type === "touch" || type === "leaving") return true;
|
|
1308
|
+
return typeof requestId === "number" && typeof type === "string" && RELAYED_TYPES.has(type);
|
|
872
1309
|
}
|
|
873
|
-
|
|
874
|
-
|
|
1310
|
+
function spooledBodyOf(relayed) {
|
|
1311
|
+
if (relayed === null) return null;
|
|
1312
|
+
return {
|
|
1313
|
+
path: relayed.path,
|
|
1314
|
+
bytes: relayed.bytes,
|
|
1315
|
+
remove: () => rm(path.dirname(relayed.path), { recursive: true, force: true })
|
|
1316
|
+
};
|
|
1317
|
+
}
|
|
1318
|
+
async function answerRequest(handlers, request, port, streams) {
|
|
1319
|
+
const captured = createCapturingResponse(
|
|
1320
|
+
request.hookContext?.remoteAddress ?? "",
|
|
1321
|
+
request.requestId,
|
|
1322
|
+
(part, moved) => port.postMessage(part, moved)
|
|
1323
|
+
);
|
|
1324
|
+
streams.set(request.requestId, captured);
|
|
875
1325
|
const ctx = {
|
|
876
1326
|
res: captured.sink,
|
|
877
1327
|
params: request.params,
|
|
878
1328
|
query: new URLSearchParams(request.query),
|
|
879
1329
|
contentType: request.contentType,
|
|
880
1330
|
rawBody: request.rawBody === null ? null : Buffer.from(request.rawBody.buffer, request.rawBody.byteOffset, request.rawBody.byteLength),
|
|
881
|
-
|
|
1331
|
+
spooledBody: spooledBodyOf(request.spooledBody),
|
|
1332
|
+
abort: captured.abort,
|
|
882
1333
|
hookContext: request.hookContext
|
|
883
1334
|
};
|
|
884
1335
|
try {
|
|
@@ -887,7 +1338,9 @@ async function answerRequest(handlers, request) {
|
|
|
887
1338
|
sendError(ctx.res, 500, ServerErrorCodes.INTERNAL_ERROR, "An unexpected error occurred");
|
|
888
1339
|
}
|
|
889
1340
|
captured.finishUnanswered();
|
|
890
|
-
|
|
1341
|
+
const answered = await captured.done;
|
|
1342
|
+
streams.delete(request.requestId);
|
|
1343
|
+
return answered === null ? null : toRelayedResponse(request.requestId, answered);
|
|
891
1344
|
}
|
|
892
1345
|
async function answerAuthorize(authorize, request) {
|
|
893
1346
|
if (authorize === void 0) {
|
|
@@ -925,6 +1378,15 @@ async function answerEmbed(core, request) {
|
|
|
925
1378
|
return { type: "embedded", requestId: request.requestId, value: null, error: toHttpError(err).body };
|
|
926
1379
|
}
|
|
927
1380
|
}
|
|
1381
|
+
async function answerRerank(core, request) {
|
|
1382
|
+
try {
|
|
1383
|
+
const scores = await rerankOnHost(core, request.adapter, request.query, request.documents);
|
|
1384
|
+
return { type: "reranked", requestId: request.requestId, scores, error: null };
|
|
1385
|
+
} catch (err) {
|
|
1386
|
+
if (!isNarsilError(err)) console.warn("Reranking a query for a request thread failed:", err);
|
|
1387
|
+
return { type: "reranked", requestId: request.requestId, scores: null, error: toHttpError(err).body };
|
|
1388
|
+
}
|
|
1389
|
+
}
|
|
928
1390
|
function touchIntervalFor(copyIdleTimeoutMs) {
|
|
929
1391
|
return Math.min(MAX_INDEX_TOUCH_INTERVAL_MS, Math.floor(copyIdleTimeoutMs / INDEX_TOUCH_INTERVALS_PER_IDLE_TIMEOUT));
|
|
930
1392
|
}
|
|
@@ -937,31 +1399,60 @@ async function startRequestThreads(options) {
|
|
|
937
1399
|
const touchIntervalMs = touchIntervalFor(core.orchestrator.copyIdleTimeoutMs());
|
|
938
1400
|
const threads = /* @__PURE__ */ new Map();
|
|
939
1401
|
let stopped = false;
|
|
940
|
-
function
|
|
1402
|
+
function releaseDescriptor(thread) {
|
|
1403
|
+
if (thread.descriptor !== null) {
|
|
1404
|
+
try {
|
|
1405
|
+
acceptor.removeChildAppDescriptor(thread.descriptor);
|
|
1406
|
+
} catch {
|
|
1407
|
+
}
|
|
1408
|
+
}
|
|
1409
|
+
confirmDeparture(thread.departure);
|
|
1410
|
+
}
|
|
1411
|
+
function relayFrom(thread) {
|
|
1412
|
+
const { port } = thread;
|
|
1413
|
+
const streams = /* @__PURE__ */ new Map();
|
|
941
1414
|
port.on("message", (message) => {
|
|
942
1415
|
if (!isRelayRequest(message)) return;
|
|
1416
|
+
if (message.type === "leaving") {
|
|
1417
|
+
releaseDescriptor(thread);
|
|
1418
|
+
return;
|
|
1419
|
+
}
|
|
943
1420
|
if (message.type === "touch") {
|
|
944
1421
|
core.orchestrator.noteAccess(message.indexName);
|
|
945
1422
|
return;
|
|
946
1423
|
}
|
|
947
|
-
|
|
948
|
-
|
|
1424
|
+
if (message.type === "stream-credit") {
|
|
1425
|
+
streams.get(message.requestId)?.credit();
|
|
1426
|
+
return;
|
|
1427
|
+
}
|
|
1428
|
+
if (message.type === "stream-cancel") {
|
|
1429
|
+
streams.get(message.requestId)?.cancel();
|
|
1430
|
+
return;
|
|
1431
|
+
}
|
|
1432
|
+
const reply = message.type === "request" ? answerRequest(handlers, message, port, streams) : message.type === "authorize" ? answerAuthorize(authorize, message) : message.type === "embed" ? answerEmbed(core, message) : answerRerank(core, message);
|
|
1433
|
+
void reply.then((answer) => {
|
|
1434
|
+
if (answer !== null) port.postMessage(answer);
|
|
1435
|
+
});
|
|
949
1436
|
});
|
|
950
1437
|
}
|
|
951
1438
|
async function stopThread(workerId, thread) {
|
|
952
|
-
|
|
953
|
-
acceptor.removeChildAppDescriptor(thread.descriptor);
|
|
954
|
-
} catch {
|
|
955
|
-
}
|
|
1439
|
+
releaseDescriptor(thread);
|
|
956
1440
|
thread.port.close();
|
|
957
1441
|
clearGateSlot(options.gate, gateSlotOfWorker(workerId));
|
|
1442
|
+
clearBodyBudgetSlot(options.bodyBudget, gateSlotOfWorker(workerId));
|
|
958
1443
|
await thread.executor.execute({ type: "stopServing", requestId: `stop-serving-${workerId}` }).catch(() => void 0);
|
|
959
1444
|
}
|
|
960
1445
|
const listener = {
|
|
961
1446
|
async onWorkerReady(workerId, executor) {
|
|
962
1447
|
if (stopped) return;
|
|
963
1448
|
const channel = new MessageChannel();
|
|
964
|
-
|
|
1449
|
+
const thread = {
|
|
1450
|
+
descriptor: null,
|
|
1451
|
+
port: channel.port2,
|
|
1452
|
+
executor,
|
|
1453
|
+
departure: createDepartureWord()
|
|
1454
|
+
};
|
|
1455
|
+
relayFrom(thread);
|
|
965
1456
|
let result;
|
|
966
1457
|
try {
|
|
967
1458
|
result = await executor.execute(
|
|
@@ -970,15 +1461,20 @@ async function startRequestThreads(options) {
|
|
|
970
1461
|
requestId: `serve-${workerId}`,
|
|
971
1462
|
settings: {
|
|
972
1463
|
port: channel.port1,
|
|
1464
|
+
departure: thread.departure.buffer,
|
|
973
1465
|
gate: options.gate,
|
|
974
1466
|
gateSlot: gateSlotOfWorker(workerId),
|
|
975
1467
|
maxConcurrentRequests: options.limits.maxConcurrentRequests,
|
|
1468
|
+
bodyBudget: options.bodyBudget,
|
|
976
1469
|
touchIntervalMs,
|
|
977
1470
|
cors: options.cors,
|
|
978
1471
|
limits: options.limits,
|
|
979
1472
|
build: options.build,
|
|
980
1473
|
authorizes: authorize !== void 0,
|
|
981
|
-
searchHooks
|
|
1474
|
+
searchHooks,
|
|
1475
|
+
patternWorkCap: options.core.patternWorkCap,
|
|
1476
|
+
maxRerankWindow: options.core.rerankSettings.maxWindow,
|
|
1477
|
+
allowRegex: options.allowRegex
|
|
982
1478
|
}
|
|
983
1479
|
},
|
|
984
1480
|
[channel.port1]
|
|
@@ -988,8 +1484,8 @@ async function startRequestThreads(options) {
|
|
|
988
1484
|
console.warn(`Worker ${workerId} could not start taking requests:`, err);
|
|
989
1485
|
return;
|
|
990
1486
|
}
|
|
991
|
-
|
|
992
|
-
if (stopped) {
|
|
1487
|
+
thread.descriptor = result.descriptor;
|
|
1488
|
+
if (stopped || departureConfirmed(thread.departure)) {
|
|
993
1489
|
await stopThread(workerId, thread);
|
|
994
1490
|
return;
|
|
995
1491
|
}
|
|
@@ -1000,12 +1496,10 @@ async function startRequestThreads(options) {
|
|
|
1000
1496
|
const thread = threads.get(workerId);
|
|
1001
1497
|
if (thread === void 0) return;
|
|
1002
1498
|
threads.delete(workerId);
|
|
1003
|
-
|
|
1004
|
-
acceptor.removeChildAppDescriptor(thread.descriptor);
|
|
1005
|
-
} catch {
|
|
1006
|
-
}
|
|
1499
|
+
releaseDescriptor(thread);
|
|
1007
1500
|
thread.port.close();
|
|
1008
1501
|
clearGateSlot(options.gate, gateSlotOfWorker(workerId));
|
|
1502
|
+
clearBodyBudgetSlot(options.bodyBudget, gateSlotOfWorker(workerId));
|
|
1009
1503
|
}
|
|
1010
1504
|
};
|
|
1011
1505
|
await core.orchestrator.serveRequestsOnWorkers(listener);
|
|
@@ -1245,14 +1739,24 @@ var TaskRegistry = class {
|
|
|
1245
1739
|
};
|
|
1246
1740
|
|
|
1247
1741
|
// src/server/create-server.ts
|
|
1248
|
-
function
|
|
1742
|
+
function bodyBytesInFlightOf(fraction) {
|
|
1743
|
+
const processLimitBytes = readMemoryFigures()?.processLimitBytes;
|
|
1744
|
+
if (fraction === 0 || processLimitBytes === void 0) return Number.POSITIVE_INFINITY;
|
|
1745
|
+
return Math.floor(fraction * processLimitBytes);
|
|
1746
|
+
}
|
|
1747
|
+
function resolveLimits(limits, engineRerankWindow) {
|
|
1249
1748
|
return {
|
|
1749
|
+
maxBodyBytesInFlight: bodyBytesInFlightOf(
|
|
1750
|
+
limits?.maxBodyBytesInFlightFraction ?? DEFAULT_MAX_BODY_BYTES_IN_FLIGHT_FRACTION
|
|
1751
|
+
),
|
|
1250
1752
|
maxBodyBytes: limits?.maxBodyBytes ?? DEFAULT_MAX_BODY_BYTES,
|
|
1251
1753
|
maxImportBytes: limits?.maxImportBytes ?? DEFAULT_MAX_IMPORT_BYTES,
|
|
1754
|
+
maxRestoreBytes: limits?.maxRestoreBytes ?? DEFAULT_MAX_RESTORE_BYTES,
|
|
1252
1755
|
maxLineBytes: limits?.maxLineBytes ?? DEFAULT_MAX_LINE_BYTES,
|
|
1253
1756
|
importBatchSize: limits?.importBatchSize ?? DEFAULT_IMPORT_BATCH_SIZE,
|
|
1254
1757
|
maxConcurrentRequests: limits?.maxConcurrentRequests ?? DEFAULT_MAX_CONCURRENT_REQUESTS,
|
|
1255
1758
|
maxResultWindow: limits?.maxResultWindow ?? DEFAULT_MAX_RESULT_WINDOW,
|
|
1759
|
+
maxRerankWindow: limits?.maxRerankWindow ?? Math.min(DEFAULT_MAX_RERANK_WINDOW, engineRerankWindow ?? DEFAULT_MAX_RERANK_WINDOW),
|
|
1256
1760
|
maxFetchDocuments: limits?.maxFetchDocuments ?? DEFAULT_MAX_FETCH_DOCUMENTS,
|
|
1257
1761
|
maxImportErrors: limits?.maxImportErrors ?? DEFAULT_MAX_IMPORT_ERRORS,
|
|
1258
1762
|
maxTaskPageSize: limits?.maxTaskPageSize ?? DEFAULT_MAX_TASK_PAGE_SIZE,
|
|
@@ -1282,6 +1786,7 @@ function mainThreadHandlers(deps) {
|
|
|
1282
1786
|
const doc = createDocumentHandlers(deps);
|
|
1283
1787
|
const search = createSearchHandlers(deps);
|
|
1284
1788
|
const admin = createAdminHandlers(deps);
|
|
1789
|
+
const documentExport = createDocumentExportHandlers(deps);
|
|
1285
1790
|
const health = createHealthHandlers(deps);
|
|
1286
1791
|
const cluster = createClusterHandlers(deps);
|
|
1287
1792
|
const version = createVersionHandler(deps);
|
|
@@ -1293,6 +1798,9 @@ function mainThreadHandlers(deps) {
|
|
|
1293
1798
|
capabilities: capabilities.report,
|
|
1294
1799
|
clusterTopology: cluster.topology,
|
|
1295
1800
|
clusterAllocation: cluster.allocation,
|
|
1801
|
+
clusterReplicationFactor: cluster.replicationFactor,
|
|
1802
|
+
clusterHealth: cluster.health,
|
|
1803
|
+
metrics: createMetricsHandler(deps),
|
|
1296
1804
|
memory: admin.memory,
|
|
1297
1805
|
listTasks: admin.listTasks,
|
|
1298
1806
|
getTask: admin.getTask,
|
|
@@ -1328,7 +1836,11 @@ function mainThreadHandlers(deps) {
|
|
|
1328
1836
|
optimize: admin.optimize,
|
|
1329
1837
|
rebalance: admin.rebalance,
|
|
1330
1838
|
partitionConfig: admin.partitionConfig,
|
|
1331
|
-
|
|
1839
|
+
readSynonyms: admin.readSynonyms,
|
|
1840
|
+
replaceSynonyms: admin.replaceSynonyms,
|
|
1841
|
+
restore: admin.restore,
|
|
1842
|
+
exportDocuments: documentExport.exportDocuments,
|
|
1843
|
+
importExport: documentExport.importExport
|
|
1332
1844
|
};
|
|
1333
1845
|
}
|
|
1334
1846
|
var NarsilHttpServer = class {
|
|
@@ -1344,7 +1856,9 @@ var NarsilHttpServer = class {
|
|
|
1344
1856
|
stopIdleHeapCleanup = () => void 0;
|
|
1345
1857
|
constructor(engine, options = {}) {
|
|
1346
1858
|
assertServerEngine(engine);
|
|
1347
|
-
|
|
1859
|
+
const engineRerankWindow = rerankWindowCapOf(engine);
|
|
1860
|
+
assertServerLimits(options.limits, engineRerankWindow);
|
|
1861
|
+
assertAllowRegex(options.allowRegex);
|
|
1348
1862
|
this.host = options.host ?? "127.0.0.1";
|
|
1349
1863
|
this.port = options.port ?? 9876;
|
|
1350
1864
|
this.options = options;
|
|
@@ -1352,14 +1866,18 @@ var NarsilHttpServer = class {
|
|
|
1352
1866
|
for (const [name, adapter] of Object.entries(options.embeddingAdapters ?? {})) {
|
|
1353
1867
|
engine.registerEmbeddingAdapter(name, adapter);
|
|
1354
1868
|
}
|
|
1869
|
+
for (const [name, adapter] of Object.entries(options.rerankAdapters ?? {})) {
|
|
1870
|
+
engine.registerRerankAdapter(name, adapter);
|
|
1871
|
+
}
|
|
1355
1872
|
engineCoreOf(engine)?.orchestrator.shareMainThread();
|
|
1356
1873
|
const taskStore = options.taskStore ?? new InMemoryTaskStore();
|
|
1357
1874
|
const instanceId = options.instanceId ?? randomUUID();
|
|
1358
|
-
const limits = resolveLimits(options.limits);
|
|
1875
|
+
const limits = resolveLimits(options.limits, engineRerankWindow);
|
|
1359
1876
|
this.deps = {
|
|
1360
1877
|
engine,
|
|
1361
1878
|
tasks: new TaskRegistry(taskStore, instanceId, limits.maxConcurrentTasks),
|
|
1362
1879
|
limits,
|
|
1880
|
+
allowRegex: options.allowRegex ?? true,
|
|
1363
1881
|
isReady: () => this.ready,
|
|
1364
1882
|
build: resolveBuild(options.build),
|
|
1365
1883
|
cluster: options.cluster,
|
|
@@ -1417,17 +1935,30 @@ var NarsilHttpServer = class {
|
|
|
1417
1935
|
const core = engineCoreOf(this.engine);
|
|
1418
1936
|
const threadCount = core === void 0 ? 0 : core.orchestrator.requestThreadCount();
|
|
1419
1937
|
const gate = createSharedGateBuffer(gateSlotOfWorker(threadCount));
|
|
1420
|
-
const
|
|
1938
|
+
const bodyBudget = createBodyBudgetBuffer(gateSlotOfWorker(threadCount));
|
|
1939
|
+
const { limits, build, allowRegex } = this.deps;
|
|
1421
1940
|
const handlers = mainThreadHandlers(this.deps);
|
|
1422
1941
|
const run = createRouteRunner({
|
|
1423
1942
|
authorize,
|
|
1424
1943
|
gate: createSharedRequestGate(gate, limits.maxConcurrentRequests, MAIN_THREAD_GATE_SLOT),
|
|
1944
|
+
bodyBudget: createSharedBodyBudget(bodyBudget, limits.maxBodyBytesInFlight, MAIN_THREAD_GATE_SLOT),
|
|
1425
1945
|
corsHeaders: cors ? corsHeaderReader(cors) : void 0
|
|
1426
1946
|
});
|
|
1427
1947
|
registerServerRoutes(app, run, handlers, limits, cors);
|
|
1428
1948
|
if (core === void 0 || threadCount === 0 || !detectRuntime().supportsWorkerThreads) return;
|
|
1429
1949
|
try {
|
|
1430
|
-
this.threads = await startRequestThreads({
|
|
1950
|
+
this.threads = await startRequestThreads({
|
|
1951
|
+
core,
|
|
1952
|
+
app,
|
|
1953
|
+
handlers,
|
|
1954
|
+
authorize,
|
|
1955
|
+
gate,
|
|
1956
|
+
bodyBudget,
|
|
1957
|
+
limits,
|
|
1958
|
+
allowRegex,
|
|
1959
|
+
build,
|
|
1960
|
+
cors
|
|
1961
|
+
});
|
|
1431
1962
|
} catch (err) {
|
|
1432
1963
|
console.warn("The server could not start request threads, so the main thread answers every request:", err);
|
|
1433
1964
|
}
|