sliftutils 1.7.85 → 1.7.86

package/storage/remoteStorage/dist/storePlan.ts.cache

@@ -117,8 +117,10 @@ function computeStorePlan(account, bucketName, routing) {
             }
             diskWindow = [start, end];
         }
-        let sourceSpecs = [{ validWindow: diskWindow }];
+        let sourceSpecs = [{ validWindows: [diskWindow] }];
         let noFullSync = group.entries.some(x => x.noFullSync);
+        // The same peer endpoint (url+route+flags) can appear under several windows at once (a switchover splits one window around an intermediate). It is ONE sync source that carries ALL those windows - never several sources, which would double-scan it and, worse, make matching a request depend on which window the caller happened to hold.
+        let peerByKey = new Map();
         for (let i = group.firstIndex + 1; i < routing.sources.length; i++) {
             let source = routing.sources[i];
             if (typeof source === "string" || ownIndexes.has(i))
@@ -126,7 +128,14 @@ function computeStorePlan(account, bucketName, routing) {
             let sharedRoute = (0, remoteConfig_1.routeIntersection)(group.route, source.route);
             if (!sharedRoute)
                 continue;
-            sourceSpecs.push({ sourceConfig: source, validWindow: source.validWindow, route: sharedRoute, noFullSync: source.noFullSync || noFullSync });
+            let key = JSON.stringify({ ...source, validWindow: undefined });
+            let spec = peerByKey.get(key);
+            if (!spec) {
+                spec = { sourceConfig: source, validWindows: [], route: sharedRoute, noFullSync: source.noFullSync || noFullSync };
+                peerByKey.set(key, spec);
+                sourceSpecs.push(spec);
+            }
+            spec.validWindows.push(source.validWindow);
         }
         stores.push({
             routeKey,
@@ -139,11 +148,11 @@ function computeStorePlan(account, bucketName, routing) {
     }
     if (!stores.length) {
         // Not in the config at all: still serve whatever the plain folder holds, through one inert full-route store
-        stores.push({ routeKey: JSON.stringify(IArchives_1.FULL_ROUTE), route: undefined, entries: [], rawDisk: false, readerDiskLimit: undefined, sourceSpecs: [{ validWindow: [0, 0] }] });
+        stores.push({ routeKey: JSON.stringify(IArchives_1.FULL_ROUTE), route: undefined, entries: [], rawDisk: false, readerDiskLimit: undefined, sourceSpecs: [{ validWindows: [[0, 0]] }] });
     }
     let structureKey = JSON.stringify(stores.map(s => ({ routeKey: s.routeKey, rawDisk: s.rawDisk, readerDiskLimit: s.readerDiskLimit })));
     return { selfEntries, self, stores, structureKey };
 }
 exports.computeStorePlan = computeStorePlan;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storePlan.js","sourceRoot":"","sources":["storePlan.ts"],"names":[],"mappings":"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","sourcesContent":["import { sort } from \"socket-function/src/misc\";\nimport { RemoteConfig, HostedConfig, SourceConfig, FULL_ROUTE } from \"../IArchives\";\nimport { parseHostedUrl, routeContains, routeIntersection } from \"./remoteConfig\";\nimport { isOwnAddress } from \"./serverConfig\";\n\n// Turns a bucket's routing config into this server's store plan: which of the entries are us, what stores (one per route) we run, and which peers each store synchronizes from.\n\nexport function findSelfIndexes(routing: RemoteConfig, account: string, bucketName: string): number[] {\n    let indexes: number[] = [];\n    for (let i = 0; i < routing.sources.length; i++) {\n        let source = routing.sources[i];\n        if (typeof source === \"string\" || source.type !== \"remote\") continue;\n        let parsed = parseHostedUrl(source.url);\n        if (parsed.account !== account || parsed.bucketName !== bucketName) continue;\n        if (isOwnAddress(parsed.address, parsed.port)) {\n            indexes.push(i);\n        }\n    }\n    return indexes;\n}\n\nexport function selectEntryAt(entries: HostedConfig[], time: number, route?: number): HostedConfig | undefined {\n    if (route !== undefined) {\n        let covering = entries.filter(x => routeContains(x.route, route));\n        if (covering.length) {\n            entries = covering;\n        }\n    }\n    let containing = entries.find(x => x.validWindow[0] <= time && time < x.validWindow[1]);\n    if (containing) return containing;\n    let best: HostedConfig | undefined;\n    let bestDistance = Infinity;\n    for (let entry of entries) {\n        let distance = Math.min(Math.abs(time - entry.validWindow[0]), Math.abs(time - entry.validWindow[1]));\n        if (distance < bestDistance) {\n            bestDistance = distance;\n            best = entry;\n        }\n    }\n    return best;\n}\n\n/** Our role in a bucket's routing config, summarized across ALL currently-valid self entries. Stored instead of a single representative HostedConfig, so nothing can accidentally use one entry's route or flags where the union is required - the standard config has the same URL twice: a routed write-shard entry plus an unrouted read-everything entry. */\nexport type SelfSummary = {\n    /** The union of the current entries' routes, with overlapping/adjacent ranges combined - which commonly collapses to a single full range, making matching trivial. */\n    routes: [number, number][];\n    public: boolean;\n    immutable: boolean;\n    noFullSync: boolean;\n    rawDisk: boolean;\n    readerDiskLimit?: number;\n};\n\nfunction mergeRoutes(routes: ([number, number] | undefined)[]): [number, number][] {\n    let list = routes.map(x => x || FULL_ROUTE).map(x => [x[0], x[1]] as [number, number]);\n    sort(list, x => x[0]);\n    let merged: [number, number][] = [];\n    for (let route of list) {\n        let last = merged[merged.length - 1];\n        if (last && route[0] <= last[1]) {\n            last[1] = Math.max(last[1], route[1]);\n            continue;\n        }\n        merged.push(route);\n    }\n    return merged;\n}\n\nfunction summarizeSelf(selfEntries: HostedConfig[], now: number): SelfSummary | undefined {\n    let current = selfEntries.filter(x => x.validWindow[0] <= now && now < x.validWindow[1]);\n    if (!current.length) {\n        let nearest = selectEntryAt(selfEntries, now);\n        current = nearest && [nearest] || [];\n    }\n    if (!current.length) {\n        return undefined;\n    }\n    return {\n        routes: mergeRoutes(current.map(x => x.route)),\n        public: current.some(x => x.public),\n        immutable: current.some(x => x.immutable),\n        noFullSync: current.some(x => x.noFullSync),\n        rawDisk: current.some(x => x.rawDisk),\n        readerDiskLimit: current.find(x => x.readerDiskLimit !== undefined)?.readerDiskLimit,\n    };\n}\n\nexport type StoreSourceSpec = { sourceConfig?: SourceConfig; validWindow: [number, number]; route?: [number, number]; noFullSync?: boolean };\nexport type StorePlanStore = {\n    routeKey: string;\n    route?: [number, number];\n    entries: HostedConfig[];\n    rawDisk: boolean;\n    readerDiskLimit?: number;\n    sourceSpecs: StoreSourceSpec[];\n};\nexport type StorePlan = {\n    selfEntries: HostedConfig[];\n    self: SelfSummary | undefined;\n    stores: StorePlanStore[];\n    structureKey: string;\n};\n\nexport function computeStorePlan(account: string, bucketName: string, routing: RemoteConfig): StorePlan {\n    let selfIndexes = findSelfIndexes(routing, account, bucketName);\n    let selfEntries = selfIndexes.map(i => routing.sources[i] as HostedConfig);\n    let self = summarizeSelf(selfEntries, Date.now());\n    let ownIndexes = new Set(selfIndexes);\n    // One store per distinct route among ALL our entries - past and future windows included, so historical route folders keep serving their data and upcoming routes sync ahead of their window\n    let groups = new Map<string, { route?: [number, number]; entries: HostedConfig[]; firstIndex: number }>();\n    for (let i of selfIndexes) {\n        let entry = routing.sources[i] as HostedConfig;\n        let routeKey = JSON.stringify(entry.route || FULL_ROUTE);\n        let group = groups.get(routeKey);\n        if (!group) {\n            group = { route: entry.route, entries: [], firstIndex: i };\n            groups.set(routeKey, group);\n        }\n        group.entries.push(entry);\n    }\n    let stores: StorePlanStore[] = [];\n    for (let [routeKey, group] of groups) {\n        let anchor = selectEntryAt(group.entries, Date.now());\n        let diskWindow: [number, number] = [0, 0];\n        if (anchor) {\n            let [start, end] = anchor.validWindow;\n            let merged = true;\n            while (merged) {\n                merged = false;\n                for (let entry of group.entries) {\n                    let [entryStart, entryEnd] = entry.validWindow;\n                    if (entryStart > end || entryEnd < start) continue;\n                    if (entryStart < start || entryEnd > end) {\n                        start = Math.min(start, entryStart);\n                        end = Math.max(end, entryEnd);\n                        merged = true;\n                    }\n                }\n            }\n            diskWindow = [start, end];\n        }\n        let sourceSpecs: StoreSourceSpec[] = [{ validWindow: diskWindow }];\n        let noFullSync = group.entries.some(x => x.noFullSync);\n        for (let i = group.firstIndex + 1; i < routing.sources.length; i++) {\n            let source = routing.sources[i];\n            if (typeof source === \"string\" || ownIndexes.has(i)) continue;\n            let sharedRoute = routeIntersection(group.route, source.route);\n            if (!sharedRoute) continue;\n            sourceSpecs.push({ sourceConfig: source, validWindow: source.validWindow, route: sharedRoute, noFullSync: source.noFullSync || noFullSync });\n        }\n        stores.push({\n            routeKey,\n            route: group.route,\n            entries: group.entries,\n            rawDisk: group.entries.some(x => x.rawDisk),\n            readerDiskLimit: group.entries.find(x => x.readerDiskLimit !== undefined)?.readerDiskLimit,\n            sourceSpecs,\n        });\n    }\n    if (!stores.length) {\n        // Not in the config at all: still serve whatever the plain folder holds, through one inert full-route store\n        stores.push({ routeKey: JSON.stringify(FULL_ROUTE), route: undefined, entries: [], rawDisk: false, readerDiskLimit: undefined, sourceSpecs: [{ validWindow: [0, 0] }] });\n    }\n    let structureKey = JSON.stringify(stores.map(s => ({ routeKey: s.routeKey, rawDisk: s.rawDisk, readerDiskLimit: s.readerDiskLimit })));\n    return { selfEntries, self, stores, structureKey };\n}\n"]}
