@neat.is/core 0.7.8 → 0.7.9

package/dist/index.cjs

@@ -503,13 +503,18 @@ function loadProtobufResponseEncoder() {
   );
   return exportTraceServiceResponseType;
 }
-function encodeProtobufResponseBody() {
-  if (cachedProtobufResponseBody) return cachedProtobufResponseBody;
+function encodeProtobufResponseBody(rejected, message) {
   const Type = loadProtobufResponseEncoder();
-  const msg = Type.create({});
-  const encoded = Type.encode(msg).finish();
-  cachedProtobufResponseBody = Buffer.from(encoded);
-  return cachedProtobufResponseBody;
+  if (!rejected) {
+    if (cachedProtobufResponseBody) return cachedProtobufResponseBody;
+    const msg2 = Type.create({});
+    cachedProtobufResponseBody = Buffer.from(Type.encode(msg2).finish());
+    return cachedProtobufResponseBody;
+  }
+  const msg = Type.fromObject({
+    partial_success: { rejected_spans: rejected, error_message: message ?? "" }
+  });
+  return Buffer.from(Type.encode(msg).finish());
 }
 async function decodeProtobufBody(buf) {
   const Type = loadProtobufDecoder();
@@ -624,6 +629,13 @@ async function buildOtelReceiver(opts) {
     }
     return reply.code(200).header("content-type", "application/json").send({ partialSuccess: {} });
   }
+  function sendOtlpPartial(reply, flavor, rejected, message) {
+    if (flavor === "protobuf") {
+      const buf = encodeProtobufResponseBody(rejected, message);
+      return reply.code(200).header("content-type", "application/x-protobuf").send(buf);
+    }
+    return reply.code(200).header("content-type", "application/json").send({ partialSuccess: { rejectedSpans: rejected, errorMessage: message } });
+  }
   app.addContentTypeParser(
     "application/x-protobuf",
     { parseAs: "buffer", bodyLimit: opts.bodyLimit ?? 16 * 1024 * 1024 },
@@ -651,6 +663,10 @@ async function buildOtelReceiver(opts) {
       }
     }
     enqueue(spans);
+    if (opts.classifyBareRoutability) {
+      const { rejected, message } = opts.classifyBareRoutability(spans);
+      if (rejected > 0) return sendOtlpPartial(reply, result.flavor, rejected, message);
+    }
     return sendOtlpSuccess(reply, result.flavor);
   });
   app.post("/projects/:project/v1/traces", async (req, reply) => {
@@ -4865,10 +4881,15 @@ function resolveDistToSrc(absFilepath, line) {
   }
   if (!entry) return null;
   try {
-    const pos = entry.consumer.originalPositionFor({
-      line: line !== void 0 && Number.isFinite(line) ? line : 1,
-      column: 0
-    });
+    const queryLine = line !== void 0 && Number.isFinite(line) ? line : 1;
+    let pos = entry.consumer.originalPositionFor({ line: queryLine, column: 0 });
+    if (!pos || !pos.source) {
+      pos = entry.consumer.originalPositionFor({
+        line: queryLine,
+        column: 0,
+        bias: sourceMapJs.SourceMapConsumer.LEAST_UPPER_BOUND
+      });
+    }
     if (!pos || !pos.source) return null;
     const root = entry.consumer.sourceRoot ?? "";
     const resolved = import_node_path8.default.resolve(entry.dir, root, pos.source);
@@ -4877,6 +4898,9 @@ function resolveDistToSrc(absFilepath, line) {
     return null;
   }
 }
+function hasAdjacentSourceMap(absFilepath) {
+  return sourceMapCache.get(absFilepath) != null;
+}
 function callSiteFromSpan(span, serviceNode, scanPath) {
   const filepath = codeFilepathOf(span.attributes);
   if (filepath === void 0) return null;
@@ -4892,7 +4916,7 @@ function callSiteFromSpan(span, serviceNode, scanPath) {
   }
   const relPath = relPathForRuntimeFile(effectivePath, serviceNode, scanPath);
   if (!relPath) return null;
-  if (!resolved && abs.endsWith(".js") && relPath.startsWith("dist/") && serviceNode?.name) {
+  if (!resolved && abs.endsWith(".js") && relPath.startsWith("dist/") && !hasAdjacentSourceMap(abs) && serviceNode?.name) {
     warnNoSourceMaps(serviceNode.name);
   }
   const fn = codeFunctionOf(span.attributes);
@@ -5168,7 +5192,7 @@ function resolveServiceId(graph, host, env) {
 function frontierIdFor(host) {
   return (0, import_types8.frontierId)(host);
 }
-function ensureServiceNode(graph, serviceName, env) {
+function resolveFusedServiceId(graph, serviceName, env) {
   const id = (0, import_types8.serviceId)(serviceName, env);
   if (graph.hasNode(id)) return id;
   const wanted = serviceName.toLowerCase();
@@ -5178,17 +5202,21 @@ function ensureServiceNode(graph, serviceName, env) {
     if (svc.discoveredVia === "otel") return false;
     return typeof svc.name === "string" && svc.name.toLowerCase() === wanted;
   });
-  if (extractedId) return extractedId;
+  return extractedId ?? id;
+}
+function ensureServiceNode(graph, serviceName, env) {
+  const resolved = resolveFusedServiceId(graph, serviceName, env);
+  if (graph.hasNode(resolved)) return resolved;
   const node = {
-    id,
+    id: resolved,
     type: import_types8.NodeType.ServiceNode,
     name: serviceName,
     language: "unknown",
     discoveredVia: "otel",
     ...env !== "unknown" ? { env } : {}
   };
-  graph.addNode(id, node);
-  return id;
+  graph.addNode(resolved, node);
+  return resolved;
 }
 function ensureInfraNode(graph, kind, name, provider) {
   const id = (0, import_types8.infraId)(kind, name);
@@ -5382,7 +5410,7 @@ async function appendErrorEvent(ctx, ev) {
   await import_node_fs7.promises.appendFile(ctx.errorsPath, JSON.stringify(ev) + "\n", "utf8");
 }
 function incidentAffectedNode(span, graph, scanPath) {
-  const sid = (0, import_types8.serviceId)(span.service, span.env);
+  const sid = graph ? resolveFusedServiceId(graph, span.service, span.env) : (0, import_types8.serviceId)(span.service, span.env);
   const serviceNode = graph && graph.hasNode(sid) ? graph.getNodeAttributes(sid) : void 0;
   const callSite = callSiteFromSpan(span, serviceNode, scanPath);
   if (callSite) {
@@ -6784,7 +6812,7 @@ function disambiguate(defs) {
 }
 async function addSymbols(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -6800,7 +6828,7 @@ async function addSymbols(graph, services) {
   for (const service of services) {
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
-      const parser = parserForExt4(import_node_path17.default.extname(file.path));
+      const parser = parserForExt5(import_node_path17.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path17.default.relative(service.dir, file.path));
       let defs;
@@ -6952,7 +6980,7 @@ function stringInner(node) {
 }
 async function addSymbolEdges(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -6969,7 +6997,7 @@ async function addSymbolEdges(graph, services) {
     const tsPaths = await loadTsPathConfig(service.dir);
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
-      const parser = parserForExt4(import_node_path18.default.extname(file.path));
+      const parser = parserForExt5(import_node_path18.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path18.default.relative(service.dir, file.path));
       const fileDir = import_node_path18.default.dirname(file.path);
@@ -7231,7 +7259,7 @@ function firstReferenceLines(root, wanted) {
 }
 async function addServerActions(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -7254,7 +7282,7 @@ async function addServerActions(graph, services) {
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = parserForExt4(import_node_path19.default.extname(file.path));
+      const parser = parserForExt5(import_node_path19.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path19.default.relative(service.dir, file.path));
       let root;
@@ -7317,7 +7345,7 @@ async function addServerActions(graph, services) {
     }
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = parserForExt4(import_node_path19.default.extname(file.path));
+      const parser = parserForExt5(import_node_path19.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path19.default.relative(service.dir, file.path));
       const fileDir = import_node_path19.default.dirname(file.path);
@@ -8281,6 +8309,7 @@ init_cjs_shims();
 var import_node_path30 = __toESM(require("path"), 1);
 var import_tree_sitter6 = __toESM(require("tree-sitter"), 1);
 var import_tree_sitter_javascript4 = __toESM(require("tree-sitter-javascript"), 1);
+var import_tree_sitter_typescript2 = __toESM(require("tree-sitter-typescript"), 1);
 var import_tree_sitter_python3 = __toESM(require("tree-sitter-python"), 1);
 var import_types20 = require("@neat.is/types");
 var STRING_LITERAL_NODE_TYPES = /* @__PURE__ */ new Set(["string_fragment", "string_content"]);
@@ -8331,19 +8360,27 @@ function callsFromSource(source, parser, knownHosts) {
   }
   return out;
 }
-function makeJsParser3() {
-  const p = new import_tree_sitter6.default();
-  p.setLanguage(import_tree_sitter_javascript4.default);
-  return p;
-}
-function makePyParser3() {
-  const p = new import_tree_sitter6.default();
-  p.setLanguage(import_tree_sitter_python3.default);
-  return p;
+var GRAMMAR_BY_EXT2 = {
+  ".ts": import_tree_sitter_typescript2.default.typescript,
+  ".tsx": import_tree_sitter_typescript2.default.tsx,
+  ".js": import_tree_sitter_javascript4.default,
+  ".jsx": import_tree_sitter_javascript4.default,
+  ".mjs": import_tree_sitter_javascript4.default,
+  ".cjs": import_tree_sitter_javascript4.default,
+  ".py": import_tree_sitter_python3.default
+};
+function parserForExt(ext, cache) {
+  const grammar = GRAMMAR_BY_EXT2[ext] ?? import_tree_sitter_javascript4.default;
+  let parser = cache.get(grammar);
+  if (!parser) {
+    parser = new import_tree_sitter6.default();
+    parser.setLanguage(grammar);
+    cache.set(grammar, parser);
+  }
+  return parser;
 }
 async function addHttpCallEdges(graph, services) {
-  const jsParser = makeJsParser3();
-  const pyParser = makePyParser3();
+  const parserCache = /* @__PURE__ */ new Map();
   const { knownHosts, hostToNodeId } = buildServiceHostIndex(services);
   let nodesAdded = 0;
   let edgesAdded = 0;
@@ -8352,7 +8389,7 @@ async function addHttpCallEdges(graph, services) {
     const seen = /* @__PURE__ */ new Set();
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = import_node_path30.default.extname(file.path) === ".py" ? pyParser : jsParser;
+      const parser = parserForExt(import_node_path30.default.extname(file.path), parserCache);
       let sites;
       try {
         sites = callsFromSource(file.content, parser, knownHosts);
@@ -8425,7 +8462,7 @@ function parseSource5(parser, source) {
     (index) => index >= source.length ? "" : source.slice(index, index + PARSE_CHUNK5)
   );
 }
-function makeJsParser4() {
+function makeJsParser3() {
   const p = new import_tree_sitter7.default();
   p.setLanguage(import_tree_sitter_javascript5.default);
   return p;
@@ -8603,7 +8640,7 @@ function findRoute(entries, method, normalizedPath) {
   );
 }
 async function addRouteCallEdges(graph, services) {
-  const jsParser = makeJsParser4();
+  const jsParser = makeJsParser3();
   const { knownHosts, hostToNodeId } = buildServiceHostIndex(services);
   const routeIndex = buildRouteIndex(graph);
   if (routeIndex.size === 0) return { nodesAdded: 0, edgesAdded: 0 };
@@ -8995,7 +9032,7 @@ var import_tree_sitter_javascript6 = __toESM(require("tree-sitter-javascript"),
 var import_types27 = require("@neat.is/types");
 var FIRESTORE_CLIENT_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])firebase\/firestore['"`]/;
 var FIRESTORE_ADMIN_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])firebase-admin(?:\/firestore)?['"`]/;
-function parserForExt(ext) {
+function parserForExt2(ext) {
   const p = new import_tree_sitter8.default();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? import_tree_sitter_javascript6.default);
   return p;
@@ -9160,7 +9197,7 @@ function firestoreEndpointsFromFile(file, serviceDir) {
   const hasAdmin = FIRESTORE_ADMIN_IMPORT_RE.test(file.content);
   if (!hasClient && !hasAdmin) return [];
   const fileSdk = hasClient && !hasAdmin ? "client" : hasAdmin && !hasClient ? "admin" : null;
-  const tree = parseSource3(parserForExt(import_node_path37.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt2(import_node_path37.default.extname(file.path)), file.content);
   const clientVars = firestoreClientVars(tree.rootNode);
   const collLine = /* @__PURE__ */ new Map();
   const writes = /* @__PURE__ */ new Map();
@@ -9577,7 +9614,7 @@ var import_tree_sitter_python4 = __toESM(require("tree-sitter-python"), 1);
 var import_types29 = require("@neat.is/types");
 var SQLALCHEMY_IMPORT_RE = /(?:from|import)\s+(?:flask_sqlalchemy|sqlalchemy)\b/;
 var PARSE_CHUNK6 = 16384;
-function makePyParser4() {
+function makePyParser3() {
   const p = new import_tree_sitter9.default();
   p.setLanguage(import_tree_sitter_python4.default);
   return p;
@@ -9684,7 +9721,7 @@ function foreignKeyParentTable(call) {
 }
 function sqlalchemyForeignKeys(file, serviceDir) {
   if (!SQLALCHEMY_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource6(makePyParser4(), file.content);
+  const tree = parseSource6(makePyParser3(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   walk3(tree.rootNode, (node) => {
@@ -9721,7 +9758,7 @@ function sqlalchemyForeignKeys(file, serviceDir) {
 }
 function sqlalchemyEndpointsFromFile(file, serviceDir) {
   if (!SQLALCHEMY_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource6(makePyParser4(), file.content);
+  const tree = parseSource6(makePyParser3(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const push = (name, line, columns) => {
@@ -9773,7 +9810,7 @@ function sqlalchemyEndpointsFromFile(file, serviceDir) {
 function buildSqlalchemyModelRegistry(files) {
   const table = /* @__PURE__ */ new Map();
   const ambiguous = /* @__PURE__ */ new Set();
-  const parser = makePyParser4();
+  const parser = makePyParser3();
   for (const file of files) {
     if (!SQLALCHEMY_IMPORT_RE.test(file.content)) continue;
     const tree = parseSource6(parser, file.content);
@@ -9822,7 +9859,7 @@ function importsModelName(content, name) {
 function pythonOrmCrossFileEndpoints(files, serviceDir) {
   const registry = buildSqlalchemyModelRegistry(files);
   if (registry.size === 0) return [];
-  const parser = makePyParser4();
+  const parser = makePyParser3();
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const file of files) {
@@ -9860,7 +9897,7 @@ var import_tree_sitter_python5 = __toESM(require("tree-sitter-python"), 1);
 var import_types30 = require("@neat.is/types");
 var DJANGO_IMPORT_RE = /(?:from|import)\s+django\b/;
 var PARSE_CHUNK7 = 16384;
-function makePyParser5() {
+function makePyParser4() {
   const p = new import_tree_sitter10.default();
   p.setLanguage(import_tree_sitter_python5.default);
   return p;
@@ -9921,7 +9958,7 @@ function readMeta(body) {
 }
 function djangoOrmEndpointsFromFile(file, serviceDir) {
   if (!DJANGO_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource7(makePyParser5(), file.content);
+  const tree = parseSource7(makePyParser4(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const defaultAppLabel = import_node_path40.default.basename(import_node_path40.default.dirname(file.path));
@@ -9956,7 +9993,7 @@ var import_tree_sitter_javascript7 = __toESM(require("tree-sitter-javascript"),
 var import_types31 = require("@neat.is/types");
 var DRIZZLE_IMPORT_RE = /drizzle-orm/;
 var TABLE_BUILDERS = /* @__PURE__ */ new Set(["pgTable", "mysqlTable", "sqliteTable"]);
-function parserForExt2(ext) {
+function parserForExt3(ext) {
   const p = new import_tree_sitter11.default();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? import_tree_sitter_javascript7.default);
   return p;
@@ -10028,7 +10065,7 @@ function columnsFromObject(obj) {
 }
 function drizzleEndpointsFromFile(file, serviceDir) {
   if (!DRIZZLE_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt2(import_node_path41.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt3(import_node_path41.default.extname(file.path)), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const walk9 = (node) => {
@@ -10117,7 +10154,7 @@ function referencesTargetVar(call) {
 }
 function drizzleForeignKeys(file, serviceDir) {
   if (!DRIZZLE_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt2(import_node_path41.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt3(import_node_path41.default.extname(file.path)), file.content);
   const { tables, varToTable } = collectDrizzleTables(tree.rootNode);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -12824,7 +12861,7 @@ var import_tree_sitter_javascript8 = __toESM(require("tree-sitter-javascript"),
 var import_types47 = require("@neat.is/types");
 var ZOD_IMPORT_RE = /\bzod\b/;
 var ZOD_OBJECTS = /* @__PURE__ */ new Set(["z", "zod"]);
-function parserForExt3(ext) {
+function parserForExt4(ext) {
   const p = new import_tree_sitter16.default();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? import_tree_sitter_javascript8.default);
   return p;
@@ -12913,7 +12950,7 @@ function topLevelSchemas(root) {
 }
 function zodShapesFromFile(file, serviceDir) {
   if (!ZOD_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt3(import_node_path57.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt4(import_node_path57.default.extname(file.path)), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const { name, call } of topLevelSchemas(tree.rootNode)) {
@@ -18931,6 +18968,19 @@ async function startDaemon(opts = {}) {
   let otlpAddress = "";
   let daemonRecord = null;
   if (bind) {
+    let bareSpanIsRoutable2 = function(serviceName) {
+      if (singleProject) {
+        const slot = slots.get(singleProject);
+        if (!slot) {
+          return !serviceName || serviceNameMatchesProject(serviceName, singleProject);
+        }
+        return spanBelongsToSingleProject(slot.graph, singleProject, serviceName);
+      }
+      const entries = [...slots.values()].map((s) => s.entry);
+      const target = routeSpanToProject(serviceName, entries);
+      return slots.has(target) || slots.has(DEFAULT_PROJECT);
+    };
+    var bareSpanIsRoutable = bareSpanIsRoutable2;
     const auth = readAuthEnv();
     const host = resolveHost(opts, Boolean(auth.authToken));
     const restPort = resolveRestPort(opts);
@@ -19028,6 +19078,20 @@ async function startDaemon(opts = {}) {
       const liveEntries = await listProjects().catch(() => []);
       let slot = slots.get(project);
       if (!slot) {
+        if (singleProject && project === singleProject) {
+          slot = await tryRecoverSlot({
+            name: singleProject,
+            path: singleProjectPath,
+            registeredAt: (/* @__PURE__ */ new Date()).toISOString(),
+            languages: [],
+            status: "active"
+          });
+          if (!slot || slot.status !== "active") {
+            warnDroppedSpan(singleProject, slot?.errorReason ?? "unknown");
+            return null;
+          }
+          return slot;
+        }
         await recordUnroutedSpan(serviceName, traceId);
         return null;
       }
@@ -19094,7 +19158,30 @@ async function startDaemon(opts = {}) {
         // host, rather than accepting it and dropping the batch. `slots` covers
         // active/recovering projects, `bootstrapStatus` the ones still
         // extracting; a foreign or wrong-cased project name matches neither.
-        isProjectRegistered: (project) => slots.has(project) || bootstrapStatus.has(project)
+        // A single-project daemon owns exactly one project by definition, so its
+        // own name always counts as registered even before loadAll populates the
+        // slot — otherwise a scoped span arriving during cold-start would 404 and
+        // be lost (OTLP does not retry 4xx). resolveSlotByName then builds it (#879).
+        isProjectRegistered: (project) => slots.has(project) || bootstrapStatus.has(project) || singleProject !== void 0 && project === singleProject,
+        // #881 — the bare `/v1/traces` route replies before the span is routed
+        // (off the queue), so tell the receiver, per batch, how many spans will
+        // land on no project. It keeps the 200 but reports those as
+        // partialSuccess.rejectedSpans instead of an empty partialSuccess that an
+        // exporter reads as full acceptance. Pure — the drop + unrouted-ledger
+        // write still happen on the async onSpan path.
+        classifyBareRoutability: (spans) => {
+          let rejected = 0;
+          for (const span of spans) {
+            if (!bareSpanIsRoutable2(span.service)) rejected++;
+          }
+          if (rejected === 0) return { rejected: 0 };
+          const noun = rejected === 1 ? "span" : "spans";
+          const verb = rejected === 1 ? "was" : "were";
+          return {
+            rejected,
+            message: `${rejected} ${noun} matched no project on this daemon and ${verb} dropped. Export to /projects/<project>/v1/traces, or check the exporter's service.name.`
+          };
+        }
       });
       otlpAddress = await listenSteppingOtlp(otlpApp, otlpPort, host);
       console.log(`neatd: OTLP listening on ${otlpAddress}/v1/traces`);