@gaganref/confect-alchemy 10.6.0-fork.3 → 10.6.0-fork.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Backend.d.ts +64 -5
- package/dist/Backend.d.ts.map +1 -1
- package/dist/Backend.js +187 -3
- package/dist/Backend.js.map +1 -1
- package/dist/Code.d.ts +14 -2
- package/dist/Code.d.ts.map +1 -1
- package/dist/Code.js +2 -2
- package/dist/Code.js.map +1 -1
- package/dist/Confect.d.ts +1 -1
- package/dist/Confect.d.ts.map +1 -1
- package/dist/Confect.js +8 -3
- package/dist/Confect.js.map +1 -1
- package/dist/Convex.d.ts +4 -1
- package/dist/Convex.d.ts.map +1 -1
- package/dist/Convex.js +10 -1
- package/dist/Convex.js.map +1 -1
- package/dist/ConvexClient.d.ts +92 -3
- package/dist/ConvexClient.d.ts.map +1 -1
- package/dist/ConvexClient.js +149 -27
- package/dist/ConvexClient.js.map +1 -1
- package/dist/CustomDomain.d.ts +156 -0
- package/dist/CustomDomain.d.ts.map +1 -0
- package/dist/CustomDomain.js +255 -0
- package/dist/CustomDomain.js.map +1 -0
- package/dist/DeployKey.js +3 -3
- package/dist/Deployment.d.ts +29 -3
- package/dist/Deployment.d.ts.map +1 -1
- package/dist/Deployment.js +39 -15
- package/dist/Deployment.js.map +1 -1
- package/dist/EnvironmentVariables.d.ts +76 -21
- package/dist/EnvironmentVariables.d.ts.map +1 -1
- package/dist/EnvironmentVariables.js +203 -19
- package/dist/EnvironmentVariables.js.map +1 -1
- package/dist/LogStream.d.ts +134 -0
- package/dist/LogStream.d.ts.map +1 -0
- package/dist/LogStream.js +324 -0
- package/dist/LogStream.js.map +1 -0
- package/dist/Project.js +2 -2
- package/dist/Providers.d.ts.map +1 -1
- package/dist/Providers.js +30 -15
- package/dist/Providers.js.map +1 -1
- package/dist/UsageLimit.d.ts +140 -0
- package/dist/UsageLimit.d.ts.map +1 -0
- package/dist/UsageLimit.js +145 -0
- package/dist/UsageLimit.js.map +1 -0
- package/dist/internal/CodeDeployment.d.ts +28 -1
- package/dist/internal/CodeDeployment.d.ts.map +1 -1
- package/dist/internal/CodeDeployment.js +85 -2
- package/dist/internal/CodeDeployment.js.map +1 -1
- package/dist/internal/CommandRunner.d.ts +4 -0
- package/dist/internal/CommandRunner.d.ts.map +1 -1
- package/dist/internal/CommandRunner.js +92 -6
- package/dist/internal/CommandRunner.js.map +1 -1
- package/dist/internal/FileLock.js +1 -1
- package/dist/internal/FunctionsDirectory.d.ts +12 -0
- package/dist/internal/FunctionsDirectory.d.ts.map +1 -0
- package/dist/internal/FunctionsDirectory.js +22 -0
- package/dist/internal/FunctionsDirectory.js.map +1 -0
- package/dist/internal/Lifecycle.d.ts +1 -0
- package/dist/internal/Lifecycle.d.ts.map +1 -1
- package/dist/internal/Lifecycle.js +24 -2
- package/dist/internal/Lifecycle.js.map +1 -1
- package/dist/internal/LocalBackend.d.ts +9 -0
- package/dist/internal/LocalBackend.d.ts.map +1 -1
- package/dist/internal/LocalBackend.js +14 -5
- package/dist/internal/LocalBackend.js.map +1 -1
- package/dist/internal/LogStream.d.ts +115 -0
- package/dist/internal/LogStream.d.ts.map +1 -0
- package/dist/internal/LogStream.js +123 -0
- package/dist/internal/LogStream.js.map +1 -0
- package/dist/internal/MountInit.d.ts.map +1 -1
- package/dist/internal/MountInit.js +4 -6
- package/dist/internal/MountInit.js.map +1 -1
- package/dist/internal/PushLock.d.ts +1 -0
- package/dist/internal/PushLock.d.ts.map +1 -1
- package/dist/internal/PushLock.js +4 -3
- package/dist/internal/PushLock.js.map +1 -1
- package/dist/internal/ResourceIdentity.js +1 -1
- package/dist/internal/Zip.js +1 -1
- package/package.json +4 -4
- package/src/Backend.ts +422 -12
- package/src/Code.ts +13 -0
- package/src/Confect.ts +7 -1
- package/src/Convex.ts +24 -1
- package/src/ConvexClient.ts +364 -31
- package/src/CustomDomain.ts +453 -0
- package/src/Deployment.ts +74 -12
- package/src/EnvironmentVariables.ts +505 -19
- package/src/LogStream.ts +662 -0
- package/src/Providers.ts +18 -0
- package/src/UsageLimit.ts +253 -0
- package/src/internal/CodeDeployment.ts +115 -0
- package/src/internal/CommandRunner.ts +182 -1
- package/src/internal/FunctionsDirectory.ts +27 -0
- package/src/internal/Lifecycle.ts +21 -1
- package/src/internal/LocalBackend.ts +9 -0
- package/src/internal/LogStream.ts +154 -0
- package/src/internal/MountInit.ts +3 -13
- package/src/internal/PushLock.ts +4 -1
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import type { UsageLimitMetric, UsageLimitType, UsageLimitWindow } from "@convex-dev/platform/deploymentApi";
|
|
2
|
+
import { OwnedBySomeoneElse } from "alchemy/AdoptPolicy";
|
|
3
|
+
import * as Provider from "alchemy/Provider";
|
|
4
|
+
import { Resource } from "alchemy/Resource";
|
|
5
|
+
import * as Effect from "effect/Effect";
|
|
6
|
+
import * as Schema from "effect/Schema";
|
|
7
|
+
import { ConvexClient } from "./ConvexClient.js";
|
|
8
|
+
import type { Providers } from "./Providers.js";
|
|
9
|
+
export interface UsageLimitProps {
|
|
10
|
+
readonly deployment: {
|
|
11
|
+
readonly name: string;
|
|
12
|
+
readonly url: string;
|
|
13
|
+
};
|
|
14
|
+
readonly metric: UsageLimitMetric;
|
|
15
|
+
readonly window: UsageLimitWindow;
|
|
16
|
+
readonly limit: number;
|
|
17
|
+
readonly limitType?: UsageLimitType;
|
|
18
|
+
readonly enabled?: boolean;
|
|
19
|
+
}
|
|
20
|
+
export interface UsageLimitAttributes {
|
|
21
|
+
readonly deployment: {
|
|
22
|
+
readonly name: string;
|
|
23
|
+
readonly url: string;
|
|
24
|
+
};
|
|
25
|
+
readonly id: string;
|
|
26
|
+
readonly metric: UsageLimitMetric;
|
|
27
|
+
readonly window: UsageLimitWindow;
|
|
28
|
+
readonly limit: number;
|
|
29
|
+
readonly limitType: UsageLimitType;
|
|
30
|
+
readonly enabled: boolean;
|
|
31
|
+
}
|
|
32
|
+
export type UsageLimit = Resource<"Convex.UsageLimit", UsageLimitProps, UsageLimitAttributes, never, Providers>;
|
|
33
|
+
export declare const UsageLimit: import("alchemy").ResourceClass<UsageLimit>;
|
|
34
|
+
declare const UsageLimitTargetChange_base: Schema.Class<UsageLimitTargetChange, Schema.TaggedStruct<"UsageLimitTargetChange", {
|
|
35
|
+
readonly deploymentName: Schema.String;
|
|
36
|
+
}>, import("effect/Cause").YieldableError & {
|
|
37
|
+
readonly brand: unique symbol;
|
|
38
|
+
}>;
|
|
39
|
+
export declare class UsageLimitTargetChange extends UsageLimitTargetChange_base {
|
|
40
|
+
}
|
|
41
|
+
declare const AmbiguousUsageLimit_base: Schema.Class<AmbiguousUsageLimit, Schema.TaggedStruct<"AmbiguousUsageLimit", {
|
|
42
|
+
readonly deploymentName: Schema.String;
|
|
43
|
+
readonly metric: Schema.String;
|
|
44
|
+
readonly window: Schema.String;
|
|
45
|
+
readonly limitType: Schema.String;
|
|
46
|
+
readonly limitIds: Schema.$Array<Schema.String>;
|
|
47
|
+
}>, import("effect/Cause").YieldableError & {
|
|
48
|
+
readonly brand: unique symbol;
|
|
49
|
+
}>;
|
|
50
|
+
export declare class AmbiguousUsageLimit extends AmbiguousUsageLimit_base {
|
|
51
|
+
get message(): string;
|
|
52
|
+
}
|
|
53
|
+
declare const InvalidUsageLimit_base: Schema.Class<InvalidUsageLimit, Schema.TaggedStruct<"InvalidUsageLimit", {
|
|
54
|
+
readonly limit: Schema.String;
|
|
55
|
+
}>, import("effect/Cause").YieldableError & {
|
|
56
|
+
readonly brand: unique symbol;
|
|
57
|
+
}>;
|
|
58
|
+
export declare class InvalidUsageLimit extends InvalidUsageLimit_base {
|
|
59
|
+
get message(): string;
|
|
60
|
+
}
|
|
61
|
+
declare const UnsupportedLocalUsageLimit_base: Schema.Class<UnsupportedLocalUsageLimit, Schema.TaggedStruct<"UnsupportedLocalUsageLimit", {}>, import("effect/Cause").YieldableError & {
|
|
62
|
+
readonly brand: unique symbol;
|
|
63
|
+
}>;
|
|
64
|
+
export declare class UnsupportedLocalUsageLimit extends UnsupportedLocalUsageLimit_base {
|
|
65
|
+
get message(): string;
|
|
66
|
+
}
|
|
67
|
+
export declare const provider: Effect.Effect<{
|
|
68
|
+
diff: (args_0: {
|
|
69
|
+
id: string;
|
|
70
|
+
fqn: string;
|
|
71
|
+
instanceId: string;
|
|
72
|
+
olds: UsageLimitProps;
|
|
73
|
+
news: import("alchemy").Input<UsageLimitProps>;
|
|
74
|
+
oldBindings: import("alchemy").ResourceBinding<never>[];
|
|
75
|
+
newBindings: import("alchemy").Input<import("alchemy").ResourceBinding<never>[]>;
|
|
76
|
+
output: UsageLimitAttributes | undefined;
|
|
77
|
+
}) => Effect.Effect<{
|
|
78
|
+
action: "replace";
|
|
79
|
+
} | {
|
|
80
|
+
action: "update";
|
|
81
|
+
} | undefined, import("./ConvexClient.js").ConvexApiError | import("./ConvexClient.js").ConvexConflict | InvalidUsageLimit, never>;
|
|
82
|
+
read: (args_0: {
|
|
83
|
+
id: string;
|
|
84
|
+
fqn: string;
|
|
85
|
+
instanceId: string;
|
|
86
|
+
olds: UsageLimitProps;
|
|
87
|
+
output: UsageLimitAttributes | undefined;
|
|
88
|
+
previous?: UsageLimitAttributes;
|
|
89
|
+
}) => Effect.Effect<{
|
|
90
|
+
id: string;
|
|
91
|
+
metric: "actionComputeConvexGbHours" | "actionComputeCpuGbHours" | "actionComputeNodeJsGbHours" | "aiGatewayCostDollars" | "dataEgressGb" | "databaseIoGb" | "functionCalls" | "queryMutationComputeGbHours" | "searchQueryGb";
|
|
92
|
+
window: "day" | "month";
|
|
93
|
+
limitType: "disable" | "warning";
|
|
94
|
+
limit: number;
|
|
95
|
+
enabled: boolean;
|
|
96
|
+
deployment: {
|
|
97
|
+
readonly name: string;
|
|
98
|
+
readonly url: string;
|
|
99
|
+
};
|
|
100
|
+
} | undefined, AmbiguousUsageLimit | import("./ConvexClient.js").ConvexApiError | import("./ConvexClient.js").ConvexConflict | InvalidUsageLimit, never>;
|
|
101
|
+
reconcile: (args_0: {
|
|
102
|
+
id: string;
|
|
103
|
+
fqn: string;
|
|
104
|
+
instanceId: string;
|
|
105
|
+
news: UsageLimitProps;
|
|
106
|
+
olds: UsageLimitProps | undefined;
|
|
107
|
+
output: UsageLimitAttributes | undefined;
|
|
108
|
+
session: import("alchemy/Report").ScopedPlanStatusSession;
|
|
109
|
+
bindings: import("alchemy").ResourceBinding<never>[];
|
|
110
|
+
}) => Effect.Effect<{
|
|
111
|
+
id: string;
|
|
112
|
+
metric: "actionComputeConvexGbHours" | "actionComputeCpuGbHours" | "actionComputeNodeJsGbHours" | "aiGatewayCostDollars" | "dataEgressGb" | "databaseIoGb" | "functionCalls" | "queryMutationComputeGbHours" | "searchQueryGb";
|
|
113
|
+
window: "day" | "month";
|
|
114
|
+
limitType: "disable" | "warning";
|
|
115
|
+
limit: number;
|
|
116
|
+
enabled: boolean;
|
|
117
|
+
deployment: {
|
|
118
|
+
readonly name: string;
|
|
119
|
+
readonly url: string;
|
|
120
|
+
};
|
|
121
|
+
}, AmbiguousUsageLimit | import("./ConvexClient.js").ConvexApiError | import("./ConvexClient.js").ConvexConflict | import("./ConvexClient.js").ConvexNotFound | InvalidUsageLimit | import("./internal/Lifecycle.js").LifecycleStateError | OwnedBySomeoneElse | import("alchemy/State/State").StateStoreError | UsageLimitTargetChange, never>;
|
|
122
|
+
delete: (args_0: {
|
|
123
|
+
id: string;
|
|
124
|
+
fqn: string;
|
|
125
|
+
instanceId: string;
|
|
126
|
+
olds: UsageLimitProps;
|
|
127
|
+
output: UsageLimitAttributes;
|
|
128
|
+
session: import("alchemy/Report").ScopedPlanStatusSession;
|
|
129
|
+
bindings: import("alchemy").ResourceBinding<never>[];
|
|
130
|
+
force?: boolean;
|
|
131
|
+
}) => Effect.Effect<void, import("./ConvexClient.js").ConvexApiError | import("./ConvexClient.js").ConvexConflict, never>;
|
|
132
|
+
}, never, ConvexClient>;
|
|
133
|
+
export declare const localProvider: Effect.Effect<{
|
|
134
|
+
reconcile: () => Effect.Effect<never, UnsupportedLocalUsageLimit, never>;
|
|
135
|
+
delete: () => Effect.Effect<void, never, never>;
|
|
136
|
+
}, never, never>;
|
|
137
|
+
export declare const layer: import("effect/Layer").Layer<Provider.Provider<UsageLimit>, never, ConvexClient>;
|
|
138
|
+
export declare const localLayer: import("effect/Layer").Layer<Provider.Provider<UsageLimit>, never, never>;
|
|
139
|
+
export {};
|
|
140
|
+
//# sourceMappingURL=UsageLimit.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UsageLimit.d.ts","sources":["../src/UsageLimit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAW,MAAM,qBAAqB,CAAC;AAElE,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,YAAY,EAAwB,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACrE,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,UAAU,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACrE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAC/B,mBAAmB,EACnB,eAAe,EACf,oBAAoB,EACpB,KAAK,EACL,SAAS,CACV,CAAC;AACF,eAAO,MAAM,UAAU,6CAA4C,CAAC;;;;oBAIhD,OAAO,MAAM;;AAFjC,qBAAa,sBAAuB,SAAQ,2BAGoB;CAAG;;;;;;;;oBAI/C,OAAO,MAAM;;AAFjC,qBAAa,mBAAoB,SAAQ,wBASvC;IACA,IAAa,OAAO,WAEnB;CACF;;;;oBAImB,OAAO,MAAM;;AAFjC,qBAAa,iBAAkB,SAAQ,sBAGW;IAChD,IAAa,OAAO,WAEnB;CACF;;oBAImB,OAAO,MAAM;;AAFjC,qBAAa,0BAA2B,SAAQ,+BAGX;IACnC,IAAa,OAAO,WAEnB;CACF;AAoCD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAnGmB,MAAM;0BAAgB,MAAM;;;;;;;;;;;;;;;;;;;;2BAA5B,MAAM;0BAAgB,MAAM;;;;;;;;;;;;;uBAiOlE,CAAC;AAEH,eAAO,MAAM,aAAa;;;gBAG4B,CAAC;AAEvD,eAAO,MAAM,KAAK,kFAAwC,CAAC;AAC3D,eAAO,MAAM,UAAU,2EAA6C,CAAC"}
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { ConvexClient } from "./ConvexClient.js";
|
|
2
|
+
import { checkpointCreate, shouldAdopt } from "./internal/Lifecycle.js";
|
|
3
|
+
import * as Array from "effect/Array";
|
|
4
|
+
import * as Effect from "effect/Effect";
|
|
5
|
+
import * as Schema from "effect/Schema";
|
|
6
|
+
import * as Provider from "alchemy/Provider";
|
|
7
|
+
import { Resource } from "alchemy/Resource";
|
|
8
|
+
import * as Option from "effect/Option";
|
|
9
|
+
import { OwnedBySomeoneElse, Unowned } from "alchemy/AdoptPolicy";
|
|
10
|
+
import { isResolved } from "alchemy/Diff";
|
|
11
|
+
// src/UsageLimit.ts
|
|
12
|
+
const UsageLimit = Resource("Convex.UsageLimit");
|
|
13
|
+
var UsageLimitTargetChange = class extends Schema.TaggedError()("UsageLimitTargetChange", { deploymentName: Schema.String }) {};
|
|
14
|
+
var AmbiguousUsageLimit = class extends Schema.TaggedError()("AmbiguousUsageLimit", {
|
|
15
|
+
deploymentName: Schema.String,
|
|
16
|
+
metric: Schema.String,
|
|
17
|
+
window: Schema.String,
|
|
18
|
+
limitType: Schema.String,
|
|
19
|
+
limitIds: Schema.Array(Schema.String)
|
|
20
|
+
}) {
|
|
21
|
+
get message() {
|
|
22
|
+
return `Usage limit ${this.metric}/${this.window}/${this.limitType} on ${this.deploymentName} matches multiple ids: ${Array.join(this.limitIds, ", ")}.`;
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
var InvalidUsageLimit = class extends Schema.TaggedError()("InvalidUsageLimit", { limit: Schema.String }) {
|
|
26
|
+
get message() {
|
|
27
|
+
return `Usage limit ${this.limit} must be a positive safe integer.`;
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
var UnsupportedLocalUsageLimit = class extends Schema.TaggedError()("UnsupportedLocalUsageLimit", {}) {
|
|
31
|
+
get message() {
|
|
32
|
+
return "Declare Convex.UsageLimit only for cloud stages.";
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
const validateLimit = Effect.fn("UsageLimit.validateLimit")(function* (limit) {
|
|
36
|
+
if (!Number.isSafeInteger(limit) || limit < 1) return yield* InvalidUsageLimit.make({ limit: String(limit) });
|
|
37
|
+
});
|
|
38
|
+
const desired = (props) => ({
|
|
39
|
+
metric: props.metric,
|
|
40
|
+
window: props.window,
|
|
41
|
+
limit: props.limit,
|
|
42
|
+
limitType: props.limitType ?? "warning",
|
|
43
|
+
enabled: props.enabled ?? true
|
|
44
|
+
});
|
|
45
|
+
const sameTarget = (current, props) => current.deployment.name === props.deployment.name;
|
|
46
|
+
const sameConfig = (current, input) => current.metric === input.metric && current.window === input.window && current.limitType === input.limitType && current.limit === input.limit && current.enabled === input.enabled;
|
|
47
|
+
const ownershipConflict = (input) => {
|
|
48
|
+
const physicalName = `${input.metric}/${input.window}/${input.limitType}`;
|
|
49
|
+
return new OwnedBySomeoneElse({
|
|
50
|
+
message: `Usage limit ${physicalName} already exists on this deployment. Declare one limit per metric, window and type. Re-run with --adopt or adopt(true) to take it over.`,
|
|
51
|
+
resourceType: UsageLimit.Type,
|
|
52
|
+
physicalName
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
const provider = Effect.gen(function* () {
|
|
56
|
+
const client = yield* ConvexClient;
|
|
57
|
+
const find = Effect.fn("UsageLimit.find")(function* (output, url = output.deployment.url) {
|
|
58
|
+
const limits = yield* client.listUsageLimits(url).pipe(Effect.catchTag("ConvexNotFound", () => Effect.succeed([])));
|
|
59
|
+
return Option.getOrUndefined(Array.findFirst(limits, (limit) => limit.id === output.id));
|
|
60
|
+
});
|
|
61
|
+
const findMatching = Effect.fn("UsageLimit.findMatching")(function* (deployment, input) {
|
|
62
|
+
const limits = yield* client.listUsageLimits(deployment.url).pipe(Effect.catchTag("ConvexNotFound", () => Effect.succeed([])));
|
|
63
|
+
const matches = Array.filter(limits, (limit) => limit.metric === input.metric && limit.window === input.window && limit.limitType === input.limitType);
|
|
64
|
+
if (matches.length > 1) return yield* AmbiguousUsageLimit.make({
|
|
65
|
+
deploymentName: deployment.name,
|
|
66
|
+
...input,
|
|
67
|
+
limitIds: Array.map(matches, (limit) => limit.id)
|
|
68
|
+
});
|
|
69
|
+
return matches[0];
|
|
70
|
+
});
|
|
71
|
+
return {
|
|
72
|
+
diff: Effect.fn("UsageLimit.diff")(function* ({ news, output }) {
|
|
73
|
+
if (!isResolved(news)) return;
|
|
74
|
+
yield* validateLimit(news.limit);
|
|
75
|
+
if (output === void 0) return;
|
|
76
|
+
if (!sameTarget(output, news)) return { action: "replace" };
|
|
77
|
+
const current = yield* find(output, news.deployment.url);
|
|
78
|
+
if (output.deployment.url !== news.deployment.url || current === void 0 || !sameConfig(current, desired(news))) return { action: "update" };
|
|
79
|
+
}),
|
|
80
|
+
read: Effect.fn("UsageLimit.read")(function* ({ fqn, olds, output }) {
|
|
81
|
+
if (output === void 0) {
|
|
82
|
+
if (olds.limit !== void 0) yield* validateLimit(olds.limit);
|
|
83
|
+
if (olds.deployment === void 0 || olds.metric === void 0 || olds.window === void 0) return;
|
|
84
|
+
const input = {
|
|
85
|
+
metric: olds.metric,
|
|
86
|
+
window: olds.window,
|
|
87
|
+
limitType: olds.limitType ?? "warning"
|
|
88
|
+
};
|
|
89
|
+
const current = yield* findMatching(olds.deployment, input);
|
|
90
|
+
if (current !== void 0 && !(yield* shouldAdopt(fqn))) yield* Effect.logWarning(ownershipConflict(input).message);
|
|
91
|
+
return current === void 0 ? void 0 : Unowned({
|
|
92
|
+
deployment: olds.deployment,
|
|
93
|
+
...current
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
const current = yield* find(output);
|
|
97
|
+
return current === void 0 ? void 0 : {
|
|
98
|
+
deployment: output.deployment,
|
|
99
|
+
...current
|
|
100
|
+
};
|
|
101
|
+
}),
|
|
102
|
+
reconcile: Effect.fn("UsageLimit.reconcile")(function* ({ fqn, instanceId, news, output }) {
|
|
103
|
+
yield* validateLimit(news.limit);
|
|
104
|
+
if (output === void 0) yield* checkpointCreate(fqn, instanceId, news);
|
|
105
|
+
if (output !== void 0 && !sameTarget(output, news)) return yield* UsageLimitTargetChange.make({ deploymentName: output.deployment.name });
|
|
106
|
+
const input = desired(news);
|
|
107
|
+
let current = output === void 0 ? void 0 : yield* find(output, news.deployment.url);
|
|
108
|
+
if (current === void 0) {
|
|
109
|
+
const existing = yield* findMatching(news.deployment, input);
|
|
110
|
+
if (existing !== void 0 && !(yield* shouldAdopt(fqn))) return yield* ownershipConflict(input);
|
|
111
|
+
current = existing;
|
|
112
|
+
}
|
|
113
|
+
if (current !== void 0) {
|
|
114
|
+
yield* checkpointCreate(fqn, instanceId, news, {
|
|
115
|
+
deployment: news.deployment,
|
|
116
|
+
...current
|
|
117
|
+
});
|
|
118
|
+
const updated = sameConfig(current, input) ? current : yield* client.updateUsageLimit(news.deployment.url, current.id, input);
|
|
119
|
+
return {
|
|
120
|
+
deployment: news.deployment,
|
|
121
|
+
...updated
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
const created = yield* client.createUsageLimit(news.deployment.url, input);
|
|
125
|
+
const attributes = {
|
|
126
|
+
deployment: news.deployment,
|
|
127
|
+
...created
|
|
128
|
+
};
|
|
129
|
+
yield* checkpointCreate(fqn, instanceId, news, attributes);
|
|
130
|
+
return attributes;
|
|
131
|
+
}),
|
|
132
|
+
delete: Effect.fn("UsageLimit.delete")(function* ({ output }) {
|
|
133
|
+
yield* client.deleteUsageLimit(output.deployment.url, output.id).pipe(Effect.catchTag("ConvexNotFound", () => Effect.void));
|
|
134
|
+
})
|
|
135
|
+
};
|
|
136
|
+
});
|
|
137
|
+
const localProvider = Effect.succeed({
|
|
138
|
+
reconcile: () => Effect.fail(UnsupportedLocalUsageLimit.make({})),
|
|
139
|
+
delete: () => Effect.void
|
|
140
|
+
});
|
|
141
|
+
const layer = Provider.effect(UsageLimit, provider);
|
|
142
|
+
const localLayer = Provider.effect(UsageLimit, localProvider);
|
|
143
|
+
export { AmbiguousUsageLimit, InvalidUsageLimit, UnsupportedLocalUsageLimit, UsageLimit, UsageLimitTargetChange, layer, localLayer, localProvider, provider };
|
|
144
|
+
|
|
145
|
+
//# sourceMappingURL=UsageLimit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UsageLimit.js","names":[],"sources":["../src/UsageLimit.ts"],"sourcesContent":["import type {\n UsageLimitMetric,\n UsageLimitType,\n UsageLimitWindow,\n} from \"@convex-dev/platform/deploymentApi\";\nimport { OwnedBySomeoneElse, Unowned } from \"alchemy/AdoptPolicy\";\nimport { isResolved } from \"alchemy/Diff\";\nimport * as Provider from \"alchemy/Provider\";\nimport { Resource } from \"alchemy/Resource\";\nimport * as Array from \"effect/Array\";\nimport * as Effect from \"effect/Effect\";\nimport * as Option from \"effect/Option\";\nimport * as Schema from \"effect/Schema\";\n\nimport { ConvexClient, type UsageLimitInput } from \"./ConvexClient.js\";\nimport type { Providers } from \"./Providers.js\";\nimport { checkpointCreate, shouldAdopt } from \"./internal/Lifecycle.js\";\n\nexport interface UsageLimitProps {\n readonly deployment: { readonly name: string; readonly url: string };\n readonly metric: UsageLimitMetric;\n readonly window: UsageLimitWindow;\n readonly limit: number;\n readonly limitType?: UsageLimitType;\n readonly enabled?: boolean;\n}\n\nexport interface UsageLimitAttributes {\n readonly deployment: { readonly name: string; readonly url: string };\n readonly id: string;\n readonly metric: UsageLimitMetric;\n readonly window: UsageLimitWindow;\n readonly limit: number;\n readonly limitType: UsageLimitType;\n readonly enabled: boolean;\n}\n\nexport type UsageLimit = Resource<\n \"Convex.UsageLimit\",\n UsageLimitProps,\n UsageLimitAttributes,\n never,\n Providers\n>;\nexport const UsageLimit = Resource<UsageLimit>(\"Convex.UsageLimit\");\n\nexport class UsageLimitTargetChange extends Schema.TaggedError<\n UsageLimitTargetChange,\n { readonly brand: unique symbol }\n>()(\"UsageLimitTargetChange\", { deploymentName: Schema.String }) {}\n\nexport class AmbiguousUsageLimit extends Schema.TaggedError<\n AmbiguousUsageLimit,\n { readonly brand: unique symbol }\n>()(\"AmbiguousUsageLimit\", {\n deploymentName: Schema.String,\n metric: Schema.String,\n window: Schema.String,\n limitType: Schema.String,\n limitIds: Schema.Array(Schema.String),\n}) {\n override get message() {\n return `Usage limit ${this.metric}/${this.window}/${this.limitType} on ${this.deploymentName} matches multiple ids: ${Array.join(this.limitIds, \", \")}.`;\n }\n}\n\nexport class InvalidUsageLimit extends Schema.TaggedError<\n InvalidUsageLimit,\n { readonly brand: unique symbol }\n>()(\"InvalidUsageLimit\", { limit: Schema.String }) {\n override get message() {\n return `Usage limit ${this.limit} must be a positive safe integer.`;\n }\n}\n\nexport class UnsupportedLocalUsageLimit extends Schema.TaggedError<\n UnsupportedLocalUsageLimit,\n { readonly brand: unique symbol }\n>()(\"UnsupportedLocalUsageLimit\", {}) {\n override get message() {\n return \"Declare Convex.UsageLimit only for cloud stages.\";\n }\n}\n\nconst validateLimit = Effect.fn(\"UsageLimit.validateLimit\")(function* (\n limit: number,\n) {\n if (!Number.isSafeInteger(limit) || limit < 1)\n return yield* InvalidUsageLimit.make({ limit: String(limit) });\n});\n\nconst desired = (props: UsageLimitProps): UsageLimitInput => ({\n metric: props.metric,\n window: props.window,\n limit: props.limit,\n limitType: props.limitType ?? \"warning\",\n enabled: props.enabled ?? true,\n});\nconst sameTarget = (current: UsageLimitAttributes, props: UsageLimitProps) =>\n current.deployment.name === props.deployment.name;\nconst sameConfig = (current: UsageLimitInput, input: UsageLimitInput) =>\n current.metric === input.metric &&\n current.window === input.window &&\n current.limitType === input.limitType &&\n current.limit === input.limit &&\n current.enabled === input.enabled;\n\nconst ownershipConflict = (\n input: Pick<UsageLimitInput, \"metric\" | \"window\" | \"limitType\">,\n) => {\n const physicalName = `${input.metric}/${input.window}/${input.limitType}`;\n return new OwnedBySomeoneElse({\n message: `Usage limit ${physicalName} already exists on this deployment. Declare one limit per metric, window and type. Re-run with --adopt or adopt(true) to take it over.`,\n resourceType: UsageLimit.Type,\n physicalName,\n });\n};\n\nexport const provider = Effect.gen(function* () {\n const client = yield* ConvexClient;\n const find = Effect.fn(\"UsageLimit.find\")(function* (\n output: UsageLimitAttributes,\n url = output.deployment.url,\n ) {\n const limits = yield* client\n .listUsageLimits(url)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.succeed([])));\n return Option.getOrUndefined(\n Array.findFirst(limits, (limit) => limit.id === output.id),\n );\n });\n const findMatching = Effect.fn(\"UsageLimit.findMatching\")(function* (\n deployment: UsageLimitProps[\"deployment\"],\n input: Pick<UsageLimitInput, \"metric\" | \"window\" | \"limitType\">,\n ) {\n const limits = yield* client\n .listUsageLimits(deployment.url)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.succeed([])));\n const matches = Array.filter(\n limits,\n (limit) =>\n limit.metric === input.metric &&\n limit.window === input.window &&\n limit.limitType === input.limitType,\n );\n if (matches.length > 1)\n return yield* AmbiguousUsageLimit.make({\n deploymentName: deployment.name,\n ...input,\n limitIds: Array.map(matches, (limit) => limit.id),\n });\n return matches[0];\n });\n return {\n diff: Effect.fn(\"UsageLimit.diff\")(function* ({ news, output }) {\n if (!isResolved(news)) return;\n yield* validateLimit(news.limit);\n if (output === undefined) return;\n if (!sameTarget(output, news)) return { action: \"replace\" };\n const current = yield* find(output, news.deployment.url);\n if (\n output.deployment.url !== news.deployment.url ||\n current === undefined ||\n !sameConfig(current, desired(news))\n )\n return { action: \"update\" };\n }),\n read: Effect.fn(\"UsageLimit.read\")(function* ({ fqn, olds, output }) {\n if (output === undefined) {\n if (olds.limit !== undefined) yield* validateLimit(olds.limit);\n if (\n olds.deployment === undefined ||\n olds.metric === undefined ||\n olds.window === undefined\n )\n return;\n const input = {\n metric: olds.metric,\n window: olds.window,\n limitType: olds.limitType ?? \"warning\",\n };\n const current = yield* findMatching(olds.deployment, input);\n if (current !== undefined && !(yield* shouldAdopt(fqn)))\n yield* Effect.logWarning(ownershipConflict(input).message);\n return current === undefined\n ? undefined\n : Unowned({ deployment: olds.deployment, ...current });\n }\n const current = yield* find(output);\n return current === undefined\n ? undefined\n : { deployment: output.deployment, ...current };\n }),\n reconcile: Effect.fn(\"UsageLimit.reconcile\")(function* ({\n fqn,\n instanceId,\n news,\n output,\n }) {\n yield* validateLimit(news.limit);\n if (output === undefined) yield* checkpointCreate(fqn, instanceId, news);\n if (output !== undefined && !sameTarget(output, news))\n return yield* UsageLimitTargetChange.make({\n deploymentName: output.deployment.name,\n });\n const input = desired(news);\n let current =\n output === undefined\n ? undefined\n : yield* find(output, news.deployment.url);\n if (current === undefined) {\n const existing = yield* findMatching(news.deployment, input);\n if (existing !== undefined && !(yield* shouldAdopt(fqn)))\n return yield* ownershipConflict(input);\n current = existing;\n }\n if (current !== undefined) {\n yield* checkpointCreate(fqn, instanceId, news, {\n deployment: news.deployment,\n ...current,\n });\n const updated = sameConfig(current, input)\n ? current\n : yield* client.updateUsageLimit(\n news.deployment.url,\n current.id,\n input,\n );\n return { deployment: news.deployment, ...updated };\n }\n const created = yield* client.createUsageLimit(\n news.deployment.url,\n input,\n );\n const attributes = { deployment: news.deployment, ...created };\n yield* checkpointCreate(fqn, instanceId, news, attributes);\n return attributes;\n }),\n delete: Effect.fn(\"UsageLimit.delete\")(function* ({ output }) {\n yield* client\n .deleteUsageLimit(output.deployment.url, output.id)\n .pipe(Effect.catchTag(\"ConvexNotFound\", () => Effect.void));\n }),\n } satisfies Provider.ProviderServiceInput<UsageLimit>;\n});\n\nexport const localProvider = Effect.succeed({\n reconcile: () => Effect.fail(UnsupportedLocalUsageLimit.make({})),\n delete: () => Effect.void,\n} satisfies Provider.ProviderServiceInput<UsageLimit>);\n\nexport const layer = Provider.effect(UsageLimit, provider);\nexport const localLayer = Provider.effect(UsageLimit, localProvider);\n"],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { ProviderMode } from "alchemy/ProviderMode";
|
|
2
2
|
import * as Effect from "effect/Effect";
|
|
3
|
+
import * as FileSystem from "effect/FileSystem";
|
|
3
4
|
import * as Path from "effect/Path";
|
|
4
5
|
import * as Schema from "effect/Schema";
|
|
5
6
|
import type { CodeProps } from "../Code.js";
|
|
7
|
+
import { ConvexClient } from "../ConvexClient.js";
|
|
6
8
|
import { CommandRunner } from "./CommandRunner.js";
|
|
7
9
|
import * as MountInit from "./MountInit.js";
|
|
8
10
|
import { PushLock } from "./PushLock.js";
|
|
@@ -13,12 +15,37 @@ declare const InvalidDeploymentTarget_base: Schema.Class<InvalidDeploymentTarget
|
|
|
13
15
|
}>;
|
|
14
16
|
export declare class InvalidDeploymentTarget extends InvalidDeploymentTarget_base {
|
|
15
17
|
}
|
|
18
|
+
declare const HealthCheckFailed_base: Schema.Class<HealthCheckFailed, Schema.TaggedStruct<"HealthCheckFailed", {
|
|
19
|
+
readonly expected: Schema.String;
|
|
20
|
+
readonly answered: Schema.optional<Schema.String>;
|
|
21
|
+
readonly detail: Schema.optional<Schema.String>;
|
|
22
|
+
}>, import("effect/Cause").YieldableError & {
|
|
23
|
+
readonly brand: unique symbol;
|
|
24
|
+
}>;
|
|
25
|
+
export declare class HealthCheckFailed extends HealthCheckFailed_base {
|
|
26
|
+
get message(): string;
|
|
27
|
+
}
|
|
28
|
+
declare const StaleManifest_base: Schema.Class<StaleManifest, Schema.TaggedStruct<"StaleManifest", {
|
|
29
|
+
readonly expected: Schema.String;
|
|
30
|
+
readonly reason: Schema.Literals<readonly ["DifferentDigest", "NotGenerated"]>;
|
|
31
|
+
readonly generated: Schema.optionalKey<Schema.String>;
|
|
32
|
+
readonly healthModulePath: Schema.optionalKey<Schema.String>;
|
|
33
|
+
}>, import("effect/Cause").YieldableError & {
|
|
34
|
+
readonly brand: unique symbol;
|
|
35
|
+
}>;
|
|
36
|
+
/**
|
|
37
|
+
* Prepare's health module is edited, missing, or generated for another
|
|
38
|
+
* manifest. Nothing was pushed.
|
|
39
|
+
*/
|
|
40
|
+
export declare class StaleManifest extends StaleManifest_base {
|
|
41
|
+
get message(): string;
|
|
42
|
+
}
|
|
16
43
|
/**
|
|
17
44
|
* @internal
|
|
18
45
|
*/
|
|
19
46
|
export declare const deploy: (props: CodeProps, mode?: ProviderMode | undefined) => Effect.Effect<{
|
|
20
47
|
name: string;
|
|
21
48
|
url: string;
|
|
22
|
-
}, import("./CommandRunner.js").CommandError | InvalidDeploymentTarget | MountInit.MountInitFailed | import("./PushLock.js").PushLockError, CommandRunner |
|
|
49
|
+
}, import("./CommandRunner.js").CommandError | HealthCheckFailed | InvalidDeploymentTarget | MountInit.MountInitFailed | import("./PushLock.js").PushLockError | StaleManifest, CommandRunner | ConvexClient | FileSystem.FileSystem | Path.Path | PushLock>;
|
|
23
50
|
export {};
|
|
24
51
|
//# sourceMappingURL=CodeDeployment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeDeployment.d.ts","sources":["../../src/internal/CodeDeployment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CodeDeployment.d.ts","sources":["../../src/internal/CodeDeployment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAGpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAmB,MAAM,oBAAoB,CAAC;AAGpE,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;;;;oBAIrB,OAAO,MAAM;;AAFjC,qBAAa,uBAAwB,SAAQ,4BAK3C;CAAG;;;;;;oBAIe,OAAO,MAAM;;AAFjC,qBAAa,iBAAkB,SAAQ,sBAOrC;IACA,IAAa,OAAO,WAInB;CACF;;;;;;;oBAQmB,OAAO,MAAM;;AANjC;;;GAGG;AACH,qBAAa,aAAc,SAAQ,kBAQjC;IACA,IAAa,OAAO,WAInB;CACF;AAwGD;;GAEG;AACH,eAAO,MAAM,MAAM;;;4PAmDjB,CAAC"}
|
|
@@ -1,14 +1,84 @@
|
|
|
1
|
+
import { ConvexClient } from "../ConvexClient.js";
|
|
1
2
|
import { CommandRunner } from "./CommandRunner.js";
|
|
2
3
|
import { isOrigin } from "./Loopback.js";
|
|
4
|
+
import { functionsDirectory } from "./FunctionsDirectory.js";
|
|
3
5
|
import { run } from "./MountInit.js";
|
|
4
6
|
import { PushLock } from "./PushLock.js";
|
|
5
7
|
import * as Effect from "effect/Effect";
|
|
6
|
-
import * as Path from "effect/Path";
|
|
7
8
|
import * as Redacted from "effect/Redacted";
|
|
8
9
|
import * as Schema from "effect/Schema";
|
|
9
10
|
import * as Result from "effect/Result";
|
|
11
|
+
import * as FileSystem from "effect/FileSystem";
|
|
12
|
+
import * as Path from "effect/Path";
|
|
13
|
+
import * as Option from "effect/Option";
|
|
14
|
+
import * as HealthModule from "@confect/core/HealthModule";
|
|
10
15
|
// src/internal/CodeDeployment.ts
|
|
11
16
|
var InvalidDeploymentTarget = class extends Schema.TaggedError()("InvalidDeploymentTarget", { reason: Schema.Literals(["deployment", "deployKey"]) }) {};
|
|
17
|
+
var HealthCheckFailed = class extends Schema.TaggedError()("HealthCheckFailed", {
|
|
18
|
+
expected: Schema.String,
|
|
19
|
+
answered: Schema.optional(Schema.String),
|
|
20
|
+
detail: Schema.optional(Schema.String)
|
|
21
|
+
}) {
|
|
22
|
+
get message() {
|
|
23
|
+
return this.answered === void 0 ? `health: the pushed code gave no manifest digest (${this.detail ?? "no answer"}); expected ${this.expected}` : `health: the pushed code was generated with ${this.answered}, not ${this.expected}`;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
/**
|
|
27
|
+
* Prepare's health module is edited, missing, or generated for another
|
|
28
|
+
* manifest. Nothing was pushed.
|
|
29
|
+
*/
|
|
30
|
+
var StaleManifest = class extends Schema.TaggedError()("StaleManifest", {
|
|
31
|
+
expected: Schema.String,
|
|
32
|
+
reason: Schema.Literals(["DifferentDigest", "NotGenerated"]),
|
|
33
|
+
generated: Schema.optionalKey(Schema.String),
|
|
34
|
+
healthModulePath: Schema.optionalKey(Schema.String)
|
|
35
|
+
}) {
|
|
36
|
+
get message() {
|
|
37
|
+
return this.reason === "NotGenerated" ? `The health module ${this.healthModulePath ?? "at the configured functions directory"} is not as codegen writes it, so nothing was pushed. Do not edit or format the file; regenerate it with confect codegen. The CLI that generates it and the Alchemy package that reads it must be on the same Confect release.` : `prepare generated manifest ${this.generated}, but the stack imported manifest ${this.expected}, so nothing was pushed. Run confect codegen, commit the generated files and deploy again.`;
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
const HEALTH = "confectHealth:digest";
|
|
41
|
+
/**
|
|
42
|
+
* The digest prepare wrote into the health module, which is what the push would
|
|
43
|
+
* deploy; none when the module is missing or unreadable.
|
|
44
|
+
*/
|
|
45
|
+
const generatedDigest = Effect.fn("Code.generatedDigest")(function* (cwd) {
|
|
46
|
+
const fs = yield* FileSystem.FileSystem;
|
|
47
|
+
const path = yield* Path.Path;
|
|
48
|
+
const functions = yield* functionsDirectory(cwd);
|
|
49
|
+
const file = path.join(cwd, functions, "confectHealth.ts");
|
|
50
|
+
return {
|
|
51
|
+
path: file,
|
|
52
|
+
digest: yield* fs.readFileString(file).pipe(Effect.map(HealthModule.read), Effect.orElseSucceed(Option.none))
|
|
53
|
+
};
|
|
54
|
+
}, Effect.orElseSucceed(() => ({
|
|
55
|
+
path: void 0,
|
|
56
|
+
digest: Option.none()
|
|
57
|
+
})));
|
|
58
|
+
/**
|
|
59
|
+
* Ask the pushed code which manifest digest codegen wrote into it, and fail
|
|
60
|
+
* unless it is `expected`.
|
|
61
|
+
*/
|
|
62
|
+
const checkHealth = Effect.fn("Code.checkHealth")(function* (url, key, expected) {
|
|
63
|
+
const answer = yield* (yield* ConvexClient).runFunction(url, key, HEALTH, {}).pipe(Effect.mapError((error) => HealthCheckFailed.make({
|
|
64
|
+
expected,
|
|
65
|
+
detail: error._tag
|
|
66
|
+
})), Effect.timeoutOrElse({
|
|
67
|
+
duration: "30 seconds",
|
|
68
|
+
orElse: () => Effect.fail(HealthCheckFailed.make({
|
|
69
|
+
expected,
|
|
70
|
+
detail: "timeout"
|
|
71
|
+
}))
|
|
72
|
+
}));
|
|
73
|
+
if (typeof answer !== "string") return yield* HealthCheckFailed.make({
|
|
74
|
+
expected,
|
|
75
|
+
detail: "not a string"
|
|
76
|
+
});
|
|
77
|
+
if (answer !== expected) return yield* HealthCheckFailed.make({
|
|
78
|
+
expected,
|
|
79
|
+
answered: answer
|
|
80
|
+
});
|
|
81
|
+
});
|
|
12
82
|
const deploymentName = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
|
|
13
83
|
const cloudTarget = (props) => {
|
|
14
84
|
const { name, url } = props.deployment;
|
|
@@ -47,14 +117,27 @@ const deploy = Effect.fn("Code.deploy")(function* (props, mode = "live") {
|
|
|
47
117
|
const path = yield* Path.Path;
|
|
48
118
|
yield* lock.withLock(target.deploymentName, Effect.gen(function* () {
|
|
49
119
|
if (props.prepare !== void 0) yield* runner.prepare(props.prepare, props.cwd);
|
|
120
|
+
if (props.manifestDigest !== void 0) {
|
|
121
|
+
const { path: file, digest: generated } = yield* generatedDigest(path.resolve(props.cwd ?? "."));
|
|
122
|
+
if (Option.getOrUndefined(generated) !== props.manifestDigest) return yield* StaleManifest.make({
|
|
123
|
+
expected: props.manifestDigest,
|
|
124
|
+
...file === void 0 ? {} : { healthModulePath: file },
|
|
125
|
+
reason: Option.isNone(generated) ? "NotGenerated" : "DifferentDigest",
|
|
126
|
+
...Option.match(generated, {
|
|
127
|
+
onNone: () => ({}),
|
|
128
|
+
onSome: (digest) => ({ generated: digest })
|
|
129
|
+
})
|
|
130
|
+
});
|
|
131
|
+
}
|
|
50
132
|
yield* runner.deploy(target, props.cwd);
|
|
51
133
|
yield* run(props.deployment.url, props.deployKey, path.resolve(props.cwd ?? "."));
|
|
134
|
+
if (props.manifestDigest !== void 0) yield* checkHealth(props.deployment.url, props.deployKey, props.manifestDigest);
|
|
52
135
|
}));
|
|
53
136
|
return {
|
|
54
137
|
name: props.deployment.name,
|
|
55
138
|
url: props.deployment.url
|
|
56
139
|
};
|
|
57
140
|
});
|
|
58
|
-
export { InvalidDeploymentTarget, deploy };
|
|
141
|
+
export { HealthCheckFailed, InvalidDeploymentTarget, StaleManifest, deploy };
|
|
59
142
|
|
|
60
143
|
//# sourceMappingURL=CodeDeployment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeDeployment.js","names":["Loopback.isOrigin","MountInit.run"],"sources":["../../src/internal/CodeDeployment.ts"],"sourcesContent":["import type { ProviderMode } from \"alchemy/ProviderMode\";\nimport * as Effect from \"effect/Effect\";\nimport * as Path from \"effect/Path\";\nimport * as Redacted from \"effect/Redacted\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport type { CodeProps } from \"../Code.js\";\nimport { CommandRunner, type PushTarget } from \"./CommandRunner.js\";\nimport * as Loopback from \"./Loopback.js\";\nimport * as MountInit from \"./MountInit.js\";\nimport { PushLock } from \"./PushLock.js\";\n\nexport class InvalidDeploymentTarget extends Schema.TaggedError<\n InvalidDeploymentTarget,\n { readonly brand: unique symbol }\n>()(\"InvalidDeploymentTarget\", {\n reason: Schema.Literals([\"deployment\", \"deployKey\"]),\n}) {}\n\nconst deploymentName = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;\n\nconst cloudTarget = (\n props: CodeProps,\n): Result.Result<PushTarget, InvalidDeploymentTarget> => {\n const { name, url } = props.deployment;\n if (\n !deploymentName.test(name) ||\n !new RegExp(\n `^https://${name}(?:\\\\.[a-z]{2}-[a-z]+-[0-9]+)?\\\\.convex\\\\.cloud$`,\n ).test(url)\n )\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployment\" }));\n const key =\n /^(?:dev|prod|preview|custom):([a-z0-9]+(?:-[a-z0-9]+)*)\\|[a-zA-Z0-9+/=_-]+$/.exec(\n Redacted.value(props.deployKey),\n );\n if (key === null || key[1] !== name)\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployKey\" }));\n return Result.succeed({\n _tag: \"Cloud\",\n deploymentName: name,\n deployKey: props.deployKey,\n });\n};\n\nconst localTarget = (\n props: CodeProps,\n): Result.Result<PushTarget, InvalidDeploymentTarget> => {\n const { name, url } = props.deployment;\n if (!deploymentName.test(name) || !Loopback.isOrigin(url))\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployment\" }));\n const key = /^([a-z0-9]+(?:-[a-z0-9]+)*)\\|[0-9a-f]+$/.exec(\n Redacted.value(props.deployKey),\n );\n if (key === null || key[1] !== name)\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployKey\" }));\n return Result.succeed({\n _tag: \"SelfHosted\",\n deploymentName: name,\n url,\n adminKey: props.deployKey,\n });\n};\n\nconst targets = { live: cloudTarget, local: localTarget } satisfies Record<\n ProviderMode,\n (props: CodeProps) => Result.Result<PushTarget, InvalidDeploymentTarget>\n>;\n\n/**\n * @internal\n */\nexport const deploy = Effect.fn(\"Code.deploy\")(function* (\n props: CodeProps,\n mode: ProviderMode = \"live\",\n) {\n const target = yield* Effect.fromResult(targets[mode](props));\n const runner = yield* CommandRunner;\n const lock = yield* PushLock;\n const path = yield* Path.Path;\n yield* lock.withLock(\n target.deploymentName,\n Effect.gen(function* () {\n if (props.prepare !== undefined)\n yield* runner.prepare(props.prepare, props.cwd);\n yield* runner.deploy(target, props.cwd);\n // WORKAROUND: Convex has no component `init` or install `args` in a\n // stable release, so each push runs every mount's `init` itself, inside\n // the lock so no other push lands between this code and its `init`.\n // Delete this step at gaganref/confect#18's trigger: a stable `convex`\n // release with `init` and `args`, and an open-source backend that\n // accepts them. CHANGES.md lists what else goes with it.\n yield* MountInit.run(\n props.deployment.url,\n props.deployKey,\n path.resolve(props.cwd ?? \".\"),\n );\n }),\n );\n return { name: props.deployment.name, url: props.deployment.url };\n});\n"],"mappings":";;;;;;;;;;AAYA,IAAa,0BAAb,cAA6C,OAAO,YAGlD,CAAC,CAAC,2BAA2B,EAC7B,QAAQ,OAAO,SAAS,CAAC,cAAc,WAAW,CAAC,EACrD,CAAC,CAAC,CAAC,CAAC;AAEJ,MAAM,iBAAiB;AAEvB,MAAM,eACJ,UACuD;CACvD,MAAM,EAAE,MAAM,QAAQ,MAAM;CAC5B,IACE,CAAC,eAAe,KAAK,IAAI,KACzB,CAAC,IAAI,OACH,YAAY,KAAK,iDACnB,CAAC,CAAC,KAAK,GAAG,GAEV,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,aAAa,CAAC,CAAC;CAC3E,MAAM,MACJ,8EAA8E,KAC5E,SAAS,MAAM,MAAM,SAAS,CAChC;CACF,IAAI,QAAQ,QAAQ,IAAI,OAAO,MAC7B,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,YAAY,CAAC,CAAC;CAC1E,OAAO,OAAO,QAAQ;EACpB,MAAM;EACN,gBAAgB;EAChB,WAAW,MAAM;CACnB,CAAC;AACH;AAEA,MAAM,eACJ,UACuD;CACvD,MAAM,EAAE,MAAM,QAAQ,MAAM;CAC5B,IAAI,CAAC,eAAe,KAAK,IAAI,KAAK,CAACA,SAAkB,GAAG,GACtD,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,aAAa,CAAC,CAAC;CAC3E,MAAM,MAAM,0CAA0C,KACpD,SAAS,MAAM,MAAM,SAAS,CAChC;CACA,IAAI,QAAQ,QAAQ,IAAI,OAAO,MAC7B,OAAO,OAAO,KAAK,wBAAwB,KAAK,EAAE,QAAQ,YAAY,CAAC,CAAC;CAC1E,OAAO,OAAO,QAAQ;EACpB,MAAM;EACN,gBAAgB;EAChB;EACA,UAAU,MAAM;CAClB,CAAC;AACH;AAEA,MAAM,UAAU;CAAE,MAAM;CAAa,OAAO;AAAY;;;;AAQxD,MAAa,SAAS,OAAO,GAAG,aAAa,CAAC,CAAC,WAC7C,OACA,OAAqB,QACrB;CACA,MAAM,SAAS,OAAO,OAAO,WAAW,QAAQ,KAAK,CAAC,KAAK,CAAC;CAC5D,MAAM,SAAS,OAAO;CACtB,MAAM,OAAO,OAAO;CACpB,MAAM,OAAO,OAAO,KAAK;CACzB,OAAO,KAAK,SACV,OAAO,gBACP,OAAO,IAAI,aAAa;EACtB,IAAI,MAAM,YAAY,KAAA,GACpB,OAAO,OAAO,QAAQ,MAAM,SAAS,MAAM,GAAG;EAChD,OAAO,OAAO,OAAO,QAAQ,MAAM,GAAG;EAOtC,OAAOC,IACL,MAAM,WAAW,KACjB,MAAM,WACN,KAAK,QAAQ,MAAM,OAAO,GAAG,CAC/B;CACF,CAAC,CACH;CACA,OAAO;EAAE,MAAM,MAAM,WAAW;EAAM,KAAK,MAAM,WAAW;CAAI;AAClE,CAAC"}
|
|
1
|
+
{"version":3,"file":"CodeDeployment.js","names":["Loopback.isOrigin","MountInit.run"],"sources":["../../src/internal/CodeDeployment.ts"],"sourcesContent":["import * as HealthModule from \"@confect/core/HealthModule\";\nimport type { ProviderMode } from \"alchemy/ProviderMode\";\nimport * as Effect from \"effect/Effect\";\nimport * as FileSystem from \"effect/FileSystem\";\nimport * as Option from \"effect/Option\";\nimport * as Path from \"effect/Path\";\nimport * as Redacted from \"effect/Redacted\";\nimport * as Result from \"effect/Result\";\nimport * as Schema from \"effect/Schema\";\nimport type { CodeProps } from \"../Code.js\";\nimport { ConvexClient } from \"../ConvexClient.js\";\nimport { CommandRunner, type PushTarget } from \"./CommandRunner.js\";\nimport * as Loopback from \"./Loopback.js\";\nimport { functionsDirectory } from \"./FunctionsDirectory.js\";\nimport * as MountInit from \"./MountInit.js\";\nimport { PushLock } from \"./PushLock.js\";\n\nexport class InvalidDeploymentTarget extends Schema.TaggedError<\n InvalidDeploymentTarget,\n { readonly brand: unique symbol }\n>()(\"InvalidDeploymentTarget\", {\n reason: Schema.Literals([\"deployment\", \"deployKey\"]),\n}) {}\n\nexport class HealthCheckFailed extends Schema.TaggedError<\n HealthCheckFailed,\n { readonly brand: unique symbol }\n>()(\"HealthCheckFailed\", {\n expected: Schema.String,\n answered: Schema.optional(Schema.String),\n detail: Schema.optional(Schema.String),\n}) {\n override get message() {\n return this.answered === undefined\n ? `health: the pushed code gave no manifest digest (${this.detail ?? \"no answer\"}); expected ${this.expected}`\n : `health: the pushed code was generated with ${this.answered}, not ${this.expected}`;\n }\n}\n\n/**\n * Prepare's health module is edited, missing, or generated for another\n * manifest. Nothing was pushed.\n */\nexport class StaleManifest extends Schema.TaggedError<\n StaleManifest,\n { readonly brand: unique symbol }\n>()(\"StaleManifest\", {\n expected: Schema.String,\n reason: Schema.Literals([\"DifferentDigest\", \"NotGenerated\"]),\n generated: Schema.optionalKey(Schema.String),\n healthModulePath: Schema.optionalKey(Schema.String),\n}) {\n override get message() {\n return this.reason === \"NotGenerated\"\n ? `The health module ${this.healthModulePath ?? \"at the configured functions directory\"} is not as codegen writes it, so nothing was pushed. Do not edit or format the file; regenerate it with confect codegen. The CLI that generates it and the Alchemy package that reads it must be on the same Confect release.`\n : `prepare generated manifest ${this.generated}, but the stack imported manifest ${this.expected}, so nothing was pushed. Run confect codegen, commit the generated files and deploy again.`;\n }\n}\n\nconst HEALTH = \"confectHealth:digest\";\n\n/**\n * The digest prepare wrote into the health module, which is what the push would\n * deploy; none when the module is missing or unreadable.\n */\nconst generatedDigest = Effect.fn(\"Code.generatedDigest\")(\n function* (cwd: string) {\n const fs = yield* FileSystem.FileSystem;\n const path = yield* Path.Path;\n const functions = yield* functionsDirectory(cwd);\n const file = path.join(cwd, functions, \"confectHealth.ts\");\n const digest = yield* fs\n .readFileString(file)\n .pipe(\n Effect.map(HealthModule.read),\n Effect.orElseSucceed(Option.none<string>),\n );\n return { path: file, digest };\n },\n Effect.orElseSucceed(() => ({\n path: undefined,\n digest: Option.none<string>(),\n })),\n);\n\n/**\n * Ask the pushed code which manifest digest codegen wrote into it, and fail\n * unless it is `expected`.\n */\nconst checkHealth = Effect.fn(\"Code.checkHealth\")(function* (\n url: string,\n key: Redacted.Redacted<string>,\n expected: string,\n) {\n const client = yield* ConvexClient;\n const answer = yield* client.runFunction(url, key, HEALTH, {}).pipe(\n Effect.mapError((error) =>\n HealthCheckFailed.make({ expected, detail: error._tag }),\n ),\n Effect.timeoutOrElse({\n duration: \"30 seconds\",\n orElse: () =>\n Effect.fail(HealthCheckFailed.make({ expected, detail: \"timeout\" })),\n }),\n );\n if (typeof answer !== \"string\")\n return yield* HealthCheckFailed.make({ expected, detail: \"not a string\" });\n if (answer !== expected)\n return yield* HealthCheckFailed.make({ expected, answered: answer });\n});\n\nconst deploymentName = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;\n\nconst cloudTarget = (\n props: CodeProps,\n): Result.Result<PushTarget, InvalidDeploymentTarget> => {\n const { name, url } = props.deployment;\n if (\n !deploymentName.test(name) ||\n !new RegExp(\n `^https://${name}(?:\\\\.[a-z]{2}-[a-z]+-[0-9]+)?\\\\.convex\\\\.cloud$`,\n ).test(url)\n )\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployment\" }));\n const key =\n /^(?:dev|prod|preview|custom):([a-z0-9]+(?:-[a-z0-9]+)*)\\|[a-zA-Z0-9+/=_-]+$/.exec(\n Redacted.value(props.deployKey),\n );\n if (key === null || key[1] !== name)\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployKey\" }));\n return Result.succeed({\n _tag: \"Cloud\",\n deploymentName: name,\n deployKey: props.deployKey,\n });\n};\n\nconst localTarget = (\n props: CodeProps,\n): Result.Result<PushTarget, InvalidDeploymentTarget> => {\n const { name, url } = props.deployment;\n if (!deploymentName.test(name) || !Loopback.isOrigin(url))\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployment\" }));\n const key = /^([a-z0-9]+(?:-[a-z0-9]+)*)\\|[0-9a-f]+$/.exec(\n Redacted.value(props.deployKey),\n );\n if (key === null || key[1] !== name)\n return Result.fail(InvalidDeploymentTarget.make({ reason: \"deployKey\" }));\n return Result.succeed({\n _tag: \"SelfHosted\",\n deploymentName: name,\n url,\n adminKey: props.deployKey,\n });\n};\n\nconst targets = { live: cloudTarget, local: localTarget } satisfies Record<\n ProviderMode,\n (props: CodeProps) => Result.Result<PushTarget, InvalidDeploymentTarget>\n>;\n\n/**\n * @internal\n */\nexport const deploy = Effect.fn(\"Code.deploy\")(function* (\n props: CodeProps,\n mode: ProviderMode = \"live\",\n) {\n const target = yield* Effect.fromResult(targets[mode](props));\n const runner = yield* CommandRunner;\n const lock = yield* PushLock;\n const path = yield* Path.Path;\n yield* lock.withLock(\n target.deploymentName,\n Effect.gen(function* () {\n if (props.prepare !== undefined)\n yield* runner.prepare(props.prepare, props.cwd);\n if (props.manifestDigest !== undefined) {\n const { path: file, digest: generated } = yield* generatedDigest(\n path.resolve(props.cwd ?? \".\"),\n );\n if (Option.getOrUndefined(generated) !== props.manifestDigest)\n return yield* StaleManifest.make({\n expected: props.manifestDigest,\n ...(file === undefined ? {} : { healthModulePath: file }),\n reason: Option.isNone(generated)\n ? \"NotGenerated\"\n : \"DifferentDigest\",\n ...Option.match(generated, {\n onNone: () => ({}),\n onSome: (digest) => ({ generated: digest }),\n }),\n });\n }\n yield* runner.deploy(target, props.cwd);\n // WORKAROUND: Convex has no component `init` or install `args` in a\n // stable release, so each push runs every mount's `init` itself, inside\n // the lock so no other push lands between this code and its `init`.\n // Delete this step at gaganref/confect#18's trigger: a stable `convex`\n // release with `init` and `args`, and an open-source backend that\n // accepts them. CHANGES.md lists what else goes with it.\n yield* MountInit.run(\n props.deployment.url,\n props.deployKey,\n path.resolve(props.cwd ?? \".\"),\n );\n if (props.manifestDigest !== undefined)\n yield* checkHealth(\n props.deployment.url,\n props.deployKey,\n props.manifestDigest,\n );\n }),\n );\n return { name: props.deployment.name, url: props.deployment.url };\n});\n"],"mappings":"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"}
|
|
@@ -29,10 +29,14 @@ declare const CommandError_base: Schema.Class<CommandError, Schema.TaggedStruct<
|
|
|
29
29
|
readonly operation: Schema.Literals<readonly ["prepare", "deploy"]>;
|
|
30
30
|
readonly reason: Schema.Literals<readonly ["configuration", "spawn", "exit"]>;
|
|
31
31
|
readonly exitCode: Schema.optionalKey<Schema.Finite>;
|
|
32
|
+
readonly signal: Schema.optionalKey<Schema.String>;
|
|
33
|
+
readonly stdout: Schema.optionalKey<Schema.String>;
|
|
34
|
+
readonly stderr: Schema.optionalKey<Schema.String>;
|
|
32
35
|
}>, import("effect/Cause").YieldableError & {
|
|
33
36
|
readonly brand: unique symbol;
|
|
34
37
|
}>;
|
|
35
38
|
export declare class CommandError extends CommandError_base {
|
|
39
|
+
get message(): string;
|
|
36
40
|
}
|
|
37
41
|
declare const CommandRunner_base: Context.ServiceClass<CommandRunner, "@confect/alchemy/internal/CommandRunner", {
|
|
38
42
|
readonly prepare: (command: PrepareCommand, cwd?: string) => Effect.Effect<void, CommandError>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandRunner.d.ts","sources":["../../src/internal/CommandRunner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CommandRunner.d.ts","sources":["../../src/internal/CommandRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAgB,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAInE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACtC;AAED;;;GAGG;AACH,MAAM,MAAM,UAAU,GAClB;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC/C,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC;;;;;;;;;oBASc,OAAO,MAAM;;AAFjC,qBAAa,YAAa,SAAQ,iBAUhC;IACA,IAAa,OAAO,IAAI,MAAM,CAQ7B;CACF;;sBAKqB,CAChB,OAAO,EAAE,cAAc,EACvB,GAAG,CAAC,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC;qBACrB,CACf,MAAM,EAAE,UAAU,EAClB,GAAG,CAAC,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC;;AAV1C,qBAAa,aAAc,SAAQ,kBAYW;CAAG;AAEjD;;;GAGG;AACH,eAAO,MAAM,kBAAkB;;;;;;;EAa7B,CAAC;AAuIH;;GAEG;AACH,eAAO,MAAM,KAAK,gHAqMjB,CAAC"}
|