@playcademy/sandbox 0.1.10 → 0.1.11

package/dist/cli.js

@@ -135702,7 +135702,7 @@ var serve = (options, listeningListener) => {
 // package.json
 var package_default = {
   name: "@playcademy/sandbox",
-  version: "0.1.9",
+  version: "0.1.10",
   description: "Local development server for Playcademy game development",
   type: "module",
   exports: {
@@ -157173,9 +157173,9 @@ async function publishPersonalBestNotification(userId, gameId, rank, newScore, p
 }
 // ../cloudflare/src/playcademy/provider.ts
 import { execSync } from "node:child_process";
-import { mkdir, rm, writeFile } from "node:fs/promises";
+import { mkdir, readdir as readdir2, readFile as readFile2, rm, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join5, relative } from "node:path";
 init_src();
 
 // ../cloudflare/src/core/client.ts
@@ -158126,6 +158126,63 @@ class CloudflareProvider {
   getClient() {
     return this.client;
   }
+  async checkIfRequiresR2Strategy(assetsPath) {
+    async function scanDirectory(dir) {
+      const entries = await readdir2(dir, { withFileTypes: true });
+      for (const entry of entries) {
+        const fullPath = join5(dir, entry.name);
+        if (entry.isDirectory()) {
+          if (await scanDirectory(fullPath))
+            return true;
+        } else {
+          const stats = await stat(fullPath);
+          if (stats.size >= 25 * 1024 * 1024) {
+            log2.info("[CloudflareProvider] Large file detected, R2 strategy required", {
+              file: entry.name,
+              size: `${(stats.size / 1024 / 1024).toFixed(2)}MB`
+            });
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+    return await scanDirectory(assetsPath);
+  }
+  async resolveAssetBasePath(dirPath) {
+    const entries = await readdir2(dirPath, { withFileTypes: true });
+    if (entries.length === 1 && entries[0]?.isDirectory()) {
+      const unwrappedPath = join5(dirPath, entries[0].name);
+      log2.debug("[CloudflareProvider] Unwrapping wrapper directory", {
+        wrapper: entries[0].name
+      });
+      return await this.resolveAssetBasePath(unwrappedPath);
+    }
+    return dirPath;
+  }
+  async uploadFilesToR2(dir, baseDir, bucketName) {
+    const entries = await readdir2(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join5(dir, entry.name);
+      if (entry.isDirectory()) {
+        await this.uploadFilesToR2(fullPath, baseDir, bucketName);
+      } else {
+        const content = await readFile2(fullPath);
+        const relativePath = relative(baseDir, fullPath).replace(/\\/g, "/");
+        const contentType = getContentType(relativePath);
+        await this.client.r2.putObject(bucketName, relativePath, content, contentType);
+      }
+    }
+  }
+  async uploadDirectoryToR2(dirPath, bucketName) {
+    const basePath = await this.resolveAssetBasePath(dirPath);
+    log2.debug("[CloudflareProvider] Uploading assets to R2", {
+      bucketName,
+      basePath,
+      filesFrom: relative(dirPath, basePath) || "(root)"
+    });
+    await this.uploadFilesToR2(basePath, basePath, bucketName);
+  }
   async deploy(deploymentId, code, env2, options) {
     const opts = normalizeDeploymentOptions(options);
     const isFirstDeploy = env2.PLAYCADEMY_API_KEY !== undefined;
@@ -158209,16 +158266,45 @@ class CloudflareProvider {
       warnDurableObjectsNotImplemented(opts.bindings.durableObjects);
       addResourceBindings(bindings, resourceIds);
       let assetsJWT;
+      let assetsStrategy;
+      let assetsR2Bucket;
       if (finalAssetsPath) {
-        log2.debug("[CloudflareProvider] Uploading assets", {
-          deploymentId,
-          finalAssetsPath
-        });
-        assetsJWT = await this.client.workers.uploadAssets(this.config.dispatchNamespace, deploymentId, { type: "directory", path: finalAssetsPath });
-      }
-      if (finalAssetsPath || assetsJWT || opts.keepAssets) {
+        const requiresR2 = await this.checkIfRequiresR2Strategy(finalAssetsPath);
+        if (requiresR2) {
+          assetsStrategy = "r2";
+          assetsR2Bucket = `${deploymentId}-assets`;
+          log2.info("[CloudflareProvider] Using R2 strategy for large files", {
+            deploymentId,
+            bucketName: assetsR2Bucket
+          });
+          await this.client.r2.create(assetsR2Bucket);
+          await this.uploadDirectoryToR2(finalAssetsPath, assetsR2Bucket);
+          bindings.push({
+            type: "r2_bucket",
+            name: "ASSETS",
+            bucket_name: assetsR2Bucket
+          });
+          if (!resources.r2)
+            resources.r2 = [];
+          resources.r2.push({ name: assetsR2Bucket });
+        } else {
+          assetsStrategy = "workers-assets";
+          log2.debug("[CloudflareProvider] Using Workers Assets strategy", {
+            deploymentId,
+            finalAssetsPath
+          });
+          assetsJWT = await this.client.workers.uploadAssets(this.config.dispatchNamespace, deploymentId, { type: "directory", path: finalAssetsPath });
+          bindings.push({ type: "assets", name: "ASSETS" });
+        }
+      } else if (opts.keepAssets) {
         bindings.push({ type: "assets", name: "ASSETS" });
       }
+      if (assetsStrategy) {
+        resources.assetsStrategy = assetsStrategy;
+        if (assetsR2Bucket) {
+          resources.assetsR2Bucket = assetsR2Bucket;
+        }
+      }
       const keepBindingsValue = !isFirstDeploy ? ["secret_text"] : [];
       log2.info("[Cloudflare Provider] Deployment configuration", {
         deploymentId,
@@ -158299,7 +158385,8 @@ class CloudflareProvider {
     await Promise.all([
       this.client.d1.delete(deploymentId).catch(() => {}),
       this.client.kv.delete(deploymentId).catch(() => {}),
-      this.client.r2.delete(deploymentId).catch(() => {})
+      this.client.r2.delete(deploymentId).catch(() => {}),
+      this.client.r2.delete(`${deploymentId}-assets`).catch(() => {})
     ]);
   }
   async deleteCustomDomains(customDomains, gameSlug) {
@@ -158794,7 +158881,7 @@ async function checkIfNeedsSeeding(db) {
   }
 }
 async function setupServerDatabase(processedOptions, project) {
-  const { memoryOnly, recreateDb, databasePath, seed, verbose, quiet } = processedOptions;
+  const { memoryOnly, recreateDb, databasePath, seed, quiet } = processedOptions;
   const effectiveDbPath = databasePath ?? process.env.PLAYCADEMY_SANDBOX_DB_PATH;
   const resolvedDbPath = memoryOnly || effectiveDbPath === ":memory:" ? ":memory:" : effectiveDbPath ? DatabasePathManager.resolveDatabasePath(effectiveDbPath) : DatabasePathManager.resolveDatabasePath();
   if (!memoryOnly && recreateDb && fs5.existsSync(resolvedDbPath)) {
@@ -158805,9 +158892,6 @@ async function setupServerDatabase(processedOptions, project) {
     }
   }
   const isNewDb = resolvedDbPath === ":memory:" ? true : !fs5.existsSync(resolvedDbPath);
-  if (verbose && !quiet && resolvedDbPath !== ":memory:") {
-    console.log(`[Sandbox] Database: ${resolvedDbPath}`);
-  }
   const db = await setupDatabase(resolvedDbPath);
   const shouldSeed = seed && (isNewDb || await checkIfNeedsSeeding(db));
   if (shouldSeed) {
@@ -168788,8 +168872,8 @@ async function getNotificationStats(ctx) {
       status: notifications.status,
       count: sql`count(*)`
     }).from(notifications).where(and(...conditions)).groupBy(notifications.status);
-    const statsMap = stats.reduce((acc, stat) => {
-      acc[stat.status] = Number(stat.count);
+    const statsMap = stats.reduce((acc, stat2) => {
+      acc[stat2.status] = Number(stat2.count);
       return acc;
     }, {});
     const total = Object.values(statsMap).reduce((sum3, count2) => sum3 + count2, 0);

package/dist/server.js

@@ -133792,7 +133792,7 @@ var serve = (options, listeningListener) => {
 // package.json
 var package_default = {
   name: "@playcademy/sandbox",
-  version: "0.1.9",
+  version: "0.1.10",
   description: "Local development server for Playcademy game development",
   type: "module",
   exports: {
@@ -155263,9 +155263,9 @@ async function publishPersonalBestNotification(userId, gameId, rank, newScore, p
 }
 // ../cloudflare/src/playcademy/provider.ts
 import { execSync } from "node:child_process";
-import { mkdir, rm, writeFile } from "node:fs/promises";
+import { mkdir, readdir as readdir2, readFile as readFile2, rm, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join5, relative } from "node:path";
 init_src();
 
 // ../cloudflare/src/core/client.ts
@@ -156216,6 +156216,63 @@ class CloudflareProvider {
   getClient() {
     return this.client;
   }
+  async checkIfRequiresR2Strategy(assetsPath) {
+    async function scanDirectory(dir) {
+      const entries = await readdir2(dir, { withFileTypes: true });
+      for (const entry of entries) {
+        const fullPath = join5(dir, entry.name);
+        if (entry.isDirectory()) {
+          if (await scanDirectory(fullPath))
+            return true;
+        } else {
+          const stats = await stat(fullPath);
+          if (stats.size >= 25 * 1024 * 1024) {
+            log2.info("[CloudflareProvider] Large file detected, R2 strategy required", {
+              file: entry.name,
+              size: `${(stats.size / 1024 / 1024).toFixed(2)}MB`
+            });
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+    return await scanDirectory(assetsPath);
+  }
+  async resolveAssetBasePath(dirPath) {
+    const entries = await readdir2(dirPath, { withFileTypes: true });
+    if (entries.length === 1 && entries[0]?.isDirectory()) {
+      const unwrappedPath = join5(dirPath, entries[0].name);
+      log2.debug("[CloudflareProvider] Unwrapping wrapper directory", {
+        wrapper: entries[0].name
+      });
+      return await this.resolveAssetBasePath(unwrappedPath);
+    }
+    return dirPath;
+  }
+  async uploadFilesToR2(dir, baseDir, bucketName) {
+    const entries = await readdir2(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join5(dir, entry.name);
+      if (entry.isDirectory()) {
+        await this.uploadFilesToR2(fullPath, baseDir, bucketName);
+      } else {
+        const content = await readFile2(fullPath);
+        const relativePath = relative(baseDir, fullPath).replace(/\\/g, "/");
+        const contentType = getContentType(relativePath);
+        await this.client.r2.putObject(bucketName, relativePath, content, contentType);
+      }
+    }
+  }
+  async uploadDirectoryToR2(dirPath, bucketName) {
+    const basePath = await this.resolveAssetBasePath(dirPath);
+    log2.debug("[CloudflareProvider] Uploading assets to R2", {
+      bucketName,
+      basePath,
+      filesFrom: relative(dirPath, basePath) || "(root)"
+    });
+    await this.uploadFilesToR2(basePath, basePath, bucketName);
+  }
   async deploy(deploymentId, code, env2, options) {
     const opts = normalizeDeploymentOptions(options);
     const isFirstDeploy = env2.PLAYCADEMY_API_KEY !== undefined;
@@ -156299,16 +156356,45 @@ class CloudflareProvider {
       warnDurableObjectsNotImplemented(opts.bindings.durableObjects);
       addResourceBindings(bindings, resourceIds);
       let assetsJWT;
+      let assetsStrategy;
+      let assetsR2Bucket;
       if (finalAssetsPath) {
-        log2.debug("[CloudflareProvider] Uploading assets", {
-          deploymentId,
-          finalAssetsPath
-        });
-        assetsJWT = await this.client.workers.uploadAssets(this.config.dispatchNamespace, deploymentId, { type: "directory", path: finalAssetsPath });
-      }
-      if (finalAssetsPath || assetsJWT || opts.keepAssets) {
+        const requiresR2 = await this.checkIfRequiresR2Strategy(finalAssetsPath);
+        if (requiresR2) {
+          assetsStrategy = "r2";
+          assetsR2Bucket = `${deploymentId}-assets`;
+          log2.info("[CloudflareProvider] Using R2 strategy for large files", {
+            deploymentId,
+            bucketName: assetsR2Bucket
+          });
+          await this.client.r2.create(assetsR2Bucket);
+          await this.uploadDirectoryToR2(finalAssetsPath, assetsR2Bucket);
+          bindings.push({
+            type: "r2_bucket",
+            name: "ASSETS",
+            bucket_name: assetsR2Bucket
+          });
+          if (!resources.r2)
+            resources.r2 = [];
+          resources.r2.push({ name: assetsR2Bucket });
+        } else {
+          assetsStrategy = "workers-assets";
+          log2.debug("[CloudflareProvider] Using Workers Assets strategy", {
+            deploymentId,
+            finalAssetsPath
+          });
+          assetsJWT = await this.client.workers.uploadAssets(this.config.dispatchNamespace, deploymentId, { type: "directory", path: finalAssetsPath });
+          bindings.push({ type: "assets", name: "ASSETS" });
+        }
+      } else if (opts.keepAssets) {
         bindings.push({ type: "assets", name: "ASSETS" });
       }
+      if (assetsStrategy) {
+        resources.assetsStrategy = assetsStrategy;
+        if (assetsR2Bucket) {
+          resources.assetsR2Bucket = assetsR2Bucket;
+        }
+      }
       const keepBindingsValue = !isFirstDeploy ? ["secret_text"] : [];
       log2.info("[Cloudflare Provider] Deployment configuration", {
         deploymentId,
@@ -156389,7 +156475,8 @@ class CloudflareProvider {
     await Promise.all([
       this.client.d1.delete(deploymentId).catch(() => {}),
       this.client.kv.delete(deploymentId).catch(() => {}),
-      this.client.r2.delete(deploymentId).catch(() => {})
+      this.client.r2.delete(deploymentId).catch(() => {}),
+      this.client.r2.delete(`${deploymentId}-assets`).catch(() => {})
     ]);
   }
   async deleteCustomDomains(customDomains, gameSlug) {
@@ -156884,7 +156971,7 @@ async function checkIfNeedsSeeding(db) {
   }
 }
 async function setupServerDatabase(processedOptions, project) {
-  const { memoryOnly, recreateDb, databasePath, seed, verbose, quiet } = processedOptions;
+  const { memoryOnly, recreateDb, databasePath, seed, quiet } = processedOptions;
   const effectiveDbPath = databasePath ?? process.env.PLAYCADEMY_SANDBOX_DB_PATH;
   const resolvedDbPath = memoryOnly || effectiveDbPath === ":memory:" ? ":memory:" : effectiveDbPath ? DatabasePathManager.resolveDatabasePath(effectiveDbPath) : DatabasePathManager.resolveDatabasePath();
   if (!memoryOnly && recreateDb && fs5.existsSync(resolvedDbPath)) {
@@ -156895,9 +156982,6 @@ async function setupServerDatabase(processedOptions, project) {
     }
   }
   const isNewDb = resolvedDbPath === ":memory:" ? true : !fs5.existsSync(resolvedDbPath);
-  if (verbose && !quiet && resolvedDbPath !== ":memory:") {
-    console.log(`[Sandbox] Database: ${resolvedDbPath}`);
-  }
   const db = await setupDatabase(resolvedDbPath);
   const shouldSeed = seed && (isNewDb || await checkIfNeedsSeeding(db));
   if (shouldSeed) {
@@ -166878,8 +166962,8 @@ async function getNotificationStats(ctx) {
       status: notifications.status,
       count: sql`count(*)`
     }).from(notifications).where(and(...conditions)).groupBy(notifications.status);
-    const statsMap = stats.reduce((acc, stat) => {
-      acc[stat.status] = Number(stat.count);
+    const statsMap = stats.reduce((acc, stat2) => {
+      acc[stat2.status] = Number(stat2.count);
       return acc;
     }, {});
     const total = Object.values(statsMap).reduce((sum3, count2) => sum3 + count2, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/sandbox",
-    "version": "0.1.10",
+    "version": "0.1.11",
     "description": "Local development server for Playcademy game development",
     "type": "module",
     "exports": {