fix: controller is already closed trpc subscription observable error (#743)

This commit is contained in:
Meier Lukas
2024-07-03 20:31:06 +02:00
committed by GitHub
parent f557fbbae1
commit 41dba7b516
6 changed files with 33 additions and 12 deletions

View File

@@ -21,14 +21,22 @@ export const cronJobsRouter = createTRPCRouter({
}), }),
subscribeToStatusUpdates: publicProcedure.subscription(() => { subscribeToStatusUpdates: publicProcedure.subscription(() => {
return observable<TaskStatus>((emit) => { return observable<TaskStatus>((emit) => {
let isConnectionClosed = false;
for (const job of jobGroup.getJobRegistry().values()) { for (const job of jobGroup.getJobRegistry().values()) {
const channel = createCronJobStatusChannel(job.name); const channel = createCronJobStatusChannel(job.name);
channel.subscribe((data) => { channel.subscribe((data) => {
if (isConnectionClosed) return;
emit.next(data); emit.next(data);
}); });
} }
logger.info("A tRPC client has connected to the cron job status updates procedure"); logger.info("A tRPC client has connected to the cron job status updates procedure");
return () => {
isConnectionClosed = true;
};
}); });
}), }),
}); });

View File

@@ -9,10 +9,17 @@ import { createTRPCRouter, publicProcedure } from "../trpc";
export const logRouter = createTRPCRouter({ export const logRouter = createTRPCRouter({
subscribe: publicProcedure.subscription(() => { subscribe: publicProcedure.subscription(() => {
return observable<LoggerMessage>((emit) => { return observable<LoggerMessage>((emit) => {
let isConnectionClosed = false;
loggingChannel.subscribe((data) => { loggingChannel.subscribe((data) => {
if (isConnectionClosed) return;
emit.next(data); emit.next(data);
}); });
logger.info("A tRPC client has connected to the logging procedure"); logger.info("A tRPC client has connected to the logging procedure");
return () => {
isConnectionClosed = true;
};
}); });
}), }),
}); });

View File

@@ -1,11 +1,9 @@
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { observable } from "@trpc/server/observable";
import { createSaltAsync, hashPasswordAsync } from "@homarr/auth"; import { createSaltAsync, hashPasswordAsync } from "@homarr/auth";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, createId, eq, schema } from "@homarr/db"; import { and, createId, eq, schema } from "@homarr/db";
import { groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema/sqlite"; import { groupMembers, groupPermissions, groups, invites, users } from "@homarr/db/schema/sqlite";
import { exampleChannel } from "@homarr/redis";
import { validation, z } from "@homarr/validation"; import { validation, z } from "@homarr/validation";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc"; import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
@@ -232,16 +230,6 @@ export const userRouter = createTRPCRouter({
}) })
.where(eq(users.id, input.userId)); .where(eq(users.id, input.userId));
}), }),
setMessage: publicProcedure.input(z.string()).mutation(async ({ input }) => {
await exampleChannel.publishAsync({ message: input });
}),
test: publicProcedure.subscription(() => {
return observable<{ message: string }>((emit) => {
exampleChannel.subscribe((message) => {
emit.next(message);
});
});
}),
}); });
const createUserAsync = async (db: Database, input: z.infer<typeof validation.user.create>) => { const createUserAsync = async (db: Database, input: z.infer<typeof validation.user.create>) => {

View File

@@ -27,14 +27,19 @@ export const appRouter = createTRPCRouter({
const pingResult = await sendPingRequestAsync(input.url); const pingResult = await sendPingRequestAsync(input.url);
return observable<{ url: string; statusCode: number } | { url: string; error: string }>((emit) => { return observable<{ url: string; statusCode: number } | { url: string; error: string }>((emit) => {
let isConnectionClosed = false;
emit.next({ url: input.url, ...pingResult }); emit.next({ url: input.url, ...pingResult });
pingChannel.subscribe((message) => { pingChannel.subscribe((message) => {
if (isConnectionClosed) return;
// Only emit if same url // Only emit if same url
if (message.url !== input.url) return; if (message.url !== input.url) return;
emit.next(message); emit.next(message);
}); });
return () => { return () => {
isConnectionClosed = true;
void pingUrlChannel.removeAsync(input.url); void pingUrlChannel.removeAsync(input.url);
}; };
}); });

View File

@@ -25,15 +25,21 @@ export const mediaServerRouter = createTRPCRouter({
.unstable_concat(createManyIntegrationMiddleware("jellyfin", "plex")) .unstable_concat(createManyIntegrationMiddleware("jellyfin", "plex"))
.subscription(({ ctx }) => { .subscription(({ ctx }) => {
return observable<{ integrationId: string; data: StreamSession[] }>((emit) => { return observable<{ integrationId: string; data: StreamSession[] }>((emit) => {
let isConnectionClosed = false;
for (const integration of ctx.integrations) { for (const integration of ctx.integrations) {
const channel = createItemAndIntegrationChannel<StreamSession[]>("mediaServer", integration.id); const channel = createItemAndIntegrationChannel<StreamSession[]>("mediaServer", integration.id);
void channel.subscribeAsync((sessions) => { void channel.subscribeAsync((sessions) => {
if (isConnectionClosed) return;
emit.next({ emit.next({
integrationId: integration.id, integrationId: integration.id,
data: sessions, data: sessions,
}); });
}); });
} }
return () => {
isConnectionClosed = true;
};
}); });
}), }),
}); });

View File

@@ -13,12 +13,19 @@ export const smartHomeRouter = createTRPCRouter({
entityId: string; entityId: string;
state: string; state: string;
}>((emit) => { }>((emit) => {
let isConnectionClosed = false;
homeAssistantEntityState.subscribe((message) => { homeAssistantEntityState.subscribe((message) => {
if (isConnectionClosed) return;
if (message.entityId !== input.entityId) { if (message.entityId !== input.entityId) {
return; return;
} }
emit.next(message); emit.next(message);
}); });
return () => {
isConnectionClosed = true;
};
}); });
}), }),
switchEntity: publicProcedure switchEntity: publicProcedure