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
4 changes: 3 additions & 1 deletion apps/server/src/kin/KinServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import * as Option from "effect/Option";
import { KinIdentity } from "./chat/KinIdentity.ts";
import { KinChatService } from "./chat/KinChatService.ts";
import { KinChatHub } from "./chat/KinChatHub.ts";
import { KinBudget } from "./lead/KinBudget.ts";
import { KinEventQueue } from "./lead/KinEventQueue.ts";

export type Services = KinIdentity | KinChatService;
export type Services = KinIdentity | KinChatService | KinBudget | KinEventQueue;

export class KinServer extends Context.Service<
KinServer,
Expand Down
4 changes: 4 additions & 0 deletions apps/server/src/kin/chat/layer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import * as Layer from "effect/Layer";
import * as Budget from "../lead/KinBudget.ts";
import * as Queue from "../lead/KinEventQueue.ts";
import * as Cache from "../memory/MemoryCache.ts";
import * as KinPersistence from "../persistence/KinPersistence.ts";
import * as Repository from "./KinChatRepository.ts";
import * as Hub from "./KinChatHub.ts";
Expand All @@ -7,6 +10,7 @@ import { KinIdentity, KinIdentityConfig } from "./KinIdentity.ts";

export const layer = Layer.mergeAll(
Service.layer,
Budget.layer.pipe(Layer.provideMerge(Queue.layer), Layer.provide(Cache.layer)),
KinIdentity.layer.pipe(Layer.provide(KinIdentityConfig.layer)),
).pipe(
Layer.provideMerge(Hub.layer),
Expand Down
81 changes: 79 additions & 2 deletions apps/server/src/kin/chat/rpcHandlers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import * as NodeSocket from "@effect/platform-node/NodeSocket";
import {
AuthSessionId,
AuthSettingsWriteScope,
AuthOrchestrationReadScope,
KinChatError,
KinMemberId,
KinPersonId,
Expand All @@ -18,7 +19,7 @@ import {
KinAgentId,
KinChatId,
KinMessageId,
KinChatRpcs,
KinRpcs,
KinOrgId,
ThreadId,
RpcScopeAuthorization,
Expand Down Expand Up @@ -74,7 +75,7 @@ const probe = WsRpcGroup.omit(
tag !== WS_METHODS.serverProbe,
),
);
const group = RpcGroup.make(...KinChatRpcs, ...probe.requests.values()).middleware(
const group = RpcGroup.make(...KinRpcs, ...probe.requests.values()).middleware(
RpcScopeAuthorization,
);
const seed = Effect.gen(function* () {
Expand Down Expand Up @@ -531,3 +532,79 @@ it.effect("drops a failed waiting read without ending the chat list stream", ()
if (next._tag === "chat") assert.strictEqual(next.chat.lastSeq, 1);
}).pipe(Effect.provide(root.pipe(Layer.provideMerge(Sqlite.layerMemory)))),
);

it.effect(
"serves budget settings to the owner and refuses non-owner and foreign organizations",
() =>
Effect.gen(function* () {
const { person, repo } = yield* seed;
const handlers = yield* makeKinChatHandlers(session);
const client = yield* RpcTest.makeClient(group).pipe(
Effect.provide(
Layer.merge(
group.toLayer({ ...handlers, "server.probe": () => Effect.succeed({}) }),
RpcAuthorization.layer(AuthStandardClientScopes),
),
),
);
const input = { orgId: person.orgId, limits: { leadUnits: 300, workerUnits: 600 } };
assert.deepStrictEqual((yield* client["kin.budget.set"](input)).limits, input.limits);
assert.deepStrictEqual(
(yield* client["kin.budget.get"]({ orgId: person.orgId })).limits,
input.limits,
);
assert.include(
yield* client["kin.budget.set"]({ ...input, orgId: KinOrgId.make("foreign") }).pipe(
Effect.flip,
),
{ reason: "not_found" },
);
const memberId = KinPersonId.make("non-owner");
yield* repo.insertPerson({
orgId: person.orgId,
personId: memberId,
handle: "member",
displayName: "Member",
githubLogin: null,
createdAt: "1970-01-01T00:00:00.000Z",
});
const kin = yield* Kin.KinServer;
const services = Option.getOrThrow(kin.services);
const identity = Context.get(services, KinIdentity);
const memberHandlers = yield* makeKinChatHandlers(session).pipe(
Effect.provideService(Kin.KinServer, {
...kin,
services: Option.some(
Context.add(services, KinIdentity, {
...identity,
resolve: () =>
Effect.succeed([{ _tag: "person", orgId: person.orgId, personId: memberId }]),
}),
),
}),
);
const memberClient = yield* RpcTest.makeClient(group).pipe(
Effect.provide(
Layer.merge(
group.toLayer({ ...memberHandlers, "server.probe": () => Effect.succeed({}) }),
RpcAuthorization.layer(AuthStandardClientScopes),
),
),
);
assert.include(yield* memberClient["kin.budget.set"](input).pipe(Effect.flip), {
reason: "not_allowed",
});
const readOnly = yield* RpcTest.makeClient(group).pipe(
Effect.provide(
Layer.merge(
group.toLayer({ ...handlers, "server.probe": () => Effect.succeed({}) }),
RpcAuthorization.layer([AuthOrchestrationReadScope]),
),
),
);
assert.strictEqual(
(yield* readOnly["kin.budget.set"](input).pipe(Effect.flip))._tag,
"EnvironmentAuthorizationError",
);
}).pipe(Effect.provide(root.pipe(Layer.provideMerge(Sqlite.layerMemory)))),
);
22 changes: 20 additions & 2 deletions apps/server/src/kin/chat/rpcHandlers.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { KinChatError, KinChatRpcs } from "@t3tools/contracts";
import { KinChatError, KinRpcs } from "@t3tools/contracts";
import * as Context from "effect/Context";
import * as Effect from "effect/Effect";
import * as Schema from "effect/Schema";
Expand All @@ -7,10 +7,11 @@ import * as Stream from "effect/Stream";
import * as RpcGroup from "effect/rpc/RpcGroup";
import type { AuthenticatedSession } from "../../auth/EnvironmentAuth.ts";
import { KinServer } from "../layer.ts";
import { KinBudget } from "../lead/KinBudget.ts";
import { KinIdentity } from "./KinIdentity.ts";
import { KinChatService } from "./KinChatService.ts";

const group = RpcGroup.make(...KinChatRpcs);
const group = RpcGroup.make(...KinRpcs);
const unavailable = new KinChatError({ reason: "unavailable", message: "Kin is unavailable." });
const isKinChatError = Schema.is(KinChatError);
const mapError = (error: { readonly _tag: string }) =>
Expand All @@ -26,6 +27,7 @@ export const makeKinChatHandlers = Effect.fn("makeKinChatHandlers")(function* (
if (Option.isNone(kin) || Option.isNone(kin.value.services)) return yield* unavailable;
return {
identity: Context.get(kin.value.services.value, KinIdentity),
budget: Context.get(kin.value.services.value, KinBudget),
chat: Context.get(kin.value.services.value, KinChatService),
};
});
Expand All @@ -34,6 +36,22 @@ export const makeKinChatHandlers = Effect.fn("makeKinChatHandlers")(function* (
return { chat, people: yield* identity.resolve(session) };
});
return group.of({
"kin.budget.get": (input) =>
services.pipe(
Effect.flatMap(({ identity, budget }) =>
identity
.resolve(session)
.pipe(Effect.flatMap((people) => budget.view(people, input.orgId))),
),
Effect.mapError(mapError),
),
"kin.budget.set": (input) =>
services.pipe(
Effect.flatMap(({ identity, budget }) =>
identity.resolve(session).pipe(Effect.flatMap((people) => budget.set(people, input))),
),
Effect.mapError(mapError),
),
"kin.orgs.list": () =>
services.pipe(
Effect.flatMap(({ identity, chat }) =>
Expand Down
Loading