@mastra/deployer-cloudflare 0.0.1-alpha.34 → 0.0.1-alpha.5

package/dist/index.js

@@ -1,151 +1,8 @@
-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 Deployer {
-  cloudflare;
-  routes = [];
-  workerNamespace;
-  scope;
-  env;
-  projectName;
-  constructor({
-    scope,
-    env,
-    projectName = "mastra",
-    routes,
-    workerNamespace,
-    auth
-  }) {
-    super({ name: "CLOUDFLARE" });
-    this.scope = scope;
-    this.projectName = projectName;
-    this.routes = routes;
-    this.workerNamespace = workerNamespace;
-    if (env) {
-      this.env = env;
-    }
-    this.cloudflare = new Cloudflare(auth);
-  }
-  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"],
-      observability: {
-        logs: {
-          enabled: true
-        }
-      },
-      vars: envsAsObject
-    };
-    if (!this.workerNamespace && this.routes) {
-      wranglerConfig.routes = this.routes;
-    }
-    writeFileSync(join(outputDirectory, "wrangler.json"), JSON.stringify(wranglerConfig));
-  }
-  getEntry() {
-    return `
-export default {
-  fetch: async (request, env, context) => {
-    Object.keys(env).forEach(key => {
-      process.env[key] = env[key]
-    })
+'use strict'
 
-    const { mastra } = await import('#mastra')
-    const { createHonoServer } = await import('#server')
-    const app = await createHonoServer(mastra)
-    return app.fetch(request, env, context);
-  }
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./deployer-cloudflare.cjs.production.min.js')
+} else {
+  module.exports = require('./deployer-cloudflare.cjs.development.js')
 }
-`;
-  }
-  async bundle(mastraDir, outputDirectory) {
-    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 prepare(outputDirectory) {
-    await super.prepare(outputDirectory);
-    await this.writeFiles(outputDirectory);
-  }
-  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: outputDirectory
-    });
-    await cpLogger({
-      cmd,
-      args: [],
-      env: {
-        CLOUDFLARE_API_TOKEN: this.cloudflare.apiToken,
-        CLOUDFLARE_ACCOUNT_ID: this.scope,
-        ...this.env,
-        PATH: process.env.PATH
-      }
-    });
-  }
-  async tagWorker({
-    workerName,
-    namespace,
-    tags,
-    scope
-  }) {
-    if (!this.cloudflare) {
-      throw new Error("Cloudflare Deployer not initialized");
-    }
-    await this.cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.update(namespace, workerName, {
-      account_id: scope,
-      body: tags
-    });
-  }
-};
-
-export { CloudflareDeployer };

package/dist/secrets-manager/index.d.ts

@@ -1,4 +1,4 @@
-declare class CloudflareSecretsManager {
+export declare class CloudflareSecretsManager {
     accountId: string;
     apiToken: string;
     baseUrl: string;
@@ -22,5 +22,4 @@ declare class CloudflareSecretsManager {
     }): Promise<any>;
     listSecrets(workerId: string): Promise<any>;
 }
-
-export { CloudflareSecretsManager };
+//# sourceMappingURL=index.d.ts.map

package/dist/secrets-manager/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/secrets-manager/index.ts"],"names":[],"mappings":"AAAA,qBAAa,wBAAwB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;gBAEJ,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;IAMtE,YAAY,CAAC,EACjB,QAAQ,EACR,UAAU,EACV,WAAW,GACZ,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;KACrB;IA6BK,oBAAoB,CAAC,EACzB,QAAQ,EACR,UAAU,EACV,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjC;IAOK,YAAY,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;IAwB/E,WAAW,CAAC,QAAQ,EAAE,MAAM;CAsBnC"}

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@mastra/deployer-cloudflare",
-  "version": "0.0.1-alpha.34",
+  "version": "0.0.1-alpha.5",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
+  "module": "dist/deployer-cloudflare.esm.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./secrets-manager": {
-      "types": "./dist/secrets-manager/index.d.ts",
-      "default": "./dist/secrets-manager/index.js"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/deployer-cloudflare.esm.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
     "./package.json": "./package.json"
   },
@@ -20,29 +23,27 @@
   "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/deployer": "0.0.1-alpha.30",
-    "@mastra/core": "0.2.0-alpha.84"
+    "@mastra/core": "0.1.27-alpha.67",
+    "@mastra/deployer": "0.0.1-alpha.4"
   },
   "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",
-    "tsup": "^8.0.1",
-    "vitest": "^3.0.4"
+    "@types/pg": "^8.11.10",
+    "dts-cli": "^2.0.5",
+    "vitest": "^2.1.8"
   },
   "scripts": {
-    "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",
+    "build": "dts build",
+    "build:dev": "dts watch",
     "test": "vitest run"
   }
 }

package/src/index.ts

@@ -1,7 +1,5 @@
-import { Deployer, createChildProcessLogger } from '@mastra/deployer';
-import { getBundler } from '@mastra/deployer/build';
-import virtual from '@rollup/plugin-virtual';
-import { Cloudflare } from 'cloudflare';
+import { MastraDeployer } from '@mastra/core';
+import * as child_process from 'child_process';
 import { writeFileSync } from 'fs';
 import { join } from 'path';
 
@@ -11,182 +9,88 @@ interface CFRoute {
   custom_domain?: boolean;
 }
 
