@jeffusion/bungee-core 6.5.1 → 6.6.0

package/dist/config-storage-worker.js

@@ -7479,16 +7479,16 @@ function parseRoutes(value, catalog, context) {
       context.add("duplicate_path", `${itemPath}.path`, "Route path must be unique");
     else
       paths.add(path);
-    const references = parseReferences(object.service_references, `${itemPath}.service_references`, context, undefined, "service_references" in object);
+    const endpointCandidates = Array.isArray(object.endpoints) ? object.endpoints : [];
+    const referenceCandidates = Array.isArray(object.service_references) ? object.service_references : [];
+    const sharedPositions = normalizePositions([...endpointCandidates, ...referenceCandidates], itemPath, context, (offset) => offset < endpointCandidates.length ? `${itemPath}.endpoints[${offset}]` : `${itemPath}.service_references[${offset - endpointCandidates.length}]`);
+    const references = parseReferences(object.service_references, `${itemPath}.service_references`, context, sharedPositions.slice(endpointCandidates.length), "service_references" in object);
     const hasService = references.length > 0;
     if ("service_references" in object && !hasService)
       context.add("invalid_value", `${itemPath}.service_references`, "Service route requires at least one reference");
-    const endpointCount = Array.isArray(object.endpoints) ? object.endpoints.length : 0;
+    const endpointCount = endpointCandidates.length;
     const policies = copyKnown(object, ROUTE_KEYS, itemPath, context);
     validateRouteDomain(object, itemPath, hasService, endpointCount, context);
-    if (hasService && object.endpoints !== undefined) {
-      context.add("conflicting_owner", `${itemPath}.endpoints`, "A service route cannot own upstreams");
-    }
     const base = {
       ...policies,
       id,
@@ -7496,10 +7496,15 @@ function parseRoutes(value, catalog, context) {
       path,
       plugins: parsePlugins(object.plugins, `${itemPath}.plugins`, catalog, context, "plugins" in object)
     };
-    if (hasService)
-      routes.push({ ...base, service_references: references });
-    else
-      routes.push({ ...base, endpoints: parseUpstreams(object.endpoints, `${itemPath}.endpoints`, catalog, context, "endpoints" in object) });
+    const endpoints = parseUpstreams(object.endpoints, `${itemPath}.endpoints`, catalog, context, "endpoints" in object, sharedPositions);
+    if (hasService) {
+      routes.push({
+        ...base,
+        service_references: references,
+        ...endpoints.length ? { endpoints } : {}
+      });
+    } else
+      routes.push({ ...base, endpoints });
   });
   return routes.sort((left, right) => left.position - right.position);
 }
@@ -9484,14 +9489,20 @@ function readRawActiveAggregate(db) {
     endpoints: takeGroup(upstreams, `service:${row.id}`),
     plugins: takeGroup(bindings, `service:${row.id}`)
   }));
-  const routes = sqliteAll(db, "SELECT id,position,path,policy_json FROM routes ORDER BY position").map((row) => ({
-    ...parseCanonicalObject(row.policy_json, "route policy_json", ROUTE_RESERVED),
-    id: requireUuid(row.id, "routes.id"),
-    position: requireSafeInteger(row.position, "routes.position"),
-    path: row.path,
-    ...references.has(`route:${row.id}`) ? takeReferences(`route:${row.id}`) : { endpoints: takeGroup(upstreams, `route:${row.id}`) },
-    plugins: takeGroup(bindings, `route:${row.id}`)
-  }));
+  const routes = sqliteAll(db, "SELECT id,position,path,policy_json FROM routes ORDER BY position").map((row) => {
+    const key = `route:${row.id}`;
+    const hasReferences = references.has(key);
+    const endpoints = takeGroup(upstreams, key);
+    return {
+      ...parseCanonicalObject(row.policy_json, "route policy_json", ROUTE_RESERVED),
+      id: requireUuid(row.id, "routes.id"),
+      position: requireSafeInteger(row.position, "routes.position"),
+      path: row.path,
+      ...hasReferences ? takeReferences(key) : {},
+      ...!hasReferences || endpoints.length ? { endpoints } : {},
+      plugins: takeGroup(bindings, key)
+    };
+  });
   const activations = sqliteAll(db, "SELECT plugin_name FROM plugin_activations ORDER BY plugin_name");
   const input = { logical_configuration: {
     ...readSettings(db),