Compare commits
3 commits
main
...
graphite-b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e57031cfd | ||
|
|
0082382c57 | ||
|
|
df0d9da4a3 |
5 changed files with 35 additions and 9 deletions
|
|
@ -182,19 +182,19 @@ describe("notification shoutrrr URL builders", () => {
|
|||
expect(
|
||||
buildTelegramShoutrrrUrl({
|
||||
type: "telegram",
|
||||
botToken: "bot-token",
|
||||
botToken: "123456:ABCdef",
|
||||
chatId: "chat-id",
|
||||
}),
|
||||
).toBe("telegram://bot-token@telegram?channels=chat-id");
|
||||
).toBe("telegram://123456:ABCdef@telegram?channels=chat-id");
|
||||
|
||||
expect(
|
||||
buildTelegramShoutrrrUrl({
|
||||
type: "telegram",
|
||||
botToken: "bot-token",
|
||||
botToken: "123456:ABCdef",
|
||||
chatId: "chat-id",
|
||||
threadId: "thread-id",
|
||||
}),
|
||||
).toBe("telegram://bot-token@telegram?channels=chat-id%3Athread-id");
|
||||
).toBe("telegram://123456:ABCdef@telegram?channels=chat-id:thread-id");
|
||||
});
|
||||
|
||||
test("builds generic URLs with reserved params, transport flags, and headers", () => {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
import type { NotificationConfig } from "~/schemas/notifications";
|
||||
|
||||
export const buildTelegramShoutrrrUrl = (config: Extract<NotificationConfig, { type: "telegram" }>) => {
|
||||
const shoutrrrUrl = new URL("telegram://telegram");
|
||||
shoutrrrUrl.username = config.botToken;
|
||||
shoutrrrUrl.searchParams.set("channels", `${config.chatId}${config.threadId ? `:${config.threadId}` : ""}`);
|
||||
return shoutrrrUrl.toString().replace("/?", "?");
|
||||
let shoutrrrUrl = `telegram://${config.botToken}@telegram?channels=${config.chatId}`;
|
||||
if (config.threadId) {
|
||||
shoutrrrUrl += `:${config.threadId}`;
|
||||
}
|
||||
return shoutrrrUrl;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -261,6 +261,23 @@ describe("buildEnv", () => {
|
|||
});
|
||||
});
|
||||
|
||||
describe("rclone backend", () => {
|
||||
test("sets RCLONE_NO_CHECK_CERTIFICATE when insecureTls is enabled", async () => {
|
||||
const env = await buildEnvForTest(
|
||||
withCustomPassword({
|
||||
backend: "rclone" as const,
|
||||
remote: "my-remote",
|
||||
path: "/backups",
|
||||
insecureTls: true,
|
||||
}),
|
||||
"org-1",
|
||||
);
|
||||
|
||||
expect(env._INSECURE_TLS).toBe("true");
|
||||
expect(env.RCLONE_NO_CHECK_CERTIFICATE).toBe("true");
|
||||
});
|
||||
});
|
||||
|
||||
describe("sftp backend", () => {
|
||||
const baseSftpConfig = withCustomPassword({
|
||||
backend: "sftp" as const,
|
||||
|
|
|
|||
|
|
@ -142,6 +142,10 @@ export const buildEnv = async (
|
|||
|
||||
if (config.insecureTls) {
|
||||
env._INSECURE_TLS = "true";
|
||||
|
||||
if (config.backend === "rclone") {
|
||||
env.RCLONE_NO_CHECK_CERTIFICATE = "true";
|
||||
}
|
||||
}
|
||||
|
||||
return env;
|
||||
|
|
|
|||
|
|
@ -83,11 +83,12 @@ export function safeSpawn(params: SafeSpawnParams): Promise<SpawnResult> {
|
|||
child.stderr.setEncoding("utf8");
|
||||
|
||||
const rlErr = createInterface({ input: child.stderr });
|
||||
let rl: ReturnType<typeof createInterface> | undefined;
|
||||
|
||||
if (stdoutMode === "lines") {
|
||||
child.stdout.setEncoding("utf8");
|
||||
|
||||
const rl = createInterface({ input: child.stdout });
|
||||
rl = createInterface({ input: child.stdout });
|
||||
|
||||
rl.on("line", (line) => {
|
||||
if (onStdout) onStdout(line);
|
||||
|
|
@ -107,6 +108,9 @@ export function safeSpawn(params: SafeSpawnParams): Promise<SpawnResult> {
|
|||
});
|
||||
|
||||
child.on("error", (err) => {
|
||||
rlErr.close();
|
||||
rl?.close();
|
||||
|
||||
resolve({
|
||||
exitCode: -1,
|
||||
summary: lastStdout,
|
||||
|
|
|
|||
Loading…
Reference in a new issue