-export class CloudflareDeployer extends Deployer {
-  private cloudflare: Cloudflare | undefined;
+export class CloudflareDeployer extends MastraDeployer {
   routes?: CFRoute[] = [];
   workerNamespace?: string;
-  scope: string;
-  env?: Record<string, any>;
-  projectName?: string;
-
   constructor({
     scope,
     env,
-    projectName = 'mastra',
+    projectName,
     routes,
     workerNamespace,
-    auth,
   }: {
     env?: Record<string, any>;
     scope: string;
-    projectName?: string;
+    projectName: string;
     routes?: CFRoute[];
     workerNamespace?: string;
-    auth: {
-      apiToken: string;
-      apiEmail?: string;
-    };
   }) {
-    super({ name: 'CLOUDFLARE' });
+    super({ scope, env, projectName });
 
-    this.scope = scope;
-    this.projectName = projectName;
     this.routes = routes;
     this.workerNamespace = workerNamespace;
-
-    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');
+  writeFiles({ dir }: { dir: string }): void {
+    this.loadEnvVars();
 
-    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,
-      ),
-    );
-  }
+    this.writeIndex({ dir });
 
-  async writeFiles(outputDirectory: string): Promise<void> {
-    const env = await this.loadEnvVars();
-
-    const envsAsObject = Object.assign({}, Object.fromEntries(env.entries()), this.env);
-
-    const cfWorkerName = this.projectName;
+    const cfWorkerName = this.projectName || 'mastra';
 
     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: envsAsObject,
+      vars: this.env,
     };
 
     if (!this.workerNamespace && this.routes) {
       wranglerConfig.routes = this.routes;
     }
 
-    writeFileSync(join(outputDirectory, 'wrangler.json'), JSON.stringify(wranglerConfig));
-  }
-
-  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);
-  }
-}
-`;
+    writeFileSync(join(dir, 'wrangler.json'), JSON.stringify(wranglerConfig));
   }
 
-  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' },
+  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);
+        }
+      }
+      `,
     );
-
-    await 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);
-  }
-
-  async deploy(outputDirectory: string): Promise<void> {
+  async deploy({ dir, token }: { dir: string; token: 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: outputDirectory,
-    });
-
-    await cpLogger({
-      cmd,
-      args: [],
+    child_process.execSync(cmd, {
+      cwd: dir,
+      stdio: 'inherit',
       env: {
-        CLOUDFLARE_API_TOKEN: this.cloudflare!.apiToken!,
+        CLOUDFLARE_API_TOKEN: token,
         CLOUDFLARE_ACCOUNT_ID: this.scope,
         ...this.env,
-        PATH: process.env.PATH!,
+        PATH: process.env.PATH,
       },
     });
   }
-
-  async tagWorker({
-    workerName,
-    namespace,
-    tags,
-    scope,
-  }: {
-    scope: string;
-    workerName: string;
-    namespace: string;
-    tags: string[];
-  }): Promise<void> {
-    if (!this.cloudflare) {
-      throw new Error('Cloudflare Deployer not initialized');
-    }
-
-    await this.cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.update(namespace, workerName, {
-      account_id: scope,
-      body: tags,
-    });
-  }
 }

package/src/secrets-manager/index.ts

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

package/tsconfig.json

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

package/vitest.config.ts

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

package/README.md

@@ -1,99 +0,0 @@
-# @mastra/deployer-cloudflare
-
-A Cloudflare Workers deployer for Mastra applications.
-
-## Features
-
-- Deploy Mastra applications to Cloudflare Workers
-- Configure custom domains and routes
-- Support for worker namespaces
-- Automatic environment variable configuration
-
-## Installation
-
-```bash
-pnpm add @mastra/deployer-cloudflare
-```
-
-## Usage
-
-The Cloudflare deployer is used as part of the Mastra framework:
-
-```typescript
-import { Mastra } from '@mastra/core';
-import { CloudflareDeployer } from '@mastra/deployer-cloudflare';
-
-const deployer = new CloudflareDeployer({
-  scope: 'your-account-id',
-  projectName: 'your-project-name',
-  routes: [
-    {
-      pattern: 'example.com/*',
-      zone_name: 'example.com',
-      custom_domain: true,
-    },
-  ],
-  workerNamespace: 'your-namespace',
-  auth: {
-    apiToken: 'your-api-token',
-    apiEmail: 'your-email',
-  },
-});
-
-const mastra = new Mastra({
-  deployer,
-  // ... other Mastra configuration options
-});
-```
-
-## Configuration
-
-### Constructor Options
-
-- `scope` (required): Your Cloudflare account ID
-- `projectName`: Name of your worker project
-- `routes`: Array of route configurations for your worker
-  - `pattern`: URL pattern to match
-  - `zone_name`: Domain zone name
-  - `custom_domain`: Whether to use a custom domain
-- `workerNamespace`: Namespace for your worker
-- `auth`: Cloudflare authentication details
-  - `apiToken`: Your Cloudflare API token
-  - `apiEmail`: Your Cloudflare account email
-
-## Environment Variables
-
-The deployer will automatically load environment variables from:
-
-- `.env` files in your project
-- Environment variables passed through the Mastra configuration
-
-## Routes
-
-Routes can be configured to direct traffic to your worker based on URL patterns and domains:
-
-```typescript
-const routes = [
-  {
-    pattern: 'api.example.com/*',
-    zone_name: 'example.com',
-    custom_domain: true,
-  },
-  {
-    pattern: 'example.com/api/*',
-    zone_name: 'example.com',
-  },
-];
-```
-
-Each route requires:
-
-- `pattern`: URL pattern to match
-- `zone_name`: Domain zone name
-- `custom_domain`: (optional) Set to true to use a custom domain
-
-## Requirements
-
-- Cloudflare account with Workers enabled
-- API token with appropriate permissions
-- Domain(s) configured in Cloudflare (for custom domains)