@mastra/deployer-cloudflare 0.0.1-alpha.8 → 0.1.0-alpha.37

package/package.json

@@ -1,21 +1,18 @@
 {
   "name": "@mastra/deployer-cloudflare",
-  "version": "0.0.1-alpha.8",
+  "version": "0.1.0-alpha.37",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
-  "module": "dist/deployer-cloudflare.esm.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/deployer-cloudflare.esm.js"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./secrets-manager": {
+      "types": "./dist/secrets-manager/index.d.ts",
+      "default": "./dist/secrets-manager/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -23,28 +20,29 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@rollup/plugin-virtual": "^3.0.2",
     "cloudflare": "^4.0.0",
     "date-fns": "^4.1.0",
     "dotenv": "^16.3.1",
     "execa": "^9.3.1",
+    "rollup-plugin-polyfill-node": "^0.13.0",
+    "rollup-plugin-shim": "^1.0.0",
     "wrangler": "^3.103.2",
     "zod": "^3.24.1",
-    "@mastra/core": "0.1.27-alpha.69",
-    "@mastra/deployer": "0.0.1-alpha.7"
+    "@mastra/core": "^0.2.0-alpha.87",
+    "@mastra/deployer": "^0.1.0-alpha.33"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
     "@tsconfig/recommended": "^1.0.7",
-    "@types/jsdom": "^21.1.7",
     "@types/node": "^22.9.0",
-    "@types/pg": "^8.11.10",
-    "dts-cli": "^2.0.5",
-    "vitest": "^2.1.8"
+    "tsup": "^8.0.1",
+    "vitest": "^3.0.4"
   },
   "scripts": {
-    "build": "dts build",
-    "build:dev": "dts watch",
+    "build": "tsup-node src/index.ts src/secrets-manager/index.ts --format esm --dts --clean --treeshake",
+    "dev": "tsup-node src/index.ts src/secrets-manager/index.ts --format esm --dts --clean --treeshake --watch",
     "test": "vitest run"
   }
 }

package/src/index.ts

@@ -1,5 +1,6 @@
-import { MastraDeployer } from '@mastra/core';
-import * as child_process from 'child_process';
+import { Deployer, createChildProcessLogger } from '@mastra/deployer';
+import { getBundler } from '@mastra/deployer/build';
+import virtual from '@rollup/plugin-virtual';
 import { Cloudflare } from 'cloudflare';
 import { writeFileSync } from 'fs';
 import { join } from 'path';
@@ -10,97 +11,160 @@ interface CFRoute {
   custom_domain?: boolean;
 }
 
