Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/server/src/kin/KinEnabled.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import * as Cause from "effect/Cause";
import * as Config from "effect/Config";
import * as Context from "effect/Context";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Ref from "effect/Ref";

export class KinEnabled extends Context.Service<
KinEnabled,
{
readonly enabled: boolean;
readonly reportFailure: (cause: Cause.Cause<unknown>) => Effect.Effect<void>;
}
>()("t3/kin/KinEnabled") {}

export const layer = Layer.effect(
KinEnabled,
Effect.gen(function* () {
const enabled = yield* Config.Boolean("KIN_ENABLED").pipe(
Config.withDefault(false),
Effect.catch((error) =>
Effect.logError("Kin disabled: invalid KIN_ENABLED.", error.message).pipe(Effect.as(false)),
),
);
const reported = yield* Ref.make(false);
return {
enabled,
reportFailure: Effect.fn("KinEnabled.reportFailure")(function* (cause) {
if (!(yield* Ref.getAndSet(reported, true)))
yield* Effect.logError("Kin disabled: initialization failed.", Cause.pretty(cause));
}),
};
}),
);
137 changes: 68 additions & 69 deletions apps/server/src/kin/chat/KinChatHub.test.ts
Original file line number Diff line number Diff line change
@@ -1,79 +1,78 @@
import { assert, describe, it } from "@effect/vitest";
import { KinChatId, KinMemberId, KinOrgId } from "@t3tools/contracts";
import { assert, it } from "@effect/vitest";
import { KinChatId, KinMemberId, KinOrgId, KinPersonId } from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as PubSub from "effect/PubSub";
import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";
import * as SqlClient from "effect/sql/SqlClient";
import * as Sqlite from "../../persistence/Sqlite.ts";
import * as KinPersistence from "../persistence/KinPersistence.ts";
import * as Repository from "./KinChatRepository.ts";
import * as Hub from "./KinChatHub.ts";

