@decocms/runtime 0.28.1 → 1.0.0-alpha.5

package/src/asset-server/dev-server-proxy.ts

@@ -0,0 +1,16 @@
+import { proxy } from "hono/proxy";
+import { Context } from "hono";
+
+export const devServerProxy = (url: string | URL) => (c: Context) => {
+  const incomingUrl = new URL(c.req.raw.url);
+  const target = new URL(url);
+  target.pathname = incomingUrl.pathname;
+  target.search = incomingUrl.search;
+
+  return proxy(target, {
+    raw: c.req.raw,
+    headers: {
+      ...c.req.raw.headers,
+    },
+  });
+};

package/src/asset-server/index.ts

@@ -0,0 +1,44 @@
+import { serveStatic } from "hono/bun";
+import { Hono } from "hono";
+import { devServerProxy } from "./dev-server-proxy";
+import { Handler } from "hono/types";
+
+interface AssetServerConfig {
+  env: "development" | "production" | "test";
+  localDevProxyUrl?: string | URL;
+  assetsDirectory?: string;
+}
+
+const DEFAULT_LOCAL_DEV_PROXY_URL = "http://localhost:4000";
+const DEFAULT_ASSETS_DIRECTORY = "./dist/client";
+
+interface HonoApp {
+  use: (path: string, handler: Handler) => void;
+  get: (path: string, handler: Handler) => void;
+}
+
+export const applyAssetServerRoutes = (
+  app: HonoApp,
+  config: AssetServerConfig,
+) => {
+  const environment = config.env;
+  const localDevProxyUrl =
+    config.localDevProxyUrl ?? DEFAULT_LOCAL_DEV_PROXY_URL;
+  const assetsDirectory = config.assetsDirectory ?? DEFAULT_ASSETS_DIRECTORY;
+
+  if (environment === "development") {
+    app.use("*", devServerProxy(localDevProxyUrl));
+  } else if (environment === "production") {
+    app.use("/assets/*", serveStatic({ root: assetsDirectory }));
+    app.get("*", serveStatic({ path: `${assetsDirectory}/index.html` }));
+  }
+};
+
+export const createAssetServer = (config: AssetServerConfig) => {
+  const app = new Hono();
+  applyAssetServerRoutes(app, config);
+  return app;
+};
+
+export const createAssetServerFetcher = (config: AssetServerConfig) =>
+  createAssetServer(config).fetch;

package/src/bindings/README.md

