@pikku/core 0.7.8 → 0.8.0

package/src/{scheduler → events/scheduler}/scheduler-runner.ts

@@ -3,13 +3,13 @@ import type {
   CoreSingletonServices,
   CoreUserSession,
   CreateSessionServices,
-} from '../types/core.types.js'
+} from '../../types/core.types.js'
 import type { CoreScheduledTask } from './scheduler.types.js'
-import type { CoreAPIFunctionSessionless } from '../function/functions.types.js'
-import { getErrorResponse } from '../errors/error-handler.js'
-import { closeSessionServices } from '../utils.js'
-import { pikkuState } from '../pikku-state.js'
-import { addFunction, runPikkuFunc } from '../function/function-runner.js'
+import type { CoreAPIFunctionSessionless } from '../../function/functions.types.js'
+import { getErrorResponse } from '../../errors/error-handler.js'
+import { closeSessionServices } from '../../utils.js'
+import { pikkuState } from '../../pikku-state.js'
+import { addFunction, runPikkuFunc } from '../../function/function-runner.js'
 import { rpcService } from '../rpc/rpc-runner.js'
 
 export type RunScheduledTasksParams = {
@@ -50,10 +50,7 @@ class ScheduledTaskNotFoundError extends Error {
   }
 }
 
-export async function runScheduledTask<
-  SingletonServices extends CoreSingletonServices = CoreSingletonServices,
-  UserSession extends CoreUserSession = CoreUserSession,
->({
+export async function runScheduledTask({
   name,
   session,
   singletonServices,
@@ -108,3 +105,7 @@ export async function runScheduledTask<
     }
   }
 }
+
+export const getScheduledTasks = () => {
+  return pikkuState('scheduler', 'tasks')
+}

package/src/{scheduler → events/scheduler}/scheduler.types.ts

@@ -1,5 +1,5 @@
-import { APIDocs, CoreUserSession } from '../types/core.types.js'
-import { CoreAPIFunctionSessionless } from '../function/functions.types.js'
+import { APIDocs, CoreUserSession } from '../../types/core.types.js'
+import { CoreAPIFunctionSessionless } from '../../function/functions.types.js'
 
 /**
  * Represents metadata for scheduled tasks, including title, schedule, and documentation.
@@ -22,12 +22,10 @@ export type ScheduledTasksMeta<UserSession extends CoreUserSession = any> =
  */
 export type CoreScheduledTask<
   APIFunction = CoreAPIFunctionSessionless<void, void>,
-  UserSession extends CoreUserSession = CoreUserSession,
 > = {
   name: string
   schedule: string
   func: APIFunction
   docs?: APIDocs
-  session?: UserSession
   tags?: string[]
 }

package/src/function/function-runner.ts

@@ -1,9 +1,14 @@
 import { ForbiddenError } from '../errors/errors.js'
+import { runMiddleware } from '../middleware-runner.js'
 import { verifyPermissions } from '../permissions.js'
 import { pikkuState } from '../pikku-state.js'
 import { coerceTopLevelDataFromSchema, validateSchema } from '../schema.js'
 import { Logger } from '../services/logger.js'
-import { CoreServices, CoreUserSession } from '../types/core.types.js'
+import {
+  CoreServices,
+  CoreUserSession,
+  PikkuFunctionMiddleware,
+} from '../types/core.types.js'
 import {
   CorePermissionGroup,
   CorePikkuFunctionConfig,
@@ -145,5 +150,18 @@ export const runPikkuFunc = async <In = any, Out = any>(
     throw new ForbiddenError('Permission denied')
   }
 
+  if (funcConfig.middleware) {
+    return (await runMiddleware<PikkuFunctionMiddleware>(
+      allServices,
+      {
+        http: allServices.http,
+        mcp: allServices.mcp,
+        rpc: allServices.rpc,
+      },
+      funcConfig.middleware,
+      async () => await funcConfig.func(allServices, data, session!)
+    )) as Out
+  }
+
   return (await funcConfig.func(allServices, data, session!)) as Out
 }

package/src/function/functions.types.ts

@@ -1,8 +1,9 @@
-import { PikkuChannel } from '../channel/channel.types.js'
+import { PikkuChannel } from '../events/channel/channel.types.js'
 import type {
   CoreServices,
   CoreSingletonServices,
   CoreUserSession,
+  PikkuFunctionMiddleware,
 } from '../types/core.types.js'
 
 /**
@@ -85,4 +86,5 @@ export type CorePikkuFunctionConfig<
   func: APIFunction
   auth?: boolean
   permissions?: CorePermissionGroup<APIPermission>
+  middleware?: PikkuFunctionMiddleware[]
 }

package/src/handle-error.ts

@@ -1,7 +1,7 @@
 import { getErrorResponse } from './errors/error-handler.js'
 import { NotFoundError } from './errors/errors.js'
 import { Logger } from './services/logger.js'
-import { PikkuHTTP } from './http/http.types.js'
+import { PikkuHTTP } from './events/http/http.types.js'
 
 /**
  * Handle errors that occur during route processing
@@ -14,7 +14,7 @@ import { PikkuHTTP } from './http/http.types.js'
  * @param {boolean} respondWith404 - Whether to respond with 404 for NotFoundError
  * @param {boolean} bubbleError - Whether to throw the error after handling
  */
-export const handleError = (
+export const handleHTTPError = (
   e: any,
   http: PikkuHTTP | undefined,
   trackerId: string | undefined,

package/src/index.ts

@@ -6,15 +6,32 @@ export * from './function/index.js'
 export * from './pikku-request.js'
 export * from './pikku-response.js'
 export * from './services/index.js'
-export * from './http/index.js'
-export * from './channel/index.js'
-export * from './scheduler/index.js'
+export * from './events/http/index.js'
+export * from './events/channel/index.js'
+export * from './events/scheduler/index.js'
+export * from './events/rpc/index.js'
+export * from './events/queue/index.js'
+export * from './events/mcp/index.js'
 export * from './errors/index.js'
 export * from './middleware/index.js'
 export * from './time-utils.js'
 export * from './utils.js'
 export { pikkuState } from './pikku-state.js'
 export { runMiddleware } from './middleware-runner.js'
-export { addHTTPRoute, addMiddleware } from './http/http-runner.js'
-export { addChannel } from './channel/channel-runner.js'
-export { addScheduledTask } from './scheduler/scheduler-runner.js'
+export { addHTTPRoute, addMiddleware } from './events/http/http-runner.js'
+export { addChannel } from './events/channel/channel-runner.js'
+export { addScheduledTask } from './events/scheduler/scheduler-runner.js'
+export {
+  addMCPResource,
+  addMCPTool,
+  addMCPPrompt,
+  runMCPResource,
+  runMCPTool,
+  runMCPPrompt,
+  getMCPTools,
+  getMCPResources,
+  getMCPPrompts,
+  getMCPResourcesMeta,
+  getMCPToolsMeta,
+  getMCPPromptsMeta,
+} from './events/mcp/mcp-runner.js'

package/src/middleware-runner.ts

@@ -1,6 +1,7 @@
 import { UserSessionService } from './services/user-session-service.js'
 import {
   CoreSingletonServices,
+  PikkuFunctionMiddleware,
   PikkuInteraction,
   PikkuMiddleware,
 } from './types/core.types.js'
@@ -22,22 +23,28 @@ import {
  *   async () => { return await runMain(); }
  * );
  */
-export const runMiddleware = async (
+export const runMiddleware = async <
+  Middleware extends
+    | PikkuMiddleware
+    | PikkuFunctionMiddleware = PikkuMiddleware,
+>(
   services: CoreSingletonServices & {
-    userSession: UserSessionService<any>
+    userSession?: UserSessionService<any>
   },
   interaction: PikkuInteraction,
-  middlewares: PikkuMiddleware[],
-  main?: () => Promise<void>
-): Promise<void> => {
+  middlewares: Middleware[],
+  main?: () => Promise<unknown>
+): Promise<unknown> => {
+  let result: any
   const dispatch = async (index: number): Promise<any> => {
     if (middlewares && index < middlewares.length) {
-      return await middlewares[index]!(services, interaction, () =>
+      return await middlewares[index]!(services as any, interaction, () =>
         dispatch(index + 1)
       )
     } else if (main) {
-      await main()
+      result = await main()
     }
   }
   await dispatch(0)
+  return result
 }

package/src/pikku-state.ts

@@ -1,17 +1,29 @@
-import { ChannelsMeta, CoreAPIChannel } from './channel/channel.types.js'
+import { ChannelsMeta, CoreAPIChannel } from './events/channel/channel.types.js'
 import {
   CoreHTTPFunctionRoute,
   HTTPMethod,
   HTTPRoutesMeta,
-} from './http/http.types.js'
+} from './events/http/http.types.js'
 import { FunctionsMeta, PikkuMiddleware } from './types/core.types.js'
 import {
   CoreScheduledTask,
   ScheduledTasksMeta,
-} from './scheduler/scheduler.types.js'
+} from './events/scheduler/scheduler.types.js'
 import { ErrorDetails, PikkuError } from './errors/error-handler.js'
 import { CorePikkuFunctionConfig } from './function/functions.types.js'
-import { RPCMeta } from './rpc/rpc-types.js'
+import { RPCMeta } from './events/rpc/rpc-types.js'
+import {
+  queueWorkersMeta,
+  CoreQueueWorker,
+} from './events/queue/queue.types.js'
+import {
+  CoreMCPResource,
+  CoreMCPTool,
+  CoreMCPPrompt,
+  MCPResourceMeta,
+  MCPToolMeta,
+  MCPPromptMeta,
+} from './events/mcp/mcp.types.js'
 
 interface PikkuState {
   function: {
@@ -41,6 +53,18 @@ interface PikkuState {
     tasks: Map<string, CoreScheduledTask>
     meta: ScheduledTasksMeta
   }
+  queue: {
+    registrations: Map<string, CoreQueueWorker>
+    meta: queueWorkersMeta
+  }
+  mcp: {
+    resources: Map<string, CoreMCPResource>
+    resourcesMeta: MCPResourceMeta
+    tools: Map<string, CoreMCPTool>
+    toolsMeta: MCPToolMeta
+    prompts: Map<string, CoreMCPPrompt>
+    promptsMeta: MCPPromptMeta
+  }
   misc: {
     errors: Map<PikkuError, ErrorDetails>
     schemas: Map<string, any>
@@ -70,6 +94,18 @@ export const resetPikkuState = () => {
       tasks: new Map(),
       meta: [] as unknown as ScheduledTasksMeta,
     },
+    queue: {
+      registrations: new Map(),
+      meta: {},
+    },
+    mcp: {
+      resources: new Map(),
+      resourcesMeta: {} as MCPResourceMeta,
+      tools: new Map(),
+      toolsMeta: {} as MCPToolMeta,
+      prompts: new Map(),
+      promptsMeta: {} as MCPPromptMeta,
+    },
     misc: {
       errors: globalThis.pikkuState?.misc?.errors || new Map(),
       schemas: globalThis.pikkuState?.misc?.schema || new Map(),

package/src/services/user-session-service.ts

@@ -1,4 +1,4 @@
-import { ChannelStore } from '../channel/channel-store.js'
+import { ChannelStore } from '../events/channel/channel-store.js'
 import { CoreUserSession } from '../types/core.types.js'
 
 export interface UserSessionService<UserSession extends CoreUserSession> {

package/src/types/core.types.ts

@@ -1,19 +1,22 @@
 import type { Logger, LogLevel } from '../services/logger.js'
 import { VariablesService } from '../services/variables-service.js'
-import { EventHubService } from '../channel/eventhub-service.js'
+import { EventHubService } from '../events/channel/eventhub-service.js'
 import { SchemaService } from '../services/schema-service.js'
-import { PikkuHTTP } from '../http/http.types.js'
+import { PikkuHTTP } from '../events/http/http.types.js'
 import { UserSessionService } from '../services/user-session-service.js'
 import { JWTService } from '../services/jwt-service.js'
 import { SecretService } from '../services/secret-service.js'
-import { PikkuChannel } from '../channel/channel.types.js'
-import { PikkuRPC } from '../rpc/rpc-types.js'
+import { PikkuChannel } from '../events/channel/channel.types.js'
+import { PikkuRPC } from '../events/rpc/rpc-types.js'
+import { PikkuMCP } from '../events/mcp/mcp.types.js'
 
 export enum PikkuEventTypes {
   http = 'http',
   scheduled = 'scheduled',
   channel = 'channel',
   rpc = 'rpc',
+  queue = 'queue',
+  mcp = 'mcp',
 }
 
 export interface FunctionServicesMeta {
@@ -109,8 +112,24 @@ export interface CoreSingletonServices<Config extends CoreConfig = CoreConfig> {
  */
 export interface PikkuInteraction {
   http?: PikkuHTTP
+  mcp?: PikkuMCP
+  rpc?: PikkuRPC
 }
 
+/**
+ * A function that can wrap an interaction and be called before or after
+ */
+export type PikkuFunctionMiddleware<
+  SingletonServices extends CoreSingletonServices = CoreSingletonServices,
+  UserSession extends CoreUserSession = CoreUserSession,
+> = (
+  services: SingletonServices & {
+    userSession?: UserSessionService<UserSession>
+  },
+  interactions: PikkuInteraction,
+  next: () => Promise<void>
+) => Promise<void>
+
 /**
  * A function that can wrap an interaction and be called before or after
  */
@@ -134,6 +153,7 @@ export type CoreServices<
   CoreServices extends Record<string, unknown> = {},
 > = SingletonServices &
   PikkuInteraction & {
+    mcp?: PikkuMCP
     rpc?: PikkuRPC
     userSession?: UserSessionService<UserSession>
     channel?: PikkuChannel<unknown, unknown>

package/tsconfig.json

@@ -3,10 +3,11 @@
   "compilerOptions": {
     "rootDir": "./src",
     "composite": true,
-    "module": "Node16",
+    "module": "Node18",
     "outDir": "dist",
     "target": "esnext",
-    "moduleResolution": "node16"
+    "moduleResolution": "node16",
+    "tsBuildInfoFile": null
   },
   "exclude": ["**/*.test.ts", "node_modules", "dist"],
   "references": []