@uploadista/server 0.0.20-beta.6 → 0.0.20-beta.8

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/permissions/errors.ts

@@ -64,7 +64,9 @@ export class AuthenticationRequiredError extends AdapterError {
  * ```
  */
 export class OrganizationMismatchError extends AdapterError {
-  constructor(message = "Access denied: resource belongs to another organization") {
+  constructor(
+    message = "Access denied: resource belongs to another organization",
+  ) {
     super(message, 403, "ORGANIZATION_MISMATCH");
     this.name = "OrganizationMismatchError";
   }

package/src/permissions/index.ts

@@ -4,6 +4,6 @@
  * Exports all permission-related types, constants, and utilities.
  */
 
-export * from "./types";
-export * from "./matcher";
 export * from "./errors";
+export * from "./matcher";
+export * from "./types";

package/src/permissions/types.ts

@@ -121,22 +121,13 @@ export const PERMISSION_SETS = {
   ADMIN: [ENGINE_PERMISSIONS.ALL] as const,
 
   /** Organization owner - all flow and upload permissions */
-  ORGANIZATION_OWNER: [
-    FLOW_PERMISSIONS.ALL,
-    UPLOAD_PERMISSIONS.ALL,
-  ] as const,
+  ORGANIZATION_OWNER: [FLOW_PERMISSIONS.ALL, UPLOAD_PERMISSIONS.ALL] as const,
 
   /** Organization member - same as owner for now */
-  ORGANIZATION_MEMBER: [
-    FLOW_PERMISSIONS.ALL,
-    UPLOAD_PERMISSIONS.ALL,
-  ] as const,
+  ORGANIZATION_MEMBER: [FLOW_PERMISSIONS.ALL, UPLOAD_PERMISSIONS.ALL] as const,
 
   /** API key - limited to execute flows and create uploads */
-  API_KEY: [
-    FLOW_PERMISSIONS.EXECUTE,
-    UPLOAD_PERMISSIONS.CREATE,
-  ] as const,
+  API_KEY: [FLOW_PERMISSIONS.EXECUTE, UPLOAD_PERMISSIONS.CREATE] as const,
 } as const;
 
 /**

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";
@@ -50,14 +50,15 @@ export type FlowSuccess<
     flowId: string,
     clientId: string | null,
   ) => Effect.Effect<unknown, unknown, unknown>,
-> = ReturnType<TFlows> extends Effect.Effect<infer Success, unknown, unknown>
-  ? Success
-  : never;
+> =
+  ReturnType<TFlows> extends Effect.Effect<infer Success, unknown, unknown>
+    ? Success
+    : never;
 
 /**
  * @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
@@ -75,13 +76,14 @@ export type FlowRequirementsOf<
     flowId: string,
     clientId: string | null,
   ) => Effect.Effect<unknown, unknown, unknown>,
-> = FlowSuccess<TFlows> extends Flow<
-  z.ZodSchema<unknown>,
-  z.ZodSchema<unknown>,
-  infer R
->
-  ? Exclude<R, UploadServer>
-  : never;
+> =
+  FlowSuccess<TFlows> extends Flow<
+    z.ZodSchema<unknown>,
+    z.ZodSchema<unknown>,
+    infer R
+  >
+    ? Exclude<R, UploadEngine>
+    : never;
 
 /**
  * @deprecated Use `ExtractFlowPluginRequirements` from `@uploadista/server/core/plugin-types` instead.
@@ -104,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.

package/src/service.ts

@@ -1,10 +1,13 @@
 import { Context, Effect, Layer } from "effect";
-import type { AuthContext } from "./types";
 import {
-  hasPermission as matchHasPermission,
+  AuthenticationRequiredError,
+  AuthorizationError,
+} from "./permissions/errors";
+import {
   hasAnyPermission as matchHasAnyPermission,
+  hasPermission as matchHasPermission,
 } from "./permissions/matcher";
-import { AuthorizationError, AuthenticationRequiredError } from "./permissions/errors";
+import type { AuthContext } from "./types";
 
 /**
  * Authentication Context Service
@@ -154,7 +157,9 @@ export const AuthContextServiceLive = (
     hasAnyPermission: (requiredPermissions: readonly string[]) =>
       bypassAuth
         ? Effect.succeed(true)
-        : Effect.succeed(matchHasAnyPermission(permissions, requiredPermissions)),
+        : Effect.succeed(
+            matchHasAnyPermission(permissions, requiredPermissions),
+          ),
 
     requirePermission: (permission: string) =>
       Effect.gen(function* () {

package/src/usage-hooks/index.ts

@@ -4,5 +4,5 @@
  * Exports all usage hook types and services.
  */
 
-export * from "./types";
 export * from "./service";
+export * from "./types";

package/src/usage-hooks/service.ts

@@ -6,12 +6,12 @@
 
 import { Context, Effect, Layer } from "effect";
 import type {
+  FlowUsageContext,
+  UploadUsageContext,
   UsageHookConfig,
   UsageHookResult,
-  UploadUsageContext,
-  FlowUsageContext,
 } from "./types";
-import { DEFAULT_USAGE_HOOK_TIMEOUT, continueResult } from "./types";
+import { continueResult, DEFAULT_USAGE_HOOK_TIMEOUT } from "./types";
 
 /**
  * Usage Hook Service
@@ -70,22 +70,20 @@ export const UsageHookServiceLive = (
         return Effect.succeed(continueResult());
       }
 
-      return hooks
-        .onUploadStart(ctx)
-        .pipe(
-          // Add timeout - proceed on timeout (fail-open)
-          Effect.timeout(timeout),
-          Effect.map((result) => result ?? continueResult()),
-          // On any error, log and continue (fail-open for availability)
-          Effect.catchAll((error) =>
-            Effect.gen(function* () {
-              yield* Effect.logWarning(
-                `onUploadStart hook failed: ${error}. Proceeding with upload.`,
-              );
-              return continueResult();
-            }),
-          ),
-        );
+      return hooks.onUploadStart(ctx).pipe(
+        // Add timeout - proceed on timeout (fail-open)
+        Effect.timeout(timeout),
+        Effect.map((result) => result ?? continueResult()),
+        // On any error, log and continue (fail-open for availability)
+        Effect.catchAll((error) =>
+          Effect.gen(function* () {
+            yield* Effect.logWarning(
+              `onUploadStart hook failed: ${error}. Proceeding with upload.`,
+            );
+            return continueResult();
+          }),
+        ),
+      );
     },
 
     onUploadComplete: (ctx: UploadUsageContext) => {
@@ -93,19 +91,17 @@ export const UsageHookServiceLive = (
         return Effect.void;
       }
 
-      return hooks
-        .onUploadComplete(ctx)
-        .pipe(
-          // Add timeout
-          Effect.timeout(timeout),
-          Effect.asVoid,
-          // On any error, just log (fire-and-forget)
-          Effect.catchAll((error) =>
-            Effect.logWarning(
-              `onUploadComplete hook failed: ${error}. Upload already completed.`,
-            ),
+      return hooks.onUploadComplete(ctx).pipe(
+        // Add timeout
+        Effect.timeout(timeout),
+        Effect.asVoid,
+        // On any error, just log (fire-and-forget)
+        Effect.catchAll((error) =>
+          Effect.logWarning(
+            `onUploadComplete hook failed: ${error}. Upload already completed.`,
           ),
-        );
+        ),
+      );
     },
 
     onFlowStart: (ctx: FlowUsageContext) => {
@@ -113,22 +109,20 @@ export const UsageHookServiceLive = (
         return Effect.succeed(continueResult());
       }
 
-      return hooks
-        .onFlowStart(ctx)
-        .pipe(
-          // Add timeout - proceed on timeout (fail-open)
-          Effect.timeout(timeout),
-          Effect.map((result) => result ?? continueResult()),
-          // On any error, log and continue (fail-open for availability)
-          Effect.catchAll((error) =>
-            Effect.gen(function* () {
-              yield* Effect.logWarning(
-                `onFlowStart hook failed: ${error}. Proceeding with flow.`,
-              );
-              return continueResult();
-            }),
-          ),
-        );
+      return hooks.onFlowStart(ctx).pipe(
+        // Add timeout - proceed on timeout (fail-open)
+        Effect.timeout(timeout),
+        Effect.map((result) => result ?? continueResult()),
+        // On any error, log and continue (fail-open for availability)
+        Effect.catchAll((error) =>
+          Effect.gen(function* () {
+            yield* Effect.logWarning(
+              `onFlowStart hook failed: ${error}. Proceeding with flow.`,
+            );
+            return continueResult();
+          }),
+        ),
+      );
     },
 
     onFlowComplete: (ctx: FlowUsageContext) => {
@@ -136,19 +130,17 @@ export const UsageHookServiceLive = (
         return Effect.void;
       }
 
-      return hooks
-        .onFlowComplete(ctx)
-        .pipe(
-          // Add timeout
-          Effect.timeout(timeout),
-          Effect.asVoid,
-          // On any error, just log (fire-and-forget)
-          Effect.catchAll((error) =>
-            Effect.logWarning(
-              `onFlowComplete hook failed: ${error}. Flow already completed.`,
-            ),
+      return hooks.onFlowComplete(ctx).pipe(
+        // Add timeout
+        Effect.timeout(timeout),
+        Effect.asVoid,
+        // On any error, just log (fire-and-forget)
+        Effect.catchAll((error) =>
+          Effect.logWarning(
+            `onFlowComplete hook failed: ${error}. Flow already completed.`,
           ),
-        );
+        ),
+      );
     },
   });
 };

package/src/usage-hooks/types.ts

@@ -5,7 +5,7 @@
  * Used for usage tracking, quota enforcement, and billing integration.
  */
 
-import { Effect } from "effect";
+import type { Effect } from "effect";
 
 // ============================================================================
 // Usage Hook Result Types
@@ -144,9 +144,7 @@ export type OnFlowStartHook = (
  * Hook called after flow completes (success, failure, or cancellation).
  * Used for recording usage. Errors are logged but don't fail the response.
  */
-export type OnFlowCompleteHook = (
-  ctx: FlowUsageContext,
-) => Effect.Effect<void>;
+export type OnFlowCompleteHook = (ctx: FlowUsageContext) => Effect.Effect<void>;
 
 // ============================================================================
 // Usage Hooks Configuration