93 lines
3.7 KiB
TypeScript
93 lines
3.7 KiB
TypeScript
// Re-export everything from the shared adapter-utils/server-utils package.
|
|
// This file is kept as a convenience shim so existing in-tree
|
|
// imports (process/, http/, heartbeat.ts) don't need rewriting.
|
|
import type { ChildProcess } from "node:child_process";
|
|
import { logger } from "../middleware/logger.js";
|
|
import * as serverUtils from "@paperclipai/adapter-utils/server-utils";
|
|
export type { RunProcessResult } from "@paperclipai/adapter-utils/server-utils";
|
|
|
|
type BuildInvocationEnvForLogsOptions = {
|
|
runtimeEnv?: NodeJS.ProcessEnv | Record<string, string>;
|
|
includeRuntimeKeys?: string[];
|
|
resolvedCommand?: string | null;
|
|
resolvedCommandEnvKey?: string;
|
|
};
|
|
|
|
export const runningProcesses: Map<string, { child: ChildProcess; graceSec: number }> =
|
|
serverUtils.runningProcesses;
|
|
export const MAX_CAPTURE_BYTES = serverUtils.MAX_CAPTURE_BYTES;
|
|
export const MAX_EXCERPT_BYTES = serverUtils.MAX_EXCERPT_BYTES;
|
|
export const parseObject = serverUtils.parseObject;
|
|
export const asString = serverUtils.asString;
|
|
export const asNumber = serverUtils.asNumber;
|
|
export const asBoolean = serverUtils.asBoolean;
|
|
export const asStringArray = serverUtils.asStringArray;
|
|
export const parseJson = serverUtils.parseJson;
|
|
export const appendWithCap = serverUtils.appendWithCap;
|
|
export const resolvePathValue = serverUtils.resolvePathValue;
|
|
export const renderTemplate = serverUtils.renderTemplate;
|
|
export const redactEnvForLogs = serverUtils.redactEnvForLogs;
|
|
export const buildPaperclipEnv = serverUtils.buildPaperclipEnv;
|
|
export const defaultPathForPlatform = serverUtils.defaultPathForPlatform;
|
|
export const ensurePathInEnv = serverUtils.ensurePathInEnv;
|
|
export const ensureAbsoluteDirectory = serverUtils.ensureAbsoluteDirectory;
|
|
export const ensureCommandResolvable = serverUtils.ensureCommandResolvable;
|
|
export const resolveCommandForLogs = serverUtils.resolveCommandForLogs;
|
|
|
|
export function buildInvocationEnvForLogs(
|
|
env: Record<string, string>,
|
|
options: BuildInvocationEnvForLogsOptions = {},
|
|
): Record<string, string> {
|
|
// TODO: Remove this fallback once @paperclipai/adapter-utils exports buildInvocationEnvForLogs everywhere we consume it.
|
|
const maybeBuildInvocationEnvForLogs = (
|
|
serverUtils as typeof serverUtils & {
|
|
buildInvocationEnvForLogs?: (
|
|
env: Record<string, string>,
|
|
options?: BuildInvocationEnvForLogsOptions,
|
|
) => Record<string, string>;
|
|
}
|
|
).buildInvocationEnvForLogs;
|
|
|
|
if (typeof maybeBuildInvocationEnvForLogs === "function") {
|
|
return maybeBuildInvocationEnvForLogs(env, options);
|
|
}
|
|
|
|
const merged: Record<string, string> = { ...env };
|
|
const runtimeEnv = options.runtimeEnv ?? {};
|
|
|
|
for (const key of options.includeRuntimeKeys ?? []) {
|
|
if (key in merged) continue;
|
|
const value = runtimeEnv[key];
|
|
if (typeof value !== "string" || value.length === 0) continue;
|
|
merged[key] = value;
|
|
}
|
|
|
|
const resolvedCommand = options.resolvedCommand?.trim();
|
|
if (resolvedCommand) {
|
|
merged[options.resolvedCommandEnvKey ?? "PAPERCLIP_RESOLVED_COMMAND"] = resolvedCommand;
|
|
}
|
|
|
|
return redactEnvForLogs(merged);
|
|
}
|
|
|
|
// Re-export runChildProcess with the server's pino logger wired in.
|
|
import type { RunProcessResult } from "@paperclipai/adapter-utils/server-utils";
|
|
const _runChildProcess = serverUtils.runChildProcess;
|
|
|
|
export async function runChildProcess(
|
|
runId: string,
|
|
command: string,
|
|
args: string[],
|
|
opts: {
|
|
cwd: string;
|
|
env: Record<string, string>;
|
|
timeoutSec: number;
|
|
graceSec: number;
|
|
onLog: (stream: "stdout" | "stderr", chunk: string) => Promise<void>;
|
|
},
|
|
): Promise<RunProcessResult> {
|
|
return _runChildProcess(runId, command, args, {
|
|
...opts,
|
|
onLogError: (err, id, msg) => logger.warn({ err, runId: id }, msg),
|
|
});
|
|
}
|