-export class CloudflareDeployer extends MastraDeployer {
+export class CloudflareDeployer extends Deployer {
   private cloudflare: Cloudflare | undefined;
   routes?: CFRoute[] = [];
   workerNamespace?: string;
+  scope: string;
+  env?: Record<string, any>;
+  projectName?: string;
+
   constructor({
     scope,
     env,
-    projectName,
+    projectName = 'mastra',
     routes,
     workerNamespace,
     auth,
   }: {
     env?: Record<string, any>;
     scope: string;
-    projectName: string;
+    projectName?: string;
     routes?: CFRoute[];
     workerNamespace?: string;
-    auth?: {
+    auth: {
       apiToken: string;
-      apiEmail: string;
+      apiEmail?: string;
     };
   }) {
-    super({ scope, env, projectName });
+    super({ name: 'CLOUDFLARE' });
 
+    this.scope = scope;
+    this.projectName = projectName;
     this.routes = routes;
     this.workerNamespace = workerNamespace;
 
-    if (auth) {
-      this.cloudflare = new Cloudflare(auth);
+    if (env) {
+      this.env = env;
     }
+
+    this.cloudflare = new Cloudflare(auth);
+  }
+
+  async writePackageJson(outputDirectory: string) {
+    this.logger.debug(`Writing package.json`);
+    const pkgPath = join(outputDirectory, 'package.json');
+
+    writeFileSync(
+      pkgPath,
+      JSON.stringify(
+        {
+          name: 'server',
+          version: '1.0.0',
+          description: '',
+          type: 'module',
+          main: 'index.mjs',
+          scripts: {
+            start: 'node ./index.mjs',
+            build: 'echo "Already built"',
+          },
+          author: 'Mastra',
+          license: 'ISC',
+          dependencies: {
+            '@mastra/core': 'latest',
+          },
+        },
+        null,
+        2,
+      ),
+    );
   }
 
-  writeFiles({ dir }: { dir: string }): void {
-    this.loadEnvVars();
+  async writeFiles(outputDirectory: string): Promise<void> {
+    const env = await this.loadEnvVars();
 
-    this.writeIndex({ dir });
+    const envsAsObject = Object.assign({}, Object.fromEntries(env.entries()), this.env);
 
-    const cfWorkerName = this.projectName || 'mastra';
+    const cfWorkerName = this.projectName;
 
     const wranglerConfig: Record<string, any> = {
       name: cfWorkerName,
       main: 'index.mjs',
       compatibility_date: '2024-12-02',
       compatibility_flags: ['nodejs_compat'],
-      build: {
-        command: 'npm install',
-      },
       observability: {
         logs: {
           enabled: true,
         },
       },
-      vars: this.env,
+      vars: envsAsObject,
     };
 
     if (!this.workerNamespace && this.routes) {
       wranglerConfig.routes = this.routes;
     }
 
-    writeFileSync(join(dir, 'wrangler.json'), JSON.stringify(wranglerConfig));
+    writeFileSync(join(outputDirectory, 'wrangler.json'), JSON.stringify(wranglerConfig));
   }
 
-  writeIndex({ dir }: { dir: string }): void {
-    writeFileSync(
-      join(dir, './index.mjs'),
-      `
-      export default {
-        fetch: async (request, env, context) => {
-          Object.keys(env).forEach(key => {
-            process.env[key] = env[key]
-          })
-          const { app } = await import('./hono.mjs');
-          return app.fetch(request, env, context);
-        }
-      }
-      `,
+  private getEntry(): string {
+    return `
+export default {
+  fetch: async (request, env, context) => {
+    Object.keys(env).forEach(key => {
+      process.env[key] = env[key]
+    })
+
+    const { mastra } = await import('#mastra')
+    const { createHonoServer } = await import('#server')
+    const app = await createHonoServer(mastra)
+    return app.fetch(request, env, context);
+  }
+}
+`;
+  }
+
+  async bundle(mastraDir: string, outputDirectory: string): Promise<void> {
+    const bundler = await getBundler(
+      {
+        input: '#entry',
+        plugins: [virtual({ '#entry': this.getEntry() })],
+        external: [/^@opentelemetry\//],
+        treeshake: 'smallest',
+      },
+      { platform: 'browser' },
     );
+
+    await bundler.write({
+      inlineDynamicImports: true,
+      file: join(outputDirectory, 'index.mjs'),
+      format: 'es',
+    });
   }
 
-  async deploy({ dir, token }: { dir: string; token: string }): Promise<void> {
+  async prepare(outputDirectory: string): Promise<void> {
+    await super.prepare(outputDirectory);
+    await this.writeFiles(outputDirectory);
+  }
+
+  async deploy(outputDirectory: string): Promise<void> {
     const cmd = this.workerNamespace
       ? `npm exec -- wrangler deploy --dispatch-namespace ${this.workerNamespace}`
       : 'npm exec -- wrangler deploy';
-    child_process.execSync(cmd, {
-      cwd: dir,
-      stdio: 'inherit',
+
+    const cpLogger = createChildProcessLogger({
+      logger: this.logger,
+      root: outputDirectory,
+    });
+
+    await cpLogger({
+      cmd,
+      args: [],
       env: {
-        CLOUDFLARE_API_TOKEN: token,
+        CLOUDFLARE_API_TOKEN: this.cloudflare!.apiToken!,
         CLOUDFLARE_ACCOUNT_ID: this.scope,
         ...this.env,
-        PATH: process.env.PATH,
+        PATH: process.env.PATH!,
       },
     });
   }

package/src/secrets-manager/index.ts

@@ -33,7 +33,7 @@ export class CloudflareSecretsManager {
         }),
       });
 
-      const data = await response.json();
+      const data = (await response.json()) as { success: boolean; result: any; errors: any[] };
 
       if (!data.success) {
         throw new Error(data.errors[0].message);
@@ -72,7 +72,7 @@ export class CloudflareSecretsManager {
         },
       });
 
-      const data = await response.json();
+      const data = (await response.json()) as { success: boolean; result: any; errors: any[] };
 
       if (!data.success) {
         throw new Error(data.errors[0].message);
@@ -95,7 +95,7 @@ export class CloudflareSecretsManager {
         },
       });
 
-      const data = await response.json();
+      const data = (await response.json()) as { success: boolean; result: any; errors: any[] };
 
       if (!data.success) {
         throw new Error(data.errors[0].message);

package/tsconfig.json

@@ -1,10 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "moduleResolution": "bundler",
-    "outDir": "./dist",
-    "rootDir": "./src"
-  },
-  "include": ["src/**/*"],
+  "extends": "../../tsconfig.node.json",
+  "include": ["./global.d.ts", "src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
 }

package/vitest.config.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
-    globals: true,
+    environment: 'node',
     include: ['src/**/*.test.ts'],
   },
 });