@mastra/deployer-cloudflare 0.0.1-alpha.31 → 0.0.1-alpha.32

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @mastra/deployer-cloudflare
 
+## 0.0.1-alpha.32
+
+### Patch Changes
+
+- 38b7f66: Update deployer logic
+- Updated dependencies [2f17a5f]
+- Updated dependencies [0696eeb]
+- Updated dependencies [cb290ee]
+- Updated dependencies [b4d7416]
+- Updated dependencies [38b7f66]
+  - @mastra/core@0.2.0-alpha.84
+  - @mastra/deployer@0.0.1-alpha.29
+
 ## 0.0.1-alpha.31
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,35 +1,34 @@
-import { MastraDeployer } from '@mastra/core/deployer';
+import { Deployer } from '@mastra/deployer';
 
 interface CFRoute {
     pattern: string;
     zone_name: string;
     custom_domain?: boolean;
 }
-declare class CloudflareDeployer extends MastraDeployer {
+declare class CloudflareDeployer extends Deployer {
     private cloudflare;
     routes?: CFRoute[];
     workerNamespace?: string;
+    scope: string;
+    env?: Record<string, any>;
+    projectName?: string;
     constructor({ scope, env, projectName, 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;
         };
     });
-    writeFiles({ dir }: {
-        dir: string;
-    }): void;
-    writeIndex({ dir }: {
-        dir: string;
-    }): void;
-    deploy({ dir, token }: {
-        dir: string;
-        token: string;
-    }): Promise<void>;
+    writePackageJson(outputDirectory: string): Promise<void>;
+    writeFiles(outputDirectory: string): Promise<void>;
+    private getEntry;
+    bundle(mastraDir: string, outputDirectory: string): Promise<void>;
+    prepare(outputDirectory: string): Promise<void>;
+    deploy(outputDirectory: string): Promise<void>;
     tagWorker({ workerName, namespace, tags, scope, }: {
         scope: string;
         workerName: string;

package/dist/index.js

@@ -1,80 +1,131 @@
-import { MastraDeployer } from '@mastra/core/deployer';
-import { createChildProcessLogger } from '@mastra/deployer';
+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';
 
 // src/index.ts
-var CloudflareDeployer = class extends MastraDeployer {
+var CloudflareDeployer = class extends Deployer {
   cloudflare;
   routes = [];
   workerNamespace;
+  scope;
+  env;
+  projectName;
   constructor({
     scope,
     env,
-    projectName,
+    projectName = "mastra",
     routes,
     workerNamespace,
     auth
   }) {
-    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);
   }
-  writeFiles({ dir }) {
-    this.loadEnvVars();
-    this.writeIndex({ dir });
-    const cfWorkerName = this.projectName || "mastra";
+  async writePackageJson(outputDirectory) {
+    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
+      )
+    );
+  }
+  async writeFiles(outputDirectory) {
+    const env = await this.loadEnvVars();
+    const envsAsObject = Object.assign({}, Object.fromEntries(env.entries()), this.env);
+    const cfWorkerName = this.projectName;
     const wranglerConfig = {
       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 }) {
-    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);
-        }
-      }
-      `
+  getEntry() {
+    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, outputDirectory) {
+    const bundler = await getBundler(
+      {
+        input: "#entry",
+        plugins: [virtual({ "#entry": this.getEntry() })],
+        external: [/^@opentelemetry\//],
+        treeshake: "smallest"
+      },
+      "browser"
     );
+    bundler.write({
+      inlineDynamicImports: true,
+      file: join(outputDirectory, "index.mjs"),
+      format: "es"
+    });
+  }
+  async prepare(outputDirectory) {
+    await super.prepare(outputDirectory);
+    await this.writeFiles(outputDirectory);
   }
-  async deploy({ dir, token }) {
+  async deploy(outputDirectory) {
     const cmd = this.workerNamespace ? `npm exec -- wrangler deploy --dispatch-namespace ${this.workerNamespace}` : "npm exec -- wrangler deploy";
     const cpLogger = createChildProcessLogger({
       logger: this.logger,
-      root: dir
+      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

package/global.d.ts

@@ -0,0 +1 @@
+declare module 'rollup-plugin-shim';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer-cloudflare",
-  "version": "0.0.1-alpha.31",
+  "version": "0.0.1-alpha.32",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -20,14 +20,17 @@
   "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.2.0-alpha.83",
-    "@mastra/deployer": "0.0.1-alpha.28"
+    "@mastra/core": "0.2.0-alpha.84",
+    "@mastra/deployer": "0.0.1-alpha.29"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",

package/src/index.ts

@@ -1,5 +1,6 @@
-import { MastraDeployer } from '@mastra/core/deployer';
-import { createChildProcessLogger } from '@mastra/deployer';
+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,100 +11,157 @@ 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,
+      ),
+    );
   }
 
-  override 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));
   }
 
-  override 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',
+      },
+      'browser',
     );
+
+    bundler.write({
+      inlineDynamicImports: true,
+      file: join(outputDirectory, 'index.mjs'),
+      format: 'es',
+    });
+  }
+
+  async prepare(outputDirectory: string): Promise<void> {
+    await super.prepare(outputDirectory);
+    await this.writeFiles(outputDirectory);
   }
 
-  override async deploy({ dir, token }: { dir: string; token: string }): Promise<void> {
+  async deploy(outputDirectory: string): Promise<void> {
     const cmd = this.workerNamespace
       ? `npm exec -- wrangler deploy --dispatch-namespace ${this.workerNamespace}`
       : 'npm exec -- wrangler deploy';
 
     const cpLogger = createChildProcessLogger({
       logger: this.logger,
-      root: dir,
+      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!,

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.node.json",
-  "include": ["src/**/*"],
+  "include": ["./global.d.ts", "src/**/*"],
   "exclude": ["node_modules", "**/*.test.ts"]
 }