@b9g/platform 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/platform",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "ServiceWorker-first universal deployment platform. Write ServiceWorker apps once, deploy anywhere (Node/Bun/Cloudflare). Registry-based multi-app orchestration.",
   "keywords": [
     "serviceworker",
@@ -16,6 +16,8 @@
   ],
   "dependencies": {
     "@b9g/async-context": "^0.1.1",
+    "@b9g/cache": "^0.1.4",
+    "@b9g/filesystem": "^0.1.5",
     "@logtape/logtape": "^1.2.0"
   },
   "devDependencies": {

package/src/config.d.ts

@@ -16,6 +16,7 @@
  *   "S3_BUCKET || my-bucket-name"
  *   "BASE_PATH || ./uploads"
  */
+import { Cache } from "@b9g/cache";
 /**
  * Parse a configuration expression with the DSL
  */
@@ -92,6 +93,16 @@ export interface BucketFactoryOptions {
 /**
  * Creates a bucket factory function for CustomBucketStorage.
  * Lazily imports bucket implementations.
+ *
+ * Provider resolution:
+ * 1. "node" -> built-in NodeBucket (default)
+ * 2. "memory" -> built-in MemoryBucket
+ * 3. "s3" -> @b9g/filesystem-s3 (blessed module)
+ * 4. Any other string -> treated as a module name (e.g., "my-custom-bucket")
+ *
+ * Custom bucket modules must export a class that:
+ * - Implements FileSystemDirectoryHandle
+ * - Has constructor(name: string, options?: object)
  */
 export declare function createBucketFactory(options: BucketFactoryOptions): (name: string) => Promise<FileSystemDirectoryHandle>;
 export interface CacheFactoryOptions {
@@ -101,5 +112,14 @@ export interface CacheFactoryOptions {
 /**
  * Creates a cache factory function for CustomCacheStorage.
  * Lazily imports cache implementations.
+ *
+ * Provider resolution:
+ * 1. "memory" -> built-in MemoryCache
+ * 2. "redis" -> @b9g/cache-redis (blessed module)
+ * 3. Any other string -> treated as a module name (e.g., "my-custom-cache")
+ *
+ * Custom cache modules must export a class that:
+ * - Extends Cache (from @b9g/cache)
+ * - Has constructor(name: string, options?: object)
  */
 export declare function createCacheFactory(options?: CacheFactoryOptions): (name: string) => Promise<Cache>;

package/src/config.js

@@ -2,6 +2,7 @@
 // src/config.ts
 import { readFileSync } from "fs";
 import { resolve } from "path";
+import { Cache } from "@b9g/cache";
 function getEnv() {
   if (typeof import.meta !== "undefined" && import.meta.env) {
     return import.meta.env;
@@ -409,6 +410,11 @@ var WELL_KNOWN_BUCKET_PATHS = {
   static: (baseDir) => resolve(baseDir, "../static"),
   server: (baseDir) => baseDir
 };
+var BUILTIN_BUCKET_PROVIDERS = {
+  node: "@b9g/filesystem/node.js",
+  memory: "@b9g/filesystem/memory.js",
+  s3: "@b9g/filesystem-s3"
+};
 function createBucketFactory(options) {
   const { baseDir, config } = options;
   return async (name) => {
@@ -422,32 +428,80 @@ function createBucketFactory(options) {
       bucketPath = resolve(baseDir, `../${name}`);
     }
     const provider = String(bucketConfig.provider || "node");
-    switch (provider) {
-      case "memory": {
-        const { MemoryBucket } = await import("@b9g/filesystem/memory.js");
-        return new MemoryBucket(name);
+    const modulePath = BUILTIN_BUCKET_PROVIDERS[provider] || provider;
+    if (modulePath === "@b9g/filesystem/node.js") {
+      const { NodeBucket } = await import("@b9g/filesystem/node.js");
+      return new NodeBucket(bucketPath);
+    }
+    if (modulePath === "@b9g/filesystem/memory.js") {
+      const { MemoryBucket } = await import("@b9g/filesystem/memory.js");
+      return new MemoryBucket(name);
+    }
+    try {
+      const module = await import(modulePath);
+      const BucketClass = module.default || // Default export
+      module.S3Bucket || // Named export for s3
+      module.Bucket || // Generic Bucket export
+      Object.values(module).find(
+        (v) => typeof v === "function" && v.name?.includes("Bucket")
+      );
+      if (!BucketClass) {
+        throw new Error(
+          `Bucket module "${modulePath}" does not export a valid bucket class. Expected a default export or named export (S3Bucket, Bucket).`
+        );
       }
-      case "node":
-      default: {
-        const { NodeBucket } = await import("@b9g/filesystem/node.js");
-        return new NodeBucket(bucketPath);
+      const { provider: _, path: __, ...bucketOptions } = bucketConfig;
+      return new BucketClass(name, { path: bucketPath, ...bucketOptions });
+    } catch (error) {
+      if (error.code === "ERR_MODULE_NOT_FOUND" || error.code === "MODULE_NOT_FOUND") {
+        throw new Error(
+          `Bucket provider "${provider}" not found. Make sure the module "${modulePath}" is installed.
+For S3: npm install @b9g/filesystem-s3`
+        );
       }
+      throw error;
     }
   };
 }
+var BUILTIN_CACHE_PROVIDERS = {
+  memory: "@b9g/cache/memory.js",
+  redis: "@b9g/cache-redis"
+};
 function createCacheFactory(options = {}) {
   const { config } = options;
   return async (name) => {
     const cacheConfig = config ? getCacheConfig(config, name) : {};
     const provider = String(cacheConfig.provider || "memory");
-    switch (provider) {
-      case "memory":
-      default: {
-        const { MemoryCache } = await import("@b9g/cache/memory.js");
-        return new MemoryCache(name, {
-          maxEntries: typeof cacheConfig.maxEntries === "number" ? cacheConfig.maxEntries : 1e3
-        });
+    const modulePath = BUILTIN_CACHE_PROVIDERS[provider] || provider;
+    if (modulePath === "@b9g/cache/memory.js") {
+      const { MemoryCache } = await import("@b9g/cache/memory.js");
+      return new MemoryCache(name, {
+        maxEntries: typeof cacheConfig.maxEntries === "number" ? cacheConfig.maxEntries : 1e3
+      });
+    }
+    try {
+      const module = await import(modulePath);
+      const CacheClass = module.default || // Default export
+      module.RedisCache || // Named export for redis
+      module.Cache || // Generic Cache export
+      Object.values(module).find(
+        (v) => typeof v === "function" && v.prototype instanceof Cache
+      );
+      if (!CacheClass) {
+        throw new Error(
+          `Cache module "${modulePath}" does not export a valid cache class. Expected a default export or named export (RedisCache, Cache) that extends Cache.`
+        );
+      }
+      const { provider: _, ...cacheOptions } = cacheConfig;
+      return new CacheClass(name, cacheOptions);
+    } catch (error) {
+      if (error.code === "ERR_MODULE_NOT_FOUND" || error.code === "MODULE_NOT_FOUND") {
+        throw new Error(
+          `Cache provider "${provider}" not found. Make sure the module "${modulePath}" is installed.
+For redis: npm install @b9g/cache-redis`
+        );
       }
+      throw error;
     }
   };
 }