Revert "Revert "(feat): Deployments" (#921)" (#922)

This reverts commit 6452342.

Author: mcandeia

apps/api/src/api.ts

@@ -6,7 +6,6 @@ import {
   AuthorizationClient,
   createMCPToolsStub,
   EMAIL_TOOLS,
-  Entrypoint,
   getPresignedReadUrl_WITHOUT_CHECKING_AUTHORIZATION,
   getWorkspaceBucketName,
   GLOBAL_TOOLS,
@@ -24,16 +23,15 @@ import { logger } from "hono/logger";
 import { endTime, startTime } from "hono/timing";
 import type { ContentfulStatusCode } from "hono/utils/http-status";
 import { z } from "zod";
-import { fetchScript } from "./apps.ts";
 import { ROUTES as loginRoutes } from "./auth/index.ts";
 import { withActorsStubMiddleware } from "./middlewares/actors-stub.ts";
 import { withActorsMiddleware } from "./middlewares/actors.ts";
 import { withContextMiddleware } from "./middlewares/context.ts";
 import { setUserMiddleware } from "./middlewares/user.ts";
+import { handleCodeExchange } from "./oauth/code.ts";
 import { type AppContext, type AppEnv, State } from "./utils/context.ts";
 import { handleStripeWebhook } from "./webhooks/stripe.ts";
 import { handleTrigger } from "./webhooks/trigger.ts";
-import { handleCodeExchange } from "./oauth/code.ts";
 
 export const app = new Hono<AppEnv>();
 export const honoCtxToAppCtx = (c: Context<AppEnv>): AppContext => {
@@ -332,51 +330,6 @@ app.get("/apps/oauth", (c) => {
 // Health check endpoint
 app.get("/health", (c: Context) => c.json({ status: "ok" }));
 
-const DECO_WORKSPACE_HEADER = "x-deco-workspace";
-const SENSITIVE_HEADERS = ["Cookie", "Authorization"];
-app.on([
-  "GET",
-  "POST",
-  "PUT",
-  "DELETE",
-  "PATCH",
-  "OPTIONS",
-], [
-  "/:root/:slug/views/:script/:path{.+}?",
-  "/views/:script/:path{.+}?",
-], (c: Context) => {
-  const script = c.req.param("script");
-  const path = c.req.param("path");
-  const root = c.req.param("root");
-  const slug = c.req.param("slug");
-  const workspace = root && slug
-    ? `/${root}/${slug}`
-    : c.req.header(DECO_WORKSPACE_HEADER);
-
-  const url = new URL(c.req.raw.url);
-  url.protocol = "https:";
-  url.port = "443";
-  url.host = Entrypoint.host(script);
-  url.pathname = `/${path || ""}`;
-
-  const headers = new Headers(c.req.header());
-  SENSITIVE_HEADERS.forEach((header) => {
-    headers.delete(header);
-  });
-
-  workspace && headers.set(DECO_WORKSPACE_HEADER, workspace);
-  return fetchScript(
-    c,
-    script,
-    new Request(url, {
-      redirect: c.req.raw.redirect,
-      body: c.req.raw.body,
-      method: c.req.raw.method,
-      headers,
-    }),
-  );
-});
-
 app.onError((err, c) => {
   console.error(err);
 

apps/api/src/apps.ts

@@ -1,12 +1,15 @@
 import { SWRCache } from "@deco/sdk/cache/swr";
-import { Entrypoint, HOSTING_APPS_DOMAIN } from "@deco/sdk/mcp";
+import { Entrypoint } from "@deco/sdk/mcp";
 import { type Context, Hono } from "hono";
 import { APPS_DOMAIN_QS, appsDomainOf } from "./app.ts";
 import { withContextMiddleware } from "./middlewares/context.ts";
 import type { AppEnv } from "./utils/context.ts";
 
 const ONE_HOUR_SECONDS = 60 * 60;
-const domainSWRCache = new SWRCache<string>("domain-swr", ONE_HOUR_SECONDS);
+const domainSWRCache = new SWRCache<string | null>(
+  "domain-swr",
+  ONE_HOUR_SECONDS,
+);
 export type DispatcherFetch = typeof fetch;
 export const app = new Hono<AppEnv>();
 
@@ -53,32 +56,46 @@ app.all("/*", async (c: Context<AppEnv>) => {
   if (!host) {
     return new Response("No host", { status: 400 });
   }
-  let script = Entrypoint.script(host);
+  const locator = Entrypoint.script(host);
+  // if it has a deployment ID, we can use the script ID directly
+  let script = locator?.isCanonical ? locator.slug : null;
   if (!script) {
     script = await domainSWRCache.cache(
-      async () => {
+      async (): Promise<string | null> => {
         const { data, error } = await c.var.db.from("deco_chat_hosting_routes")
-          .select("*, deco_chat_hosting_apps(slug)").eq(
+          .select(`
+              *,
+              deco_chat_hosting_apps_deployments!deployment_id(
+                id,
+                deco_chat_hosting_apps!hosting_app_id(slug)
+              )
+            `).eq(
             "route_pattern",
             host,
           ).maybeSingle();
         if (error) {
           throw error;
         }
-        const slug = data?.deco_chat_hosting_apps?.slug;
-        if (!slug) {
-          throw new Error("No slug found");
+        if (!data && locator) {
+          return locator.slug;
         }
-        return slug;
+        const deployment = data?.deco_chat_hosting_apps_deployments;
+        const slug = deployment?.deco_chat_hosting_apps?.slug;
+        const deploymentId = deployment?.id;
+        if (!slug || !deploymentId) {
+          throw new Error("No slug or deployment ID found");
+        }
+        return Entrypoint.id(slug, deploymentId);
       },
       host,
       false,
     ).catch(() => null);
-    host = `${script}${HOSTING_APPS_DOMAIN}`;
   }
+
   if (!script) {
     return new Response("Not found", { status: 404 });
   }
+  host = Entrypoint.host(script);
   if (url.host !== host) {
     url.host = host;
     url.protocol = "https";

apps/api/src/email.ts

@@ -81,7 +81,7 @@ export function email(
     msg.setSender(message.to);
     msg.setRecipient(message.from);
     const cc = message.headers.get("Cc");
-    // @ts-expect-error - this exists
+    // @ts-ignore: cc is not a valid property of the EmailMessage class
     cc && msg.setCc(message.cc);
     msg.setSubject(replySubject); // Use the threaded subject instead of generic text
 

docs/server/deco.gen.ts

@@ -5644,7 +5644,7 @@ export interface Env {
      * ]
      * Important Notes:
      * - You can access the app workspace by accessing env.DECO_CHAT_WORKSPACE
-     * - You can access the app script slug by accessing env.DECO_CHAT_SCRIPT_SLUG
+     * - You can access the app script slug by accessing env.DECO_CHAT_APP_SLUG
      * - Token and workspace can be used to make authenticated requests to the Deco API under https://api.deco.chat
      * - Always use Cloudflare Workers syntax with export default and proper fetch handler signature
      * - When using template literals inside content strings, escape backticks with a backslash (\) or use string concatenation (+)

packages/cli/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@deco/cli",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "description": "A CLI for interacting with deco.chat.",
   "license": "MIT",
   "exports": "./cli.ts",

packages/cli/src/hosting/deploy.ts

@@ -182,6 +182,8 @@ export const deploy = async (
     throw new Error(errorTextJson ?? errorText ?? "Unknown error");
   }
 
-  const { entrypoint } = response.structuredContent as { entrypoint: string };
-  console.log(`\n🎉 Deployed! Available at: ${entrypoint}\n`);
+  const { hosts } = response.structuredContent as { hosts: string[] };
+  console.log(`\n🎉 Deployed! Available at:`);
+  hosts.forEach((host) => console.log(`  ${host}`));
+  console.log();
 };

packages/cli/src/typings.ts

@@ -166,6 +166,7 @@ export const genEnv = async (
   const apiClient = await createWorkspaceClient({ local });
 
   const types = new Map<string, number>();
+  types.set("Env", 1); // set the default env type
   let tsTypes = "";
   const props = await Promise.all(
     [

packages/runtime/src/index.ts

@@ -30,11 +30,12 @@ export interface WorkspaceDB {
 export interface DefaultEnv<TSchema extends z.ZodTypeAny = any> {
   DECO_CHAT_REQUEST_CONTEXT: RequestContext<TSchema>;
   DECO_CHAT_APP_NAME: string;
-  DECO_CHAT_SCRIPT_SLUG: string;
+  DECO_CHAT_APP_SLUG: string;
   DECO_CHAT_APP_ENTRYPOINT: string;
   DECO_CHAT_API_URL?: string;
   DECO_CHAT_WORKSPACE: string;
   DECO_CHAT_API_JWT_PUBLIC_KEY: string;
+  DECO_CHAT_APP_DEPLOYMENT_ID: string;
   DECO_CHAT_BINDINGS: string;
   DECO_CHAT_API_TOKEN: string;
   DECO_CHAT_WORKFLOW_DO: DurableObjectNamespace<WorkflowDO>;

packages/runtime/src/workflow.ts

@@ -107,7 +107,9 @@ export const Workflow = (
         },
         telemetry: {
           enabled: true,
-          serviceName: `app-${this.env.DECO_CHAT_SCRIPT_SLUG}`,
+          serviceName: `app-${
+            this.env.DECO_CHAT_SCRIPT_SLUG ?? this.env.DECO_CHAT_APP_SLUG
+          }`,
         },
       });
       // since mastra workflows are thenables, so we need to wrap then into an object

packages/sdk/package.json

@@ -44,7 +44,8 @@
     "@opentelemetry/semantic-conventions": "^1.21.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.53.0",
     "@opentelemetry/otlp-exporter-base": "^0.53.0",
-    "@opentelemetry/otlp-transformer": "^0.53.0"
+    "@opentelemetry/otlp-transformer": "^0.53.0",
+    "short-unique-id": "^5.3.2"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250510.0",