- /* _JS_SOURCE_HASH = "9bef0980db5b25c667b14368838cb733860e13722b222e7c53ddcfb8e53ba4fb"; */
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storePlan.js","sourceRoot":"","sources":["storePlan.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,4CAAoF;AACpF,iDAAkF;AAClF,iDAA8C;AAE9C,gLAAgL;AAEhL,SAAgB,eAAe,CAAC,OAAqB,EAAE,OAAe,EAAE,UAAkB;IACtF,IAAI,OAAO,GAAa,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ;YAAE,SAAS;QACrE,IAAI,MAAM,GAAG,IAAA,6BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU;YAAE,SAAS;QAC7E,IAAI,IAAA,2BAAY,EAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAZD,0CAYC;AAED,SAAgB,aAAa,CAAC,OAAuB,EAAE,IAAY,EAAE,KAAc;IAC/E,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,IAAI,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,4BAAa,EAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,GAAG,QAAQ,CAAC;QACvB,CAAC;IACL,CAAC;IACD,IAAI,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IACxF,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAClC,IAAI,IAA8B,CAAC;IACnC,IAAI,YAAY,GAAG,QAAQ,CAAC;IAC5B,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtG,IAAI,QAAQ,GAAG,YAAY,EAAE,CAAC;YAC1B,YAAY,GAAG,QAAQ,CAAC;YACxB,IAAI,GAAG,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAnBD,sCAmBC;AAaD,SAAS,WAAW,CAAC,MAAwC;IACzD,IAAI,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,sBAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAqB,CAAC,CAAC;IACvF,IAAA,WAAI,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,MAAM,GAAuB,EAAE,CAAC;IACpC,KAAK,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrC,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,SAAS;QACb,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,WAA2B,EAAE,GAAW;;IAC3D,IAAI,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IACzF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAClB,IAAI,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC9C,OAAO,GAAG,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO;QACH,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QACnC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACzC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;QAC3C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACrC,eAAe,EAAE,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS,CAAC,0CAAE,eAAe;KACvF,CAAC;AACN,CAAC;AAkBD,SAAgB,gBAAgB,CAAC,OAAe,EAAE,UAAkB,EAAE,OAAqB;;IACvF,IAAI,WAAW,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAChE,IAAI,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAiB,CAAC,CAAC;IAC3E,IAAI,IAAI,GAAG,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IACtC,4LAA4L;IAC5L,IAAI,MAAM,GAAG,IAAI,GAAG,EAAqF,CAAC;IAC1G,KAAK,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;QACxB,IAAI,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAiB,CAAC;QAC/C,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,IAAI,sBAAU,CAAC,CAAC;QACzD,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,KAAK,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;YAC3D,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,MAAM,GAAqB,EAAE,CAAC;IAClC,KAAK,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,EAAE,CAAC;QACnC,IAAI,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACtD,IAAI,UAAU,GAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC;YACtC,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,OAAO,MAAM,EAAE,CAAC;gBACZ,MAAM,GAAG,KAAK,CAAC;gBACf,KAAK,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBAC9B,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC;oBAC/C,IAAI,UAAU,GAAG,GAAG,IAAI,QAAQ,GAAG,KAAK;wBAAE,SAAS;oBACnD,IAAI,UAAU,GAAG,KAAK,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAC;wBACvC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;wBACpC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;wBAC9B,MAAM,GAAG,IAAI,CAAC;oBAClB,CAAC;gBACL,CAAC;YACL,CAAC;YACD,UAAU,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,WAAW,GAAsB,CAAC,EAAE,YAAY,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACtE,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACvD,8UAA8U;QAC9U,IAAI,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAC;QACnD,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjE,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;gBAAE,SAAS;YAC9D,IAAI,WAAW,GAAG,IAAA,gCAAiB,EAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/D,IAAI,CAAC,WAAW;gBAAE,SAAS;YAC3B,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;YAChE,IAAI,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,IAAI,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,UAAU,EAAE,CAAC;gBACnH,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACzB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;YACR,QAAQ;YACR,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAC3C,eAAe,EAAE,MAAA,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS,CAAC,0CAAE,eAAe;YAC1F,WAAW;SACd,CAAC,CAAC;IACP,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACjB,4GAA4G;QAC5G,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,sBAAU,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAChL,CAAC;IACD,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;IACvI,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AACvD,CAAC;AAvED,4CAuEC","sourcesContent":["import { sort } from \"socket-function/src/misc\";\nimport { RemoteConfig, HostedConfig, SourceConfig, FULL_ROUTE } from \"../IArchives\";\nimport { parseHostedUrl, routeContains, routeIntersection } from \"./remoteConfig\";\nimport { isOwnAddress } from \"./serverConfig\";\n\n// Turns a bucket's routing config into this server's store plan: which of the entries are us, what stores (one per route) we run, and which peers each store synchronizes from.\n\nexport function findSelfIndexes(routing: RemoteConfig, account: string, bucketName: string): number[] {\n    let indexes: number[] = [];\n    for (let i = 0; i < routing.sources.length; i++) {\n        let source = routing.sources[i];\n        if (typeof source === \"string\" || source.type !== \"remote\") continue;\n        let parsed = parseHostedUrl(source.url);\n        if (parsed.account !== account || parsed.bucketName !== bucketName) continue;\n        if (isOwnAddress(parsed.address, parsed.port)) {\n            indexes.push(i);\n        }\n    }\n    return indexes;\n}\n\nexport function selectEntryAt(entries: HostedConfig[], time: number, route?: number): HostedConfig | undefined {\n    if (route !== undefined) {\n        let covering = entries.filter(x => routeContains(x.route, route));\n        if (covering.length) {\n            entries = covering;\n        }\n    }\n    let containing = entries.find(x => x.validWindow[0] <= time && time < x.validWindow[1]);\n    if (containing) return containing;\n    let best: HostedConfig | undefined;\n    let bestDistance = Infinity;\n    for (let entry of entries) {\n        let distance = Math.min(Math.abs(time - entry.validWindow[0]), Math.abs(time - entry.validWindow[1]));\n        if (distance < bestDistance) {\n            bestDistance = distance;\n            best = entry;\n        }\n    }\n    return best;\n}\n\n/** Our role in a bucket's routing config, summarized across ALL currently-valid self entries. Stored instead of a single representative HostedConfig, so nothing can accidentally use one entry's route or flags where the union is required - the standard config has the same URL twice: a routed write-shard entry plus an unrouted read-everything entry. */\nexport type SelfSummary = {\n    /** The union of the current entries' routes, with overlapping/adjacent ranges combined - which commonly collapses to a single full range, making matching trivial. */\n    routes: [number, number][];\n    public: boolean;\n    immutable: boolean;\n    noFullSync: boolean;\n    rawDisk: boolean;\n    readerDiskLimit?: number;\n};\n\nfunction mergeRoutes(routes: ([number, number] | undefined)[]): [number, number][] {\n    let list = routes.map(x => x || FULL_ROUTE).map(x => [x[0], x[1]] as [number, number]);\n    sort(list, x => x[0]);\n    let merged: [number, number][] = [];\n    for (let route of list) {\n        let last = merged[merged.length - 1];\n        if (last && route[0] <= last[1]) {\n            last[1] = Math.max(last[1], route[1]);\n            continue;\n        }\n        merged.push(route);\n    }\n    return merged;\n}\n\nfunction summarizeSelf(selfEntries: HostedConfig[], now: number): SelfSummary | undefined {\n    let current = selfEntries.filter(x => x.validWindow[0] <= now && now < x.validWindow[1]);\n    if (!current.length) {\n        let nearest = selectEntryAt(selfEntries, now);\n        current = nearest && [nearest] || [];\n    }\n    if (!current.length) {\n        return undefined;\n    }\n    return {\n        routes: mergeRoutes(current.map(x => x.route)),\n        public: current.some(x => x.public),\n        immutable: current.some(x => x.immutable),\n        noFullSync: current.some(x => x.noFullSync),\n        rawDisk: current.some(x => x.rawDisk),\n        readerDiskLimit: current.find(x => x.readerDiskLimit !== undefined)?.readerDiskLimit,\n    };\n}\n\nexport type StoreSourceSpec = { sourceConfig?: SourceConfig; validWindows: [number, number][]; route?: [number, number]; noFullSync?: boolean };\nexport type StorePlanStore = {\n    routeKey: string;\n    route?: [number, number];\n    entries: HostedConfig[];\n    rawDisk: boolean;\n    readerDiskLimit?: number;\n    sourceSpecs: StoreSourceSpec[];\n};\nexport type StorePlan = {\n    selfEntries: HostedConfig[];\n    self: SelfSummary | undefined;\n    stores: StorePlanStore[];\n    structureKey: string;\n};\n\nexport function computeStorePlan(account: string, bucketName: string, routing: RemoteConfig): StorePlan {\n    let selfIndexes = findSelfIndexes(routing, account, bucketName);\n    let selfEntries = selfIndexes.map(i => routing.sources[i] as HostedConfig);\n    let self = summarizeSelf(selfEntries, Date.now());\n    let ownIndexes = new Set(selfIndexes);\n    // One store per distinct route among ALL our entries - past and future windows included, so historical route folders keep serving their data and upcoming routes sync ahead of their window\n    let groups = new Map<string, { route?: [number, number]; entries: HostedConfig[]; firstIndex: number }>();\n    for (let i of selfIndexes) {\n        let entry = routing.sources[i] as HostedConfig;\n        let routeKey = JSON.stringify(entry.route || FULL_ROUTE);\n        let group = groups.get(routeKey);\n        if (!group) {\n            group = { route: entry.route, entries: [], firstIndex: i };\n            groups.set(routeKey, group);\n        }\n        group.entries.push(entry);\n    }\n    let stores: StorePlanStore[] = [];\n    for (let [routeKey, group] of groups) {\n        let anchor = selectEntryAt(group.entries, Date.now());\n        let diskWindow: [number, number] = [0, 0];\n        if (anchor) {\n            let [start, end] = anchor.validWindow;\n            let merged = true;\n            while (merged) {\n                merged = false;\n                for (let entry of group.entries) {\n                    let [entryStart, entryEnd] = entry.validWindow;\n                    if (entryStart > end || entryEnd < start) continue;\n                    if (entryStart < start || entryEnd > end) {\n                        start = Math.min(start, entryStart);\n                        end = Math.max(end, entryEnd);\n                        merged = true;\n                    }\n                }\n            }\n            diskWindow = [start, end];\n        }\n        let sourceSpecs: StoreSourceSpec[] = [{ validWindows: [diskWindow] }];\n        let noFullSync = group.entries.some(x => x.noFullSync);\n        // The same peer endpoint (url+route+flags) can appear under several windows at once (a switchover splits one window around an intermediate). It is ONE sync source that carries ALL those windows - never several sources, which would double-scan it and, worse, make matching a request depend on which window the caller happened to hold.\n        let peerByKey = new Map<string, StoreSourceSpec>();\n        for (let i = group.firstIndex + 1; i < routing.sources.length; i++) {\n            let source = routing.sources[i];\n            if (typeof source === \"string\" || ownIndexes.has(i)) continue;\n            let sharedRoute = routeIntersection(group.route, source.route);\n            if (!sharedRoute) continue;\n            let key = JSON.stringify({ ...source, validWindow: undefined });\n            let spec = peerByKey.get(key);\n            if (!spec) {\n                spec = { sourceConfig: source, validWindows: [], route: sharedRoute, noFullSync: source.noFullSync || noFullSync };\n                peerByKey.set(key, spec);\n                sourceSpecs.push(spec);\n            }\n            spec.validWindows.push(source.validWindow);\n        }\n        stores.push({\n            routeKey,\n            route: group.route,\n            entries: group.entries,\n            rawDisk: group.entries.some(x => x.rawDisk),\n            readerDiskLimit: group.entries.find(x => x.readerDiskLimit !== undefined)?.readerDiskLimit,\n            sourceSpecs,\n        });\n    }\n    if (!stores.length) {\n        // Not in the config at all: still serve whatever the plain folder holds, through one inert full-route store\n        stores.push({ routeKey: JSON.stringify(FULL_ROUTE), route: undefined, entries: [], rawDisk: false, readerDiskLimit: undefined, sourceSpecs: [{ validWindows: [[0, 0]] }] });\n    }\n    let structureKey = JSON.stringify(stores.map(s => ({ routeKey: s.routeKey, rawDisk: s.rawDisk, readerDiskLimit: s.readerDiskLimit })));\n    return { selfEntries, self, stores, structureKey };\n}\n"]}
+ /* _JS_SOURCE_HASH = "de02e6db6f6d1447f4a3b26c37f95ce8a86b8f1d3dd558e60fca94e7a7974c9f"; */

