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 .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"typescript.experimental.useTsgo": false,
"typescript.tsdk": "node_modules/typescript/lib",
"oxc.fmt.experimental": true,
"editor.codeLens": false,
"editor.formatOnSave": true,
Expand Down Expand Up @@ -51,5 +52,6 @@
"[jsx]": {
"editor.indentSize": 2,
"editor.defaultFormatter": "oxc.oxc-vscode"
}
},
"typescript.tsdk": "node_modules/typescript/lib"
}
3 changes: 2 additions & 1 deletion @alchemy.run/effect-aws/src/client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import type { TagInstance } from "@alchemy.run/effect";
import type * as Context from "effect/Context";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
Expand All @@ -7,6 +6,8 @@ import type { AWSClientConfig } from "itty-aws";
import { Credentials } from "./credentials.ts";
import { Region } from "./region.ts";

export type TagInstance<T> = T extends new (_: never) => infer R ? R : never;

export const createAWSServiceClientLayer =
<Tag extends Context.Tag<any, any>, Client>(
tag: Tag,
Expand Down
18 changes: 13 additions & 5 deletions @alchemy.run/effect-aws/src/lambda/consume.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { $, Policy } from "@alchemy.run/effect";
import type { From } from "@alchemy.run/effect";
import { declare } from "@alchemy.run/effect";
import type {
Context as LambdaContext,
SQSBatchResponse,
Expand All @@ -12,18 +13,25 @@ import * as Lambda from "./function.ts";
export const consume =
<Q extends SQS.Queue, ID extends string, Req>(
id: ID,
{ queue, handle }: {
{
queue,
handle,
}: {
queue: Q;
handle: (
this: unknown,
event: SQS.QueueEvent<Q["props"]["schema"]["Type"]>,
context: LambdaContext,
) => Effect.Effect<SQSBatchResponse | void, never, Req>;
},
) =>
<const Props extends Lambda.FunctionProps<Req>>(props: Props) =>
<const Props extends Lambda.FunctionProps<Req>>({
bindings,
...props
}: Props) =>
Lambda.Function(id, {
handle: Effect.fn(function* (event: SQSEvent, context: LambdaContext) {
yield* Policy.declare<SQS.Consume<Q>>();
yield* declare<SQS.Consume<From<Q>>>();
const records = yield* Effect.all(
event.Records.map(
Effect.fn(function* (record) {
Expand Down Expand Up @@ -53,4 +61,4 @@ export const consume =
],
} satisfies SQSBatchResponse;
}),
})({ ...props, bindings: $(SQS.Consume(queue)) });
})({ ...props, bindings: bindings.and(SQS.QueueEventSource(queue)) });
4 changes: 2 additions & 2 deletions @alchemy.run/effect-aws/src/lambda/function.invoke.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as Effect from "effect/Effect";

import { Capability, Policy } from "@alchemy.run/effect";
import { FunctionClient } from "./function.client.ts";
import { FunctionRuntime } from "./function.ts";
import { Function } from "./function.ts";

export interface InvokeFunction<Resource = unknown>
extends Capability<"AWS.Lambda.InvokeFunction", Resource> {
Expand All @@ -13,7 +13,7 @@ export const InvokeFunction = Capability<InvokeFunction>(
"AWS.Lambda.InvokeFunction",
);

export const invoke = <F extends FunctionRuntime>(func: F, input: any) =>
export const invoke = <F extends Function>(func: F, input: any) =>
Effect.gen(function* () {
const lambda = yield* FunctionClient;
const functionArn = process.env[`${func.id}-functionArn`]!;
Expand Down
15 changes: 5 additions & 10 deletions @alchemy.run/effect-aws/src/lambda/function.provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,11 @@ import * as IAM from "../iam.ts";
import { Region } from "../region.ts";
import { zipCode } from "../zip.ts";
import { FunctionClient } from "./function.client.ts";
import {
FunctionRuntime,
FunctionType,
type FunctionAttr,
type FunctionProps,
} from "./function.ts";
import { Function, type FunctionAttr, type FunctionProps } from "./function.ts";

export const functionProvider = () =>
Layer.effect(
Provider(FunctionRuntime),
Provider(Function),
Effect.gen(function* () {
const lambda = yield* FunctionClient;
const iam = yield* IAM.IAMClient;
Expand Down Expand Up @@ -70,7 +65,7 @@ export const functionProvider = () =>

for (const binding of bindings) {
if (binding.action === "attach") {
const binder = yield* FunctionRuntime(
const binder = yield* Function(
binding.capability,
// erase the Lambda(Capability) requirement
// TODO(sam): move bindings into the core engine instead of replicating them here
Expand Down Expand Up @@ -400,7 +395,7 @@ export const functionProvider = () =>
}`;

return {
type: FunctionType,
type: "AWS.Lambda.Function",
read: Effect.fn(function* ({ id, output }) {
if (output) {
// example: refresh the function URL from the API
Expand Down Expand Up @@ -596,6 +591,6 @@ export const functionProvider = () =>
.pipe(Effect.catchTag("NoSuchEntityException", () => Effect.void));
return null as any;
}),
} as any satisfies ProviderService<FunctionRuntime>;
} as any satisfies ProviderService<Function>;
}),
);
65 changes: 16 additions & 49 deletions @alchemy.run/effect-aws/src/lambda/function.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
import * as Alchemy from "@alchemy.run/effect";
import {
Binding,
Capability,
Policy,
Provider,
Runtime,
type RuntimeHandler,
} from "@alchemy.run/effect";
import type { Context as LambdaContext } from "aws-lambda";
import type { Effect } from "effect/Effect";
import * as IAM from "../iam.ts";

export const FunctionType = "AWS.Lambda.Function";
export type FunctionType = typeof FunctionType;
import type { Context } from "aws-lambda";
export type { Context } from "aws-lambda";

export type FunctionProps<Req = any> = {
export interface FunctionProps<Req = any> {
main: string;
handler?: string;
memory?: number;
runtime?: "nodejs20x" | "nodejs22x";
architecture?: "x86_64" | "arm64";
url?: boolean;
bindings: Policy<Extract<Req, Capability>>;
};
bindings: Policy<Function, Extract<Req, Capability>>;
}

export type FunctionAttr<Props extends FunctionProps = FunctionProps> = {
functionArn: string;
Expand All @@ -34,46 +30,17 @@ export type FunctionAttr<Props extends FunctionProps = FunctionProps> = {
};
};

export interface FunctionRuntime<
svc = unknown,
cap = unknown,
props = FunctionProps,
> extends Runtime<FunctionType, svc, cap, props> {
export interface Function<
Handler extends
| RuntimeHandler<[event: any, context: Context]>
| unknown = unknown,
Props extends FunctionProps<RuntimeHandler.Caps<Handler>> | unknown = unknown,
> extends Runtime<"AWS.Lambda.Function", Handler, Props> {
readonly Provider: FunctionProvider;
readonly Binding: FunctionBinding<this["capability"]>;
readonly Instance: FunctionRuntime<
this["service"],
this["capability"],
this["props"]
>;
readonly Instance: Function<this["handler"], this["props"]>;

readonly attr: FunctionAttr<Extract<this["props"], FunctionProps>>;
}
export const FunctionRuntime = Runtime(FunctionType)<FunctionRuntime>();

export const Function =
<const ID extends string, In, Out, Req>(
id: ID,
{ handle }: {
handle: (input: In, context: LambdaContext) => Effect<Out, never, Req>;
},
) =>
<const Props extends FunctionProps<Req>>(props: Props) =>
Alchemy.bind(
FunctionRuntime,
Alchemy.Service(id, handle, props.bindings),
props,
);

export type FunctionProvider = Provider<
FunctionRuntime<unknown, unknown, FunctionProps>
>;
export const Function = Runtime("AWS.Lambda.Function")<Function>();

export interface FunctionBinding<Cap extends Capability.Concrete>
extends Binding<
FunctionRuntime,
Cap,
{
env: Record<string, string>;
policyStatements: IAM.PolicyStatement[];
}
> {}
export type FunctionProvider = Provider<Function>;
2 changes: 1 addition & 1 deletion @alchemy.run/effect-aws/src/lambda/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ export * from "./serve.ts";
export type * from "../account.ts";
export type * from "../region.ts";

export type * as lambda from "aws-lambda";
// export type * as lambda from "aws-lambda";
26 changes: 16 additions & 10 deletions @alchemy.run/effect-aws/src/lambda/serve.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
import type {
Context as LambdaContext,
LambdaFunctionURLEvent,
LambdaFunctionURLResult,
} from "aws-lambda";
import * as Effect from "effect/Effect";
import * as Lambda from "./function.ts";

import type {
LambdaFunctionURLEvent as FunctionURLEvent,
LambdaFunctionURLResult as FunctionURLResult,
} from "aws-lambda";
export type {
LambdaFunctionURLEvent as FunctionURLEvent,
LambdaFunctionURLResult as FunctionURLResult,
} from "aws-lambda";

export const serve =
<const ID extends string, Req>(
id: ID,
{ fetch }: {
{
fetch,
}: {
fetch: (
event: LambdaFunctionURLEvent,
context: LambdaContext,
) => Effect.Effect<LambdaFunctionURLResult, never, Req>;
event: FunctionURLEvent,
context: Lambda.Context,
) => Effect.Effect<FunctionURLResult, never, Req>;
},
) =>
<const Props extends Lambda.FunctionProps<Req>>(props: Props) =>
Lambda.Function(id, { handle: fetch })({ ...props, url: true });
Lambda.Function(id, { handle: fetch })(props);
3 changes: 0 additions & 3 deletions @alchemy.run/effect-aws/src/sqs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@ export * from "./queue.consume.ts";
export * from "./queue.provider.ts";
export * from "./queue.send-message.ts";
export * from "./queue.ts";

export type * as lambda from "aws-lambda";
export type * as sqs from "itty-aws/sqs";
62 changes: 34 additions & 28 deletions @alchemy.run/effect-aws/src/sqs/queue.consume.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
import { Binding, Capability, type From } from "@alchemy.run/effect";
import type * as lambda from "aws-lambda";

import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import { FunctionRuntime } from "../lambda/function.ts";

import { Capability } from "@alchemy.run/effect";
import { Function } from "../lambda/index.ts";
import { Queue } from "./queue.ts";

export interface Consume<Res = unknown>
extends Capability<"AWS.SQS.Consume", Res> {
constructor: Consume;
construct: Consume<this["instance"]>;
}
export const Consume = Capability<Consume>("AWS.SQS.Consume");

export type QueueRecord<Data> = Omit<lambda.SQSRecord, "body"> & {
body: Data;
};
Expand All @@ -22,21 +12,37 @@ export type QueueEvent<Data> = Omit<lambda.SQSEvent, "Records"> & {
Records: QueueRecord<Data>[];
};

export interface Consume<Q = Queue> extends Capability<"AWS.SQS.Consume", Q> {}

export const QueueEventSource = Binding<
<Q extends Queue>(
queue: Q,
props?: {
batchSize?: number;
maxBatchingWindow?: number;
maxConcurrency?: number;
reportBatchItemFailures?: boolean;
},
) => Binding<Function, Consume<From<Q>>>
>(Function, Queue, "AWS.SQS.Consume");

export const consumeFromLambdaFunction = () =>
Layer.succeed(
FunctionRuntime(Consume(Queue)),
FunctionRuntime(Consume(Queue)).of({
attach: Effect.fn(function* (queue, capability) {
return {
policyStatements: [
{
Sid: capability.sid,
Effect: "Allow",
Action: ["sqs:SendMessage"],
Resource: [queue.attr.queueArn],
},
],
};
}),
QueueEventSource.layer.succeed({
// oxlint-disable-next-line require-yield
attach: Effect.fn(function* (queue, _props, _target) {
return {
policyStatements: [
{
Sid: capability.sid,
Effect: "Allow",
Action: [
"sqs:ReceiveMessage",
"sqs:DeleteMessage",
"sqs:ChangeMessageVisibility",
],
Resource: [queue.attr.queueArn],
},
],
};
}),
);
});
Loading