const layer = Layer.provideMerge(
Hub.layer,
Layer.provideMerge(
Repository.layer,
Layer.provideMerge(KinPersistence.layer, Sqlite.layerMemory),
),
const layer = Hub.layer.pipe(
Layer.provideMerge(Repository.layer),
Layer.provideMerge(KinPersistence.layer),
Layer.provideMerge(Sqlite.layerMemory),
);
const orgId = Schema.decodeSync(KinOrgId)("org-a");
const otherOrg = Schema.decodeSync(KinOrgId)("org-b");
const event: Hub.KinChatHubEvent = {
type: "read.updated",
orgId,
chatId: Schema.decodeSync(KinChatId)("chat"),
memberId: Schema.decodeSync(KinMemberId)("member"),
seq: 1,
};

describe("KinChatHub", () => {
it.effect(
"isolates org subscriptions and delivers only after the outer commit, discarding rollbacks",
() =>
Effect.gen(function* () {
const hub = yield* Hub.KinChatHub;
const sql = yield* SqlClient.SqlClient;
const first = yield* hub.subscribe(orgId);
const second = yield* hub.subscribe(orgId);
const other = yield* hub.subscribe(otherOrg);
yield* sql`CREATE TABLE chat_hub_test (seq INTEGER)`;
yield* sql.withTransaction(
Effect.gen(function* () {
yield* sql`INSERT INTO chat_hub_test VALUES (1)`;
yield* sql.withTransaction(hub.publish(event));
assert.deepStrictEqual(yield* PubSub.takeUpTo(first, 10), []);
yield* sql
.withTransaction(
hub
.publish({ ...event, seq: 2 })
.pipe(Effect.andThen(Effect.fail("nested rollback"))),
)
.pipe(Effect.flip);
}),
);
assert.deepStrictEqual(yield* PubSub.take(first), event);
assert.deepStrictEqual(yield* PubSub.take(second), event);
assert.deepStrictEqual(yield* sql`SELECT seq FROM chat_hub_test ORDER BY seq`, [
{ seq: 1 },
]);
yield* sql
.withTransaction(
Effect.gen(function* () {
yield* sql`INSERT INTO chat_hub_test VALUES (3)`;
yield* hub.publish({ ...event, seq: 3 });
return yield* Effect.fail("outer rollback");
}),
)
.pipe(Effect.flip);
assert.deepStrictEqual(yield* PubSub.takeUpTo(first, 10), []);
assert.deepStrictEqual(yield* PubSub.takeUpTo(second, 10), []);
assert.deepStrictEqual(yield* PubSub.takeUpTo(other, 10), []);
yield* hub.publish({ ...event, orgId: otherOrg });
assert.deepStrictEqual(yield* PubSub.take(other), { ...event, orgId: otherOrg });
assert.deepStrictEqual(yield* sql`SELECT seq FROM chat_hub_test ORDER BY seq`, [
{ seq: 1 },
]);
}).pipe(Effect.provide(layer)),
);
});
it.effect("delivers only committed viewer events and isolates organizations", () =>
Effect.gen(function* () {
const hub = yield* Hub.KinChatHub;
const sql = yield* SqlClient.SqlClient;
const repo = yield* Repository.KinChatRepository;
const orgId = KinOrgId.make("org");
const personId = KinPersonId.make("owner");
const chatId = KinChatId.make("chat");
const memberId = KinMemberId.make("member");
const now = "1970-01-01T00:00:00.000Z";
yield* repo.insertOrg({ orgId, name: "Kin", createdAt: now });
yield* repo.insertPerson({
orgId,
personId,
handle: "owner",
displayName: "Owner",
githubLogin: null,
createdAt: now,
});
yield* repo.createChat({
orgId,
chatId,
kind: "project_group",
title: "Test",
teamId: null,
directKey: null,
createdAt: now,
lastMessageAt: null,
archivedAt: null,
});
yield* repo.addMember({
orgId,
chatId,
memberId,
principal: { _tag: "person", personId },
role: "owner",
joinedAt: now,
leftAt: null,
mutedUntil: null,
});
const first = yield* hub.subscribeForViewer({ _tag: "person", orgId, personId });
const second = yield* hub.subscribeForViewer({ _tag: "person", orgId, personId });
const event: Hub.KinChatHubEvent = { type: "read.updated", orgId, chatId, memberId, seq: 1 };
yield* sql
.withTransaction(
hub.publish({ ...event, seq: 0 }).pipe(Effect.andThen(Effect.fail("rollback"))),
)
.pipe(Effect.flip);
yield* hub.publish({ ...event, orgId: KinOrgId.make("other") });
yield* sql.withTransaction(hub.publish(event));
yield* hub.publish({ ...event, seq: 2 });
assert.deepStrictEqual(yield* Stream.runCollect(first.pipe(Stream.take(2))), [
event,
{ ...event, seq: 2 },
]);
assert.deepStrictEqual(yield* Stream.runCollect(second.pipe(Stream.take(2))), [
event,
{ ...event, seq: 2 },
]);
}).pipe(Effect.provide(layer)),
);
33 changes: 21 additions & 12 deletions apps/server/src/kin/chat/KinChatHub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {
KinChat,
KinChatId,
KinMemberId,
KinChatMember,
KinMessage,
KinOrgId,
KinWaitingItem,
Expand All @@ -23,6 +24,7 @@ type ChatEvent =
| { readonly type: "message.posted"; readonly message: KinMessage }
| { readonly type: "widget.updated"; readonly widget: KinWidget }
| { readonly type: "waiting.updated"; readonly item: KinWaitingItem }
| { readonly type: "member.removed"; readonly member: KinChatMember }
| {
readonly type: "read.updated";
readonly chatId: KinChatId;
Expand All @@ -42,9 +44,6 @@ export class KinChatHub extends Context.Service<
never,
Scope.Scope
>;
readonly subscribe: (
orgId: KinOrgId,
) => Effect.Effect<PubSub.Subscription<KinChatHubEvent>, never, Scope.Scope>;
}
>()("t3/kin/chat/KinChatHub") {}

Expand Down Expand Up @@ -73,12 +72,17 @@ const make = Effect.gen(function* () {
}),
);
}),
subscribe,
subscribeForViewer: Effect.fn("KinChatHub.subscribeForViewer")(function* (identity) {
const subscription = yield* subscribe(identity.orgId);
return Stream.fromEffectRepeat(PubSub.take(subscription)).pipe(
Stream.filterEffect(
Effect.fn("KinChatHub.canDeliver")(function* (event) {
if (event.type === "member.removed")
return identity._tag === "person"
? event.member.principal._tag === "person" &&
event.member.principal.personId === identity.personId
: event.member.principal._tag === "agent" &&
event.member.principal.agentId === identity.agentId;
const chatId =
event.type === "chat.created"
? event.chat.chatId
Expand All @@ -89,14 +93,19 @@ const make = Effect.gen(function* () {
: event.type === "waiting.updated"
? event.item.chatId
: event.chatId;
const member = (yield* repo.listMembers({ orgId: identity.orgId, chatId })).find(
(row) =>
row.leftAt === null &&
(identity._tag === "person"
? row.principal._tag === "person" && row.principal.personId === identity.personId
: row.principal._tag === "agent" && row.principal.agentId === identity.agentId),
);
if (member === undefined) return false;
if (
event.type === "waiting.updated" &&
(identity._tag !== "person" || event.item.personId !== identity.personId)
)
return false;
if (event.type === "waiting.updated" && event.item.resolvedAt !== null) return true;
const memberOption = yield* repo.activeMember({
orgId: identity.orgId,
chatId,
principal: identity,
});
if (Option.isNone(memberOption)) return false;
const member = memberOption.value;
const messageId =
event.type === "widget.updated"
? event.widget.messageId
Expand Down
23 changes: 20 additions & 3 deletions apps/server/src/kin/chat/KinChatRepository.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ describe("KinChatRepository", () => {
...agent,
retiredAt: null,
});
assert.deepStrictEqual(yield* repo.listAgents({ orgId }), [agent]);
assert.deepStrictEqual(yield* repo.listAgents({ orgId }), [{ ...agent, retiredAt: null }]);
assert.deepStrictEqual(
yield* repo.createChat({
...chat,
Expand All @@ -192,6 +192,18 @@ describe("KinChatRepository", () => {
assert.deepStrictEqual(yield* repo.listMembersByPerson({ orgId, personId }), [owner]);
assert.deepStrictEqual(yield* repo.listMembersByAgent({ orgId, agentId }), [agentMember]);
assert.deepStrictEqual(Option.getOrThrow(yield* repo.getMember(scope)), owner);
const indexSql = yield* SqlClient.SqlClient;
for (const [principal, column] of [
[owner.principal, "person_id"],
[agentMember.principal, "agent_id"],
] as const) {
assert.isTrue(Option.isSome(yield* repo.activeMember({ ...scope, principal })));
const plan = yield* indexSql<{
detail: string;
}>`EXPLAIN QUERY PLAN ${Repository.activeMemberStatement(indexSql, { ...scope, principal })}`;
assert.isTrue(plan.some((row) => row.detail.includes(`(chat_id=? AND ${column}=?)`)));
}

for (const retry of [owner, agentMember]) {
assert.deepStrictEqual(yield* repo.addMember(retry), retry);
}
Expand All @@ -215,6 +227,11 @@ describe("KinChatRepository", () => {
createdAt: timestamp,
});
for (const retry of [
{
...owner,
memberId: decodeMemberId("second-owner"),
principal: { _tag: "person", personId: secondPerson },
},
{ ...owner, principal: { _tag: "person", personId: secondPerson } },
{ ...owner, memberId: decodeMemberId("retry-member") },
{ ...agentMember, memberId: decodeMemberId("retry-agent-member") },
Expand Down Expand Up @@ -291,8 +308,8 @@ describe("KinChatRepository", () => {
);
assert.strictEqual(wrongChat._tag, "KinChatError");
if (wrongChat._tag === "KinChatError") assert.strictEqual(wrongChat.reason, "not_found");
assert.strictEqual(yield* repo.leaveChat({ ...scope, leftAt: later }), true);
assert.strictEqual(yield* repo.leaveChat({ ...scope, leftAt: timestamp }), false);
assert.deepStrictEqual(yield* repo.leaveChat({ ...scope, leftAt: later }), []);
assert.deepStrictEqual(yield* repo.leaveChat({ ...scope, leftAt: timestamp }), []);
assert.strictEqual(
(yield* Effect.flip(repo.insertMessage(message("left-post"))))._tag,
"KinChatError",
Expand Down
Loading
Loading