@uploadista/server 0.0.20-beta.7 → 0.0.20-beta.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uploadista/server",
   "type": "module",
-  "version": "0.0.20-beta.7",
+  "version": "0.0.20-beta.9",
   "description": "Core Server package for Uploadista",
   "license": "MIT",
   "author": "Uploadista",
@@ -20,23 +20,23 @@
     }
   },
   "dependencies": {
-    "@uploadista/core": "0.0.20-beta.7",
-    "@uploadista/event-broadcaster-memory": "0.0.20-beta.7",
-    "@uploadista/event-emitter-websocket": "0.0.20-beta.7",
-    "@uploadista/observability": "0.0.20-beta.7"
+    "@uploadista/core": "0.0.20-beta.9",
+    "@uploadista/observability": "0.0.20-beta.9",
+    "@uploadista/event-broadcaster-memory": "0.0.20-beta.9",
+    "@uploadista/event-emitter-websocket": "0.0.20-beta.9"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "4.20251211.0",
+    "@cloudflare/workers-types": "4.20251213.0",
     "@effect/vitest": "0.27.0",
     "@types/express": "^5.0.0",
-    "@types/node": "24.10.3",
-    "effect": "3.19.11",
+    "@types/node": "24.10.4",
+    "effect": "3.19.12",
     "tsd": "0.33.0",
-    "tsdown": "0.17.2",
+    "tsdown": "0.18.0",
     "typescript": "5.9.3",
     "vitest": "4.0.15",
-    "zod": "4.1.13",
-    "@uploadista/typescript-config": "0.0.20-beta.7"
+    "zod": "4.2.0",
+    "@uploadista/typescript-config": "0.0.20-beta.9"
   },
   "peerDependencies": {
     "effect": "^3.0.0",
@@ -45,7 +45,7 @@
     "zod": "^4.0.0"
   },
   "scripts": {
-    "build": "tsdown",
+    "build": "tsc --noEmit && tsdown",
     "format": "biome format --write ./src",
     "lint": "biome lint --write ./src",
     "check": "biome check --write ./src",

package/src/adapter/types.ts

@@ -1,4 +1,4 @@
-import type { FlowServer, UploadServer } from "@uploadista/core";
+import type { FlowEngine, UploadEngine } from "@uploadista/core";
 import type { Effect } from "effect";
 import type { UploadistaRequest, UploadistaResponse } from "../core/routes";
 import type { AuthResult } from "../types";
@@ -200,12 +200,12 @@ export interface ServerAdapter<
    *
    * @param ws - Framework-specific WebSocket object
    * @param ctx - Framework-specific context object (for initial handshake)
-   * @param context - Server context with baseUrl, uploadServer, and flowServer
+   * @param context - Server context with baseUrl, uploadEngine, and flowServer
    * @returns WebSocketHandler with callbacks for message, close, and error events
    */
   webSocketHandler(context: {
     baseUrl: string;
-  }): Effect.Effect<TWebSocketHandler, never, UploadServer | FlowServer>;
+  }): Effect.Effect<TWebSocketHandler, never, UploadEngine | FlowEngine>;
 
   /**
    * Optional: Extract waitUntil callback from the framework context.

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

@@ -1,4 +1,4 @@
-import { FlowServer } from "@uploadista/core/flow";
+import { FlowEngine } from "@uploadista/core/flow";
 import { Effect } from "effect";
 import { AuthCacheService } from "../../cache";
 import { QuotaExceededError } from "../../permissions/errors";
@@ -22,7 +22,7 @@ import type {
 
 export const handleGetFlow = ({ flowId }: GetFlowRequest) => {
   return Effect.gen(function* () {
-    const flowServer = yield* FlowServer;
+    const flowEngine = yield* FlowEngine;
     const authService = yield* AuthContextService;
     const clientId = yield* authService.getClientId();
 
@@ -35,7 +35,7 @@ export const handleGetFlow = ({ flowId }: GetFlowRequest) => {
       );
     }
 
-    const flowData = yield* flowServer.getFlowData(flowId, clientId);
+    const flowData = yield* flowEngine.getFlowData(flowId, clientId);
 
     return {
       status: 200,
@@ -50,7 +50,7 @@ export const handleRunFlow = <TRequirements>({
   inputs,
 }: RunFlowRequest) => {
   return Effect.gen(function* () {
-    const flowServer = yield* FlowServer;
+    const flowEngine = yield* FlowEngine;
     const authService = yield* AuthContextService;
     const authCache = yield* AuthCacheService;
     const usageHookService = yield* UsageHookService;
@@ -96,7 +96,7 @@ export const handleRunFlow = <TRequirements>({
     // Run flow returns immediately with jobId
     const startTime = Date.now();
     yield* Effect.logInfo(`[Flow] Calling flowServer.runFlow...`);
-    const result = yield* flowServer
+    const result = yield* flowEngine
       .runFlow<TRequirements>({
         flowId,
         storageId,
@@ -133,7 +133,7 @@ export const handleRunFlow = <TRequirements>({
 
 export const handleJobStatus = ({ jobId }: GetJobStatusRequest) => {
   return Effect.gen(function* () {
-    const flowServer = yield* FlowServer;
+    const flowEngine = yield* FlowEngine;
     const authService = yield* AuthContextService;
     const authCache = yield* AuthCacheService;
     const clientId = yield* authService.getClientId();
@@ -151,7 +151,7 @@ export const handleJobStatus = ({ jobId }: GetJobStatusRequest) => {
       );
     }
 
-    const result = yield* flowServer.getJobStatus(jobId);
+    const result = yield* flowEngine.getJobStatus(jobId);
 
     // Clear cache if flow is completed or failed
     if (result.status === "completed" || result.status === "failed") {
@@ -176,7 +176,7 @@ export const handleResumeFlow = <TRequirements>({
   newData,
 }: ResumeFlowRequest) => {
   return Effect.gen(function* () {
-    const flowServer = yield* FlowServer;
+    const flowEngine = yield* FlowEngine;
     const authService = yield* AuthContextService;
     const authCache = yield* AuthCacheService;
 
@@ -200,7 +200,7 @@ export const handleResumeFlow = <TRequirements>({
       throw new Error("Missing newData");
     }
 
-    const result = yield* flowServer.resumeFlow<TRequirements>({
+    const result = yield* flowEngine.resumeFlow<TRequirements>({
       jobId,
       nodeId,
       newData,
@@ -226,7 +226,7 @@ export const handleResumeFlow = <TRequirements>({
 
 export const handlePauseFlow = ({ jobId }: PauseFlowRequest) => {
   return Effect.gen(function* () {
-    const flowServer = yield* FlowServer;
+    const flowEngine = yield* FlowEngine;
     const authService = yield* AuthContextService;
     const authCache = yield* AuthCacheService;
 
@@ -246,7 +246,7 @@ export const handlePauseFlow = ({ jobId }: PauseFlowRequest) => {
       );
     }
 
-    const result = yield* flowServer.pauseFlow(jobId, clientId);
+    const result = yield* flowEngine.pauseFlow(jobId, clientId);
 
     if (clientId) {
       yield* Effect.logInfo(
@@ -263,7 +263,7 @@ export const handlePauseFlow = ({ jobId }: PauseFlowRequest) => {
 
 export const handleCancelFlow = ({ jobId }: CancelFlowRequest) => {
   return Effect.gen(function* () {
-    const flowServer = yield* FlowServer;
+    const flowEngine = yield* FlowEngine;
     const authService = yield* AuthContextService;
     const authCache = yield* AuthCacheService;
     const usageHookService = yield* UsageHookService;
@@ -288,7 +288,7 @@ export const handleCancelFlow = ({ jobId }: CancelFlowRequest) => {
       );
     }
 
-    const result = yield* flowServer.cancelFlow(jobId, clientId);
+    const result = yield* flowEngine.cancelFlow(jobId, clientId);
 
     // Clear cache since flow is cancelled
     yield* authCache.delete(jobId);

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

@@ -1,5 +1,5 @@
 import { inputFileSchema } from "@uploadista/core/types";
-import { UploadServer } from "@uploadista/core/upload";
+import { UploadEngine } from "@uploadista/core/upload";
 import { isSupportedAlgorithm } from "@uploadista/core/utils";
 import { MetricsService } from "@uploadista/observability";
 import { Effect } from "effect";
@@ -22,7 +22,7 @@ import type {
 
 export const handleCreateUpload = (req: CreateUploadRequest) =>
   Effect.gen(function* () {
-    const server = yield* UploadServer;
+    const uploadEngine = yield* UploadEngine;
     const authService = yield* AuthContextService;
     const authCache = yield* AuthCacheService;
     const usageHookService = yield* UsageHookService;
@@ -79,7 +79,7 @@ export const handleCreateUpload = (req: CreateUploadRequest) =>
       }
     }
 
-    const fileCreated = yield* server.createUpload(
+    const fileCreated = yield* uploadEngine.createUpload(
       parsedInputFile.data,
       clientId,
     );
@@ -104,14 +104,17 @@ export const handleCreateUpload = (req: CreateUploadRequest) =>
 
 export const handleGetCapabilities = ({ storageId }: GetCapabilitiesRequest) =>
   Effect.gen(function* () {
-    const server = yield* UploadServer;
+    const uploadEngine = yield* UploadEngine;
     const authService = yield* AuthContextService;
     const clientId = yield* authService.getClientId();
 
     // Check permission for reading upload capabilities
     yield* authService.requirePermission(PERMISSIONS.UPLOAD.READ);
 
-    const capabilities = yield* server.getCapabilities(storageId, clientId);
+    const capabilities = yield* uploadEngine.getCapabilities(
+      storageId,
+      clientId,
+    );
 
     return {
       status: 200,
@@ -125,13 +128,13 @@ export const handleGetCapabilities = ({ storageId }: GetCapabilitiesRequest) =>
 
 export const handleGetUpload = ({ uploadId }: GetUploadRequest) =>
   Effect.gen(function* () {
-    const server = yield* UploadServer;
+    const uploadEngine = yield* UploadEngine;
     const authService = yield* AuthContextService;
 
     // Check permission for reading upload status
     yield* authService.requirePermission(PERMISSIONS.UPLOAD.READ);
 
-    const fileResult = yield* server.getUpload(uploadId);
+    const fileResult = yield* uploadEngine.getUpload(uploadId);
 
     return {
       status: 200,
@@ -141,7 +144,7 @@ export const handleGetUpload = ({ uploadId }: GetUploadRequest) =>
 
 export const handleUploadChunk = (req: UploadChunkRequest) =>
   Effect.gen(function* () {
-    const server = yield* UploadServer;
+    const uploadEngine = yield* UploadEngine;
     const authService = yield* AuthContextService;
     const authCache = yield* AuthCacheService;
     const metricsService = yield* MetricsService;
@@ -168,7 +171,11 @@ export const handleUploadChunk = (req: UploadChunkRequest) =>
     }
 
     const startTime = Date.now();
-    const fileResult = yield* server.uploadChunk(uploadId, clientId, data);
+    const fileResult = yield* uploadEngine.uploadChunk(
+      uploadId,
+      clientId,
+      data,
+    );
 
     // Clear cache and record metrics if upload is complete
     if (fileResult.size && fileResult.offset >= fileResult.size) {

package/src/core/plugin-types.ts

@@ -166,7 +166,7 @@ export type TypeSafePluginConfig<
  * Extracts plugin requirements from a flow function type.
  *
  * This navigates through the flow function signature to extract the requirements
- * from the Flow type it returns, excluding UploadServer (provided by runtime).
+ * from the Flow type it returns, excluding UploadEngine (provided by runtime).
  *
  * @template TFlowFn - The flow function type to extract requirements from
  *
@@ -191,7 +191,7 @@ export type ExtractFlowPluginRequirements<
   ReturnType<TFlowFn> extends Effect.Effect<infer TFlow, any, any>
     ? // biome-ignore lint/suspicious/noExplicitAny: Conditional type inference requires any for input and output schema parameters
       TFlow extends Flow<any, any, infer TRequirements>
-      ? Exclude<TRequirements, never> // Exclude UploadServer is handled by FlowPluginRequirements in core
+      ? Exclude<TRequirements, never> // Exclude UploadEngine is handled by FlowPluginRequirements in core
       : never
     : never;
 

package/src/core/server.ts

@@ -21,7 +21,7 @@ import type { z } from "zod";
 import type { StandardResponse } from "../adapter";
 import { AuthCacheServiceLive } from "../cache";
 import { handleFlowError } from "../http-utils";
-import { createFlowServerLayer, createUploadServerLayer } from "../layer-utils";
+import { createFlowEngineLayer, createUploadEngineLayer } from "../layer-utils";
 import { AuthContextServiceLive } from "../service";
 import type { AuthContext } from "../types";
 import { UsageHookServiceLive } from "../usage-hooks/service";
@@ -252,7 +252,7 @@ export const createUploadistaServer = async <
   > = await createDataStoreLayer(dataStore);
 
   // Create upload server layer
-  const uploadServerLayer = createUploadServerLayer({
+  const uploadEngineLayer = createUploadEngineLayer({
     kvStore,
     eventEmitter: finalEventEmitter,
     dataStore: dataStoreLayer,
@@ -261,11 +261,11 @@ export const createUploadistaServer = async <
   });
 
   // Create flow server layer
-  const flowServerLayer = createFlowServerLayer({
+  const flowEngineLayer = createFlowEngineLayer({
     kvStore,
     eventEmitter: finalEventEmitter,
     flowProvider: flowProviderLayer,
-    uploadServer: uploadServerLayer,
+    uploadEngine: uploadEngineLayer,
   });
 
   // Create auth cache layer (always present, even if auth is not enabled)
@@ -299,8 +299,8 @@ export const createUploadistaServer = async <
    * with user-provided plugin layers.
    */
   const serverLayerRaw = Layer.mergeAll(
-    uploadServerLayer,
-    flowServerLayer,
+    uploadEngineLayer,
+    flowEngineLayer,
     effectiveMetricsLayer,
     authCacheLayer,
     usageHookLayer,

package/src/core/websocket-handlers/flow-websocket-handlers.ts

@@ -1,4 +1,4 @@
-import type { FlowServerShape } from "@uploadista/core/flow";
+import type { FlowEngineShape } from "@uploadista/core/flow";
 import { Effect } from "effect";
 import type { WebSocketConnection } from "../websocket-routes";
 
@@ -7,7 +7,7 @@ import type { WebSocketConnection } from "../websocket-routes";
  * Subscribes the WebSocket connection to receive real-time flow execution events
  */
 export const handleSubscribeToFlowEvents = (
-  flowServer: FlowServerShape,
+  flowEngine: FlowEngineShape,
   jobId: string | undefined,
   connection: WebSocketConnection,
 ) => {
@@ -25,7 +25,7 @@ export const handleSubscribeToFlowEvents = (
       return;
     }
 
-    yield* flowServer.subscribeToFlowEvents(jobId, connection);
+    yield* flowEngine.subscribeToFlowEvents(jobId, connection);
   });
 };
 