package/storage/remoteStorage/storageServerState.d.ts

@@ -23,7 +23,7 @@ export type BucketState = {
 };
 /** The loaded bucket, loading it (which instantiates its stores and starts their synchronization) if needed. A bucket that does not exist on this server throws - callers never see undefined buckets. */
 export declare function requireBucket(account: string, bucketName: string): Promise<BucketState>;
-/** The store serving a request: the exact config entry the CLIENT selected, matched by equality (key order ignored) against the bucket's own entries. A match is honored even when its window has passed - the selection never validates, the store's own validation throws instead. Throws when nothing matches, listing what is available. */
+/** The store serving a request: the config entry the CLIENT selected, matched against the bucket's own entries by identity EXCLUDING the valid window (see sourceMatchKey). The selection never validates - the store's own window/route checks throw if the caller is stale - so honoring a window mismatch here is exactly right. Throws when nothing matches, listing what is available. */
 export declare function findBucketStore(account: string, bucketName: string, sourceConfig: SourceConfig | undefined): Promise<LoadedStore>;
 /** Internal (store-to-store) reads skip store selection entirely: the caller is another store whose index says this MACHINE holds the bytes - the persisted holder identity is just a URL, which cannot name a store. Whichever store's folder has the newest copy answers. */
 export declare function readBucketInternal(account: string, bucketName: string, config: {

package/storage/remoteStorage/storageServerState.ts

@@ -62,15 +62,20 @@ export async function requireBucket(account: string, bucketName: string): Promis
     return bucket;
 }
 
-/** The store serving a request: the exact config entry the CLIENT selected, matched by equality (key order ignored) against the bucket's own entries. A match is honored even when its window has passed - the selection never validates, the store's own validation throws instead. Throws when nothing matches, listing what is available. */
+/** The stable identity of a source config for matching: everything EXCEPT the valid window. The window drifts (a switchover splits one window in two around an intermediate, then rejoins it), so a caller and this server routinely disagree on it while naming the very same source - matching on it would wrongly reject the request. The route stays in the identity (it selects the store/folder). */
+function sourceMatchKey(config: SourceConfig): string {
+    return stableStringify({ ...config, validWindow: undefined });
+}
+
+/** The store serving a request: the config entry the CLIENT selected, matched against the bucket's own entries by identity EXCLUDING the valid window (see sourceMatchKey). The selection never validates - the store's own window/route checks throw if the caller is stale - so honoring a window mismatch here is exactly right. Throws when nothing matches, listing what is available. */
 export async function findBucketStore(account: string, bucketName: string, sourceConfig: SourceConfig | undefined): Promise<LoadedStore> {
     let bucket = await requireBucket(account, bucketName);
     if (!sourceConfig) {
         throw new Error(`No remote source configuration was provided for bucket ${account}/${bucketName}: every request must say which configured source it selected. Available: ${JSON.stringify(bucket.selfEntries)}`);
     }
-    let wanted = stableStringify(sourceConfig);
+    let wanted = sourceMatchKey(sourceConfig);
     for (let s of bucket.stores) {
-        if (s.entries.some(e => stableStringify(e) === wanted)) return s;
+        if (s.entries.some(e => sourceMatchKey(e) === wanted)) return s;
     }
     throw new Error(`No source on this server matches the requested remote configuration for bucket ${account}/${bucketName}. Requested: ${JSON.stringify(sourceConfig)}. Available: ${JSON.stringify(bucket.selfEntries)}`);
 }
@@ -350,7 +355,7 @@ function buildStore(account: string, bucketName: string, planStore: StorePlanSto
     let sources: ArchivesSource[] = planStore.sourceSpecs.map(spec => ({
         source: spec.sourceConfig && createApiArchives(spec.sourceConfig) || new ArchivesDisk(folder),
         url: spec.sourceConfig?.url || folder,
-        validWindow: spec.validWindow,
+        validWindows: spec.validWindows,
         route: spec.route,
         noFullSync: spec.noFullSync,
         intermediate: spec.sourceConfig?.intermediate,
@@ -447,12 +452,12 @@ async function checkRoutingChanged(account: string, bucketName: string, config?:
             live.store.updateSources(planStore.sourceSpecs.map(spec => {
                 const sourceConfig = spec.sourceConfig;
                 if (!sourceConfig) {
-                    return { identity: sourceIdentity(undefined), url: storeFolder, validWindow: spec.validWindow, create: (): IArchives => new ArchivesDisk(storeFolder) };
+                    return { identity: sourceIdentity(undefined), url: storeFolder, validWindows: spec.validWindows, create: (): IArchives => new ArchivesDisk(storeFolder) };
                 }
                 return {
                     identity: sourceIdentity(sourceConfig),
                     url: sourceConfig.url,
-                    validWindow: spec.validWindow,
+                    validWindows: spec.validWindows,
                     route: spec.route,
                     noFullSync: spec.noFullSync,
                     intermediate: sourceConfig.intermediate,

package/storage/remoteStorage/storePlan.d.ts

@@ -13,7 +13,7 @@ export type SelfSummary = {
 };
 export type StoreSourceSpec = {
     sourceConfig?: SourceConfig;
-    validWindow: [number, number];
+    validWindows: [number, number][];
     route?: [number, number];
     noFullSync?: boolean;
 };

package/storage/remoteStorage/storePlan.ts

@@ -85,7 +85,7 @@ function summarizeSelf(selfEntries: HostedConfig[], now: number): SelfSummary |
     };
 }
 
-export type StoreSourceSpec = { sourceConfig?: SourceConfig; validWindow: [number, number]; route?: [number, number]; noFullSync?: boolean };
+export type StoreSourceSpec = { sourceConfig?: SourceConfig; validWindows: [number, number][]; route?: [number, number]; noFullSync?: boolean };
 export type StorePlanStore = {
     routeKey: string;
     route?: [number, number];
@@ -139,14 +139,23 @@ export function computeStorePlan(account: string, bucketName: string, routing: R
             }
             diskWindow = [start, end];
         }
-        let sourceSpecs: StoreSourceSpec[] = [{ validWindow: diskWindow }];
+        let sourceSpecs: StoreSourceSpec[] = [{ validWindows: [diskWindow] }];
         let noFullSync = group.entries.some(x => x.noFullSync);
+        // The same peer endpoint (url+route+flags) can appear under several windows at once (a switchover splits one window around an intermediate). It is ONE sync source that carries ALL those windows - never several sources, which would double-scan it and, worse, make matching a request depend on which window the caller happened to hold.
+        let peerByKey = new Map<string, StoreSourceSpec>();
         for (let i = group.firstIndex + 1; i < routing.sources.length; i++) {
             let source = routing.sources[i];
             if (typeof source === "string" || ownIndexes.has(i)) continue;
             let sharedRoute = routeIntersection(group.route, source.route);
             if (!sharedRoute) continue;
-            sourceSpecs.push({ sourceConfig: source, validWindow: source.validWindow, route: sharedRoute, noFullSync: source.noFullSync || noFullSync });
+            let key = JSON.stringify({ ...source, validWindow: undefined });
+            let spec = peerByKey.get(key);
+            if (!spec) {
+                spec = { sourceConfig: source, validWindows: [], route: sharedRoute, noFullSync: source.noFullSync || noFullSync };
+                peerByKey.set(key, spec);
+                sourceSpecs.push(spec);
+            }
+            spec.validWindows.push(source.validWindow);
         }
         stores.push({
             routeKey,
@@ -159,7 +168,7 @@ export function computeStorePlan(account: string, bucketName: string, routing: R
     }
     if (!stores.length) {
         // Not in the config at all: still serve whatever the plain folder holds, through one inert full-route store
-        stores.push({ routeKey: JSON.stringify(FULL_ROUTE), route: undefined, entries: [], rawDisk: false, readerDiskLimit: undefined, sourceSpecs: [{ validWindow: [0, 0] }] });
+        stores.push({ routeKey: JSON.stringify(FULL_ROUTE), route: undefined, entries: [], rawDisk: false, readerDiskLimit: undefined, sourceSpecs: [{ validWindows: [[0, 0]] }] });
     }
     let structureKey = JSON.stringify(stores.map(s => ({ routeKey: s.routeKey, rawDisk: s.rawDisk, readerDiskLimit: s.readerDiskLimit })));
     return { selfEntries, self, stores, structureKey };