@oneuptime/common 11.5.3 → 11.5.5

package/build/dist/Server/Utils/CodeRepository/StackTraceRepoResolver.js

@@ -0,0 +1,336 @@
+/*
+ * Resolves which connected code repository an exception's code lives in — and
+ * at which subdirectory — at runtime from the exception's stack trace,
+ * replacing a manual service → repository mapping table. The tree fetcher is
+ * injected, so the resolution logic stays pure: deterministic, explainable,
+ * and unit-testable.
+ *
+ * Resolution order (first hit wins):
+ *   1. "stack-trace"     — file paths parsed from the stack trace, matched
+ *                          against each repository's tree by longest suffix.
+ *   2. "name-match"      — exact service-name ↔ repository-name match via the
+ *                          ServiceRepoLinkSuggester (score 3 only, unique).
+ *   3. "only-repository" — the project has exactly one connected repository.
+ */
+import { computeLinkSuggestions, } from "./ServiceRepoLinkSuggester";
+const WINDOWS_DRIVE_RE = /^[A-Za-z]:\//;
+const FILE_EXTENSION_RE = /\.[A-Za-z0-9]+$/;
+// Stack top is most relevant — anything past this is noise.
+const MAX_CANDIDATE_PATHS = 10;
+// A suffix match of at least this many path segments is "strong".
+const STRONG_MATCH_MIN_SEGMENTS = 2;
+// Only exact-name suggestions (score 3) are trusted for the name-match fallback.
+const EXACT_NAME_MATCH_SCORE = 3;
+/*
+ * Leading absolute segments that are container/deploy noise rather than
+ * repository structure. Only the first matching pattern is stripped — the
+ * suffix ladder takes care of any remaining non-repository segments.
+ */
+const CONTAINER_PREFIX_PATTERNS = [
+    /^\/usr\/src\/app\//,
+    /^\/var\/task\//,
+    /^\/app\//,
+    /^\/home\/[^/]+\//,
+];
+// Frames inside dependency directories never point at first-party code.
+const DEPENDENCY_FRAME_MARKERS = [
+    "/node_modules/",
+    "/site-packages/",
+    "/dist-packages/",
+    "/vendor/",
+    "/gems/",
+];
+/*
+ * `/app/src/x.ts:12` — a path whose basename has an extension, followed by a
+ * line number. Covers Node (`at fn (/app/src/x.ts:1:2)`, `at /app/src/x.js:1:2`),
+ * Ruby (`from /app/lib/x.rb:1`), Go (`\t/app/pkg/x.go:12 +0x1b`) and Java
+ * (`at com.acme.X.method(X.java:12)` — the opening parenthesis is not a path
+ * character, so only the reliable basename `X.java` is captured).
+ */
+const PATH_WITH_LINE_REGEX = /((?:[A-Za-z]:)?[\w.\-/\\@+~]+\.[A-Za-z][A-Za-z0-9]{0,9}):\d+/g;
+// Python traceback frames: `File "/app/src/x.py", line 1`.
+const PYTHON_FRAME_REGEX = /File\s+"([^"]+)"\s*,\s*line\s+\d+/g;
+const normalizeCandidatePath = (rawPath) => {
+    let path = rawPath.trim().replace(/\\/g, "/");
+    // `<anonymous>`, `<frozen importlib._bootstrap>` and friends are not files.
+    if (path.includes("<") || path.includes(">")) {
+        return null;
+    }
+    // Windows drive letters are absolute-root noise: C:/app/x.ts → /app/x.ts.
+    if (WINDOWS_DRIVE_RE.test(path)) {
+        path = path.slice(2);
+    }
+    path = path.replace(/\/{2,}/g, "/");
+    // Guarantee a leading slash so the markers match at the very start too.
+    const probe = path.startsWith("/") ? path : `/${path}`;
+    for (const marker of DEPENDENCY_FRAME_MARKERS) {
+        if (probe.includes(marker)) {
+            return null;
+        }
+    }
+    let relative = probe;
+    for (const pattern of CONTAINER_PREFIX_PATTERNS) {
+        if (pattern.test(relative)) {
+            relative = relative.replace(pattern, "");
+            break;
+        }
+    }
+    relative = relative.replace(/^\/+/, "").replace(/^(\.\/)+/, "");
+    // Real source files have a basename with an extension.
+    if (!relative || !FILE_EXTENSION_RE.test(relative)) {
+        return null;
+    }
+    return relative;
+};
+export const extractCandidatePathsFromStackTrace = (stackTrace) => {
+    const candidates = [];
+    const seen = new Set();
+    const lines = stackTrace.split(/\r?\n/);
+    for (const line of lines) {
+        const rawPaths = [];
+        for (const match of line.matchAll(PYTHON_FRAME_REGEX)) {
+            if (match[1]) {
+                rawPaths.push(match[1]);
+            }
+        }
+        for (const match of line.matchAll(PATH_WITH_LINE_REGEX)) {
+            if (match[1]) {
+                rawPaths.push(match[1]);
+            }
+        }
+        for (const rawPath of rawPaths) {
+            const normalized = normalizeCandidatePath(rawPath);
+            if (!normalized || seen.has(normalized)) {
+                continue;
+            }
+            seen.add(normalized);
+            candidates.push(normalized);
+            if (candidates.length >= MAX_CANDIDATE_PATHS) {
+                return candidates;
+            }
+        }
+    }
+    return candidates;
+};
+const buildRepositoryMatchState = (repository, treePaths) => {
+    const basenameCounts = new Map();
+    const treePathsByBasename = new Map();
+    for (const treePath of treePaths) {
+        const lastSlashIndex = treePath.lastIndexOf("/");
+        const basename = lastSlashIndex === -1 ? treePath : treePath.slice(lastSlashIndex + 1);
+        basenameCounts.set(basename, (basenameCounts.get(basename) || 0) + 1);
+        const existing = treePathsByBasename.get(basename);
+        if (existing) {
+            existing.push(treePath);
+        }
+        else {
+            treePathsByBasename.set(basename, [treePath]);
+        }
+    }
+    return {
+        repository,
+        basenameCounts,
+        treePathsByBasename,
+        matches: [],
+    };
+};
+const matchCandidateAgainstRepository = (candidatePath, state) => {
+    const segments = candidatePath.split("/");
+    const basename = segments[segments.length - 1];
+    if (!basename) {
+        return null;
+    }
+    const treePaths = state.treePathsByBasename.get(basename) || [];
+    if (treePaths.length === 0) {
+        return null;
+    }
+    for (let start = 0; start < segments.length; start++) {
+        const suffix = segments.slice(start).join("/");
+        const matchedTreePaths = treePaths.filter((treePath) => {
+            return treePath === suffix || treePath.endsWith(`/${suffix}`);
+        });
+        if (matchedTreePaths.length > 0) {
+            const matchedSegmentCount = segments.length - start;
+            return {
+                candidatePath,
+                matchedSuffix: suffix,
+                matchedSegmentCount,
+                matchedTreePaths,
+                isStrongMatch: matchedSegmentCount >= STRONG_MATCH_MIN_SEGMENTS,
+            };
+        }
+    }
+    return null;
+};
+const totalMatchedSegmentDepth = (state) => {
+    return state.matches.reduce((sum, match) => {
+        return sum + match.matchedSegmentCount;
+    }, 0);
+};
+const deepestCommonPrefix = (prefixes) => {
+    let common = null;
+    for (const prefix of prefixes) {
+        const segments = prefix === "" ? [] : prefix.split("/");
+        if (common === null) {
+            common = segments;
+            continue;
+        }
+        let sharedLength = 0;
+        while (sharedLength < common.length &&
+            sharedLength < segments.length &&
+            common[sharedLength] === segments[sharedLength]) {
+            sharedLength++;
+        }
+        common = common.slice(0, sharedLength);
+    }
+    if (!common || common.length === 0) {
+        return null;
+    }
+    return common.join("/");
+};
+const resolveViaStackTrace = (candidatePaths, states) => {
+    for (const state of states) {
+        for (const candidatePath of candidatePaths) {
+            const match = matchCandidateAgainstRepository(candidatePath, state);
+            if (match) {
+                state.matches.push(match);
+            }
+        }
+    }
+    /*
+     * Basename-only matches are weak evidence: they count only when the
+     * basename exists in exactly one repository AND exactly once in its tree.
+     * This needs cross-repository counts, so it runs after all matching.
+     */
+    for (const state of states) {
+        state.matches = state.matches.filter((match) => {
+            if (match.isStrongMatch) {
+                return true;
+            }
+            const basename = match.matchedSuffix;
+            if ((state.basenameCounts.get(basename) || 0) !== 1) {
+                return false;
+            }
+            const existsElsewhere = states.some((other) => {
+                return (other !== state && (other.basenameCounts.get(basename) || 0) > 0);
+            });
+            return !existsElsewhere;
+        });
+    }
+    const scored = states.filter((state) => {
+        return state.matches.length > 0;
+    });
+    scored.sort((a, b) => {
+        if (b.matches.length !== a.matches.length) {
+            return b.matches.length - a.matches.length;
+        }
+        return totalMatchedSegmentDepth(b) - totalMatchedSegmentDepth(a);
+    });
+    const winner = scored[0];
+    if (!winner) {
+        return null;
+    }
+    const runnerUp = scored[1];
+    // Ambiguity must not guess — a tied score falls through to the next method.
+    if (runnerUp &&
+        runnerUp.matches.length === winner.matches.length &&
+        totalMatchedSegmentDepth(runnerUp) === totalMatchedSegmentDepth(winner)) {
+        return null;
+    }
+    const prefixes = [];
+    for (const match of winner.matches) {
+        for (const treePath of match.matchedTreePaths) {
+            prefixes.push(treePath === match.matchedSuffix
+                ? ""
+                : treePath.slice(0, treePath.length - match.matchedSuffix.length - 1));
+        }
+    }
+    const matchedSuffixes = [];
+    for (const match of winner.matches) {
+        if (!matchedSuffixes.includes(match.matchedSuffix)) {
+            matchedSuffixes.push(match.matchedSuffix);
+        }
+    }
+    return {
+        codeRepositoryId: winner.repository.id,
+        organizationName: winner.repository.organizationName,
+        repositoryName: winner.repository.repositoryName,
+        servicePathInRepository: deepestCommonPrefix(prefixes),
+        method: "stack-trace",
+        evidence: `Matched ${matchedSuffixes.join(", ")} in ${winner.repository.organizationName}/${winner.repository.repositoryName}`,
+    };
+};
+export const resolveRepositoryForExceptionFix = async (data) => {
+    // Method 1 — stack trace vs. repository trees.
+    if (data.stackTrace && data.repositories.length > 0) {
+        const candidatePaths = extractCandidatePathsFromStackTrace(data.stackTrace);
+        // No candidates → no reason to fetch any tree.
+        if (candidatePaths.length > 0) {
+            const fetched = await Promise.all(data.repositories.map(async (repository) => {
+                try {
+                    const treePaths = await data.getTreePaths(repository);
+                    return buildRepositoryMatchState(repository, treePaths);
+                }
+                catch (_a) {
+                    // A repository whose tree fetch fails is skipped; the others are still tried.
+                    return null;
+                }
+            }));
+            const states = fetched.filter((state) => {
+                return state !== null;
+            });
+            const resolution = resolveViaStackTrace(candidatePaths, states);
+            if (resolution) {
+                return resolution;
+            }
+        }
+    }
+    // Method 2 — exact service-name match (score 3, unique) via the suggester.
+    if (data.serviceName) {
+        const suggestions = computeLinkSuggestions({
+            services: [{ id: "exception-service", name: data.serviceName }],
+            repositories: data.repositories.map((repository) => {
+                return {
+                    id: repository.id,
+                    name: repository.name,
+                    repositoryName: repository.repositoryName,
+                    organizationName: repository.organizationName,
+                };
+            }),
+            existingLinks: [],
+        });
+        const exactMatches = suggestions.filter((suggestion) => {
+            return suggestion.score === EXACT_NAME_MATCH_SCORE;
+        });
+        const exactMatch = exactMatches[0];
+        if (exactMatches.length === 1 && exactMatch) {
+            const repository = data.repositories.find((candidate) => {
+                return candidate.id === exactMatch.codeRepositoryId;
+            });
+            if (repository) {
+                return {
+                    codeRepositoryId: repository.id,
+                    organizationName: repository.organizationName,
+                    repositoryName: repository.repositoryName,
+                    servicePathInRepository: null,
+                    method: "name-match",
+                    evidence: exactMatch.reason,
+                };
+            }
+        }
+    }
+    // Method 3 — a single connected repository is unambiguous by definition.
+    const onlyRepository = data.repositories[0];
+    if (data.repositories.length === 1 && onlyRepository) {
+        return {
+            codeRepositoryId: onlyRepository.id,
+            organizationName: onlyRepository.organizationName,
+            repositoryName: onlyRepository.repositoryName,
+            servicePathInRepository: null,
+            method: "only-repository",
+            evidence: "Only repository connected to this project",
+        };
+    }
+    return null;
+};
+//# sourceMappingURL=StackTraceRepoResolver.js.map