@@ -34,7 +34,7 @@ export const handleSubscribeToFlowEvents = (
  * Removes the WebSocket connection from receiving flow events
  */
 export const handleUnsubscribeFromFlowEvents = (
-  flowServer: FlowServerShape,
+  flowEngine: FlowEngineShape,
   jobId: string | undefined,
 ) => {
   return Effect.gen(function* () {
@@ -42,6 +42,6 @@ export const handleUnsubscribeFromFlowEvents = (
       return;
     }
 
-    yield* flowServer.unsubscribeFromFlowEvents(jobId);
+    yield* flowEngine.unsubscribeFromFlowEvents(jobId);
   });
 };

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

@@ -1,4 +1,4 @@
-import type { UploadServerShape } from "@uploadista/core/upload";
+import type { UploadEngineShape } from "@uploadista/core/upload";
 import { Effect } from "effect";
 import type { WebSocketConnection } from "../websocket-routes";
 
@@ -7,7 +7,7 @@ import type { WebSocketConnection } from "../websocket-routes";
  * Subscribes the WebSocket connection to receive real-time upload progress events
  */
 export const handleSubscribeToUploadEvents = (
-  uploadServer: UploadServerShape,
+  uploadEngine: UploadEngineShape,
   uploadId: string | undefined,
   connection: WebSocketConnection,
 ) => {
@@ -25,7 +25,7 @@ export const handleSubscribeToUploadEvents = (
       return;
     }
 
-    yield* uploadServer.subscribeToUploadEvents(uploadId, connection);
+    yield* uploadEngine.subscribeToUploadEvents(uploadId, connection);
   });
 };
 
