@mastra/deployer-cloudflare 0.0.1-alpha.28 → 0.0.1-alpha.3

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@mastra/deployer-cloudflare",
-  "version": "0.0.1-alpha.28",
+  "version": "0.0.1-alpha.3",
   "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,26 +23,27 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "cloudflare": "^4.0.0",
     "date-fns": "^4.1.0",
     "dotenv": "^16.3.1",
     "execa": "^9.3.1",
     "wrangler": "^3.103.2",
     "zod": "^3.24.1",
-    "@mastra/core": "0.1.27-alpha.80",
-    "@mastra/deployer": "0.0.1-alpha.25"
+    "@mastra/core": "0.1.27-alpha.67",
+    "@mastra/deployer": "0.0.1-alpha.3"
   },
   "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,6 +1,5 @@
 import { MastraDeployer } from '@mastra/core';
-import { createChildProcessLogger } from '@mastra/deployer';
-import { Cloudflare } from 'cloudflare';
+import * as child_process from 'child_process';
 import { writeFileSync } from 'fs';
 import { join } from 'path';
 
@@ -11,68 +10,52 @@ interface CFRoute {
 }
 
 export class CloudflareDeployer extends MastraDeployer {
-  private cloudflare: Cloudflare | undefined;
   routes?: CFRoute[] = [];
-  workerNamespace?: string;
   constructor({
     scope,
     env,
     projectName,
     routes,
-    workerNamespace,
-    auth,
   }: {
     env?: Record<string, any>;
     scope: string;
     projectName: string;
     routes?: CFRoute[];
-    workerNamespace?: string;
-    auth?: {
-      apiToken: string;
-      apiEmail: string;
-    };
   }) {
     super({ scope, env, projectName });
 
     this.routes = routes;
-    this.workerNamespace = workerNamespace;
-
-    if (auth) {
-      this.cloudflare = new Cloudflare(auth);
-    }
   }
 
-  override writeFiles({ dir }: { dir: string }): void {
+  writeFiles({ dir }: { dir: string }): void {
     this.loadEnvVars();
 
     this.writeIndex({ dir });
 
     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,
+    writeFileSync(
+      join(dir, 'wrangler.json'),
+      JSON.stringify({
+        name: cfWorkerName,
+        main: 'index.mjs',
+        compatibility_date: '2024-12-02',
+        compatibility_flags: ['nodejs_compat'],
+        build: {
+          command: 'npm install',
         },
-      },
-      vars: this.env,
-    };
-
-    if (!this.workerNamespace && this.routes) {
-      wranglerConfig.routes = this.routes;
-    }
-
-    writeFileSync(join(dir, 'wrangler.json'), JSON.stringify(wranglerConfig));
+        observability: {
+          logs: {
+            enabled: true,
+          },
+        },
+        routes: this.routes,
+        vars: this.env,
+      }),
+    );
   }
 
-  override writeIndex({ dir }: { dir: string }): void {
+  writeIndex({ dir }: { dir: string }): void {
     writeFileSync(
       join(dir, './index.mjs'),
       `
@@ -89,46 +72,16 @@ export class CloudflareDeployer extends MastraDeployer {
     );
   }
 
-  override 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: dir,
-    });
-
-    await cpLogger({
-      cmd,
-      args: [],
+  async deploy({ dir, token }: { dir: string; token: string }): Promise<void> {
+    child_process.execSync(`npm exec wrangler deploy`, {
+      cwd: dir,
+      stdio: 'inherit',
       env: {
         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",
+  "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/dist/secrets-manager/index.js

@@ -1,87 +0,0 @@
-// src/secrets-manager/index.ts
-var CloudflareSecretsManager = class {
-  accountId;
-  apiToken;
-  baseUrl;
-  constructor({ accountId, apiToken }) {
-    this.accountId = accountId;
-    this.apiToken = apiToken;
-    this.baseUrl = "https://api.cloudflare.com/client/v4";
-  }
-  async createSecret({
-    workerId,
-    secretName,
-    secretValue
-  }) {
-    const url = `${this.baseUrl}/accounts/${this.accountId}/workers/scripts/${workerId}/secrets`;
-    try {
-      const response = await fetch(url, {
-        method: "PUT",
-        headers: {
-          Authorization: `Bearer ${this.apiToken}`,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          name: secretName,
-          text: secretValue
-        })
-      });
-      const data = await response.json();
-      if (!data.success) {
-        throw new Error(data.errors[0].message);
-      }
-      return data.result;
-    } catch (error) {
-      console.error("Failed to create secret:", error);
-      throw error;
-    }
-  }
-  async createProjectSecrets({
-    workerId,
-    customerId,
-    envVars
-  }) {
-    const secretName = `PROJECT_${customerId.toUpperCase()}`;
-    const secretValue = JSON.stringify(envVars);
-    return this.createSecret({ workerId, secretName, secretValue });
-  }
-  async deleteSecret({ workerId, secretName }) {
-    const url = `${this.baseUrl}/accounts/${this.accountId}/workers/scripts/${workerId}/secrets/${secretName}`;
-    try {
-      const response = await fetch(url, {
-        method: "DELETE",
-        headers: {
-          Authorization: `Bearer ${this.apiToken}`
-        }
-      });
-      const data = await response.json();
-      if (!data.success) {
-        throw new Error(data.errors[0].message);
-      }
-      return data.result;
-    } catch (error) {
-      console.error("Failed to delete secret:", error);
-      throw error;
-    }
-  }
-  async listSecrets(workerId) {
-    const url = `${this.baseUrl}/accounts/${this.accountId}/workers/scripts/${workerId}/secrets`;
-    try {
-      const response = await fetch(url, {
-        headers: {
-          Authorization: `Bearer ${this.apiToken}`
-        }
-      });
-      const data = await response.json();
-      if (!data.success) {
-        throw new Error(data.errors[0].message);
-      }
-      return data.result;
-    } catch (error) {
-      console.error("Failed to list secrets:", error);
-      throw error;
-    }
-  }
-};
-
-export { CloudflareSecretsManager };