hippo-memory 1.26.0 → 1.26.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +14 -0
- package/dist/cli.js.map +1 -1
- package/dist/graph-recall.d.ts +11 -0
- package/dist/graph-recall.d.ts.map +1 -1
- package/dist/graph-recall.js +9 -2
- package/dist/graph-recall.js.map +1 -1
- package/dist/server.d.ts +5 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +17 -1
- package/dist/server.js.map +1 -1
- package/dist/src/cli.js +14 -0
- package/dist/src/cli.js.map +1 -1
- package/dist/src/graph-recall.js +9 -2
- package/dist/src/graph-recall.js.map +1 -1
- package/dist/src/server.js +17 -1
- package/dist/src/server.js.map +1 -1
- package/dist/src/version.js +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/extensions/openclaw-plugin/openclaw.plugin.json +1 -1
- package/extensions/openclaw-plugin/package.json +1 -1
- package/openclaw.plugin.json +1 -1
- package/package.json +1 -1
package/dist/graph-recall.d.ts
CHANGED
|
@@ -26,6 +26,17 @@ export interface GraphExpandOpts {
|
|
|
26
26
|
/** The recall --min-results floor: this many top base rows are kept regardless of
|
|
27
27
|
* budget, so graph expansion never violates the floor. Defaults to 1. */
|
|
28
28
|
minResults?: number;
|
|
29
|
+
/** Recall-side envelope scope rule applied to graph-REACHED memories (the injected
|
|
30
|
+
* rows), mirroring shared.ts SearchBothOptions.recallScope. Omitted = default-deny
|
|
31
|
+
* (private + quarantine scopes excluded, NULL passes) — the fail-closed default for
|
|
32
|
+
* bare/SDK callers. { requested, additive: true } = CLI --scope unlock semantics
|
|
33
|
+
* (passesCliRecallScopeFilter); additive false/absent with requested set = api
|
|
34
|
+
* exact-narrowing semantics (passesScopeFilterForRecall). Base results are the
|
|
35
|
+
* caller's responsibility (they passed through the caller's own scope filter). */
|
|
36
|
+
recallScope?: {
|
|
37
|
+
requested?: string;
|
|
38
|
+
additive?: boolean;
|
|
39
|
+
};
|
|
29
40
|
}
|
|
30
41
|
/**
|
|
31
42
|
* Augment `baseResults` with memories reached by walking the graph `hops` edges out from
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-recall.d.ts","sourceRoot":"","sources":["../src/graph-recall.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"graph-recall.d.ts","sourceRoot":"","sources":["../src/graph-recall.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,aAAa,CAAC;AAShE;kDACkD;AAClD,eAAO,MAAM,QAAQ,IAAI,CAAC;AAC1B,2EAA2E;AAC3E,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAUxC,MAAM,WAAW,eAAe;IAC9B,sFAAsF;IACtF,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAC;IAClB;8DAC0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;sCAEkC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;8EAC0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;uFAMmF;IACnF,WAAW,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC1D;AAsID;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,YAAY,EAAE,EAC3B,IAAI,EAAE,eAAe,GACpB,YAAY,EAAE,CAyEhB"}
|
package/dist/graph-recall.js
CHANGED
|
@@ -40,6 +40,7 @@ import { loadEntriesByIds } from './store.js';
|
|
|
40
40
|
import { estimateTokens } from './search.js';
|
|
41
41
|
import { compareEntryIdentity } from './compare.js';
|
|
42
42
|
import { loadEntitiesByMemoryId, loadEntitiesByIds, loadNeighborRelations, } from './graph.js';
|
|
43
|
+
import { passesCliRecallScopeFilter, passesScopeFilterForRecall } from './recall-scope.js';
|
|
43
44
|
/** Hard cap on `--hops` (a higher value just walks more of a finite graph; this bounds
|
|
44
45
|
* worst-case work and keeps the flag honest). */
|
|
45
46
|
export const MAX_HOPS = 3;
|
|
@@ -66,7 +67,7 @@ function loadByIdsChunked(root, tenantId, ids) {
|
|
|
66
67
|
* stores. Pure reads.
|
|
67
68
|
*/
|
|
68
69
|
function produceHitsForRoot(root, baseResults, baseScoreByMemId, seenMemoryIds, hitsByOrigin, opts) {
|
|
69
|
-
const { hops, maxNeighbors, tenantId, includeSuperseded, asOfDate } = opts;
|
|
70
|
+
const { hops, maxNeighbors, tenantId, includeSuperseded, asOfDate, recallScope } = opts;
|
|
70
71
|
// Seeds = graph entities (in THIS store) whose source memory is a base result.
|
|
71
72
|
const seedEntities = loadEntitiesByMemoryId(root, tenantId, baseResults.map((r) => r.entry.id));
|
|
72
73
|
if (seedEntities.length === 0)
|
|
@@ -166,6 +167,11 @@ function produceHitsForRoot(root, baseResults, baseScoreByMemId, seenMemoryIds,
|
|
|
166
167
|
else if (!includeSuperseded && (mem.superseded_by || isSupersededEndpoint)) {
|
|
167
168
|
continue; // default recall drops superseded
|
|
168
169
|
}
|
|
170
|
+
const scopeOk = recallScope.additive
|
|
171
|
+
? passesCliRecallScopeFilter(mem.scope ?? null, recallScope.requested)
|
|
172
|
+
: passesScopeFilterForRecall(mem.scope ?? null, recallScope.requested);
|
|
173
|
+
if (!scopeOk)
|
|
174
|
+
continue;
|
|
169
175
|
const origin = originMemByEntityId.get(ent.id) ?? baseResults[0].entry.id;
|
|
170
176
|
const originScore = baseScoreByMemId.get(origin) ?? baseResults[baseResults.length - 1].score;
|
|
171
177
|
seenMemoryIds.add(mem.id);
|
|
@@ -200,6 +206,7 @@ export function graphExpandRecall(baseResults, opts) {
|
|
|
200
206
|
const includeSuperseded = opts.includeSuperseded ?? false;
|
|
201
207
|
const asOfDate = opts.asOf ? new Date(opts.asOf) : null;
|
|
202
208
|
const minResults = opts.minResults ?? 1;
|
|
209
|
+
const recallScope = opts.recallScope ?? {};
|
|
203
210
|
const baseScoreByMemId = new Map(baseResults.map((r) => [r.entry.id, r.score]));
|
|
204
211
|
const seenMemoryIds = new Set(baseResults.map((r) => r.entry.id));
|
|
205
212
|
const hitsByOrigin = new Map();
|
|
@@ -207,7 +214,7 @@ export function graphExpandRecall(baseResults, opts) {
|
|
|
207
214
|
const roots = globalRoot && globalRoot !== hippoRoot ? [hippoRoot, globalRoot] : [hippoRoot];
|
|
208
215
|
for (const root of roots) {
|
|
209
216
|
produceHitsForRoot(root, baseResults, baseScoreByMemId, seenMemoryIds, hitsByOrigin, {
|
|
210
|
-
hops, maxNeighbors, tenantId, includeSuperseded, asOfDate,
|
|
217
|
+
hops, maxNeighbors, tenantId, includeSuperseded, asOfDate, recallScope,
|
|
211
218
|
});
|
|
212
219
|
}
|
|
213
220
|
if (hitsByOrigin.size === 0)
|
package/dist/graph-recall.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph-recall.js","sourceRoot":"","sources":["../src/graph-recall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAqB,cAAc,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"graph-recall.js","sourceRoot":"","sources":["../src/graph-recall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAqB,cAAc,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAE3F;kDACkD;AAClD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC;AAC1B,2EAA2E;AAC3E,MAAM,CAAC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACxC;8EAC8E;AAC9E,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,qFAAqF;AACrF,MAAM,UAAU,GAAG,GAAG,CAAC;AAqCvB,uFAAuF;AACvF,SAAS,gBAAgB,CAAC,IAAY,EAAE,QAAgB,EAAE,GAAa;IACrE,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAChC,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;QAChD,GAAG,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CACzB,IAAY,EACZ,WAA2B,EAC3B,gBAAqC,EACrC,aAA0B,EAC1B,YAAqC,EACrC,IAGC;IAED,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAExF,+EAA+E;IAC/E,MAAM,YAAY,GAAG,sBAAsB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAChG,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAEtC,oFAAoF;IACpF,wFAAwF;IACxF,sDAAsD;IACtD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAS,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC5C,uFAAuF;IACvF,sFAAsF;IACtF,uEAAuE;IACvE,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC7D,KAAK,MAAM,EAAE,IAAI,YAAY;QAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC3E,IAAI,QAAQ,GAAa,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEvD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,IAAI,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QAClE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE;YAC3D,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;SAC9D,CAAC,CAAC;QACH,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACjD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,UAAkB,CAAC;YACvB,IAAI,SAAiB,CAAC;YACtB,IAAI,SAAwB,CAAC;YAC7B,IAAI,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;gBAAC,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC;gBAAC,SAAS,GAAG,IAAI,CAAC;YAAC,CAAC;iBAChG,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAAC,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC;gBAAC,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC;gBAAC,SAAS,GAAG,MAAM,CAAC;YAAC,CAAC;;gBACvG,SAAS;YACd,IAAI,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC;gBAAE,SAAS;YAC/C,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;YAC1E,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,MAAM,KAAK,SAAS;gBAAE,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACtE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9B,IAAI,YAAY,CAAC,MAAM,IAAI,YAAY;gBAAE,MAAM,CAAC,qBAAqB;QACvE,CAAC;QACD,QAAQ,GAAG,YAAY,CAAC;IAC1B,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO;IAE/B,uFAAuF;IACvF,wFAAwF;IACxF,yFAAyF;IACzF,qEAAqE;IACrE,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAC1B,eAAe;aACZ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aACtB,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CACvE,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7F,qFAAqF;IACrF,uEAAuE;IACvE,IAAI,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACnD,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACtH,kBAAkB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3G,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI;YAAE,SAAS,CAAM,wCAAwC;QAClF,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG;YAAE,SAAS,CAAuB,6CAA6C;QACvF,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,SAAS,CAAE,0CAA0C;QACpF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;QACjC,+EAA+E;QAC/E,+EAA+E;QAC/E,iFAAiF;QACjF,kFAAkF;QAClF,wDAAwD;QACxD,MAAM,oBAAoB,GAAG,GAAG,CAAC,OAAO,KAAK,YAAY,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC;QACpF,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,QAAQ;gBAAE,SAAS,CAAQ,wBAAwB;YAClF,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBACzD,kFAAkF;gBAClF,IAAI,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,QAAQ;oBAAE,SAAS;YACvD,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,iBAAiB,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,oBAAoB,CAAC,EAAE,CAAC;YAC7E,SAAS,CAAiD,kCAAkC;QAC9F,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ;YAClC,CAAC,CAAC,0BAA0B,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC;YACtE,CAAC,CAAC,0BAA0B,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO;YAAE,SAAS;QACvB,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1E,MAAM,WAAW,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9F,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,GAAG,GAAa;YACpB,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,WAAW,GAAG,CAAC,CAAC,GAAG,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC;YAClD,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;YAClB,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;YACnC,QAAQ,EAAE,GAAG;SACd,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC5D,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAC/B,WAA2B,EAC3B,IAAqB;IAErB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACvD,IAAI,IAAI,IAAI,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,qBAAqB,CAAC;IAChE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;IACnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,KAAK,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;IAE3C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChF,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAI,GAAG,EAAsB,CAAC;IAEnD,6EAA6E;IAC7E,MAAM,KAAK,GAAG,UAAU,IAAI,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC7F,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE;YACnF,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,WAAW;SACvE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAChD,uEAAuE;IACvE,kEAAkE;IAClE,uEAAuE;IACvE,gCAAgC;IAChC,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACjB,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjD,IAAI,MAAM,KAAK,CAAC;gBAAE,OAAO,MAAM,CAAC;YAChC,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YAClC,OAAO,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAElD,uFAAuF;IACvF,qFAAqF;IACrF,sFAAsF;IACtF,qFAAqF;IACrF,sFAAsF;IACtF,uFAAuF;IACvF,qFAAqF;IACrF,mFAAmF;IACnF,kFAAkF;IAClF,uFAAuF;IACvF,6DAA6D;IAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAI,GAAG,CAAe,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IACzE,IAAI,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7D,sEAAsE;IACtE,0EAA0E;IAC1E,wEAAwE;IACxE,+BAA+B;IAC/B,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QACrG,IAAI,UAAU,GAAG,CAAC,CAAC,MAAM,GAAG,MAAM;YAAE,SAAS;QAC7C,UAAU,IAAI,CAAC,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;IAED,qFAAqF;IACrF,qFAAqF;IACrF,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,SAAS;QAC3B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YACrD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAAC,UAAU,GAAG,IAAI,CAAC;YAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,+CAA+C;AAC3F,CAAC"}
|
package/dist/server.d.ts
CHANGED
|
@@ -4,6 +4,11 @@ export interface ServerHandle {
|
|
|
4
4
|
port: number;
|
|
5
5
|
url: string;
|
|
6
6
|
stop: () => Promise<void>;
|
|
7
|
+
/** Introspection-only (v1.26.2): the underlying node:http Server, exposed so
|
|
8
|
+
* tests can assert keep-alive/headers timeout hardening without reaching
|
|
9
|
+
* into serve()'s closure. Additive field — do not depend on it for control
|
|
10
|
+
* flow outside tests. */
|
|
11
|
+
server?: import('node:http').Server;
|
|
7
12
|
}
|
|
8
13
|
export interface ServeOpts {
|
|
9
14
|
hippoRoot: string;
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAyBA,kFAAkF;AAClF,wBAAgB,+BAA+B,IAAI,IAAI,CAEtD;AA0QD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAyBA,kFAAkF;AAClF,wBAAgB,+BAA+B,IAAI,IAAI,CAEtD;AA0QD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;8BAG0B;IAC1B,MAAM,CAAC,EAAE,OAAO,WAAW,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA0HD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAMrE;AAmrFD;;;;;;;;;;GAUG;AACH,wBAAsB,KAAK,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CA0JlE"}
|
package/dist/server.js
CHANGED
|
@@ -3063,6 +3063,22 @@ export async function serve(opts) {
|
|
|
3063
3063
|
sendError(res, mapped.status, mapped.message);
|
|
3064
3064
|
});
|
|
3065
3065
|
});
|
|
3066
|
+
// T3b capture (v1.26.2): tests/server-concurrency.test.ts's ECONNRESET flake
|
|
3067
|
+
// traced to a chunk-boundary reuse race — a kept-alive socket idled through
|
|
3068
|
+
// a prior response chunk gets closed by the server's default 5s
|
|
3069
|
+
// keepAliveTimeout just as a client reuses it for the next request. Raising
|
|
3070
|
+
// both timeouts shrinks that idle-close/reuse window ~13x. Keep
|
|
3071
|
+
// headersTimeout ABOVE the EFFECTIVE keep-alive expiry, which is
|
|
3072
|
+
// keepAliveTimeout + keepAliveTimeoutBuffer (the buffer defaults to
|
|
3073
|
+
// 1,000ms on Node 22.19+/24.6+ — verified 1,000 on node 24.13, so the
|
|
3074
|
+
// effective expiry here is 66s; codex review caught that a 66s
|
|
3075
|
+
// headersTimeout would sit exactly ON that boundary and recreate the
|
|
3076
|
+
// race). The headers timer also runs while a kept-alive socket waits for
|
|
3077
|
+
// its next request, so a value at or below the effective expiry would
|
|
3078
|
+
// itself close idle reused sockets, and Node would not flag it (no error
|
|
3079
|
+
// or warning at listen time — verified empirically).
|
|
3080
|
+
server.keepAliveTimeout = 65_000;
|
|
3081
|
+
server.headersTimeout = 70_000;
|
|
3066
3082
|
await new Promise((resolve, reject) => {
|
|
3067
3083
|
const onError = (err) => {
|
|
3068
3084
|
server.removeListener('listening', onListening);
|
|
@@ -3123,6 +3139,6 @@ export async function serve(opts) {
|
|
|
3123
3139
|
process.once('SIGTERM', () => { void gracefulShutdown('SIGTERM'); });
|
|
3124
3140
|
process.once('SIGINT', () => { void gracefulShutdown('SIGINT'); });
|
|
3125
3141
|
}
|
|
3126
|
-
return { port: actualPort, url, stop };
|
|
3142
|
+
return { port: actualPort, url, stop, server };
|
|
3127
3143
|
}
|
|
3128
3144
|
//# sourceMappingURL=server.js.map
|