package/build/dist/Server/Utils/CodeRepository/StackTraceRepoResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StackTraceRepoResolver.js","sourceRoot":"","sources":["../../../../../Server/Utils/CodeRepository/StackTraceRepoResolver.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Execute.js

@@ -14,19 +14,22 @@ export default class Execute {
     static executeCommand(command, options) {
         return new Promise((resolve, reject) => {
             exec(`${command}`, Object.assign({}, options), (err, stdout, stderr) => {
+                // See executeCommandFile: string | Buffer for @types/node drift.
+                const stdoutText = stdout.toString();
+                const stderrText = stderr.toString();
                 if (err) {
                     logger.error(`Error executing command: ${command}`);
                     logger.error(err);
-                    logger.error(stdout);
-                    if (stderr) {
-                        logger.error(stderr);
+                    logger.error(stdoutText);
+                    if (stderrText) {
+                        logger.error(stderrText);
                     }
                     return reject(err);
                 }
-                if (stderr) {
-                    logger.debug(stderr);
+                if (stderrText) {
+                    logger.debug(stderrText);
                 }
-                return resolve(stdout);
+                return resolve(stdoutText);
             });
         });
     }
@@ -35,17 +38,24 @@ export default class Execute {
             execFile(data.command, data.args, Object.assign(Object.assign({ cwd: data.cwd }, (data.maxBuffer ? { maxBuffer: data.maxBuffer } : {})), (data.timeoutInMS
                 ? { timeout: data.timeoutInMS, killSignal: "SIGKILL" }
                 : {})), (err, stdout, stderr) => {
+                /*
+                 * Newer @types/node type execFile's callback output as
+                 * string | Buffer — coerce so this compiles on both the pinned
+                 * and freshly-resolved typings (caret ranges drift in CI).
+                 */
+                const stdoutText = stdout.toString();
+                const stderrText = stderr.toString();
                 if (err) {
                     logger.error(`Error executing command: ${data.command} ${data.args.join(" ")}`);
                     logger.error(err);
-                    logger.error(stdout);
-                    logger.error(stderr);
+                    logger.error(stdoutText);
+                    logger.error(stderrText);
                     return reject(err);
                 }
-                if (stderr) {
-                    logger.debug(stderr);
+                if (stderrText) {
+                    logger.debug(stderrText);
                 }
-                return resolve(stdout);
+                return resolve(stdoutText);
             });
         });
     }

package/build/dist/Server/Utils/Execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"Execute.js","sourceRoot":"","sources":["../../../../Server/Utils/Execute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Execute.js","sourceRoot":"","sources":["../../../../Server/Utils/Execute.ts"],"names":[],"mappings":"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"}