@pikku/core 0.11.0 → 0.11.1

package/dist/permissions.js

@@ -1,4 +1,3 @@
-import { PikkuWiringTypes, } from './types/core.types.js';
 import { pikkuState } from './pikku-state.js';
 import { ForbiddenError } from './errors/errors.js';
 import { freezeDedupe } from './utils.js';
@@ -6,10 +5,10 @@ import { freezeDedupe } from './utils.js';
  * This function validates permissions by iterating over permission groups and executing the corresponding permission functions. If all functions in at least one group return true, the permission is considered valid.
  * @param services - The core services required for permission validation.
  * @param data - The data to be used in the permission validation functions.
- * @param session - An optional user session for permission validation.
+ * @param wire - The wire object containing request/response context and session.
  * @returns A promise that resolves to void.
  */
-export const verifyPermissions = async (permissions, services, data, session) => {
+export const verifyPermissions = async (permissions, services, data, wire) => {
     if (!permissions) {
         return true;
     }
@@ -20,13 +19,13 @@ export const verifyPermissions = async (permissions, services, data, session) =>
     }
     for (const funcs of permissionGroups) {
         if (funcs instanceof Array) {
-            const permissioned = await Promise.all(funcs.map((func) => func(services, data, session)));
+            const permissioned = await Promise.all(funcs.map((func) => func(services, data, wire)));
             if (permissioned.every((result) => result)) {
                 valid = true;
             }
         }
         else {
-            valid = await funcs(services, data, session);
+            valid = await funcs(services, data, wire);
         }
         if (valid) {
             return true;
@@ -147,14 +146,14 @@ export const getPermissionsForTags = (tags) => {
     return applicablePermissions;
 };
 const combinedPermissionsCache = {
-    [PikkuWiringTypes.http]: {},
-    [PikkuWiringTypes.rpc]: {},
-    [PikkuWiringTypes.channel]: {},
-    [PikkuWiringTypes.queue]: {},
-    [PikkuWiringTypes.scheduler]: {},
-    [PikkuWiringTypes.mcp]: {},
-    [PikkuWiringTypes.cli]: {},
-    [PikkuWiringTypes.workflow]: {},
+    http: {},
+    rpc: {},
+    channel: {},
+    queue: {},
+    scheduler: {},
+    mcp: {},
+    cli: {},
+    workflow: {},
 };
 /**
  * Combines wiring-specific permissions with function-level permissions.
@@ -265,7 +264,7 @@ export const combinePermissions = (wireType, uid, { wireInheritedPermissions, wi
  * Runs permission checks using combined permissions from all sources.
  * Combines permissions from wire and function levels, then validates them.
  */
-export const runPermissions = async (wireType, uid, { wireInheritedPermissions, wirePermissions, funcInheritedPermissions, funcPermissions, allServices, data, session, }) => {
+export const runPermissions = async (wireType, uid, { wireInheritedPermissions, wirePermissions, funcInheritedPermissions, funcPermissions, services, wire, data, }) => {
     // Combine all permissions: wireInheritedPermissions → wirePermissions → funcInheritedPermissions → funcPermissions
     const allPermissions = combinePermissions(wireType, uid, {
         wireInheritedPermissions,
@@ -277,14 +276,14 @@ export const runPermissions = async (wireType, uid, { wireInheritedPermissions,
     if (allPermissions.length > 0) {
         let permissioned = false;
         for (const permission of allPermissions) {
-            const result = await verifyPermissions(typeof permission === 'function' ? { permission } : permission, allServices, data, session);
+            const result = await verifyPermissions(typeof permission === 'function' ? { permission } : permission, services, data, wire);
             if (result) {
                 permissioned = true;
                 // Continue executing all permissions (don't break early)
             }
         }
         if (!permissioned) {
-            allServices.logger.debug('Permission denied - combined permissions');
+            services.logger.debug('Permission denied - combined permissions');
             throw new ForbiddenError('Permission denied');
         }
     }

package/dist/services/user-session-service.d.ts

@@ -1,19 +1,23 @@
 import { ChannelStore } from '../wirings/channel/channel-store.js';
 import { CoreUserSession } from '../types/core.types.js';
-export interface UserSessionService<UserSession extends CoreUserSession> {
+export interface SessionService<UserSession extends CoreUserSession> {
     sessionChanged: boolean;
+    initial: UserSession | undefined;
     setInitial(session: UserSession): void;
+    freezeInitial(): UserSession | undefined;
     set(session: UserSession): Promise<void> | void;
     clear(): Promise<void> | void;
-    get(): Promise<UserSession | undefined> | UserSession | undefined;
+    get(): Promise<UserSession> | UserSession | undefined;
 }
-export declare class PikkuUserSessionService<UserSession extends CoreUserSession> implements UserSessionService<UserSession> {
+export declare class PikkuSessionService<UserSession extends CoreUserSession> implements SessionService<UserSession> {
     private channelStore?;
     private channelId?;
     sessionChanged: boolean;
+    initial: UserSession | undefined;
     private session;
     constructor(channelStore?: ChannelStore<unknown, unknown, UserSession> | undefined, channelId?: string | undefined);
     setInitial(session: UserSession): void;
+    freezeInitial(): UserSession | undefined;
     set(session: UserSession): void | Promise<void> | undefined;
     clear(): void | Promise<void> | undefined;
     get(): Promise<UserSession> | UserSession | undefined;

package/dist/services/user-session-service.js

@@ -1,7 +1,8 @@
-export class PikkuUserSessionService {
+export class PikkuSessionService {
     channelStore;
     channelId;
     sessionChanged = false;
+    initial;
     session;
     constructor(channelStore, channelId) {
         this.channelStore = channelStore;
@@ -13,6 +14,12 @@ export class PikkuUserSessionService {
     setInitial(session) {
         this.session = session;
     }
+    freezeInitial() {
+        if (this.initial === undefined) {
+            this.initial = this.session;
+        }
+        return this.initial;
+    }
     set(session) {
         this.sessionChanged = true;
         this.session = session;

package/dist/types/core.types.d.ts

@@ -3,25 +3,16 @@ import { VariablesService } from '../services/variables-service.js';
 import { SchemaService } from '../services/schema-service.js';
 import { JWTService } from '../services/jwt-service.js';
 import { PikkuHTTP } from '../wirings/http/http.types.js';
-import { UserSessionService } from '../services/user-session-service.js';
+import { SessionService } from '../services/user-session-service.js';
 import { PikkuChannel } from '../wirings/channel/channel.types.js';
 import { PikkuRPC } from '../wirings/rpc/rpc-types.js';
 import { PikkuMCP } from '../wirings/mcp/mcp.types.js';
 import { PikkuScheduledTask } from '../wirings/scheduler/scheduler.types.js';
 import { PikkuQueue, QueueService } from '../wirings/queue/queue.types.js';
 import { PikkuCLI } from '../wirings/cli/cli.types.js';
-import { PikkuWorkflowInteraction, WorkflowService, WorkflowServiceConfig, WorkflowStepInteraction } from '../wirings/workflow/workflow.types.js';
+import { PikkuWorkflowWire, WorkflowService, WorkflowServiceConfig, WorkflowStepWire } from '../wirings/workflow/workflow.types.js';
 import { SchedulerService } from '../services/scheduler-service.js';
-export declare enum PikkuWiringTypes {
-    http = "http",
-    scheduler = "scheduler",
-    channel = "channel",
-    rpc = "rpc",
-    queue = "queue",
-    mcp = "mcp",
-    cli = "cli",
-    workflow = "workflow"
-}
+export type PikkuWiringTypes = 'http' | 'scheduler' | 'channel' | 'rpc' | 'queue' | 'mcp' | 'cli' | 'workflow';
 export interface FunctionServicesMeta {
     optimized: boolean;
     services: string[];
@@ -70,14 +61,13 @@ export type FunctionRuntimeMeta = {
 export type FunctionMeta = FunctionRuntimeMeta & Partial<{
     name: string;
     services: FunctionServicesMeta;
+    usedWires: string[];
     inputs: string[] | null;
     outputs: string[] | null;
-    tags: string[];
-    docs: PikkuDocs;
-    isDirectFunction: boolean;
     middleware: MiddlewareMetadata[];
     permissions: PermissionMetadata[];
-}>;
+    isDirectFunction: boolean;
+} & CommonWireMeta>;
 export type FunctionsRuntimeMeta = Record<string, FunctionRuntimeMeta>;
 export type FunctionsMeta = Record<string, FunctionMeta>;
 export type MakeRequired<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>;
@@ -142,25 +132,25 @@ export interface CoreSingletonServices<Config extends CoreConfig = CoreConfig> {
     schedulerService?: SchedulerService;
 }
 /**
- * Represents different forms of interaction within Pikku and the outside world.
+ * Represents different forms of wire within Pikku and the outside world.
  */
-export type PikkuInteraction<In = unknown, Out = unknown> = Partial<{
+export type PikkuWire<In = unknown, Out = unknown, HasInitialSession extends boolean = false, UserSession extends CoreUserSession = CoreUserSession, TypedRPC extends PikkuRPC = PikkuRPC, IsChannel extends true | null = null, MCPTools extends string | never = never, TypedWorkflow extends PikkuWorkflowWire | never = PikkuWorkflowWire> = Partial<{
     http: PikkuHTTP<In>;
-    mcp: PikkuMCP;
-    rpc: PikkuRPC;
-    channel: PikkuChannel<unknown, Out>;
+    mcp: PikkuMCP<MCPTools>;
+    rpc: TypedRPC;
+    channel: [IsChannel] extends [null] ? PikkuChannel<unknown, Out> : PikkuChannel<unknown, Out> | undefined;
     scheduledTask: PikkuScheduledTask;
     queue: PikkuQueue;
     cli: PikkuCLI;
-    workflow: PikkuWorkflowInteraction;
-    workflowStep: WorkflowStepInteraction;
+    workflow: TypedWorkflow;
+    workflowStep: WorkflowStepWire;
+    initialSession: HasInitialSession extends true ? UserSession : UserSession | undefined;
+    session: SessionService<UserSession>;
 }>;
 /**
- * A function that can wrap an interaction and be called before or after
+ * A function that can wrap an wire and be called before or after
  */
-export type CorePikkuMiddleware<SingletonServices extends CoreSingletonServices = CoreSingletonServices, UserSession extends CoreUserSession = CoreUserSession> = (services: SingletonServices & {
-    userSession: UserSessionService<UserSession>;
-}, interactions: PikkuInteraction, next: () => Promise<void>) => Promise<void>;
+export type CorePikkuMiddleware<SingletonServices extends CoreSingletonServices = CoreSingletonServices, UserSession extends CoreUserSession = CoreUserSession> = (services: SingletonServices, wires: PikkuWire<unknown, unknown, false, UserSession>, next: () => Promise<void>) => Promise<void>;
 /**
  * Configuration object for creating middleware with metadata
  *
@@ -193,7 +183,7 @@ export type CorePikkuMiddlewareGroup<SingletonServices extends CoreSingletonServ
  * ```typescript
  * // Direct function syntax
  * export const logMiddleware = pikkuMiddleware(
- *   async ({ logger }, _interaction, next) => {
+ *   async ({ logger }, next) => {
  *     logger.info('Request started')
  *     await next()
  *   }
@@ -203,7 +193,7 @@ export type CorePikkuMiddlewareGroup<SingletonServices extends CoreSingletonServ
  * export const logMiddleware = pikkuMiddleware({
  *   name: 'Request Logger',
  *   description: 'Logs request information',
- *   func: async ({ logger }, _interaction, next) => {
+ *   func: async ({ logger }, next) => {
  *     logger.info('Request started')
  *     await next()
  *   }
@@ -221,7 +211,7 @@ export declare const pikkuMiddleware: <SingletonServices extends CoreSingletonSe
  *   message,
  *   level = 'info'
  * }) => {
- *   return pikkuMiddleware(async ({ logger }, _interaction, next) => {
+ *   return pikkuMiddleware(async ({ logger }, next) => {
  *     logger[level](message)
  *     await next()
  *   })
@@ -230,12 +220,10 @@ export declare const pikkuMiddleware: <SingletonServices extends CoreSingletonSe
  */
 export declare const pikkuMiddlewareFactory: <In = any>(factory: CorePikkuMiddlewareFactory<In>) => CorePikkuMiddlewareFactory<In>;
 /**
- * Represents the core services used by Pikku, including singleton services and the request/response interaction.
+ * Represents the core services used by Pikku, including singleton services.
  */
-export type CoreServices<SingletonServices = CoreSingletonServices, UserSession extends CoreUserSession = CoreUserSession> = SingletonServices & PikkuInteraction & {
-    userSession?: UserSessionService<UserSession>;
-};
-export type SessionServices<SingletonServices extends CoreSingletonServices = CoreSingletonServices, Services = CoreServices<SingletonServices>> = Omit<Services, keyof SingletonServices | keyof PikkuInteraction | 'session'>;
+export type CoreServices<SingletonServices = CoreSingletonServices> = SingletonServices;
+export type WireServices<SingletonServices extends CoreSingletonServices = CoreSingletonServices, Services = CoreServices<SingletonServices>> = Omit<Services, keyof SingletonServices | 'session'>;
 /**
  * Defines a function type for creating singleton services from the given configuration.
  */
@@ -243,7 +231,7 @@ export type CreateSingletonServices<Config extends CoreConfig, SingletonServices
 /**
  * Defines a function type for creating session-specific services.
  */
-export type CreateSessionServices<SingletonServices extends CoreSingletonServices = CoreSingletonServices, Services extends CoreServices<SingletonServices> = CoreServices<SingletonServices>, UserSession extends CoreUserSession = CoreUserSession> = (services: SingletonServices, interaction: PikkuInteraction, session: UserSession | undefined) => Promise<SessionServices<Services, SingletonServices>>;
+export type CreateWireServices<SingletonServices extends CoreSingletonServices = CoreSingletonServices, Services extends CoreServices<SingletonServices> = CoreServices<SingletonServices>, UserSession extends CoreUserSession = CoreUserSession> = (services: SingletonServices, wire: PikkuWire<unknown, unknown, false, UserSession>) => Promise<WireServices<Services, SingletonServices>>;
 /**
  * Defines a function type for creating config.
  */
@@ -251,11 +239,14 @@ export type CreateConfig<Config extends CoreConfig, RemainingArgs extends any[]
 /**
  * Represents the documentation for a route, including summary, description, tags, and errors.
  */
-export type PikkuDocs = {
+export type CommonWireMeta = {
+    pikkuFuncName: string;
+    tags?: string[];
     summary?: string;
     description?: string;
-    tags?: string[];
     errors?: string[];
+    middleware?: MiddlewareMetadata[];
+    permissions?: PermissionMetadata[];
 };
 /**
  * Serialized error for storage

package/dist/types/core.types.js

@@ -1,14 +1,3 @@
-export var PikkuWiringTypes;
-(function (PikkuWiringTypes) {
-    PikkuWiringTypes["http"] = "http";
-    PikkuWiringTypes["scheduler"] = "scheduler";
-    PikkuWiringTypes["channel"] = "channel";
-    PikkuWiringTypes["rpc"] = "rpc";
-    PikkuWiringTypes["queue"] = "queue";
-    PikkuWiringTypes["mcp"] = "mcp";
-    PikkuWiringTypes["cli"] = "cli";
-    PikkuWiringTypes["workflow"] = "workflow";
-})(PikkuWiringTypes || (PikkuWiringTypes = {}));
 /**
  * Factory function for creating middleware with tree-shaking support
  * Supports both direct function and configuration object syntax
@@ -17,7 +6,7 @@ export var PikkuWiringTypes;
  * ```typescript
  * // Direct function syntax
  * export const logMiddleware = pikkuMiddleware(
- *   async ({ logger }, _interaction, next) => {
+ *   async ({ logger }, next) => {
  *     logger.info('Request started')
  *     await next()
  *   }
@@ -27,7 +16,7 @@ export var PikkuWiringTypes;
  * export const logMiddleware = pikkuMiddleware({
  *   name: 'Request Logger',
  *   description: 'Logs request information',
- *   func: async ({ logger }, _interaction, next) => {
+ *   func: async ({ logger }, next) => {
  *     logger.info('Request started')
  *     await next()
  *   }
@@ -47,7 +36,7 @@ export const pikkuMiddleware = (middleware) => {
  *   message,
  *   level = 'info'
  * }) => {
- *   return pikkuMiddleware(async ({ logger }, _interaction, next) => {
+ *   return pikkuMiddleware(async ({ logger }, next) => {
  *     logger[level](message)
  *     await next()
  *   })

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
 import { Logger } from './services/logger.js';
-export declare const closeSessionServices: (logger: Logger, sessionServices: Record<string, any>) => Promise<void>;
+export declare const closeWireServices: (logger: Logger, wireServices: Record<string, any>) => Promise<void>;
 export declare const createWeakUID: () => string;
 export declare const isSerializable: (data: any) => boolean;
 export declare const freezeDedupe: <T>(arr?: readonly T[] | T[] | undefined) => readonly T[];

package/dist/utils.js

@@ -1,8 +1,8 @@
-// TODO: SessionServices probably needs it's own type
+// TODO: WireServices probably needs it's own type
 // but is an issue for the future and will be tackled
 // with dependency injection
-export const closeSessionServices = async (logger, sessionServices) => {
-    await Promise.all(Object.values(sessionServices).map(async (service) => {
+export const closeWireServices = async (logger, wireServices) => {
+    await Promise.all(Object.values(wireServices).map(async (service) => {
         if (service?.close) {
             try {
                 await service.close();

package/dist/wirings/channel/channel-common.js

@@ -1,4 +1,3 @@
-import { PikkuWiringTypes, } from '../../types/core.types.js';
 import { combineMiddleware, runMiddleware } from '../../middleware-runner.js';
 import { runPikkuFuncDirectly } from '../../function/function-runner.js';
 /**
@@ -24,13 +23,13 @@ export const runChannelLifecycleWithMiddleware = async ({ channelConfig, meta, l
         ? lifecycleConfig.middleware || []
         : [];
     // Use combineMiddleware to properly resolve metadata + inline middleware
-    const allMiddleware = combineMiddleware(PikkuWiringTypes.channel, `${channelConfig.name}:${lifecycleType}`, {
+    const allMiddleware = combineMiddleware('channel', `${channelConfig.name}:${lifecycleType}`, {
         wireInheritedMiddleware: meta.middleware,
         wireMiddleware: lifecycleMiddleware,
     });
     // Run the lifecycle function
     const runLifecycle = async () => {
-        return await runPikkuFuncDirectly(meta.pikkuFuncName, { ...services, channel }, data);
+        return await runPikkuFuncDirectly(meta.pikkuFuncName, services, { channel }, data);
     };
     // Run with middleware if any
     if (allMiddleware.length > 0) {

package/dist/wirings/channel/channel-handler.d.ts

@@ -1,3 +1,4 @@
-import { CoreServices } from '../../types/core.types.js';
+import { CoreServices, CoreUserSession } from '../../types/core.types.js';
 import { CoreChannel, PikkuChannelHandler } from './channel.types.js';
-export declare const processMessageHandlers: (services: CoreServices, channelConfig: CoreChannel<any, any>, channelHandler: PikkuChannelHandler) => (rawData: any) => Promise<unknown>;
+import { SessionService } from '../../services/user-session-service.js';
+export declare const processMessageHandlers: (services: CoreServices, channelConfig: CoreChannel<any, any>, channelHandler: PikkuChannelHandler, userSession?: SessionService<CoreUserSession>) => (rawData: any) => Promise<unknown>;

package/dist/wirings/channel/channel-handler.js

@@ -1,4 +1,3 @@
-import { PikkuWiringTypes, } from '../../types/core.types.js';
 import { pikkuState } from '../../pikku-state.js';
 import { runPikkuFunc } from '../../function/function-runner.js';
 const getRouteMeta = (channelName, routingProperty, routerValue) => {
@@ -32,7 +31,7 @@ const validateAuth = (requiresSession, session, onMessage) => {
     }
     return true;
 };
-export const processMessageHandlers = (services, channelConfig, channelHandler) => {
+export const processMessageHandlers = (services, channelConfig, channelHandler, userSession) => {
     const logger = services.logger;
     const requiresSession = channelConfig.auth !== false;
     const processMessage = async (data, onMessage, routingProperty, routerValue) => {
@@ -69,20 +68,18 @@ export const processMessageHandlers = (services, channelConfig, channelHandler)
         const cacheKey = routingProperty
             ? `${channelConfig.name}:${routingProperty}:${routerValue}`
             : `${channelConfig.name}:default`;
-        return await runPikkuFunc(PikkuWiringTypes.channel, cacheKey, pikkuFuncName, {
+        return await runPikkuFunc('channel', cacheKey, pikkuFuncName, {
             singletonServices: services,
-            getAllServices: () => ({
-                ...services,
-                channel: channelHandler.getChannel(),
-            }),
             data: () => data,
-            userSession: services.userSession,
             inheritedMiddleware,
             wireMiddleware,
             inheritedPermissions,
             wirePermissions,
             tags: channelConfig.tags,
-            interaction: { channel: channelHandler.getChannel() },
+            wire: {
+                channel: channelHandler.getChannel(),
+                session: userSession,
+            },
         });
     };
     return async (rawData) => {

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

@@ -1,5 +1,5 @@
 import { CorePikkuPermission } from '../../function/functions.types.js';
-import { UserSessionService } from '../../services/user-session-service.js';
+import { SessionService } from '../../services/user-session-service.js';
 import { CorePikkuMiddleware } from '../../types/core.types.js';
 import { ChannelMeta, CoreChannel, RunChannelOptions, RunChannelParams } from './channel.types.js';
 /**
@@ -8,7 +8,7 @@ import { ChannelMeta, CoreChannel, RunChannelOptions, RunChannelParams } from '.
  */
 export declare const wireChannel: <In, Channel extends string, PikkuPermission extends CorePikkuPermission<In>, PikkuMiddleware extends CorePikkuMiddleware, ChannelFunction>(channel: CoreChannel<In, Channel, PikkuPermission, PikkuMiddleware, ChannelFunction>) => void;
 export declare const openChannel: ({ route, singletonServices, coerceDataFromSchema, request, }: Pick<CoreChannel<unknown, string>, "route"> & RunChannelParams<unknown> & {
-    userSession: UserSessionService<any>;
+    userSession: SessionService<any>;
 } & RunChannelOptions) => Promise<{
     openingData: unknown;
     channelConfig: CoreChannel<unknown, any>;

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

@@ -1,6 +1,6 @@
 import { PikkuError } from '../../errors/error-handler.js';
 import { HTTPFunctionMetaInputTypes, PikkuHTTPRequest, PikkuHTTPResponse } from '../http/http.types.js';
-import { PikkuDocs, CoreSingletonServices, CreateSessionServices, CorePikkuMiddleware, MiddlewareMetadata, PermissionMetadata } from '../../types/core.types.js';
+import { CoreSingletonServices, CreateWireServices, CorePikkuMiddleware, MiddlewareMetadata, PermissionMetadata } from '../../types/core.types.js';
 import { CorePermissionGroup, CorePikkuFunction, CorePikkuFunctionConfig, CorePikkuFunctionSessionless, CorePikkuPermission } from '../../function/functions.types.js';
 export type RunChannelOptions = Partial<{
     skipUserSession: boolean;
@@ -14,11 +14,14 @@ export type RunChannelParams<ChannelData> = {
     singletonServices: CoreSingletonServices;
     request?: PikkuHTTPRequest<ChannelData>;
     response?: PikkuHTTPResponse;
-    createSessionServices?: CreateSessionServices;
+    createWireServices?: CreateWireServices;
 };
 export interface ChannelMessageMeta {
     pikkuFuncName: string;
-    docs?: PikkuDocs;
+    summary?: string;
+    description?: string;
+    errors?: string[];
+    tags?: string[];
     middleware?: MiddlewareMetadata[];
     permissions?: PermissionMetadata[];
 }
@@ -33,13 +36,15 @@ export interface ChannelMeta {
     disconnect: ChannelMessageMeta | null;
     message: ChannelMessageMeta | null;
     messageWirings: Record<string, Record<string, ChannelMessageMeta>>;
-    docs?: PikkuDocs;
+    summary?: string;
+    description?: string;
+    errors?: string[];
     tags?: string[];
     middleware?: MiddlewareMetadata[];
     permissions?: PermissionMetadata[];
 }
 export type ChannelsMeta = Record<string, ChannelMeta>;
-export type CoreChannel<ChannelData, Channel extends string, ChannelConnect = CorePikkuFunctionConfig<CorePikkuFunction<void, unknown, ChannelData> | CorePikkuFunctionSessionless<void, unknown, ChannelData>, CorePikkuPermission<void>, CorePikkuMiddleware>, ChannelDisconnect = CorePikkuFunctionConfig<CorePikkuFunction<void, void, ChannelData> | CorePikkuFunctionSessionless<void, void, ChannelData>, CorePikkuPermission<void>, CorePikkuMiddleware>, ChannelFunctionMessage = CorePikkuFunctionConfig<CorePikkuFunction<unknown, unknown, ChannelData> | CorePikkuFunctionSessionless<unknown, unknown, ChannelData>, CorePikkuPermission<unknown>, CorePikkuMiddleware>, PikkuPermission = CorePikkuPermission<ChannelData>, PikkuMiddleware = CorePikkuMiddleware> = {
+export type CoreChannel<ChannelData, Channel extends string, ChannelConnect = CorePikkuFunctionConfig<CorePikkuFunction<void, unknown> | CorePikkuFunctionSessionless<void, unknown>, CorePikkuPermission<void>, CorePikkuMiddleware>, ChannelDisconnect = CorePikkuFunctionConfig<CorePikkuFunction<void, void> | CorePikkuFunctionSessionless<void, void>, CorePikkuPermission<void>, CorePikkuMiddleware>, ChannelFunctionMessage = CorePikkuFunctionConfig<CorePikkuFunction<unknown, unknown> | CorePikkuFunctionSessionless<unknown, unknown>, CorePikkuPermission<unknown>, CorePikkuMiddleware>, PikkuPermission = CorePikkuPermission<ChannelData>, PikkuMiddleware = CorePikkuMiddleware> = {
     name: string;
     route: Channel;
     onConnect?: ChannelConnect | {

package/dist/wirings/channel/local/local-channel-runner.d.ts

@@ -1,3 +1,3 @@
 import { CoreChannel, RunChannelOptions, RunChannelParams } from '../channel.types.js';
 import { PikkuLocalChannelHandler } from './local-channel-handler.js';
-export declare const runLocalChannel: ({ singletonServices, channelId, request, response, route, createSessionServices, skipUserSession, respondWith404, coerceDataFromSchema, logWarningsForStatusCodes, bubbleErrors, }: Partial<Pick<CoreChannel<unknown, any>, "route">> & RunChannelOptions & RunChannelParams<unknown>) => Promise<PikkuLocalChannelHandler | void>;
+export declare const runLocalChannel: ({ singletonServices, channelId, request, response, route, createWireServices, skipUserSession, respondWith404, coerceDataFromSchema, logWarningsForStatusCodes, bubbleErrors, }: Partial<Pick<CoreChannel<unknown, any>, "route">> & RunChannelOptions & RunChannelParams<unknown>) => Promise<PikkuLocalChannelHandler | void>;

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

@@ -1,19 +1,18 @@
 import { openChannel } from '../channel-runner.js';
-import { createHTTPInteraction } from '../../http/http-runner.js';
-import { closeSessionServices } from '../../../utils.js';
+import { createHTTPWire } from '../../http/http-runner.js';
+import { closeWireServices } from '../../../utils.js';
 import { processMessageHandlers } from '../channel-handler.js';
 import { PikkuLocalChannelHandler } from './local-channel-handler.js';
 import { handleHTTPError } from '../../../handle-error.js';
-import { PikkuUserSessionService } from '../../../services/user-session-service.js';
-import { rpcService } from '../../rpc/rpc-runner.js';
+import { PikkuSessionService } from '../../../services/user-session-service.js';
 import { runChannelLifecycleWithMiddleware } from '../channel-common.js';
-export const runLocalChannel = async ({ singletonServices, channelId, request, response, route, createSessionServices, skipUserSession = false, respondWith404 = true, coerceDataFromSchema = true, logWarningsForStatusCodes = [], bubbleErrors = false, }) => {
-    let sessionServices;
+export const runLocalChannel = async ({ singletonServices, channelId, request, response, route, createWireServices, skipUserSession = false, respondWith404 = true, coerceDataFromSchema = true, logWarningsForStatusCodes = [], bubbleErrors = false, }) => {
+    let wireServices;
     let channelHandler;
-    const userSession = new PikkuUserSessionService();
+    const userSession = new PikkuSessionService();
     let http;
     if (request) {
-        http = createHTTPInteraction(request, response);
+        http = createHTTPWire(request, response);
         route = http?.request?.path();
     }
     let openingData, channelConfig, meta;
@@ -21,7 +20,7 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
         ;
         ({ openingData, channelConfig, meta } = await openChannel({
             channelId,
-            createSessionServices,
+            createWireServices,
             respondWith404,
             request,
             response,
@@ -40,17 +39,11 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
         try {
             channelHandler = new PikkuLocalChannelHandler(channelId, channelConfig.name, openingData);
             const channel = channelHandler.getChannel();
-            const session = await userSession.get();
-            if (createSessionServices) {
-                sessionServices = await createSessionServices(singletonServices, { http, channel }, session);
+            const wire = { channel, session: userSession };
+            if (createWireServices) {
+                wireServices = await createWireServices(singletonServices, wire);
             }
-            const getAllServices = (channel, requiresAuth) => rpcService.injectRPCService({
-                ...singletonServices,
-                ...sessionServices,
-                channel,
-                userSession,
-            }, interaction, requiresAuth);
-            const interaction = { channel };
+            const services = { ...singletonServices, ...wireServices };
             channelHandler.registerOnOpen(async () => {
                 if (channelConfig.onConnect && meta.connect) {
                     try {
@@ -59,7 +52,7 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
                             meta: meta.connect,
                             lifecycleConfig: channelConfig.onConnect,
                             lifecycleType: 'connect',
-                            services: getAllServices(channel, false),
+                            services,
                             channel,
                             data: openingData,
                         });
@@ -81,7 +74,7 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
                             meta: meta.disconnect,
                             lifecycleConfig: channelConfig.onDisconnect,
                             lifecycleType: 'disconnect',
-                            services: getAllServices(channel, false),
+                            services,
                             channel,
                         });
                     }
@@ -90,11 +83,11 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
                         channel.send({ error: e.message || 'Unknown error' });
                     }
                 }
-                if (sessionServices) {
-                    await closeSessionServices(singletonServices.logger, sessionServices);
+                if (wireServices) {
+                    await closeWireServices(singletonServices.logger, wireServices);
                 }
             });
-            const onMessage = processMessageHandlers(getAllServices(channel), channelConfig, channelHandler);
+            const onMessage = processMessageHandlers(services, channelConfig, channelHandler, userSession);
             channelHandler.registerOnMessage(async (data) => {
                 try {
                     const result = await onMessage(data);
@@ -110,8 +103,8 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
             handleHTTPError(e, http, channelId, singletonServices.logger, logWarningsForStatusCodes, respondWith404, bubbleErrors);
         }
         finally {
-            if (sessionServices) {
-                await closeSessionServices(singletonServices.logger, sessionServices);
+            if (wireServices) {
+                await closeWireServices(singletonServices.logger, wireServices);
             }
         }
     };

package/dist/wirings/channel/serverless/serverless-channel-runner.d.ts

@@ -5,6 +5,6 @@ export interface RunServerlessChannelParams<ChannelData> extends RunChannelParam
     channelHandlerFactory: PikkuChannelHandlerFactory;
     channelObject?: unknown;
 }
-export declare const runChannelConnect: ({ singletonServices, channelId, channelObject, request, response, route, createSessionServices, channelStore, channelHandlerFactory, coerceDataFromSchema, logWarningsForStatusCodes, respondWith404, bubbleErrors, }: Pick<CoreChannel<unknown, any>, "route"> & RunChannelOptions & RunServerlessChannelParams<unknown>) => Promise<void>;
+export declare const runChannelConnect: ({ singletonServices, channelId, channelObject, request, response, route, createWireServices, channelStore, channelHandlerFactory, coerceDataFromSchema, logWarningsForStatusCodes, respondWith404, bubbleErrors, }: Pick<CoreChannel<unknown, any>, "route"> & RunChannelOptions & RunServerlessChannelParams<unknown>) => Promise<void>;
 export declare const runChannelDisconnect: ({ singletonServices, ...params }: RunServerlessChannelParams<unknown>) => Promise<void>;
 export declare const runChannelMessage: ({ singletonServices, ...params }: RunServerlessChannelParams<unknown>, data: unknown) => Promise<unknown>;