trigger.dev 0.0.0-v3-canary-20240322152839 → 0.0.0-v3-canary-20240322220011

package/dist/index.js

@@ -791,7 +791,7 @@ import { build as build2 } from "esbuild";
 import { execa as execa2 } from "execa";
 import { resolve as importResolve } from "import-meta-resolve";
 import { createHash } from "node:crypto";
-import { readFileSync } from "node:fs";
+import { readFileSync as readFileSync2 } from "node:fs";
 import { copyFile, mkdir, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname, join as join4, relative as relative2 } from "node:path";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
@@ -800,7 +800,7 @@ import invariant from "tiny-invariant";
 import { z as z4 } from "zod";
 
 // package.json
-var version = "0.0.0-v3-canary-20240322152839";
+var version = "0.0.0-v3-canary-20240322220011";
 var dependencies = {
   "@baselime/node-opentelemetry": "^0.4.6",
   "@clack/prompts": "^0.7.0",
@@ -820,8 +820,7 @@ var dependencies = {
   "@opentelemetry/sdk-trace-base": "^1.21.0",
   "@opentelemetry/sdk-trace-node": "^1.21.0",
   "@opentelemetry/semantic-conventions": "^1.21.0",
-  "@traceloop/instrumentation-openai": "^0.3.9",
-  "@trigger.dev/core": "workspace:0.0.0-v3-canary-20240322152839",
+  "@trigger.dev/core": "workspace:0.0.0-v3-canary-20240322220011",
   "@types/degit": "^2.8.3",
   chalk: "^5.2.0",
   chokidar: "^3.5.3",
@@ -1247,6 +1246,8 @@ var Logger = class {
   loggerLevel = getLoggerLevel();
   columns = process.stdout.columns;
   debug = (...args) => this.doLog("debug", args);
+  ignore = (...args) => {
+  };
   debugWithSanitization = (label, ...args) => {
     this.doLog("debug", [label, ...args]);
   };
@@ -1445,7 +1446,7 @@ async function gatherTaskFiles(config) {
       const fullPath = join(triggerDir, file.name);
       const filePath = relative(config.projectDir, fullPath);
       const importPath = filePath.replace(/\.(js|ts)$/, "");
-      const importName = importPath.replace(/\//g, "_");
+      const importName = importPath.replace(/\//g, "_").replace(/\./g, "_").replace(/-/g, "_");
       taskFiles.push({ triggerDir, importPath, importName, filePath });
     }
   }
@@ -1549,7 +1550,7 @@ async function readConfig(dir, options) {
     }
   }
   const tempDir = await createTempDir();
-  const builtConfigFilePath = join2(tempDir, "config.mjs");
+  const builtConfigFilePath = join2(tempDir, "config.js");
   const builtConfigFileHref = pathToFileURL(builtConfigFilePath).href;
   logger.debug("Building config file", {
     configPath,
@@ -1562,7 +1563,7 @@ async function readConfig(dir, options) {
     metafile: true,
     minify: false,
     write: true,
-    format: "esm",
+    format: "cjs",
     platform: "node",
     target: ["es2018", "node18"],
     outfile: builtConfigFilePath,
@@ -1612,6 +1613,9 @@ import checkForUpdate from "update-check";
 import chalk2 from "chalk";
 var green = "#4FFF54";
 var purple = "#735BF3";
+function chalkPurple(text2) {
+  return chalk2.hex(purple)(text2);
+}
 function chalkGrey(text2) {
   return chalk2.hex("#666")(text2);
 }
@@ -2633,6 +2637,33 @@ ${authorizationCodeResult.error}`
 // src/utilities/build.ts
 import { extname, isAbsolute } from "node:path";
 import tsConfigPaths from "tsconfig-paths";
+import { readFileSync } from "node:fs";
+function workerSetupImportConfigPlugin(configPath) {
+  return {
+    name: "trigger-worker-setup",
+    setup(build3) {
+      if (!configPath) {
+        return;
+      }
+      build3.onLoad({ filter: /worker-setup\.js$/ }, async (args) => {
+        let workerSetupContents = readFileSync(args.path, "utf-8");
+        workerSetupContents = workerSetupContents.replace(
+          "__SETUP_IMPORTED_PROJECT_CONFIG__",
+          `import * as setupImportedConfigExports from "${configPath}"; const setupImportedConfig = setupImportedConfigExports.config;`
+        );
+        logger.debug("Loading worker setup", {
+          args,
+          workerSetupContents,
+          configPath
+        });
+        return {
+          contents: workerSetupContents,
+          loader: "js"
+        };
+      });
+    }
+  };
+}
 function bundleDependenciesPlugin(config) {
   const matchPath = config.tsconfigPath ? createMatchPath(config.tsconfigPath) : void 0;
   function resolvePath(id) {
@@ -2642,22 +2673,22 @@ function bundleDependenciesPlugin(config) {
     return matchPath(id, void 0, void 0, [".ts", ".tsx", ".js", ".jsx"]) || id;
   }
   return {
-    name: "bundle-dependencies",
+    name: "trigger-bundle-dependencies",
     setup(build3) {
       build3.onResolve({ filter: /.*/ }, (args) => {
         const resolvedPath = resolvePath(args.path);
-        logger.debug(`Checking if ${args.path} should be bundled or external`, {
+        logger.ignore(`Checking if ${args.path} should be bundled or external`, {
           ...args,
           resolvedPath
         });
         if (!isBareModuleId(resolvedPath)) {
-          logger.debug(`Bundling ${args.path} because its not a bareModuleId`, {
+          logger.ignore(`Bundling ${args.path} because its not a bareModuleId`, {
             ...args
           });
           return void 0;
         }
         if (args.path.startsWith("@trigger.dev/")) {
-          logger.debug(`Bundling ${args.path} because its a trigger.dev package`, {
+          logger.ignore(`Bundling ${args.path} because its a trigger.dev package`, {
             ...args
           });
           return void 0;
@@ -2678,7 +2709,7 @@ function bundleDependenciesPlugin(config) {
             return void 0;
           }
         }
-        logger.debug(`Externalizing ${args.path}`, {
+        logger.ignore(`Externalizing ${args.path}`, {
           ...args
         });
         return {
@@ -3285,7 +3316,7 @@ async function compileProject(config, options, configPath) {
       const compileSpinner = spinner4();
       compileSpinner.start(`Building project in ${config.projectDir}`);
       const taskFiles = await gatherTaskFiles(config);
-      const workerFacade = readFileSync(
+      const workerFacade = readFileSync2(
         new URL(importResolve("./workers/prod/worker-facade.js", import.meta.url)).href.replace(
           "file://",
           ""
@@ -3330,7 +3361,7 @@ async function compileProject(config, options, configPath) {
           TRIGGER_API_URL: `"${config.triggerUrl}"`,
           __PROJECT_CONFIG__: JSON.stringify(config)
         },
-        plugins: [bundleDependenciesPlugin(config)]
+        plugins: [bundleDependenciesPlugin(config), workerSetupImportConfigPlugin(configPath)]
       });
       if (result.errors.length > 0) {
         compileSpinner.stop("Build failed, aborting deployment");
@@ -3344,7 +3375,7 @@ async function compileProject(config, options, configPath) {
       if (options.outputMetafile) {
         await writeJSONFile(join4(options.outputMetafile, "worker.json"), result.metafile);
       }
-      const entryPointContents = readFileSync(
+      const entryPointContents = readFileSync2(
         new URL(importResolve("./workers/prod/entry-point.js", import.meta.url)).href.replace(
           "file://",
           ""
@@ -3701,9 +3732,9 @@ import chalk6 from "chalk";
 import { watch } from "chokidar";
 import { context as context2 } from "esbuild";
 import { resolve as importResolve2 } from "import-meta-resolve";
-import { Box, Text, render, useApp, useInput } from "ink";
+import { render, useInput } from "ink";
 import { createHash as createHash2 } from "node:crypto";
-import fs7, { readFileSync as readFileSync2 } from "node:fs";
+import fs7, { readFileSync as readFileSync3 } from "node:fs";
 import { basename, dirname as dirname3, join as join5 } from "node:path";
 import pThrottle from "p-throttle";
 import { WebSocket } from "partysocket";
@@ -4333,7 +4364,16 @@ async function startDev(dir, options, authorization) {
         env: "dev"
       });
       if (!devEnv.success) {
-        throw new Error(devEnv.error);
+        if (devEnv.error === "Project not found") {
+          logger.error(
+            `Project not found: ${config.config.project}. Ensure you are using the correct project ref and CLI profile (use --profile). Currently using the "${options.profile}" profile, which points to ${authorization2.apiUrl}`
+          );
+        } else {
+          logger.error(
+            `Failed to initialize dev environment: ${devEnv.error}. Using project ref ${config.config.project}`
+          );
+        }
+        process.exit(1);
       }
       const environmentClient = new CliApiClient(apiUrl, devEnv.data.apiKey);
       return /* @__PURE__ */ React.createElement(
@@ -4467,12 +4507,11 @@ function useDev({
     let ctx;
     async function runBuild() {
       if (ctx) {
-        await ctx.cancel();
         await ctx.dispose();
       }
       let latestWorkerContentHash;
       const taskFiles = await gatherTaskFiles(config);
-      const workerFacade = readFileSync2(
+      const workerFacade = readFileSync3(
         new URL(importResolve2("./workers/dev/worker-facade.js", import.meta.url)).href.replace(
           "file://",
           ""
@@ -4521,6 +4560,7 @@ function useDev({
         },
         plugins: [
           bundleDependenciesPlugin(config),
+          workerSetupImportConfigPlugin(configPath),
           {
             name: "trigger.dev v3",
             setup(build3) {
@@ -4599,6 +4639,16 @@ function useDev({
                   if (!packageVersion) {
                     throw new Error(`Background Worker started without package version`);
                   }
+                  const taskIds = taskResources.map((task) => task.id);
+                  const duplicateTaskIds = taskIds.filter(
+                    (id, index) => taskIds.indexOf(id) !== index
+                  );
+                  if (duplicateTaskIds.length > 0) {
+                    logger.error(
+                      createDuplicateTaskIdOutputErrorMessage(duplicateTaskIds, taskResources)
+                    );
+                    return;
+                  }
                   const backgroundWorkerBody = {
                     localOnly: true,
                     metadata: {
@@ -4655,8 +4705,9 @@ function useDev({
       await ctx.watch();
     }
     const throttle = pThrottle({
-      limit: 2,
-      interval: 1e3
+      limit: 1,
+      interval: 1e3,
+      strict: true
     });
     const throttledRebuild = throttle(runBuild);
     const taskFileWatcher = watch(
@@ -4665,7 +4716,7 @@ function useDev({
         ignoreInitial: true
       }
     );
-    taskFileWatcher.on("add", async (path6) => {
+    taskFileWatcher.on("change", async (path6) => {
       throttledRebuild().catch((error) => {
         logger.error(error);
       });
@@ -4697,32 +4748,12 @@ function DevUIImp(props) {
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(HotKeys, null));
 }
 function useHotkeys() {
-  const { exit } = useApp();
   useInput(async (input, key) => {
-    if (key.return) {
-      console.log("");
-      return;
-    }
-    switch (input.toLowerCase()) {
-      case "c":
-        console.clear();
-        console.log();
-        break;
-      case "b": {
-        break;
-      }
-      case "q":
-      case "x":
-        exit();
-        break;
-      default:
-        break;
-    }
   });
 }
 function HotKeys() {
   useHotkeys();
-  return /* @__PURE__ */ React.createElement(Box, { borderStyle: "round", paddingLeft: 1, paddingRight: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true }, "[b]"), /* @__PURE__ */ React.createElement(Text, null, " open a browser, "), /* @__PURE__ */ React.createElement(Text, { bold: true }, "[c]"), /* @__PURE__ */ React.createElement(Text, null, " clear console, "), /* @__PURE__ */ React.createElement(Text, { bold: true }, "[x]"), /* @__PURE__ */ React.createElement(Text, null, " to exit"));
+  return /* @__PURE__ */ React.createElement(React.Fragment, null);
 }
 function WebsocketFactory(apiKey) {
   return class extends wsWebSocket {
@@ -4774,6 +4805,18 @@ async function gatherRequiredDependencies2(outputMeta, config) {
   }
   return dependencies2;
 }
+function createDuplicateTaskIdOutputErrorMessage(duplicateTaskIds, taskResources) {
+  const duplicateTable = duplicateTaskIds.map((id) => {
+    const tasks = taskResources.filter((task) => task.id === id);
+    return `id "${chalkPurple(id)}" was found in:
+${tasks.map((task) => `${task.filePath} -> ${task.exportName}`).join("\n")}`;
+  }).join("\n\n");
+  return `Duplicate task ids detected:
+
+${duplicateTable}
+
+`;
+}
 function gatherProcessEnv() {
   const env = {
     NODE_ENV: process.env.NODE_ENV ?? "development",
@@ -4905,9 +4948,6 @@ function configureInitCommand(program2) {
     program2.command("init").description("Initialize your existing project for development with Trigger.dev").argument("[path]", "The path to the project", ".").option(
       "-p, --project-ref <project ref>",
       "The project ref to use when initializing the project"
-    ).option(
-      "-p, --project-ref <project ref>",
-      "The project ref to use when initializing the project"
     ).option(
       "-t, --tag <package tag>",
       "The version of the @trigger.dev/sdk package to install",
@@ -4974,8 +5014,8 @@ async function _initCommand(dir, options) {
   } else {
     log3.info("Skipping package installation");
   }
-  await writeConfigFile(dir, selectedProject, options);
-  await createTriggerDir(dir, options);
+  const triggerDir = await createTriggerDir(dir, options);
+  await writeConfigFile(dir, selectedProject, options, triggerDir);
   await addConfigFileToTsConfig(dir, options);
   await gitIgnoreDotTriggerDir(dir, options);
   const projectDashboard = terminalLink3(
@@ -4986,7 +5026,7 @@ async function _initCommand(dir, options) {
   log3.info("Next steps:");
   log3.info(
     `   1. To start developing, run ${chalk7.green(
-      "npx trigger.dev@latest dev"
+      `npx trigger.dev@${options.tag} dev`
     )} in your project directory`
   );
   log3.info(`   2. Visit your ${projectDashboard} to view your newly created tasks.`);
@@ -5007,10 +5047,11 @@ async function _initCommand(dir, options) {
 async function createTriggerDir(dir, options) {
   return await tracer.startActiveSpan("createTriggerDir", async (span) => {
     try {
+      const defaultValue = `${dir}/src/trigger`;
       const location = await text({
         message: "Where would you like to create the Trigger.dev directory?",
-        defaultValue: `${dir}/src/trigger`,
-        placeholder: `${dir}/src/trigger`
+        defaultValue,
+        placeholder: defaultValue
       });
       if (isCancel(location)) {
         throw new OutroCommandError();
@@ -5044,7 +5085,7 @@ async function createTriggerDir(dir, options) {
         await createFile(join6(triggerDir, ".gitkeep"), "");
         log3.step(`Created directory at ${location}`);
         span.end();
-        return;
+        return { location, isCustomValue: location !== defaultValue };
       }
       const exampleFile = resolveInternalFilePath(`./templates/examples/${example}.ts.template`);
       const outputPath = join6(triggerDir, "example.ts");
@@ -5056,6 +5097,7 @@ async function createTriggerDir(dir, options) {
       const relativeOutputPath = relative3(process.cwd(), outputPath);
       log3.step(`Created example file at ${relativeOutputPath}`);
       span.end();
+      return { location, isCustomValue: location !== defaultValue };
     } catch (e) {
       if (!(e instanceof SkipCommandError)) {
         recordSpanException5(span, e);
@@ -5183,7 +5225,7 @@ async function installPackages2(dir, options) {
     }
   });
 }
-async function writeConfigFile(dir, project, options) {
+async function writeConfigFile(dir, project, options, triggerDir) {
   return await tracer.startActiveSpan("writeConfigFile", async (span) => {
     try {
       const spnnr = spinner5();
@@ -5199,7 +5241,9 @@ async function writeConfigFile(dir, project, options) {
       const result = await createFileFromTemplate({
         templatePath,
         replacements: {
-          projectRef: project.externalRef
+          projectRef: project.externalRef,
+          triggerDirectoriesOption: triggerDir.isCustomValue ? `
+  triggerDirectories: ["${triggerDir.location}"],` : ""
         },
         outputPath,
         override: options.overrideConfig