@uploadista/server 0.1.3 → 0.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uploadista/server",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Core Server package for Uploadista",
   "license": "MIT",
   "author": "Uploadista",
@@ -20,23 +20,23 @@
     }
   },
   "dependencies": {
-    "@uploadista/core": "0.1.3",
-    "@uploadista/observability": "0.1.3",
-    "@uploadista/event-broadcaster-memory": "0.1.3",
-    "@uploadista/event-emitter-websocket": "0.1.3"
+    "@uploadista/core": "0.2.0",
+    "@uploadista/event-broadcaster-memory": "0.2.0",
+    "@uploadista/observability": "0.2.0",
+    "@uploadista/event-emitter-websocket": "0.2.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "4.20260131.0",
+    "@cloudflare/workers-types": "4.20260213.0",
     "@effect/vitest": "0.27.0",
     "@types/express": "^5.0.0",
     "@types/node": "24.10.9",
-    "effect": "3.19.15",
+    "effect": "3.19.17",
     "tsd": "0.33.0",
-    "tsdown": "0.20.1",
+    "tsdown": "0.20.3",
     "typescript": "5.9.3",
     "vitest": "4.0.18",
     "zod": "4.3.6",
-    "@uploadista/typescript-config": "0.1.3"
+    "@uploadista/typescript-config": "0.2.0"
   },
   "peerDependencies": {
     "effect": "^3.0.0",

package/src/core/http-handlers/upload-http-handlers.ts

@@ -195,7 +195,7 @@ export const handleUploadChunk = (req: UploadChunkRequest) =>
           metricsService.recordUpload(clientId, fileResult.size, authMetadata),
         );
 
-        // Execute onUploadComplete hook for usage tracking
+        // Execute onUploadComplete hook for usage tracking and billing
         const duration = Date.now() - startTime;
         yield* Effect.forkDaemon(
           usageHookService.onUploadComplete({
@@ -205,6 +205,15 @@ export const handleUploadChunk = (req: UploadChunkRequest) =>
               uploadId,
               fileSize: fileResult.size,
               duration,
+              storageId: fileResult.storage?.id,
+              url: fileResult.url,
+              fileName: fileResult.metadata?.fileName as string | undefined,
+              flowContext: fileResult.flow
+                ? {
+                    flowId: fileResult.flow.flowId,
+                    jobId: fileResult.flow.jobId,
+                  }
+                : undefined,
             },
           }),
         );

package/src/core/server.ts

@@ -2,6 +2,7 @@ import type { PluginLayer, UploadistaError } from "@uploadista/core";
 import {
   deadLetterQueueService,
   type Flow,
+  FlowLifecycleHook,
   FlowProvider,
   FlowWaitUntil,
   kvCircuitBreakerStoreLayer,
@@ -24,7 +25,7 @@ import { handleFlowError } from "../http-utils";
 import { createFlowEngineLayer, createUploadEngineLayer } from "../layer-utils";
 import { AuthContextServiceLive } from "../service";
 import type { AuthContext } from "../types";
-import { UsageHookServiceLive } from "../usage-hooks/service";
+import { UsageHookService, UsageHookServiceLive } from "../usage-hooks/service";
 import { handleUploadistaRequest } from "./http-handlers/http-handlers";
 import type { ExtractFlowPluginRequirements } from "./plugin-types";
 import type { NotFoundResponse } from "./routes";
@@ -291,6 +292,27 @@ export const createUploadistaServer = async <
   // Create usage hook layer (defaults to no-op if not configured)
   const usageHookLayer = UsageHookServiceLive(usageHooks);
 
+  // Bridge UsageHookService.onFlowComplete to FlowLifecycleHook
+  // so the flow engine can call it reliably from the execution daemon
+  const flowLifecycleHookLayer = Layer.effect(
+    FlowLifecycleHook,
+    Effect.gen(function* () {
+      const usageHookService = yield* UsageHookService;
+      return {
+        onComplete: (ctx) =>
+          usageHookService.onFlowComplete({
+            clientId: ctx.clientId ?? "",
+            operation: "flow",
+            metadata: {
+              jobId: ctx.jobId,
+              flowId: ctx.flowId,
+              status: ctx.status === "completed" ? "success" : "failed",
+            },
+          }),
+      };
+    }),
+  ).pipe(Layer.provide(usageHookLayer));
+
   /**
    * Merge all server layers including plugins.
    *
@@ -304,6 +326,7 @@ export const createUploadistaServer = async <
     effectiveMetricsLayer,
     authCacheLayer,
     usageHookLayer,
+    flowLifecycleHookLayer,
     ...plugins,
     ...(circuitBreakerStoreLayer ? [circuitBreakerStoreLayer] : []),
     ...(dlqLayer ? [dlqLayer] : []),

package/src/usage-hooks/types.ts

@@ -64,6 +64,15 @@ export interface UploadUsageMetadata extends BaseUsageMetadata {
   uploadId?: string;
   /** Duration of the upload in milliseconds */
   duration?: number;
+  /** Storage configuration identifier (for database persistence) */
+  storageId?: string;
+  /** URL of the uploaded file (for database persistence) */
+  url?: string;
+  /** Flow context if this upload was initiated as part of a flow (for double-counting prevention) */
+  flowContext?: {
+    flowId: string;
+    jobId: string;
+  };
 }
 
 /**