@@ -78,7 +78,7 @@ To create a new binding:
    input/output:
 
 ```ts
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { Binder } from "../index.ts";
 
 const myInputSchema = z.object({ ... });

package/src/bindings/binder.ts

@@ -1,5 +1,5 @@
 /* oxlint-disable no-explicit-any */
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { MCPConnection } from "../connection.ts";
 import { createPrivateTool, createStreamableTool } from "../mastra.ts";
 import {

package/src/bindings/channels.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { ToolBinder } from "../mcp.ts";
 
 const callbacksSchema = z.object({

package/src/bindings/deconfig/resources.ts

@@ -103,7 +103,9 @@ export const createDeconfigResource = <
         });
 
         // Filter files that end with .json
-        const allFiles = Object.entries(filesList.files)
+        const allFiles = Object.entries(
+          (filesList as { files: Record<string, unknown> }).files,
+        )
           .filter(([path]) => path.endsWith(".json"))
           .map(([path, metadata]) => ({
             path,
@@ -189,8 +191,20 @@ export const createDeconfigResource = <
               aValue = getMetadataString(a.metadata, "description") || "";
               bValue = getMetadataString(b.metadata, "description") || "";
             } else {
-              aValue = a.metadata.mtime;
-              bValue = b.metadata.mtime;
+              aValue =
+                typeof a.metadata === "object" &&
+                a.metadata &&
+                "mtime" in a.metadata &&
+                typeof a.metadata.mtime === "number"
+                  ? a.metadata.mtime
+                  : 0;
+              bValue =
+                typeof b.metadata === "object" &&
+                b.metadata &&
+                "mtime" in b.metadata &&
+                typeof b.metadata.mtime === "number"
+                  ? b.metadata.mtime
+                  : 0;
             }
 
             if (sortOrder === "desc") {
@@ -226,11 +240,17 @@ export const createDeconfigResource = <
               uri,
               data: { name, description },
               created_at:
-                "ctime" in metadata && typeof metadata.ctime === "number"
+                typeof metadata === "object" &&
+                metadata &&
+                "ctime" in metadata &&
+                typeof metadata.ctime === "number"
                   ? new Date(metadata.ctime).toISOString()
                   : undefined,
               updated_at:
-                "mtime" in metadata && typeof metadata.mtime === "number"
+                typeof metadata === "object" &&
+                metadata &&
+                "mtime" in metadata &&
+                typeof metadata.mtime === "number"
                   ? new Date(metadata.mtime).toISOString()
                   : undefined,
               created_by: getMetadataString(metadata, "createdBy"),
@@ -264,12 +284,16 @@ export const createDeconfigResource = <
         const filePath = ResourcePath.build(directory, resourceId);
 
         try {
-          const fileData = await deconfig.READ_FILE({
+          const fileData = (await deconfig.READ_FILE({
             path: filePath,
             format: "plainString",
-          });
+          })) as {
+            content: string;
+            ctime: number;
+            mtime: number;
+          };
 
-          const content = fileData.content as string;
+          const content = fileData.content;
 
           // Parse the JSON content
           let parsedData: Record<string, unknown> = {};
@@ -285,8 +309,14 @@ export const createDeconfigResource = <
           return {
             uri,
             data: validatedData,
-            created_at: new Date(fileData.ctime).toISOString(),
-            updated_at: new Date(fileData.mtime).toISOString(),
+            created_at:
+              typeof fileData.ctime === "number"
+                ? new Date(fileData.ctime).toISOString()
+                : new Date().toISOString(),
+            updated_at:
+              typeof fileData.mtime === "number"
+                ? new Date(fileData.mtime).toISOString()
+                : new Date().toISOString(),
             created_by:
               parsedData &&
               "created_by" in parsedData &&
@@ -347,7 +377,7 @@ export const createDeconfigResource = <
         };
 
         const fileContent = JSON.stringify(resourceData, null, 2);
-        const putResult = await deconfig.PUT_FILE({
+        const putResult = (await deconfig.PUT_FILE({
           path: filePath,
           content: fileContent,
           metadata: {
@@ -357,7 +387,7 @@ export const createDeconfigResource = <
             name: validatedData.name || resourceId,
             description: validatedData.description || "",
           },
-        });
+        })) as { conflict?: boolean };
 
         if (putResult.conflict) {
           throw new UserInputError(
@@ -393,11 +423,11 @@ export const createDeconfigResource = <
         // Read existing file to get current data
         let existingData: Record<string, unknown> = {};
         try {
-          const fileData = await deconfig.READ_FILE({
+          const fileData = (await deconfig.READ_FILE({
             path: filePath,
             format: "plainString",
-          });
-          existingData = JSON.parse(fileData.content as string);
+          })) as { content: string };
+          existingData = JSON.parse(fileData.content);
         } catch {
           throw new NotFoundError(`Resource not found: ${uri}`);
         }
@@ -429,7 +459,7 @@ export const createDeconfigResource = <
 
         const fileContent = JSON.stringify(updatedData, null, 2);
 
-        const putResult = await deconfig.PUT_FILE({
+        const putResult = (await deconfig.PUT_FILE({
           path: filePath,
           content: fileContent,
           metadata: {
@@ -439,7 +469,7 @@ export const createDeconfigResource = <
             name: validatedData.name || resourceId,
             description: validatedData.description || "",
           },
-        });
+        })) as { conflict?: boolean };
 
         if (putResult.conflict) {
           throw new UserInputError(

package/src/bindings/deconfig/types.ts

@@ -1,5 +1,5 @@
 // Types for DeconfigResource
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { DefaultEnv } from "../../index.ts";
 import type { MCPClientFetchStub, ToolBinder } from "../../mcp.ts";
 import type { BaseResourceDataSchema } from "../resources/bindings.ts";

package/src/bindings/language-model/ai-sdk.ts

@@ -42,10 +42,13 @@ export const createProvider = (binding: LLMBindingClient): Provider => {
       return await binding.COLLECTION_LLM_LIST({});
     },
     languageModel: (modelId: string): LanguageModelV2 => {
-      const supportedUrls = lazy(() =>
-        binding
-          .LLM_METADATA({ modelId })
-          .then((metadata) => toRegExp(metadata.supportedUrls)),
+      const supportedUrls = lazy(
+        (): Promise<Record<string, RegExp[]>> =>
+          binding
+            .LLM_METADATA({ modelId })
+            .then((metadata: { supportedUrls: Record<string, string[]> }) =>
+              toRegExp(metadata.supportedUrls),
+            ),
       );
 
       return {

package/src/bindings/resources/bindings.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { ToolBinder } from "../../mcp.ts";
 import {
   createCreateInputSchema,

package/src/bindings/resources/schemas.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v3";
+import { z } from "zod";
 
 /**
  * Resources 2.0 Schemas

package/src/bindings/views.ts

@@ -1,5 +1,5 @@
 import { ViewsListOutputSchema } from "../views.ts";
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { ToolBinder } from "../mcp.ts";
 
 export const VIEW_BINDING = [

package/src/bindings.ts

@@ -63,8 +63,9 @@ type WorkspaceClientContext = Omit<
 >;
 export const workspaceClient = (
   ctx: WorkspaceClientContext,
+  decocmsApiUrl?: string,
 ): ReturnType<(typeof MCPClient)["forWorkspace"]> => {
-  return MCPClient.forWorkspace(ctx.workspace, ctx.token);
+  return MCPClient.forWorkspace(ctx.workspace, ctx.token, decocmsApiUrl);
 };
 
 const mcpClientForAppName = (appName: string, decoChatApiUrl?: string) => {
@@ -76,7 +77,7 @@ const mcpClientForAppName = (appName: string, decoChatApiUrl?: string) => {
     }),
   };
 
-  return MCPClient.forConnection(mcpConnection);
+  return MCPClient.forConnection(mcpConnection, decoChatApiUrl);
 };
 
 export const proxyConnectionForId = (
@@ -85,7 +86,7 @@ export const proxyConnectionForId = (
     token?: string;
     cookie?: string;
   },
-  decoChatApiUrl?: string,
+  decocmsApiUrl?: string,
   appName?: string,
 ): MCPConnection => {
   let headers: Record<string, string> | undefined = appName
@@ -100,7 +101,7 @@ export const proxyConnectionForId = (
     url: createIntegrationsUrl({
       integrationId,
       workspace: ctx.workspace,
-      decoCmsApiUrl: decoChatApiUrl,
+      decoCmsApiUrl: decocmsApiUrl,
       branch: ctx.branch,
     }),
     token: ctx.token,
@@ -110,18 +111,18 @@ export const proxyConnectionForId = (
 const mcpClientForIntegrationId = (
   integrationId: string,
   ctx: WorkspaceClientContext,
-  decoChatApiUrl?: string,
+  decocmsApiUrl?: string,
   appName?: string,
 ) => {
   const mcpConnection = proxyConnectionForId(
     integrationId,
     ctx,
-    decoChatApiUrl,
+    decocmsApiUrl,
     appName,
   );
 
   // TODO(@igorbrasileiro): Switch this proxy to be a proxy that call MCP Client.toolCall from @modelcontextprotocol
-  return MCPClient.forConnection(mcpConnection);
+  return MCPClient.forConnection(mcpConnection, decocmsApiUrl);
 };
 
 function mcpClientFromState(

package/src/index.ts

@@ -1,7 +1,7 @@
 /* oxlint-disable no-explicit-any */
 import type { ExecutionContext } from "@cloudflare/workers-types";
 import { decodeJwt } from "jose";
-import type { z } from "zod/v3";
+import type { z } from "zod";
 import {
   getReqToken,
   handleAuthCallback,
@@ -15,7 +15,6 @@ import {
 } from "./bindings.ts";
 import { DeconfigResource } from "./bindings/deconfig/index.ts";
 import { DECO_MCP_CLIENT_HEADER } from "./client.ts";
-import { DeprecatedEnv } from "./deprecated.ts";
 import {
   createMCPServer,
   type CreateMCPServerOptions,
@@ -23,8 +22,6 @@ import {
 } from "./mastra.ts";
 import { MCPClient, type QueryResult } from "./mcp.ts";
 import { State } from "./state.ts";
-import type { WorkflowDO } from "./workflow.ts";
-import { Workflow } from "./workflow.ts";
 import type { Binding, ContractBinding, MCPBinding } from "./wrangler.ts";
 export { proxyConnectionForId } from "./bindings.ts";
 export {
@@ -39,8 +36,7 @@ export interface WorkspaceDB {
   }) => Promise<{ result: QueryResult[] }>;
 }
 
-export interface DefaultEnv<TSchema extends z.ZodTypeAny = any>
-  extends DeprecatedEnv<TSchema> {
+export interface DefaultEnv<TSchema extends z.ZodTypeAny = any> {
   DECO_REQUEST_CONTEXT: RequestContext<TSchema>;
   DECO_APP_NAME: string;
   DECO_APP_SLUG: string;
@@ -51,7 +47,6 @@ export interface DefaultEnv<TSchema extends z.ZodTypeAny = any>
   DECO_APP_DEPLOYMENT_ID: string;
   DECO_BINDINGS: string;
   DECO_API_TOKEN: string;
-  DECO_WORKFLOW_DO: DurableObjectNamespace<WorkflowDO>;
   DECO_WORKSPACE_DB: WorkspaceDB & {
     forContext: (ctx: RequestContext) => WorkspaceDB;
   };
@@ -144,9 +139,9 @@ const withDefaultBindings = ({
   ctx: RequestContext;
   url?: string;
 }) => {
-  const client = workspaceClient(ctx);
+  const client = workspaceClient(ctx, env.DECO_API_URL);
   const createWorkspaceDB = (ctx: RequestContext): WorkspaceDB => {
-    const client = workspaceClient(ctx);
+    const client = workspaceClient(ctx, env.DECO_API_URL);
     return {
       query: ({ sql, params }) => {
         return client.DATABASES_RUN_SQL({
@@ -183,11 +178,6 @@ const withDefaultBindings = ({
   env["DECO_WORKSPACE_API"] = client;
   env["DECO_WORKSPACE_DB"] = workspaceDbBinding;
 
-  // Backwards compatibility
-  env["DECO_CHAT_API"] = MCPClient;
-  env["DECO_CHAT_WORKSPACE_API"] = client;
-  env["DECO_CHAT_WORKSPACE_DB"] = workspaceDbBinding;
-
   env["IS_LOCAL"] =
     (url?.startsWith("http://localhost") ||
       url?.startsWith("http://127.0.0.1")) ??
@@ -277,8 +267,6 @@ export const withBindings = <TEnv>({
   }
 
   env.DECO_REQUEST_CONTEXT = context;
-  // Backwards compatibility
-  env.DECO_CHAT_REQUEST_CONTEXT = context;
   const bindings = WorkersMCPBindings.parse(env.DECO_BINDINGS);
 
   for (const binding of bindings) {
@@ -297,9 +285,7 @@ export const withBindings = <TEnv>({
 
 export const withRuntime = <TEnv, TSchema extends z.ZodTypeAny = never>(
   userFns: UserDefaultExport<TEnv, TSchema>,
-): ExportedHandler<TEnv & DefaultEnv<TSchema>> & {
-  Workflow: ReturnType<typeof Workflow>;
-} => {
+): ExportedHandler<TEnv & DefaultEnv<TSchema>> => {
   const server = createMCPServer<TEnv, TSchema>(userFns);
   const fetcher = async (
     req: Request,
@@ -357,7 +343,6 @@ export const withRuntime = <TEnv, TSchema extends z.ZodTypeAny = never>(
     );
   };
   return {
-    Workflow: Workflow(server, userFns.workflows),
     fetch: async (
       req: Request,
       env: TEnv & DefaultEnv<TSchema>,