trigger.dev 0.0.0-prerelease-20241003205750 → 0.0.0-realtime-20241021152316
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/README.md +16 -43
- package/dist/esm/apiClient.d.ts +8 -8
- package/dist/esm/build/buildWorker.d.ts +2 -2
- package/dist/esm/cli/common.d.ts +2 -2
- package/dist/esm/commands/dev.d.ts +2 -2
- package/dist/esm/commands/dev.js +2 -3
- package/dist/esm/commands/dev.js.map +1 -1
- package/dist/esm/commands/list-profiles.d.ts +2 -2
- package/dist/esm/commands/login.d.ts +2 -2
- package/dist/esm/commands/logout.d.ts +2 -2
- package/dist/esm/commands/update.d.ts +2 -2
- package/dist/esm/commands/update.js +2 -1
- package/dist/esm/commands/update.js.map +1 -1
- package/dist/esm/commands/whoami.d.ts +2 -2
- package/dist/esm/deploy/buildImage.js +2 -1
- package/dist/esm/deploy/buildImage.js.map +1 -1
- package/dist/esm/deploy/logs.js +5 -5
- package/dist/esm/deploy/logs.js.map +1 -1
- package/dist/esm/dev/backgroundWorker.d.ts +2 -2
- package/dist/esm/dev/backgroundWorker.js +6 -45
- package/dist/esm/dev/backgroundWorker.js.map +1 -1
- package/dist/esm/entryPoints/deploy-index-controller.js +1 -1
- package/dist/esm/entryPoints/deploy-index-controller.js.map +1 -1
- package/dist/esm/entryPoints/deploy-run-controller.js +11 -1
- package/dist/esm/entryPoints/deploy-run-controller.js.map +1 -1
- package/dist/esm/entryPoints/deploy-run-worker.js +15 -3
- package/dist/esm/entryPoints/deploy-run-worker.js.map +1 -1
- package/dist/esm/entryPoints/dev-run-worker.js +5 -3
- package/dist/esm/entryPoints/dev-run-worker.js.map +1 -1
- package/dist/esm/executions/taskRunProcess.d.ts +7 -6
- package/dist/esm/executions/taskRunProcess.js +30 -2
- package/dist/esm/executions/taskRunProcess.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +5 -4
- package/dist/esm/utilities/deployErrors.d.ts +0 -19
- package/dist/esm/utilities/deployErrors.js +0 -117
- package/dist/esm/utilities/deployErrors.js.map +0 -1
- package/dist/esm/utilities/links.d.ts +0 -9
- package/dist/esm/utilities/links.js +0 -10
- package/dist/esm/utilities/links.js.map +0 -1
package/README.md
CHANGED
|
@@ -6,46 +6,19 @@ Note: this only works with Trigger.dev v3 projects and later. For older projects
|
|
|
6
6
|
|
|
7
7
|
Trigger.dev is an open source platform that makes it easy to create event-driven background tasks directly in your existing project.
|
|
8
8
|
|
|
9
|
-
##
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
|
20
|
-
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
Will update all of your @trigger.dev packages in your package.json to the latest version.
|
|
26
|
-
|
|
27
|
-
```sh
|
|
28
|
-
npx trigger.dev@latest update
|
|
29
|
-
```
|
|
30
|
-
|
|
31
|
-
You can pass the path to the folder that your package.json file lives in:
|
|
32
|
-
|
|
33
|
-
```sh
|
|
34
|
-
npx trigger.dev@latest update ./myapp
|
|
35
|
-
```
|
|
36
|
-
|
|
37
|
-
| Option | Short option | Description |
|
|
38
|
-
| ------ | ------------ | ---------------------------------------------------------- |
|
|
39
|
-
| `--to` | `-t` | The version to update to (ex: 2.1.4), defaults to "latest" |
|
|
40
|
-
|
|
41
|
-
### Who Am I?
|
|
42
|
-
|
|
43
|
-
Shows the current user that is logged in.
|
|
44
|
-
|
|
45
|
-
```sh
|
|
46
|
-
npx trigger.dev@latest whoami
|
|
47
|
-
```
|
|
48
|
-
|
|
49
|
-
| Option | Short option | Description |
|
|
50
|
-
| ----------- | ------------ | -------------------------------------------------------------------- |
|
|
51
|
-
| `--api-url` | `-a` | Set the API URL for Trigger.dev, defaults to https://api.trigger.dev |
|
|
9
|
+
## Commands
|
|
10
|
+
|
|
11
|
+
| Command | Description |
|
|
12
|
+
| :------------------------------------------------------------------- | :----------------------------------------------------------------- |
|
|
13
|
+
| [login](https://trigger.dev/docs/cli-login-commands) | Login with Trigger.dev so you can perform authenticated actions. |
|
|
14
|
+
| [init](https://trigger.dev/docs/cli-init-commands) | Initialize your existing project for development with Trigger.dev. |
|
|
15
|
+
| [dev](https://trigger.dev/docs/cli-dev-commands) | Run your Trigger.dev tasks locally. |
|
|
16
|
+
| [deploy](https://trigger.dev/docs/cli-deploy-commands) | Deploy your Trigger.dev v3 project to the cloud. |
|
|
17
|
+
| [whoami](https://trigger.dev/docs/cli-whoami-commands) | Display the current logged in user and project details. |
|
|
18
|
+
| [logout](https://trigger.dev/docs/cli-logout-commands) | Logout of Trigger.dev. |
|
|
19
|
+
| [list-profiles](https://trigger.dev/docs/cli-list-profiles-commands) | List all of your CLI profiles. |
|
|
20
|
+
| [update](https://trigger.dev/docs/cli-update-commands) | Updates all `@trigger.dev/*` packages to match the CLI version. |
|
|
21
|
+
|
|
22
|
+
## Support
|
|
23
|
+
|
|
24
|
+
If you have any questions, please reach out to us on [Discord](https://trigger.dev/discord) and we'll be happy to help.
|
package/dist/esm/apiClient.d.ts
CHANGED
|
@@ -22,9 +22,9 @@ export declare class CliApiClient {
|
|
|
22
22
|
externals: string[];
|
|
23
23
|
}>>;
|
|
24
24
|
getProject(projectRef: string): Promise<ApiResult<{
|
|
25
|
+
name: string;
|
|
25
26
|
id: string;
|
|
26
27
|
createdAt: Date;
|
|
27
|
-
name: string;
|
|
28
28
|
slug: string;
|
|
29
29
|
organization: {
|
|
30
30
|
id: string;
|
|
@@ -35,9 +35,9 @@ export declare class CliApiClient {
|
|
|
35
35
|
externalRef: string;
|
|
36
36
|
}>>;
|
|
37
37
|
getProjects(): Promise<ApiResult<{
|
|
38
|
+
name: string;
|
|
38
39
|
id: string;
|
|
39
40
|
createdAt: Date;
|
|
40
|
-
name: string;
|
|
41
41
|
slug: string;
|
|
42
42
|
organization: {
|
|
43
43
|
id: string;
|
|
@@ -68,12 +68,12 @@ export declare class CliApiClient {
|
|
|
68
68
|
};
|
|
69
69
|
run: {
|
|
70
70
|
id: string;
|
|
71
|
-
startedAt: Date;
|
|
72
71
|
payload: string;
|
|
73
72
|
payloadType: string;
|
|
74
73
|
tags: string[];
|
|
75
74
|
isTest: boolean;
|
|
76
75
|
createdAt: Date;
|
|
76
|
+
startedAt: Date;
|
|
77
77
|
durationMs: number;
|
|
78
78
|
costInCents: number;
|
|
79
79
|
baseCostInCents: number;
|
|
@@ -85,8 +85,8 @@ export declare class CliApiClient {
|
|
|
85
85
|
maxDuration?: number | undefined;
|
|
86
86
|
};
|
|
87
87
|
queue: {
|
|
88
|
-
id: string;
|
|
89
88
|
name: string;
|
|
89
|
+
id: string;
|
|
90
90
|
};
|
|
91
91
|
environment: {
|
|
92
92
|
type: "PRODUCTION" | "STAGING" | "DEVELOPMENT" | "PREVIEW";
|
|
@@ -94,13 +94,13 @@ export declare class CliApiClient {
|
|
|
94
94
|
slug: string;
|
|
95
95
|
};
|
|
96
96
|
organization: {
|
|
97
|
-
id: string;
|
|
98
97
|
name: string;
|
|
98
|
+
id: string;
|
|
99
99
|
slug: string;
|
|
100
100
|
};
|
|
101
101
|
project: {
|
|
102
|
-
id: string;
|
|
103
102
|
name: string;
|
|
103
|
+
id: string;
|
|
104
104
|
slug: string;
|
|
105
105
|
ref: string;
|
|
106
106
|
};
|
|
@@ -108,9 +108,9 @@ export declare class CliApiClient {
|
|
|
108
108
|
id: string;
|
|
109
109
|
} | undefined;
|
|
110
110
|
machine?: {
|
|
111
|
-
name: "micro" | "small-1x" | "small-2x" | "medium-1x" | "medium-2x" | "large-1x" | "large-2x";
|
|
112
111
|
cpu: number;
|
|
113
112
|
memory: number;
|
|
113
|
+
name: "micro" | "small-1x" | "small-2x" | "medium-1x" | "medium-2x" | "large-1x" | "large-2x";
|
|
114
114
|
centsPerMs: number;
|
|
115
115
|
} | undefined;
|
|
116
116
|
}>>;
|
|
@@ -158,7 +158,7 @@ export declare class CliApiClient {
|
|
|
158
158
|
contentHash: string;
|
|
159
159
|
}>>;
|
|
160
160
|
getDeployment(deploymentId: string): Promise<ApiResult<{
|
|
161
|
-
status: "
|
|
161
|
+
status: "CANCELED" | "FAILED" | "TIMED_OUT" | "PENDING" | "BUILDING" | "DEPLOYING" | "DEPLOYED";
|
|
162
162
|
id: string;
|
|
163
163
|
version: string;
|
|
164
164
|
contentHash: string;
|
|
@@ -33,8 +33,8 @@ export declare function buildWorker(options: BuildWorkerOptions): Promise<{
|
|
|
33
33
|
dirs: string[];
|
|
34
34
|
};
|
|
35
35
|
files: {
|
|
36
|
-
entry: string;
|
|
37
36
|
out: string;
|
|
37
|
+
entry: string;
|
|
38
38
|
}[];
|
|
39
39
|
sources: Record<string, {
|
|
40
40
|
contentHash: string;
|
|
@@ -52,8 +52,8 @@ export declare function buildWorker(options: BuildWorkerOptions): Promise<{
|
|
|
52
52
|
indexControllerEntryPoint?: string | undefined;
|
|
53
53
|
loaderEntryPoint?: string | undefined;
|
|
54
54
|
externals?: {
|
|
55
|
-
version: string;
|
|
56
55
|
name: string;
|
|
56
|
+
version: string;
|
|
57
57
|
}[] | undefined;
|
|
58
58
|
customConditions?: string[] | undefined;
|
|
59
59
|
image?: {
|
package/dist/esm/cli/common.d.ts
CHANGED
|
@@ -6,13 +6,13 @@ export declare const CommonCommandOptions: z.ZodObject<{
|
|
|
6
6
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
7
7
|
profile: z.ZodDefault<z.ZodString>;
|
|
8
8
|
}, "strip", z.ZodTypeAny, {
|
|
9
|
-
logLevel: "error" | "
|
|
9
|
+
logLevel: "error" | "debug" | "info" | "warn" | "none" | "log";
|
|
10
10
|
skipTelemetry: boolean;
|
|
11
11
|
profile: string;
|
|
12
12
|
apiUrl?: string | undefined;
|
|
13
13
|
}, {
|
|
14
14
|
apiUrl?: string | undefined;
|
|
15
|
-
logLevel?: "error" | "
|
|
15
|
+
logLevel?: "error" | "debug" | "info" | "warn" | "none" | "log" | undefined;
|
|
16
16
|
skipTelemetry?: boolean | undefined;
|
|
17
17
|
profile?: string | undefined;
|
|
18
18
|
}>;
|
|
@@ -11,7 +11,7 @@ declare const DevCommandOptions: z.ZodObject<{
|
|
|
11
11
|
skipUpdateCheck: z.ZodDefault<z.ZodBoolean>;
|
|
12
12
|
envFile: z.ZodOptional<z.ZodString>;
|
|
13
13
|
}, "strip", z.ZodTypeAny, {
|
|
14
|
-
logLevel: "error" | "
|
|
14
|
+
logLevel: "error" | "debug" | "info" | "warn" | "none" | "log";
|
|
15
15
|
skipTelemetry: boolean;
|
|
16
16
|
profile: string;
|
|
17
17
|
debugOtel: boolean;
|
|
@@ -21,7 +21,7 @@ declare const DevCommandOptions: z.ZodObject<{
|
|
|
21
21
|
projectRef?: string | undefined;
|
|
22
22
|
envFile?: string | undefined;
|
|
23
23
|
}, {
|
|
24
|
-
logLevel?: "error" | "
|
|
24
|
+
logLevel?: "error" | "debug" | "info" | "warn" | "none" | "log" | undefined;
|
|
25
25
|
apiUrl?: string | undefined;
|
|
26
26
|
skipTelemetry?: boolean | undefined;
|
|
27
27
|
profile?: string | undefined;
|
package/dist/esm/commands/dev.js
CHANGED
|
@@ -20,12 +20,11 @@ export function configureDevCommand(program) {
|
|
|
20
20
|
return commonOptions(program
|
|
21
21
|
.command("dev")
|
|
22
22
|
.description("Run your Trigger.dev tasks locally")
|
|
23
|
-
.
|
|
24
|
-
.option("-c, --config <config file>", "The name of the config file, found at [path].")
|
|
23
|
+
.option("-c, --config <config file>", "The name of the config file")
|
|
25
24
|
.option("-p, --project-ref <project ref>", "The project ref. Required if there is no config file.")
|
|
26
25
|
.option("--env-file <env file>", "Path to the .env file to use for the dev session. Defaults to .env in the project directory.")
|
|
27
26
|
.option("--debug-otel", "Enable OpenTelemetry debugging")
|
|
28
|
-
.option("--skip-update-check", "Skip checking for @trigger.dev package updates")).action(async (
|
|
27
|
+
.option("--skip-update-check", "Skip checking for @trigger.dev package updates")).action(async (options) => {
|
|
29
28
|
wrapCommandAction("dev", DevCommandOptions, options, async (opts) => {
|
|
30
29
|
await devCommand(opts);
|
|
31
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../src/commands/dev.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAsB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAiB,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,MAAM,CAAC;IACpD,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACrC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAC3C,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAIH,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,OAAO,aAAa,CAClB,OAAO;SACJ,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,oCAAoC,CAAC;SACjD,
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../src/commands/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,13 @@ declare const ListProfilesOptions: z.ZodObject<{
|
|
|
6
6
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
7
7
|
profile: z.ZodDefault<z.ZodString>;
|
|
8
8
|
}, "strip", z.ZodTypeAny, {
|
|
9
|
-
logLevel: "error" | "
|
|
9
|
+
logLevel: "error" | "debug" | "info" | "warn" | "none" | "log";
|
|
10
10
|
skipTelemetry: boolean;
|
|
11
11
|
profile: string;
|
|
12
12
|
apiUrl?: string | undefined;
|
|
13
13
|
}, {
|
|
14
14
|
apiUrl?: string | undefined;
|
|
15
|
-
logLevel?: "error" | "
|
|
15
|
+
logLevel?: "error" | "debug" | "info" | "warn" | "none" | "log" | undefined;
|
|
16
16
|
skipTelemetry?: boolean | undefined;
|
|
17
17
|
profile?: string | undefined;
|
|
18
18
|
}>;
|
|
@@ -7,13 +7,13 @@ export declare const LoginCommandOptions: z.ZodObject<{
|
|
|
7
7
|
profile: z.ZodDefault<z.ZodString>;
|
|
8
8
|
apiUrl: z.ZodString;
|
|
9
9
|
}, "strip", z.ZodTypeAny, {
|
|
10
|
-
logLevel: "error" | "
|
|
10
|
+
logLevel: "error" | "debug" | "info" | "warn" | "none" | "log";
|
|
11
11
|
apiUrl: string;
|
|
12
12
|
skipTelemetry: boolean;
|
|
13
13
|
profile: string;
|
|
14
14
|
}, {
|
|
15
15
|
apiUrl: string;
|
|
16
|
-
logLevel?: "error" | "
|
|
16
|
+
logLevel?: "error" | "debug" | "info" | "warn" | "none" | "log" | undefined;
|
|
17
17
|
skipTelemetry?: boolean | undefined;
|
|
18
18
|
profile?: string | undefined;
|
|
19
19
|
}>;
|
|
@@ -6,13 +6,13 @@ declare const LogoutCommandOptions: z.ZodObject<{
|
|
|
6
6
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
7
7
|
profile: z.ZodDefault<z.ZodString>;
|
|
8
8
|
}, "strip", z.ZodTypeAny, {
|
|
9
|
-
logLevel: "error" | "
|
|
9
|
+
logLevel: "error" | "debug" | "info" | "warn" | "none" | "log";
|
|
10
10
|
skipTelemetry: boolean;
|
|
11
11
|
profile: string;
|
|
12
12
|
apiUrl?: string | undefined;
|
|
13
13
|
}, {
|
|
14
14
|
apiUrl?: string | undefined;
|
|
15
|
-
logLevel?: "error" | "
|
|
15
|
+
logLevel?: "error" | "debug" | "info" | "warn" | "none" | "log" | undefined;
|
|
16
16
|
skipTelemetry?: boolean | undefined;
|
|
17
17
|
profile?: string | undefined;
|
|
18
18
|
}>;
|
|
@@ -7,10 +7,10 @@ export declare const UpdateCommandOptions: z.ZodObject<Pick<{
|
|
|
7
7
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
8
8
|
profile: z.ZodDefault<z.ZodString>;
|
|
9
9
|
}, "logLevel" | "skipTelemetry">, "strip", z.ZodTypeAny, {
|
|
10
|
-
logLevel: "error" | "
|
|
10
|
+
logLevel: "error" | "debug" | "info" | "warn" | "none" | "log";
|
|
11
11
|
skipTelemetry: boolean;
|
|
12
12
|
}, {
|
|
13
|
-
logLevel?: "error" | "
|
|
13
|
+
logLevel?: "error" | "debug" | "info" | "warn" | "none" | "log" | undefined;
|
|
14
14
|
skipTelemetry?: boolean | undefined;
|
|
15
15
|
}>;
|
|
16
16
|
export type UpdateCommandOptions = z.infer<typeof UpdateCommandOptions>;
|
|
@@ -11,6 +11,7 @@ import { spinner } from "../utilities/windows.js";
|
|
|
11
11
|
import { VERSION } from "../version.js";
|
|
12
12
|
import { hasTTY } from "std-env";
|
|
13
13
|
import nodeResolve from "resolve";
|
|
14
|
+
import * as semver from "semver";
|
|
14
15
|
export const UpdateCommandOptions = CommonCommandOptions.pick({
|
|
15
16
|
logLevel: true,
|
|
16
17
|
skipTelemetry: true,
|
|
@@ -67,7 +68,7 @@ export async function updateTriggerPackages(dir, options, embedded, requireUpdat
|
|
|
67
68
|
mismatches.push(dep);
|
|
68
69
|
}
|
|
69
70
|
const isDowngrade = mismatches.some((dep) => {
|
|
70
|
-
return dep.version
|
|
71
|
+
return semver.gt(dep.version, targetVersion);
|
|
71
72
|
});
|
|
72
73
|
return {
|
|
73
74
|
mismatches,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEtE,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AACjE,OAAO,EAAY,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAe,eAAe,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE7E,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC9F,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,WAAW,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,13 +17,13 @@ declare const WhoamiCommandOptions: z.ZodObject<{
|
|
|
17
17
|
skipTelemetry: z.ZodDefault<z.ZodBoolean>;
|
|
18
18
|
profile: z.ZodDefault<z.ZodString>;
|
|
19
19
|
}, "strip", z.ZodTypeAny, {
|
|
20
|
-
logLevel: "error" | "
|
|
20
|
+
logLevel: "error" | "debug" | "info" | "warn" | "none" | "log";
|
|
21
21
|
skipTelemetry: boolean;
|
|
22
22
|
profile: string;
|
|
23
23
|
apiUrl?: string | undefined;
|
|
24
24
|
}, {
|
|
25
25
|
apiUrl?: string | undefined;
|
|
26
|
-
logLevel?: "error" | "
|
|
26
|
+
logLevel?: "error" | "debug" | "info" | "warn" | "none" | "log" | undefined;
|
|
27
27
|
skipTelemetry?: boolean | undefined;
|
|
28
28
|
profile?: string | undefined;
|
|
29
29
|
}>;
|
|
@@ -211,6 +211,7 @@ async function selfHostedBuildImage(options) {
|
|
|
211
211
|
});
|
|
212
212
|
for await (const line of pushProcess) {
|
|
213
213
|
logger.debug(line);
|
|
214
|
+
errors.push(line);
|
|
214
215
|
}
|
|
215
216
|
if (pushProcess.exitCode !== 0) {
|
|
216
217
|
return {
|
|
@@ -279,7 +280,7 @@ async function generateBunContainerfile(options) {
|
|
|
279
280
|
const baseInstructions = (options.image?.instructions || []).join("\n");
|
|
280
281
|
const packages = Array.from(new Set(DEFAULT_PACKAGES.concat(options.image?.pkgs || []))).join(" ");
|
|
281
282
|
return `# syntax=docker/dockerfile:1
|
|
282
|
-
FROM imbios/bun-node:22-
|
|
283
|
+
FROM imbios/bun-node:1.1.24-22-slim@sha256:9cfb7cd87529261c482fe17d8894c0986263f3a5ccf84ad65c00ec0e1ed539c6 AS base
|
|
283
284
|
|
|
284
285
|
${baseInstructions}
|
|
285
286
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildImage.js","sourceRoot":"","sources":["../../../src/deploy/buildImage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"buildImage.js","sourceRoot":"","sources":["../../../src/deploy/buildImage.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/deploy/logs.js
CHANGED
|
@@ -3,7 +3,7 @@ import { writeFile } from "node:fs/promises";
|
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { chalkError, chalkWarning, cliLink } from "../utilities/cliOutput.js";
|
|
5
5
|
import { createTempDir } from "../utilities/fileSystem.js";
|
|
6
|
-
import {
|
|
6
|
+
import { links } from "@trigger.dev/core/v3";
|
|
7
7
|
export async function saveLogs(shortCode, logs) {
|
|
8
8
|
const logPath = join(await createTempDir(), `build-${shortCode}.log`);
|
|
9
9
|
await writeFile(logPath, logs);
|
|
@@ -24,15 +24,15 @@ export function checkLogsForErrors(logs) {
|
|
|
24
24
|
const errors = [
|
|
25
25
|
{
|
|
26
26
|
regex: /Error: Provided --schema at (?<schema>.*) doesn't exist/,
|
|
27
|
-
message: `Prisma generate failed to find the specified schema at "$schema".\nDid you
|
|
27
|
+
message: `Prisma generate failed to find the specified schema at "$schema".\nDid you configure the Prisma extension correctly? ${cliLink("Extension docs", links.docs.config.prisma)}`,
|
|
28
28
|
},
|
|
29
29
|
{
|
|
30
30
|
regex: /@prisma\/client did not initialize yet/,
|
|
31
|
-
message: `Prisma client not initialized yet.\nDid you
|
|
31
|
+
message: `Prisma client not initialized yet.\nDid you configure the Prisma extension? ${cliLink("Extension docs", links.docs.config.prisma)}`,
|
|
32
32
|
},
|
|
33
33
|
{
|
|
34
34
|
regex: /sh: 1: (?<packageOrBinary>.*): not found/,
|
|
35
|
-
message: `$packageOrBinary not found\n\nIf it's a package:
|
|
35
|
+
message: `$packageOrBinary not found\n\nIf it's a package: Use the ${cliLink("additionalPackages extension", links.docs.config.additionalPackages)}\nIf it's a binary: Check the other ${cliLink("build extensions", links.docs.config.extensions)}`,
|
|
36
36
|
},
|
|
37
37
|
];
|
|
38
38
|
for (const error of errors) {
|
|
@@ -59,7 +59,7 @@ export function checkLogsForWarnings(logs) {
|
|
|
59
59
|
const warnings = [
|
|
60
60
|
{
|
|
61
61
|
regex: /prisma:warn We could not find your Prisma schema/,
|
|
62
|
-
message: `Prisma generate failed to find the default schema. Did you
|
|
62
|
+
message: `Prisma generate failed to find the default schema. Did you configure the Prisma extension correctly? ${cliLink("Extension docs", links.docs.config.prisma)}`,
|
|
63
63
|
shouldFail: true,
|
|
64
64
|
},
|
|
65
65
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/deploy/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/deploy/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAoB7C,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,SAAiB,EAAE,IAAY;IAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,aAAa,EAAE,EAAE,SAAS,SAAS,MAAM,CAAC,CAAC;IACtE,MAAM,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAiB;IAC3C,KAAK,MAAM,KAAK,IAAI,MAAM,IAAI,EAAE,EAAE,CAAC;QACjC,GAAG,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAmB;IAC/C,KAAK,MAAM,OAAO,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,MAAM,MAAM,GAAqB;QAC/B;YACE,KAAK,EAAE,yDAAyD;YAChE,OAAO,EAAE,wHAAwH,OAAO,CACtI,gBAAgB,EAChB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CACzB,EAAE;SACJ;QACD;YACE,KAAK,EAAE,wCAAwC;YAC/C,OAAO,EAAE,+EAA+E,OAAO,CAC7F,gBAAgB,EAChB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CACzB,EAAE;SACJ;QACD;YACE,KAAK,EAAE,0CAA0C;YACjD,OAAO,EAAE,4DAA4D,OAAO,CAC1E,8BAA8B,EAC9B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CACrC,wCAAwC,OAAO,CAC9C,kBAAkB,EAClB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAC7B,EAAE;SACJ;KACF,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAEtE,GAAG,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC;QAChD,MAAM;IACR,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB,EAAE,QAAoC;IACpF,IAAI,OAAO,GAAG,QAAQ,CAAC;IAEvB,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,iIAAiI;AACjI,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,MAAM,QAAQ,GAAqB;QACjC;YACE,KAAK,EAAE,kDAAkD;YACzD,OAAO,EAAE,wGAAwG,OAAO,CACtH,gBAAgB,EAChB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CACzB,EAAE;YACH,UAAU,EAAE,IAAI;SACjB;KACF,CAAC;IAEF,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,eAAe,GAAa,EAAE,CAAC;IAErC,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE1C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAExE,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,UAAU,GAAG,IAAI,CAAC;YAClB,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,0DAA0D;YACnE,QAAQ,EAAE,eAAe;YACzB,MAAM,EAAE,aAAa;SACtB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAI;QACR,QAAQ,EAAE,eAAe;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -47,7 +47,6 @@ export declare class BackgroundWorkerCoordinator {
|
|
|
47
47
|
registerWorker(worker: BackgroundWorker): Promise<void>;
|
|
48
48
|
close(): void;
|
|
49
49
|
executeTaskRun(id: string, payload: TaskRunExecutionPayload, messageId: string): Promise<{
|
|
50
|
-
id: string;
|
|
51
50
|
error: {
|
|
52
51
|
message: string;
|
|
53
52
|
type: "BUILT_IN_ERROR";
|
|
@@ -60,11 +59,12 @@ export declare class BackgroundWorkerCoordinator {
|
|
|
60
59
|
type: "STRING_ERROR";
|
|
61
60
|
raw: string;
|
|
62
61
|
} | {
|
|
63
|
-
code: "COULD_NOT_FIND_EXECUTOR" | "COULD_NOT_FIND_TASK" | "COULD_NOT_IMPORT_TASK" | "CONFIGURED_INCORRECTLY" | "TASK_ALREADY_RUNNING" | "TASK_EXECUTION_FAILED" | "TASK_EXECUTION_ABORTED" | "TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE" | "TASK_PROCESS_SIGKILL_TIMEOUT" | "TASK_RUN_CANCELLED" | "TASK_OUTPUT_ERROR" | "HANDLE_ERROR_ERROR" | "GRACEFUL_EXIT_TIMEOUT" | "TASK_RUN_CRASHED" | "MAX_DURATION_EXCEEDED" | "
|
|
62
|
+
code: "COULD_NOT_FIND_EXECUTOR" | "COULD_NOT_FIND_TASK" | "COULD_NOT_IMPORT_TASK" | "CONFIGURED_INCORRECTLY" | "TASK_ALREADY_RUNNING" | "TASK_EXECUTION_FAILED" | "TASK_EXECUTION_ABORTED" | "TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE" | "TASK_PROCESS_SIGKILL_TIMEOUT" | "TASK_PROCESS_SIGTERM" | "TASK_PROCESS_OOM_KILLED" | "TASK_PROCESS_MAYBE_OOM_KILLED" | "TASK_RUN_CANCELLED" | "TASK_OUTPUT_ERROR" | "HANDLE_ERROR_ERROR" | "GRACEFUL_EXIT_TIMEOUT" | "TASK_RUN_HEARTBEAT_TIMEOUT" | "TASK_RUN_CRASHED" | "MAX_DURATION_EXCEEDED" | "DISK_SPACE_EXCEEDED" | "POD_EVICTED" | "POD_UNKNOWN_ERROR";
|
|
64
63
|
type: "INTERNAL_ERROR";
|
|
65
64
|
message?: string | undefined;
|
|
66
65
|
stackTrace?: string | undefined;
|
|
67
66
|
};
|
|
67
|
+
id: string;
|
|
68
68
|
ok: false;
|
|
69
69
|
retry?: {
|
|
70
70
|
timestamp: number;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { correctErrorStackTrace, } from "@trigger.dev/core/v3";
|
|
2
2
|
import { Evt } from "evt";
|
|
3
3
|
import { join } from "node:path";
|
|
4
|
-
import {
|
|
4
|
+
import { SigKillTimeoutProcessError } from "@trigger.dev/core/v3/errors";
|
|
5
5
|
import { TaskRunProcess } from "../executions/taskRunProcess.js";
|
|
6
6
|
import { indexWorkerManifest } from "../indexing/indexWorkerManifest.js";
|
|
7
7
|
import { prettyError } from "../utilities/cliOutput.js";
|
|
@@ -219,9 +219,9 @@ export class BackgroundWorker {
|
|
|
219
219
|
const processOptions = {
|
|
220
220
|
payload,
|
|
221
221
|
env: {
|
|
222
|
-
...sanitizeEnvVars(this.params.env),
|
|
223
222
|
// TODO: this needs the stripEmptyValues stuff too
|
|
224
223
|
...sanitizeEnvVars(payload.environment ?? {}),
|
|
224
|
+
...sanitizeEnvVars(this.params.env),
|
|
225
225
|
TRIGGER_WORKER_MANIFEST_PATH: this.workerManifestPath,
|
|
226
226
|
},
|
|
227
227
|
serverWorker: this.serverWorker,
|
|
@@ -346,7 +346,7 @@ export class BackgroundWorker {
|
|
|
346
346
|
}
|
|
347
347
|
const error = result.error;
|
|
348
348
|
if (error.type === "BUILT_IN_ERROR") {
|
|
349
|
-
const mappedError = await this.#correctError(error
|
|
349
|
+
const mappedError = await this.#correctError(error);
|
|
350
350
|
return {
|
|
351
351
|
...result,
|
|
352
352
|
error: mappedError,
|
|
@@ -355,54 +355,15 @@ export class BackgroundWorker {
|
|
|
355
355
|
return result;
|
|
356
356
|
}
|
|
357
357
|
catch (e) {
|
|
358
|
-
if (e instanceof CancelledProcessError) {
|
|
359
|
-
return {
|
|
360
|
-
id: payload.execution.run.id,
|
|
361
|
-
ok: false,
|
|
362
|
-
retry: undefined,
|
|
363
|
-
error: {
|
|
364
|
-
type: "INTERNAL_ERROR",
|
|
365
|
-
code: TaskRunErrorCodes.TASK_RUN_CANCELLED,
|
|
366
|
-
},
|
|
367
|
-
};
|
|
368
|
-
}
|
|
369
|
-
if (e instanceof CleanupProcessError) {
|
|
370
|
-
return {
|
|
371
|
-
id: payload.execution.run.id,
|
|
372
|
-
ok: false,
|
|
373
|
-
retry: undefined,
|
|
374
|
-
error: {
|
|
375
|
-
type: "INTERNAL_ERROR",
|
|
376
|
-
code: TaskRunErrorCodes.TASK_EXECUTION_ABORTED,
|
|
377
|
-
},
|
|
378
|
-
};
|
|
379
|
-
}
|
|
380
|
-
if (e instanceof UnexpectedExitError) {
|
|
381
|
-
return {
|
|
382
|
-
id: payload.execution.run.id,
|
|
383
|
-
ok: false,
|
|
384
|
-
retry: undefined,
|
|
385
|
-
error: {
|
|
386
|
-
type: "INTERNAL_ERROR",
|
|
387
|
-
code: TaskRunErrorCodes.TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE,
|
|
388
|
-
message: getFriendlyErrorMessage(e.code, e.signal, e.stderr),
|
|
389
|
-
stackTrace: e.stderr,
|
|
390
|
-
},
|
|
391
|
-
};
|
|
392
|
-
}
|
|
393
358
|
return {
|
|
394
359
|
id: payload.execution.run.id,
|
|
395
360
|
ok: false,
|
|
396
361
|
retry: undefined,
|
|
397
|
-
error:
|
|
398
|
-
type: "INTERNAL_ERROR",
|
|
399
|
-
code: TaskRunErrorCodes.TASK_EXECUTION_FAILED,
|
|
400
|
-
message: String(e),
|
|
401
|
-
},
|
|
362
|
+
error: TaskRunProcess.parseExecuteError(e),
|
|
402
363
|
};
|
|
403
364
|
}
|
|
404
365
|
}
|
|
405
|
-
async #correctError(error
|
|
366
|
+
async #correctError(error) {
|
|
406
367
|
return {
|
|
407
368
|
...error,
|
|
408
369
|
stackTrace: correctErrorStackTrace(error.stackTrace, this.params.cwd),
|