@pikku/core 0.11.0 → 0.11.1

package/dist/wirings/channel/serverless/serverless-channel-runner.js

@@ -1,13 +1,12 @@
-import { closeSessionServices } from '../../../utils.js';
+import { closeWireServices } from '../../../utils.js';
 import { processMessageHandlers } from '../channel-handler.js';
 import { openChannel } from '../channel-runner.js';
-import { createHTTPInteraction } from '../../http/http-runner.js';
+import { createHTTPWire } from '../../http/http-runner.js';
 import { handleHTTPError } from '../../../handle-error.js';
-import { PikkuUserSessionService } from '../../../services/user-session-service.js';
+import { PikkuSessionService } from '../../../services/user-session-service.js';
 import { pikkuState } from '../../../pikku-state.js';
 import { PikkuFetchHTTPRequest } from '../../http/pikku-fetch-http-request.js';
 import { runChannelLifecycleWithMiddleware } from '../channel-common.js';
-import { rpcService } from '../../rpc/rpc-runner.js';
 const getVariablesForChannel = ({ channelId, channelName, channelHandlerFactory, openingData, }) => {
     const channels = pikkuState('channel', 'channels');
     const channelConfig = channels.get(channelName);
@@ -27,16 +26,16 @@ const getVariablesForChannel = ({ channelId, channelName, channelHandlerFactory,
         meta,
     };
 };
-export const runChannelConnect = async ({ singletonServices, channelId, channelObject, request, response, route, createSessionServices, channelStore, channelHandlerFactory, coerceDataFromSchema = true, logWarningsForStatusCodes = [], respondWith404 = true, bubbleErrors = false, }) => {
-    let sessionServices;
+export const runChannelConnect = async ({ singletonServices, channelId, channelObject, request, response, route, createWireServices, channelStore, channelHandlerFactory, coerceDataFromSchema = true, logWarningsForStatusCodes = [], respondWith404 = true, bubbleErrors = false, }) => {
+    let wireServices;
     let http;
     if (request instanceof Request) {
-        http = createHTTPInteraction(new PikkuFetchHTTPRequest(request), response);
+        http = createHTTPWire(new PikkuFetchHTTPRequest(request), response);
     }
-    const userSession = new PikkuUserSessionService(channelStore, channelId);
+    const userSession = new PikkuSessionService(channelStore, channelId);
     const { channelConfig, openingData, meta } = await openChannel({
         channelId,
-        createSessionServices,
+        createWireServices,
         request,
         route,
         singletonServices,
@@ -55,23 +54,21 @@ export const runChannelConnect = async ({ singletonServices, channelId, channelO
             channelHandlerFactory,
             channelName: channelConfig.name,
         });
-        if (createSessionServices) {
-            sessionServices = await createSessionServices(singletonServices, { http }, await userSession.get());
+        const wire = { channel, session: userSession };
+        if (createWireServices) {
+            wireServices = await createWireServices(singletonServices, wire);
         }
-        const interaction = { channel };
-        const getAllServices = (requiresAuth) => rpcService.injectRPCService({
+        const services = {
             ...singletonServices,
-            ...sessionServices,
-            channel,
-            userSession,
-        }, interaction, requiresAuth);
+            ...wireServices,
+        };
         if (channelConfig.onConnect && meta.connect) {
             await runChannelLifecycleWithMiddleware({
                 channelConfig,
                 meta: meta.connect,
                 lifecycleConfig: channelConfig.onConnect,
                 lifecycleType: 'connect',
-                services: getAllServices(false),
+                services,
                 channel,
                 data: openingData,
             });
@@ -82,13 +79,13 @@ export const runChannelConnect = async ({ singletonServices, channelId, channelO
         handleHTTPError(e, http, channelId, singletonServices.logger, logWarningsForStatusCodes, respondWith404, bubbleErrors);
     }
     finally {
-        if (sessionServices) {
-            await closeSessionServices(singletonServices.logger, sessionServices);
+        if (wireServices) {
+            await closeWireServices(singletonServices.logger, wireServices);
         }
     }
 };
 export const runChannelDisconnect = async ({ singletonServices, ...params }) => {
-    let sessionServices;
+    let wireServices;
     // Try to get channel from store. In serverless environments (especially with
     // serverless-offline or worker threads), disconnect can be called multiple times
     // or after the channel has already been cleaned up. If channel doesn't exist,
@@ -107,17 +104,16 @@ export const runChannelDisconnect = async ({ singletonServices, ...params }) =>
         openingData,
         channelName,
     });
-    const userSession = new PikkuUserSessionService(params.channelStore, params.channelId);
-    if (!sessionServices && params.createSessionServices) {
-        sessionServices = await params.createSessionServices(singletonServices, { channel }, session);
+    const userSession = new PikkuSessionService(params.channelStore, params.channelId);
+    userSession.setInitial(session);
+    const wire = { channel, session: userSession };
+    if (!wireServices && params.createWireServices) {
+        wireServices = await params.createWireServices(singletonServices, wire);
     }
-    const interaction = { channel };
-    const getAllServices = (requiresAuth) => rpcService.injectRPCService({
+    const services = {
         ...singletonServices,
-        ...sessionServices,
-        channel,
-        userSession,
-    }, interaction, requiresAuth);
+        ...wireServices,
+    };
     if (channelConfig.onDisconnect && meta.disconnect) {
         try {
             await runChannelLifecycleWithMiddleware({
@@ -125,7 +121,7 @@ export const runChannelDisconnect = async ({ singletonServices, ...params }) =>
                 meta: meta.disconnect,
                 lifecycleConfig: channelConfig.onDisconnect,
                 lifecycleType: 'disconnect',
-                services: getAllServices(false),
+                services,
                 channel,
             });
         }
@@ -134,32 +130,31 @@ export const runChannelDisconnect = async ({ singletonServices, ...params }) =>
         }
     }
     await params.channelStore.removeChannels([channel.channelId]);
-    if (sessionServices) {
-        await closeSessionServices(singletonServices.logger, sessionServices);
+    if (wireServices) {
+        await closeWireServices(singletonServices.logger, wireServices);
     }
 };
 export const runChannelMessage = async ({ singletonServices, ...params }, data) => {
-    let sessionServices;
+    let wireServices;
     const { openingData, channelName, session } = await params.channelStore.getChannelAndSession(params.channelId);
     const { channel, channelHandler, channelConfig } = getVariablesForChannel({
         ...params,
         openingData,
         channelName,
     });
-    const userSession = new PikkuUserSessionService(params.channelStore, params.channelId);
-    if (params.createSessionServices) {
-        sessionServices = await params.createSessionServices(singletonServices, { channel }, session);
+    const userSession = new PikkuSessionService(params.channelStore, params.channelId);
+    userSession.setInitial(session);
+    const wire = { channel, session: userSession };
+    if (params.createWireServices) {
+        wireServices = await params.createWireServices(singletonServices, wire);
     }
-    const interaction = { channel };
-    const getAllServices = () => rpcService.injectRPCService({
+    const services = {
         ...singletonServices,
-        ...sessionServices,
-        channel,
-        userSession,
-    }, interaction);
+        ...wireServices,
+    };
     let response;
     try {
-        const onMessage = processMessageHandlers(getAllServices(), channelConfig, channelHandler);
+        const onMessage = processMessageHandlers(services, channelConfig, channelHandler, userSession);
         response = await onMessage(data);
     }
     catch (e) {
@@ -167,8 +162,8 @@ export const runChannelMessage = async ({ singletonServices, ...params }, data)
         return { error: e.message || 'Unknown error' };
     }
     finally {
-        if (sessionServices) {
-            await closeSessionServices(singletonServices.logger, sessionServices);
+        if (wireServices) {
+            await closeWireServices(singletonServices.logger, wireServices);
         }
     }
     return response;

package/dist/wirings/cli/cli-runner.d.ts

@@ -1,6 +1,6 @@
 import { CorePikkuMiddleware, CoreUserSession } from '../../types/core.types.js';
 import { CoreCLI, CorePikkuCLIRender, CoreCLICommandConfig } from './cli.types.js';
-import type { CoreSingletonServices, CoreServices, CreateSessionServices, CreateConfig, CreateSingletonServices } from '../../types/core.types.js';
+import type { CoreSingletonServices, CoreServices, CreateWireServices, CreateConfig, CreateSingletonServices } from '../../types/core.types.js';
 /**
  * CLI command execution error - thrown when CLI execution fails
  * Should be caught by the wrapper to call process.exit()
@@ -16,12 +16,12 @@ export declare const wireCLI: <Commands extends Record<string, CoreCLICommandCon
 /**
  * Executes a CLI command for a specific program
  */
-export declare function runCLICommand({ program, commandPath, data, singletonServices, createSessionServices, }: {
+export declare function runCLICommand({ program, commandPath, data, singletonServices, createWireServices, }: {
     program: string;
     commandPath: string[];
     data: Record<string, any>;
     singletonServices: CoreSingletonServices;
-    createSessionServices?: CreateSessionServices;
+    createWireServices?: CreateWireServices;
 }): Promise<any>;
 /**
  * Factory function for CLI-specific renderers
@@ -33,10 +33,10 @@ export declare const pikkuCLIRender: <Data, Services extends CoreSingletonServic
  *
  * @throws {CLIError} When CLI execution fails - should be caught by wrapper to call process.exit()
  */
-export declare function executeCLI({ programName, args, createConfig, createSingletonServices, createSessionServices, }: {
+export declare function executeCLI({ programName, args, createConfig, createSingletonServices, createWireServices, }: {
     programName: string;
     args?: string[];
     createConfig: CreateConfig<any, any>;
     createSingletonServices: CreateSingletonServices<any, any>;
-    createSessionServices?: CreateSessionServices<any, any, any>;
+    createWireServices?: CreateWireServices<any, any, any>;
 }): Promise<void>;

package/dist/wirings/cli/cli-runner.js

@@ -1,10 +1,7 @@
 import { NotFoundError } from '../../errors/errors.js';
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js';
 import { pikkuState } from '../../pikku-state.js';
-import { PikkuWiringTypes, } from '../../types/core.types.js';
-import { closeSessionServices } from '../../utils.js';
-import { rpcService } from '../rpc/rpc-runner.js';
-import { PikkuUserSessionService } from '../../services/user-session-service.js';
+import { PikkuSessionService } from '../../services/user-session-service.js';
 import { LocalVariablesService } from '../../services/local-variables.js';
 import { generateCommandHelp, parseCLIArguments } from './command-parser.js';
 /**
@@ -157,7 +154,7 @@ function pluckCLIData(mergedData, funcName, availableOptions) {
 /**
  * Executes a CLI command for a specific program
  */
-export async function runCLICommand({ program, commandPath, data, singletonServices, createSessionServices, }) {
+export async function runCLICommand({ program, commandPath, data, singletonServices, createWireServices, }) {
     // Get the command metadata to find the function name
     const cliMeta = pikkuState('cli', 'meta');
     const programMeta = cliMeta.programs?.[program];
@@ -217,39 +214,28 @@ export async function runCLICommand({ program, commandPath, data, singletonServi
         },
         state: 'open',
     };
-    const userSession = new PikkuUserSessionService();
-    let sessionServices;
-    const interaction = {
+    const userSession = new PikkuSessionService();
+    const wire = {
         cli: {
             program,
             command: commandPath,
             data: pluckedData,
             channel,
         },
-    };
-    const getAllServices = async (session) => {
-        // Create session-specific services for handling the command
-        sessionServices = await createSessionServices?.(singletonServices, interaction, session);
-        return rpcService.injectRPCService({
-            ...singletonServices,
-            ...sessionServices,
-            userSession,
-            channel,
-        }, interaction, false);
+        session: userSession,
     };
     try {
-        const result = await runPikkuFunc(PikkuWiringTypes.cli, commandId, funcName, {
+        const result = await runPikkuFunc('cli', commandId, funcName, {
             singletonServices,
-            getAllServices,
+            createWireServices,
             data: pluckedData,
             auth: false,
-            userSession,
             inheritedMiddleware: currentCommand.middleware,
             wireMiddleware: allWireMiddleware,
             inheritedPermissions: currentCommand.permissions,
             wirePermissions: undefined,
             tags: programData?.tags,
-            interaction,
+            wire,
         });
         // Apply renderer one final time with the final output (if renderer exists)
         if (renderer) {
@@ -260,10 +246,6 @@ export async function runCLICommand({ program, commandPath, data, singletonServi
     finally {
         // Close the channel
         channel.close();
-        // Clean up session services
-        if (sessionServices) {
-            await closeSessionServices(singletonServices.logger, sessionServices);
-        }
     }
 }
 /**
@@ -278,7 +260,7 @@ export const pikkuCLIRender = (renderer) => {
  *
  * @throws {CLIError} When CLI execution fails - should be caught by wrapper to call process.exit()
  */
-export async function executeCLI({ programName, args, createConfig, createSingletonServices, createSessionServices, }) {
+export async function executeCLI({ programName, args, createConfig, createSingletonServices, createWireServices, }) {
     if (!args) {
         throw new Error('CLI arguments are required, this is to satisfy release diffs');
     }
@@ -333,7 +315,7 @@ export async function executeCLI({ programName, args, createConfig, createSingle
             commandPath: parsed.commandPath,
             data,
             singletonServices,
-            createSessionServices,
+            createWireServices,
         });
     }
     catch (error) {

package/dist/wirings/cli/cli.types.d.ts

@@ -1,4 +1,4 @@
-import { CorePikkuMiddleware, CoreSingletonServices, CoreUserSession, PikkuDocs, CoreServices, MiddlewareMetadata, PermissionMetadata } from '../../types/core.types.js';
+import { CorePikkuMiddleware, CoreSingletonServices, CoreUserSession, CoreServices, MiddlewareMetadata, PermissionMetadata } from '../../types/core.types.js';
 import { CorePikkuFunctionConfig, CorePikkuPermission, CorePikkuFunction, CorePikkuFunctionSessionless } from '../../function/functions.types.js';
 import { PikkuChannel } from '../channel/channel.types.js';
 /**
@@ -27,7 +27,7 @@ export interface CLIPositional {
     variadic?: boolean;
 }
 /**
- * CLI interaction context
+ * CLI wire context
  */
 export type PikkuCLI = {
     program: string;
@@ -55,8 +55,9 @@ export interface CLICommandMeta {
     positionals: CLIPositional[];
     options: Record<string, CLIOption>;
     renderName?: string;
+    summary?: string;
     description?: string;
-    docs?: PikkuDocs;
+    errors?: string[];
     tags?: string[];
     subcommands?: Record<string, CLICommandMeta>;
     middleware?: MiddlewareMetadata[];
@@ -99,7 +100,7 @@ export type CorePikkuCLIRender<Data, Services extends CoreSingletonServices = Co
 /**
  * Extract input parameters from a Pikku function config type
  */
-export type ExtractFunctionInput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<infer Input, any, any, any, any> | CorePikkuFunctionSessionless<infer Input, any, any, any, any> ? Input : never : never;
+export type ExtractFunctionInput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<infer Input, any, any, any> | CorePikkuFunctionSessionless<infer Input, any, any, any> ? Input : never : never;
 /**
  * Strip < > [ ] characters from a string
  */
@@ -131,12 +132,12 @@ export type ValidateParameters<Params extends string, Input> = AllParamsValid<Ex
 /**
  * Extract output type from a Pikku function config type
  */
-export type ExtractFunctionOutput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<any, infer Output, any, any, any> | CorePikkuFunctionSessionless<any, infer Output, any, any, any> ? Output : never : never;
+export type ExtractFunctionOutput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<any, infer Output, any, any> | CorePikkuFunctionSessionless<any, infer Output, any, any> ? Output : never : never;
 /**
  * CLI command configuration that infers options from function input type.
  * This is a helper type for creating type-safe CLI commands.
  */
-export type CoreCLICommandConfig<FuncConfig, PikkuMiddleware extends CorePikkuMiddleware<any> = CorePikkuMiddleware<any>, PikkuCLIRender extends CorePikkuCLIRender<any, any, any> = CorePikkuCLIRender<any, any>, Params extends string = string> = {
+export type CoreCLICommandConfig<FuncConfig, PikkuMiddleware extends CorePikkuMiddleware<any, any> = CorePikkuMiddleware<any, any>, PikkuCLIRender extends CorePikkuCLIRender<any, any, any> = CorePikkuCLIRender<any, any>, Params extends string = string> = {
     parameters?: ValidateParameters<Params, ExtractFunctionInput<FuncConfig>>;
     func?: FuncConfig;
     description?: string;
@@ -157,7 +158,7 @@ export type CoreCLICommandConfig<FuncConfig, PikkuMiddleware extends CorePikkuMi
 /**
  * CLI command definition
  */
-export interface CoreCLICommand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any, any> | CorePikkuFunctionSessionless<In, Out, any, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> {
+export interface CoreCLICommand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any> | CorePikkuFunctionSessionless<In, Out, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> {
     parameters?: string;
     func: PikkuFunctionConfig;
     render?: CorePikkuCLIRender<Out>;
@@ -166,18 +167,20 @@ export interface CoreCLICommand<In, Out, PikkuFunctionConfig extends CorePikkuFu
     middleware?: PikkuMiddleware[];
     permissions?: Record<string, PikkuPermission | PikkuPermission[]>;
     auth?: boolean;
-    docs?: PikkuDocs;
+    summary?: string;
+    errors?: string[];
+    tags?: string[];
     subcommands?: Subcommands;
     isDefault?: boolean;
 }
 /**
  * Shorthand command definition (just a function)
  */
-export type CLICommandShorthand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any, any> | CorePikkuFunctionSessionless<In, Out, any, any, any>>> = PikkuFunctionConfig;
+export type CLICommandShorthand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any> | CorePikkuFunctionSessionless<In, Out, any, any>>> = PikkuFunctionConfig;
 /**
  * Command definition (either full or shorthand)
  */
-export type CLICommandDefinition<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any, any> | CorePikkuFunctionSessionless<In, Out, any, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> = CoreCLICommand<In, Out, PikkuFunctionConfig, PikkuPermission, PikkuMiddleware, Options, Subcommands> | CLICommandShorthand<In, Out, PikkuFunctionConfig>;
+export type CLICommandDefinition<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any> | CorePikkuFunctionSessionless<In, Out, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> = CoreCLICommand<In, Out, PikkuFunctionConfig, PikkuPermission, PikkuMiddleware, Options, Subcommands> | CLICommandShorthand<In, Out, PikkuFunctionConfig>;
 /**
  * CLI wiring configuration
  */
@@ -188,7 +191,8 @@ export interface CoreCLI<Commands extends Record<string, CoreCLICommandConfig<an
     options?: CLIOptions<Options>;
     middleware?: PikkuMiddleware[];
     render?: PikkuCLIRender;
-    docs?: PikkuDocs;
+    summary?: string;
+    errors?: string[];
     tags?: string[];
 }
 /**

package/dist/wirings/http/http-runner.d.ts

@@ -79,16 +79,16 @@ export declare const addHTTPPermission: <PikkuPermission extends CorePikkuPermis
  */
 export declare const wireHTTP: <In, Out, Route extends string, PikkuFunction extends CorePikkuFunction<In, Out> = CorePikkuFunction<In, Out>, PikkuFunctionSessionless extends CorePikkuFunctionSessionless<In, Out> = CorePikkuFunctionSessionless<In, Out>, PikkuPermissionGroup extends CorePikkuPermission<In> = CorePikkuPermission<In>, PikkuMiddleware extends CorePikkuMiddleware = CorePikkuMiddleware>(httpWiring: CoreHTTPFunctionWiring<In, Out, Route, PikkuFunction, PikkuFunctionSessionless, PikkuPermissionGroup, PikkuMiddleware>) => void;
 /**
- * Combines the request and response objects into a single HTTP interaction object.
+ * Combines the request and response objects into a single HTTP wire object.
  *
  * This utility function creates an object that holds both the HTTP request and response,
  * which simplifies passing these around through middleware and route execution.
  *
  * @param {PikkuHTTPRequest | undefined} request - The HTTP request object.
  * @param {PikkuHTTPResponse | undefined} response - The HTTP response object.
- * @returns {PikkuHTTP | undefined} The combined HTTP interaction object or undefined if none provided.
+ * @returns {PikkuHTTP | undefined} The combined HTTP wire object or undefined if none provided.
  */
-export declare const createHTTPInteraction: (request: PikkuHTTPRequest | undefined, response: PikkuHTTPResponse | undefined) => PikkuHTTP | undefined;
+export declare const createHTTPWire: (request: PikkuHTTPRequest | undefined, response: PikkuHTTPResponse | undefined) => PikkuHTTP | undefined;
 /**
  * Executes an HTTP route for a given Fetch API request.
  *
@@ -123,11 +123,11 @@ export declare const pikkuFetch: <In, Out>(request: Request | PikkuHTTPRequest,
  * middleware execution, error handling, and session service cleanup.
  *
  * This function does the following:
- *  - Wraps the incoming request and response into an HTTP interaction object.
+ *  - Wraps the incoming request and response into an HTTP wire object.
  *  - Determines the correct route based on HTTP method and path.
  *  - Executes middleware and the route handler.
  *  - Catches and handles errors, optionally bubbling them if configured.
- *  - Cleans up any session services created during processing.
+ *  - Cleans up any wire services created during processing.
  *
  * @template In Expected input data type.
  * @template Out Expected output data type.
@@ -136,4 +136,4 @@ export declare const pikkuFetch: <In, Out>(request: Request | PikkuHTTPRequest,
  * @param {RunHTTPWiringOptions & RunHTTPWiringParams} options - Options such as singleton services, session handling, and error configuration.
  * @returns {Promise<Out | void>} The output from the route handler or void if an error occurred.
  */
-export declare const fetchData: <In, Out>(request: Request | PikkuHTTPRequest, response: PikkuHTTPResponse, { singletonServices, createSessionServices, skipUserSession, respondWith404, logWarningsForStatusCodes, coerceDataFromSchema, bubbleErrors, generateRequestId, }: RunHTTPWiringOptions & RunHTTPWiringParams) => Promise<Out | void>;
+export declare const fetchData: <In, Out>(request: Request | PikkuHTTPRequest, response: PikkuHTTPResponse, { singletonServices, createWireServices, skipUserSession, respondWith404, logWarningsForStatusCodes, coerceDataFromSchema, bubbleErrors, generateRequestId, }: RunHTTPWiringOptions & RunHTTPWiringParams) => Promise<Out | void>;

package/dist/wirings/http/http-runner.js

@@ -1,13 +1,11 @@
-import { PikkuWiringTypes, } from '../../types/core.types.js';
 import { NotFoundError } from '../../errors/errors.js';
-import { closeSessionServices, createWeakUID, isSerializable, } from '../../utils.js';
-import { PikkuUserSessionService } from '../../services/user-session-service.js';
+import { closeWireServices, createWeakUID, isSerializable, } from '../../utils.js';
+import { PikkuSessionService } from '../../services/user-session-service.js';
 import { handleHTTPError } from '../../handle-error.js';
 import { pikkuState } from '../../pikku-state.js';
 import { PikkuFetchHTTPResponse } from './pikku-fetch-http-response.js';
 import { PikkuFetchHTTPRequest } from './pikku-fetch-http-request.js';
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js';
-import { rpcService } from '../rpc/rpc-runner.js';
 import { httpRouter } from './routers/http-router.js';
 /**
  * Registers HTTP middleware for a specific route pattern.
@@ -135,16 +133,16 @@ const getMatchingRoute = (requestType, requestPath) => {
     }
 };
 /**
- * Combines the request and response objects into a single HTTP interaction object.
+ * Combines the request and response objects into a single HTTP wire object.
  *
  * This utility function creates an object that holds both the HTTP request and response,
  * which simplifies passing these around through middleware and route execution.
  *
  * @param {PikkuHTTPRequest | undefined} request - The HTTP request object.
  * @param {PikkuHTTPResponse | undefined} response - The HTTP response object.
- * @returns {PikkuHTTP | undefined} The combined HTTP interaction object or undefined if none provided.
+ * @returns {PikkuHTTP | undefined} The combined HTTP wire object or undefined if none provided.
  */
-export const createHTTPInteraction = (request, response) => {
+export const createHTTPWire = (request, response) => {
     let http = undefined;
     if (request || response) {
         http = {};
@@ -172,17 +170,17 @@ export const createHTTPInteraction = (request, response) => {
  *
  * @param {Object} services - A collection of shared services and utilities.
  * @param {Object} matchedRoute - Contains route details, URL parameters, and optional schema.
- * @param {PikkuHTTP | undefined} http - The HTTP interaction object.
+ * @param {PikkuHTTP | undefined} http - The HTTP wire object.
  * @param {Object} options - Options for route execution (e.g., whether to coerce query strings to arrays).
- * @returns {Promise<any>} An object containing the route handler result and session services (if any).
+ * @returns {Promise<any>} An object containing the route handler result and wire services (if any).
  * @throws Throws errors like MissingSessionError or ForbiddenError on validation failures.
  */
 const executeRoute = async (services, matchedRoute, http, options) => {
-    const userSession = new PikkuUserSessionService();
+    const userSession = new PikkuSessionService();
     const { params, route, meta } = matchedRoute;
-    const { singletonServices, createSessionServices, skipUserSession, requestId, } = services;
+    const { singletonServices, createWireServices, skipUserSession, requestId } = services;
     const requiresSession = route.auth !== false;
-    let sessionServices;
+    let wireServices;
     let result;
     // Attach URL parameters to the request object
     http?.request?.setParams(params);
@@ -219,23 +217,11 @@ const executeRoute = async (services, matchedRoute, http, options) => {
             state: 'open',
         };
     }
-    const interaction = { http, channel };
-    const getAllServices = async (session) => {
-        // Create session-specific services for handling the request
-        sessionServices = await createSessionServices({ ...singletonServices, userSession, channel }, { http }, session);
-        return rpcService.injectRPCService({
-            ...singletonServices,
-            ...sessionServices,
-            http,
-            userSession,
-            channel,
-        }, interaction, route.auth);
-    };
-    result = await runPikkuFunc(PikkuWiringTypes.http, `${meta.method}:${meta.route}`, meta.pikkuFuncName, {
+    const wire = { http, channel, session: userSession };
+    result = await runPikkuFunc('http', `${meta.method}:${meta.route}`, meta.pikkuFuncName, {
         singletonServices,
-        getAllServices,
+        createWireServices,
         auth: route.auth !== false,
-        userSession,
         data,
         inheritedMiddleware: meta.middleware,
         wireMiddleware: route.middleware,
@@ -243,7 +229,7 @@ const executeRoute = async (services, matchedRoute, http, options) => {
         wirePermissions: route.permissions,
         coerceDataFromSchema: options.coerceDataFromSchema,
         tags: route.tags,
-        interaction,
+        wire,
     });
     // Respond with either a binary or JSON response based on configuration
     if (route.returnsJSON === false) {
@@ -255,7 +241,7 @@ const executeRoute = async (services, matchedRoute, http, options) => {
     http?.response?.status(200);
     // TODO: Evaluate if the response stream should be explicitly ended.
     // http?.response?.end()
-    return sessionServices ? { result, sessionServices } : { result };
+    return wireServices ? { result, wireServices } : { result };
 };
 /**
  * Executes an HTTP route for a given Fetch API request.
@@ -299,11 +285,11 @@ export const pikkuFetch = async (request, params) => {
  * middleware execution, error handling, and session service cleanup.
  *
  * This function does the following:
- *  - Wraps the incoming request and response into an HTTP interaction object.
+ *  - Wraps the incoming request and response into an HTTP wire object.
  *  - Determines the correct route based on HTTP method and path.
  *  - Executes middleware and the route handler.
  *  - Catches and handles errors, optionally bubbling them if configured.
- *  - Cleans up any session services created during processing.
+ *  - Cleans up any wire services created during processing.
  *
  * @template In Expected input data type.
  * @template Out Expected output data type.
@@ -312,14 +298,14 @@ export const pikkuFetch = async (request, params) => {
  * @param {RunHTTPWiringOptions & RunHTTPWiringParams} options - Options such as singleton services, session handling, and error configuration.
  * @returns {Promise<Out | void>} The output from the route handler or void if an error occurred.
  */
-export const fetchData = async (request, response, { singletonServices, createSessionServices, skipUserSession = false, respondWith404 = true, logWarningsForStatusCodes = [], coerceDataFromSchema = true, bubbleErrors = false, generateRequestId, }) => {
+export const fetchData = async (request, response, { singletonServices, createWireServices, skipUserSession = false, respondWith404 = true, logWarningsForStatusCodes = [], coerceDataFromSchema = true, bubbleErrors = false, generateRequestId, }) => {
     const requestId = request.getHeader?.('x-request-id') ||
         generateRequestId?.() ||
         createWeakUID();
-    let sessionServices;
+    let wireServices;
     let result;
-    // Combine the request and response into one interaction object
-    const http = createHTTPInteraction(request instanceof Request ? new PikkuFetchHTTPRequest(request) : request, response);
+    // Combine the request and response into one wire object
+    const http = createHTTPWire(request instanceof Request ? new PikkuFetchHTTPRequest(request) : request, response);
     const apiType = http.request.method();
     const apiRoute = http.request.path();
     // Locate the matching route based on the HTTP method and path
@@ -336,9 +322,9 @@ export const fetchData = async (request, response, { singletonServices, createSe
         }
         // Execute the matched route along with its middleware and session management
         ;
-        ({ result, sessionServices } = await executeRoute({
+        ({ result, wireServices } = await executeRoute({
             singletonServices,
-            createSessionServices,
+            createWireServices,
             skipUserSession,
             requestId,
         }, matchedRoute, http, { coerceDataFromSchema }));
@@ -350,8 +336,8 @@ export const fetchData = async (request, response, { singletonServices, createSe
     }
     finally {
         // Clean up any session-specific services created during processing
-        if (sessionServices) {
-            await closeSessionServices(singletonServices.logger, sessionServices);
+        if (wireServices) {
+            await closeWireServices(singletonServices.logger, wireServices);
         }
     }
 };