@@ -34,7 +34,7 @@ export const handleSubscribeToUploadEvents = (
  * Removes the WebSocket connection from receiving upload events
  */
 export const handleUnsubscribeFromUploadEvents = (
-  uploadServer: UploadServerShape,
+  uploadEngine: UploadEngineShape,
   uploadId: string | undefined,
 ) => {
   return Effect.gen(function* () {
@@ -42,6 +42,6 @@ export const handleUnsubscribeFromUploadEvents = (
       return;
     }
 
-    yield* uploadServer.unsubscribeFromUploadEvents(uploadId);
+    yield* uploadEngine.unsubscribeFromUploadEvents(uploadId);
   });
 };

package/src/core/websocket-handlers/websocket-handlers.ts

@@ -1,6 +1,6 @@
 import { UploadistaError } from "@uploadista/core/errors";
-import type { FlowServerShape } from "@uploadista/core/flow";
-import type { UploadServerShape } from "@uploadista/core/upload";
+import type { FlowEngineShape } from "@uploadista/core/flow";
+import type { UploadEngineShape } from "@uploadista/core/upload";
 import { Effect } from "effect";
 import type {
   WebSocketConnection,
@@ -26,8 +26,8 @@ export type {
  */
 export const handleWebSocketOpen = (
   request: WebSocketConnectionRequest,
-  uploadServer: UploadServerShape,
-  flowServer: FlowServerShape,
+  uploadEngine: UploadEngineShape,
+  flowEngine: FlowEngineShape,
 ) => {
   const { connection, isFlowRoute, isUploadRoute, jobId, uploadId, eventId } =
     request;
@@ -35,12 +35,12 @@ export const handleWebSocketOpen = (
   return Effect.gen(function* () {
     // Subscribe to flow events if this is a flow route
     if (isFlowRoute) {
-      yield* handleSubscribeToFlowEvents(flowServer, jobId, connection);
+      yield* handleSubscribeToFlowEvents(flowEngine, jobId, connection);
     }
 
     // Subscribe to upload events if this is an upload route
     if (isUploadRoute) {
-      yield* handleSubscribeToUploadEvents(uploadServer, uploadId, connection);
+      yield* handleSubscribeToUploadEvents(uploadEngine, uploadId, connection);
     }
 
     // Send connection confirmation
@@ -114,20 +114,20 @@ export const handleWebSocketMessage = (
  */
 export const handleWebSocketClose = (
   request: WebSocketConnectionRequest,
-  uploadServer: UploadServerShape,
-  flowServer: FlowServerShape,
+  uploadEngine: UploadEngineShape,
+  flowEngine: FlowEngineShape,
 ) => {
   const { isFlowRoute, isUploadRoute, jobId, uploadId } = request;
 
   return Effect.gen(function* () {
     // Unsubscribe from flow events if this was a flow route
     if (isFlowRoute) {
-      yield* handleUnsubscribeFromFlowEvents(flowServer, jobId);
+      yield* handleUnsubscribeFromFlowEvents(flowEngine, jobId);
     }
 
     // Unsubscribe from upload events if this was an upload route
     if (isUploadRoute) {
-      yield* handleUnsubscribeFromUploadEvents(uploadServer, uploadId);
+      yield* handleUnsubscribeFromUploadEvents(uploadEngine, uploadId);
     }
   }).pipe(
     Effect.catchAll((error) =>

package/src/error-types.ts

@@ -114,7 +114,7 @@ export const createErrorResponseBody = (error: AdapterError) => ({
  * import { createUploadistaErrorResponseBody } from "@uploadista/server";
  *
  * try {
- *   const result = yield* uploadServer.handleUpload(input);
+ *   const result = yield* uploadEngine.handleUpload(input);
  * } catch (err) {
  *   if (err instanceof UploadistaError) {
  *     const errorResponse = createUploadistaErrorResponseBody(err);

package/src/layer-utils.ts

@@ -1,5 +1,5 @@
 import type { FlowProvider } from "@uploadista/core/flow";
-import { flowServer } from "@uploadista/core/flow";
+import { flowEngine } from "@uploadista/core/flow";
 import {
   type BaseEventEmitterService,
   type BaseKvStoreService,
@@ -11,13 +11,13 @@ import {
   uploadEventEmitter,
   uploadFileKvStore,
 } from "@uploadista/core/types";
-import { type UploadServer, uploadServer } from "@uploadista/core/upload";
+import { type UploadEngine, uploadEngine } from "@uploadista/core/upload";
 import type { GenerateId } from "@uploadista/core/utils";
 import { Layer } from "effect";
 
 /**
- * Configuration for creating upload server layers.
- * Specifies all dependencies needed by the upload server Effect Layer.
+ * Configuration for creating upload engine layers.
+ * Specifies all dependencies needed by the upload engine Effect Layer.
  *
  * @property kvStore - Key-value store for upload metadata
  * @property eventEmitter - Event emitter for upload progress events
@@ -27,16 +27,16 @@ import { Layer } from "effect";
  *
  * @example
  * ```typescript
- * import { createUploadServerLayer } from "@uploadista/server";
+ * import { createUploadEngineLayer } from "@uploadista/server";
  *
- * const uploadLayerConfig: UploadServerLayerConfig = {
+ * const uploadLayerConfig: UploadEngineLayerConfig = {
  *   kvStore: redisKvStore,
  *   eventEmitter: webSocketEventEmitter,
  *   dataStore: s3DataStore,
  * };
  * ```
  */
-export interface UploadServerLayerConfig {
+export interface UploadEngineLayerConfig {
   kvStore: Layer.Layer<BaseKvStoreService>;
   eventEmitter: Layer.Layer<BaseEventEmitterService>;
   dataStore: Layer.Layer<UploadFileDataStores, never, UploadFileKVStore>;
@@ -55,7 +55,7 @@ export interface UploadServerLayerConfig {
  * @property kvStore - Key-value store for flow job metadata
  * @property eventEmitter - Event emitter for flow progress events
  * @property flowProvider - Factory function for creating flows
- * @property uploadServer - Upload server layer (used by flows for uploads)
+ * @property uploadEngine - Upload engine layer (used by flows for uploads)
  *
  * @example
  * ```typescript
@@ -65,7 +65,7 @@ export interface UploadServerLayerConfig {
  *   kvStore: redisKvStore,
  *   eventEmitter: webSocketEventEmitter,
  *   flowProvider: createFlowsEffect,
- *   uploadServer: uploadServerLayer,
+ *   uploadEngine: uploadEngineLayer,
  * };
  * ```
  */
@@ -73,7 +73,7 @@ export interface FlowServerLayerConfig {
   kvStore: Layer.Layer<BaseKvStoreService>;
   eventEmitter: Layer.Layer<BaseEventEmitterService>;
   flowProvider: Layer.Layer<FlowProvider>;
-  uploadServer: Layer.Layer<UploadServer>;
+  uploadEngine: Layer.Layer<UploadEngine>;
 }
 
 /**
@@ -88,30 +88,30 @@ export interface FlowServerLayerConfig {
  * - Optional custom ID generator
  *
  * @param config - Upload server layer configuration
- * @returns Effect Layer providing UploadServer
+ * @returns Effect Layer providing UploadEngine
  *
  * @example
  * ```typescript
- * import { createUploadServerLayer } from "@uploadista/server";
+ * import { createUploadEngineLayer } from "@uploadista/server";
  * import { Layer } from "effect";
  *
- * const uploadServerLayer = createUploadServerLayer({
+ * const uploadEngineLayer = createUploadEngineLayer({
  *   kvStore: redisKvStore,
  *   eventEmitter: webSocketEventEmitter,
  *   dataStore: s3DataStore,
  * });
  *
  * // Use in application
- * const app = Layer.provide(appLogic, uploadServerLayer);
+ * const app = Layer.provide(appLogic, uploadEngineLayer);
  * ```
  */
-export const createUploadServerLayer = ({
+export const createUploadEngineLayer = ({
   kvStore,
   eventEmitter,
   dataStore,
   bufferedDataStore,
   generateId,
-}: UploadServerLayerConfig) => {
+}: UploadEngineLayerConfig) => {
   // Set up upload server dependencies
   const uploadFileKVStoreLayer = Layer.provide(uploadFileKvStore, kvStore);
   const uploadDataStoreLayer = Layer.provide(dataStore, uploadFileKVStoreLayer);
@@ -123,7 +123,7 @@ export const createUploadServerLayer = ({
     eventEmitter,
   );
 
-  const uploadServerLayers = Layer.mergeAll(
+  const uploadEngineLayers = Layer.mergeAll(
     uploadDataStoreLayer,
     uploadFileKVStoreLayer,
     uploadEventEmitterLayer,
@@ -131,7 +131,7 @@ export const createUploadServerLayer = ({
     uploadBufferedDataStoreLayer,
   );
 
-  return Layer.provide(uploadServer, uploadServerLayers);
+  return Layer.provide(uploadEngine, uploadEngineLayers);
 };
 
 /**
@@ -156,29 +156,29 @@ export const createUploadServerLayer = ({
  *   kvStore: redisKvStore,
  *   eventEmitter: webSocketEventEmitter,
  *   flowProvider: createFlowsEffect,
- *   uploadServer: uploadServerLayer,
+ *   uploadEngine: uploadEngineLayer,
  * });
  *
  * // Use in application
  * const app = Layer.provide(appLogic, flowServerLayer);
  * ```
  */
-export const createFlowServerLayer = ({
+export const createFlowEngineLayer = ({
   kvStore,
   eventEmitter,
   flowProvider,
-  uploadServer,
+  uploadEngine,
 }: FlowServerLayerConfig) => {
   // Set up flow server dependencies
   const flowJobKVStoreLayer = Layer.provide(flowJobKvStore, kvStore);
   const flowEventEmitterLayer = Layer.provide(flowEventEmitter, eventEmitter);
 
-  const flowServerLayers = Layer.mergeAll(
+  const flowEngineLayers = Layer.mergeAll(
     flowProvider,
     flowEventEmitterLayer,
     flowJobKVStoreLayer,
-    uploadServer,
+    uploadEngine,
   );
 
-  return Layer.provide(flowServer, flowServerLayers);
+  return Layer.provide(flowEngine, flowEngineLayers);
 };

package/src/plugins-typing.ts

@@ -14,7 +14,7 @@
  * @module plugins-typing
  */
 
-import type { Flow, UploadServer } from "@uploadista/core";
+import type { Flow, UploadEngine } from "@uploadista/core";
 import type { ExtractLayerServices } from "@uploadista/core/flow";
 import type { Effect, Layer } from "effect";
 import type z from "zod";
@@ -58,7 +58,7 @@ export type FlowSuccess<
 /**
  * @deprecated Use `ExtractFlowPluginRequirements` from `@uploadista/server/core/plugin-types` instead.
  *
- * Extracts plugin requirements from a flow function, excluding UploadServer.
+ * Extracts plugin requirements from a flow function, excluding UploadEngine.
  *
  * @example Migration
  * ```typescript
@@ -82,7 +82,7 @@ export type FlowRequirementsOf<
     z.ZodSchema<unknown>,
     infer R
   >
-    ? Exclude<R, UploadServer>
+    ? Exclude<R, UploadEngine>
     : never;
 
 /**
@@ -106,7 +106,7 @@ export type RequiredPluginsOf<
     flowId: string,
     clientId: string | null,
   ) => Effect.Effect<unknown, unknown, unknown>,
-> = Exclude<FlowRequirementsOf<TFlows>, UploadServer>;
+> = Exclude<FlowRequirementsOf<TFlows>, UploadEngine>;
 
 /**
  * @deprecated Use `ValidatePlugins` from `@uploadista/server/core/plugin-types` instead.