@pikku/core 0.12.0 → 0.12.1

package/src/wirings/cli/cli-runner.ts

@@ -1,8 +1,11 @@
 import { NotFoundError, PikkuMissingMetaError } from '../../errors/errors.js'
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js'
 import { pikkuState } from '../../pikku-state.js'
-import { CorePikkuMiddleware, CoreUserSession } from '../../types/core.types.js'
-import {
+import type {
+  CorePikkuMiddleware,
+  CoreUserSession,
+} from '../../types/core.types.js'
+import type {
   CoreCLI,
   CLICommandMeta,
   CLIOption,
@@ -19,7 +22,7 @@ import type {
   CreateConfig,
   CreateSingletonServices,
 } from '../../types/core.types.js'
-import { PikkuChannel } from '../channel/channel.types.js'
+import type { PikkuChannel } from '../channel/channel.types.js'
 import {
   PikkuSessionService,
   createMiddlewareSessionWireProps,
@@ -357,7 +360,11 @@ export async function runCLICommand({
     // Skip if result is undefined (void functions handle their own output)
     if (renderer && result !== undefined) {
       await Promise.resolve(
-        renderer(singletonServices, result, userSession.get())
+        renderer(
+          singletonServices,
+          result,
+          userSession.get() as CoreUserSession | undefined
+        )
       )
     }
 

package/src/wirings/cli/cli.types.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   CorePikkuMiddleware,
   CoreSingletonServices,
   CoreUserSession,
@@ -6,13 +6,13 @@ import {
   MiddlewareMetadata,
   PermissionMetadata,
 } from '../../types/core.types.js'
-import {
+import type {
   CorePikkuFunctionConfig,
   CorePikkuPermission,
   CorePikkuFunction,
   CorePikkuFunctionSessionless,
 } from '../../function/functions.types.js'
-import { PikkuChannel } from '../channel/channel.types.js'
+import type { PikkuChannel } from '../channel/channel.types.js'
 
 /**
  * CLI option definition

package/src/wirings/cli/command-parser.test.ts

@@ -1,7 +1,7 @@
 import { test, describe } from 'node:test'
 import * as assert from 'assert'
 import { parseCLIArguments, generateCommandHelp } from './command-parser.js'
-import { CLIMeta } from './cli.types.js'
+import type { CLIMeta } from './cli.types.js'
 
 const testMeta: CLIMeta = {
   programs: {

package/src/wirings/cli/command-parser.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   CLIMeta,
   CLIProgramMeta,
   CLICommandMeta,

package/src/wirings/http/http-routes.test.ts

@@ -4,7 +4,7 @@ import { wireHTTPRoutes, defineHTTPRoutes } from './http-routes.js'
 import { pikkuState, resetPikkuState } from '../../pikku-state.js'
 import { addFunction } from '../../function/function-runner.js'
 import { httpRouter } from './routers/http-router.js'
-import { CorePikkuMiddleware } from '../../types/core.types.js'
+import type { CorePikkuMiddleware } from '../../types/core.types.js'
 
 // Mock function for testing
 const mockFunc = async () => ({ success: true })

package/src/wirings/http/http-runner.test.ts

@@ -1,7 +1,7 @@
 import { test, describe, beforeEach, afterEach } from 'node:test'
 import * as assert from 'assert'
 import { NotFoundError } from '../../errors/errors.js'
-import { JSONValue, CorePikkuMiddleware } from '../../types/core.types.js'
+import type { JSONValue, CorePikkuMiddleware } from '../../types/core.types.js'
 import { fetch, wireHTTP } from './http-runner.js'
 import { pikkuState, resetPikkuState } from '../../pikku-state.js'
 import {
@@ -42,8 +42,6 @@ const setHTTPFunctionMap = (func: any) => {
 }
 
 describe('fetch', () => {
-  let singletonServices: any
-  let createWireServices: any
   let request: any
   let response: any
 
@@ -51,7 +49,7 @@ describe('fetch', () => {
     resetPikkuState()
     httpRouter.reset()
 
-    singletonServices = {
+    const singletonServices = {
       logger: {
         info: () => {},
         warn: () => {},
@@ -59,7 +57,11 @@ describe('fetch', () => {
       },
     }
 
-    createWireServices = async () => ({})
+    const createWireServices = async () => ({})
+
+    pikkuState(null, 'package', 'singletonServices', singletonServices as any)
+    pikkuState(null, 'package', 'factories', { createWireServices } as any)
+
     request = new PikkuMockRequest('/test', 'get')
     response = new PikkuMockResponse()
 
@@ -76,8 +78,6 @@ describe('fetch', () => {
     await assert.rejects(
       async () =>
         fetch(request, {
-          singletonServices,
-          createWireServices,
           bubbleErrors: true,
         }),
       NotFoundError
@@ -97,10 +97,7 @@ describe('fetch', () => {
     // Initialize router after adding route (for tests)
     httpRouter.initialize()
 
-    const result = await fetch(request, {
-      singletonServices,
-      createWireServices,
-    })
+    const result = await fetch(request)
 
     assert.deepStrictEqual(await result.json(), { success: true })
   })
@@ -120,10 +117,7 @@ describe('fetch', () => {
       },
     })
 
-    await fetch(request, {
-      singletonServices,
-      createWireServices,
-    })
+    await fetch(request)
 
     assert.strictEqual(await permissions.test(), true)
   })
@@ -142,8 +136,6 @@ describe('fetch', () => {
     await assert.rejects(
       async () =>
         fetch(request, {
-          singletonServices,
-          createWireServices,
           bubbleErrors: true,
         }),
       error

package/src/wirings/http/http-runner.ts

@@ -1,20 +1,19 @@
-import {
+import type {
   CoreHTTPFunctionWiring,
   RunHTTPWiringOptions,
-  RunHTTPWiringParams,
   PikkuHTTP,
   PikkuHTTPRequest,
   PikkuHTTPResponse,
   HTTPWiringMeta,
   HTTPMethod,
 } from './http.types.js'
-import {
+import type {
   CorePikkuFunction,
   CorePikkuFunctionSessionless,
   CorePikkuPermission,
   CorePermissionGroup,
 } from '../../function/functions.types.js'
-import {
+import type {
   CoreUserSession,
   CorePikkuMiddleware,
   CorePikkuMiddlewareGroup,
@@ -29,17 +28,19 @@ import {
   isSerializable,
 } from '../../utils.js'
 import {
-  PikkuSessionService,
-  createMiddlewareSessionWireProps,
-} from '../../services/user-session-service.js'
+  getSingletonServices,
+  getCreateWireServices,
+} from '../../pikku-state.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 { PikkuChannel } from '../channel/channel.types.js'
+import type { PikkuChannel } from '../channel/channel.types.js'
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js'
 import { httpRouter } from './routers/http-router.js'
 import { validateSchema } from '../../schema.js'
+import { runMiddleware } from '../../middleware-runner.js'
 
 /**
  * Extract headers from a PikkuHTTPRequest based on the schema keys
@@ -369,7 +370,10 @@ const executeRoute = async (
   const wire: PikkuWire = {
     http,
     channel,
-    ...createMiddlewareSessionWireProps(userSession),
+    session: userSession.get() as CoreUserSession | undefined,
+    setSession: (s: any) => userSession.setInitial(s),
+    getSession: () => userSession.get(),
+    hasSessionChanged: () => userSession.sessionChanged,
   }
 
   result = await runPikkuFunc(
@@ -417,12 +421,12 @@ const executeRoute = async (
  * @template In Expected input data type.
  * @template Out Expected output data type.
  * @param {Request} request - The native Fetch API Request object.
- * @param {RunHTTPWiringOptions & RunHTTPWiringParams} params - Additional options including services and session management.
+ * @param {RunHTTPWiringOptions} params - Additional options including services and session management.
  * @returns {Promise<Response>} A promise that resolves to a Fetch API Response object.
  */
 export const fetch = async <In, Out>(
   request: Request,
-  params: RunHTTPWiringOptions & RunHTTPWiringParams
+  params: RunHTTPWiringOptions = {}
 ): Promise<Response> => {
   const pikkuResponse = new PikkuFetchHTTPResponse()
   await fetchData<In, Out>(request, pikkuResponse, params)
@@ -438,12 +442,12 @@ export const fetch = async <In, Out>(
  * @template In Expected input data type.
  * @template Out Expected output data type.
  * @param {Request | PikkuHTTPRequest} request - The request object.
- * @param {RunHTTPWiringOptions & RunHTTPWiringParams} params - Execution options including services and session configuration.
+ * @param {RunHTTPWiringOptions} params - Execution options including services and session configuration.
  * @returns {Promise<PikkuFetchHTTPResponse>} A promise that resolves to a PikkuFetchHTTPResponse object.
  */
 export const pikkuFetch = async <In, Out>(
   request: Request | PikkuHTTPRequest,
-  params: RunHTTPWiringOptions & RunHTTPWiringParams
+  params: RunHTTPWiringOptions = {}
 ): Promise<PikkuFetchHTTPResponse> => {
   const pikkuResponse = new PikkuFetchHTTPResponse()
   await fetchData<In, Out>(request, pikkuResponse, params)
@@ -465,43 +469,56 @@ export const pikkuFetch = async <In, Out>(
  * @template Out Expected output data type.
  * @param {Request | PikkuHTTPRequest} request - The incoming HTTP request.
  * @param {PikkuHTTPResponse} response - The response object to be populated.
- * @param {RunHTTPWiringOptions & RunHTTPWiringParams} options - Options such as singleton services, session handling, and error configuration.
+ * @param {RunHTTPWiringOptions} 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 <In, Out>(
   request: Request | PikkuHTTPRequest,
   response: PikkuHTTPResponse,
   {
-    singletonServices,
-    createWireServices,
     skipUserSession = false,
     respondWith404 = true,
     logWarningsForStatusCodes = [],
     coerceDataFromSchema = true,
     bubbleErrors = false,
     generateRequestId,
-  }: RunHTTPWiringOptions & RunHTTPWiringParams
+  }: RunHTTPWiringOptions = {}
 ): Promise<Out | void> => {
-  const requestId =
-    (request as any).getHeader?.('x-request-id') ||
-    generateRequestId?.() ||
-    createWeakUID()
+  const singletonServices = getSingletonServices()
+  const createWireServices = getCreateWireServices()
   let wireServices: WireServices<typeof singletonServices> | undefined
   let result: Out
 
   // Combine the request and response into one wire object
-  const http = createHTTPWire(
-    request instanceof Request ? new PikkuFetchHTTPRequest(request) : request,
-    response
-  )
+  const pikkuRequest =
+    request instanceof Request ? new PikkuFetchHTTPRequest(request) : request
+  let requestId: string | null = null
+  try {
+    requestId = pikkuRequest.header('x-request-id')
+  } catch {}
+  requestId = requestId || generateRequestId?.() || createWeakUID()
+  const http = createHTTPWire(pikkuRequest, response)
   const apiType = http!.request!.method()
   const apiRoute = http!.request!.path()
 
   // Locate the matching route based on the HTTP method and path
   const matchedRoute = getMatchingRoute(apiType, apiRoute)
   try {
-    // If no route matches, log the occurrence and throw a NotFoundError
     if (!matchedRoute) {
+      if (apiType.toLowerCase() === 'options') {
+        const httpGroups = pikkuState(null, 'middleware', 'httpGroup')
+        const globalMiddleware = httpGroups['*']
+        const wire: PikkuWire = { http: http! }
+        if (globalMiddleware) {
+          await runMiddleware(
+            singletonServices,
+            wire,
+            globalMiddleware as CorePikkuMiddleware[]
+          )
+        }
+        response.status(204).json(undefined as any)
+        return
+      }
       singletonServices.logger.info({
         message: 'Route not found',
         apiRoute,
@@ -525,7 +542,6 @@ export const fetchData = async <In, Out>(
 
     return result
   } catch (e: any) {
-    // Handle errors and, depending on configuration, bubble them up or respond with an error
     handleHTTPError(
       e,
       http,

package/src/wirings/http/http.types.ts

@@ -1,11 +1,7 @@
 import type { SerializeOptions } from 'cookie'
 import type { StandardSchemaV1 } from '@standard-schema/spec'
-import { PikkuError } from '../../errors/error-handler.js'
+import type { PikkuError } from '../../errors/error-handler.js'
 import type {
-  CoreServices,
-  CoreSingletonServices,
-  CoreUserSession,
-  CreateWireServices,
   CorePikkuMiddleware,
   CommonWireMeta,
 } from '../../types/core.types.js'
@@ -43,15 +39,6 @@ export type RunHTTPWiringOptions = Partial<{
   generateRequestId: () => string
 }>
 
-export type RunHTTPWiringParams = {
-  singletonServices: CoreSingletonServices
-  createWireServices?: CreateWireServices<
-    CoreSingletonServices,
-    CoreServices<CoreSingletonServices>,
-    CoreUserSession
-  >
-}
-
 /**
  * Represents the HTTP methods supported for API HTTP wirings.
  */

package/src/wirings/http/log-http-routes.ts

@@ -1,5 +1,5 @@
 import { pikkuState } from '../../pikku-state.js'
-import { Logger } from '../../services/index.js'
+import type { Logger } from '../../services/index.js'
 
 /**
  * Logs all the loaded routes.

package/src/wirings/http/pikku-fetch-http-request.ts

@@ -1,6 +1,6 @@
 import { parse as parseQuery } from 'picoquery'
 import { parse as parseCookie } from 'cookie'
-import { HTTPMethod, PikkuHTTPRequest, PikkuQuery } from './http.types.js'
+import type { HTTPMethod, PikkuHTTPRequest, PikkuQuery } from './http.types.js'
 import { UnprocessableContentError } from '../../errors/errors.js'
 
 /**

package/src/wirings/http/pikku-fetch-http-response.ts

@@ -1,8 +1,6 @@
-import { PikkuHTTPResponse } from './http.types.js'
-import {
-  SerializeOptions as CookieSerializeOptions,
-  serialize as serializeCookie,
-} from 'cookie'
+import type { PikkuHTTPResponse } from './http.types.js'
+import type { SerializeOptions as CookieSerializeOptions } from 'cookie'
+import { serialize as serializeCookie } from 'cookie'
 
 export class PikkuFetchHTTPResponse implements PikkuHTTPResponse {
   #statusCode: number = 200
@@ -91,6 +89,15 @@ export class PikkuFetchHTTPResponse implements PikkuHTTPResponse {
   // }
 
   public redirect(location: string, status: number = 302): this {
+    if (
+      !location.startsWith('/') &&
+      !location.startsWith('https://') &&
+      !location.startsWith('http://')
+    ) {
+      throw new Error(
+        'Invalid redirect location: must be a relative path or absolute URL'
+      )
+    }
     this.#statusCode = status
     this.header('Location', location)
     return this

package/src/wirings/http/routers/http-router.ts

@@ -1,4 +1,4 @@
-import { HTTPMethod } from '../http.types.js'
+import type { HTTPMethod } from '../http.types.js'
 import { PathToRegexRouter } from './path-to-regex.js'
 
 export type MatchResult = {

package/src/wirings/http/routers/path-to-regex.test.ts

@@ -2,7 +2,7 @@ import { test, describe, beforeEach } from 'node:test'
 import * as assert from 'node:assert/strict'
 import { PathToRegexRouter } from './path-to-regex.js'
 import { resetPikkuState, pikkuState } from '../../../pikku-state.js'
-import { HTTPMethod } from '../http.types.js'
+import type { HTTPMethod } from '../http.types.js'
 
 describe('PathToRegexRouter', () => {
   let router: PathToRegexRouter

package/src/wirings/http/routers/path-to-regex.ts

@@ -1,6 +1,7 @@
-import { match, MatchFunction } from 'path-to-regexp'
-import { MatchResult, Router } from './http-router.js'
-import { HTTPMethod } from '../http.types.js'
+import type { MatchFunction } from 'path-to-regexp'
+import { match } from 'path-to-regexp'
+import type { MatchResult, Router } from './http-router.js'
+import type { HTTPMethod } from '../http.types.js'
 import { pikkuState } from '../../../pikku-state.js'
 
 interface CompiledRoute {

package/src/wirings/mcp/mcp-endpoint-registry.ts

@@ -1,4 +1,8 @@
-import { MCPResourceMeta, MCPToolMeta, MCPPromptMeta } from '@pikku/core/mcp'
+import type {
+  MCPResourceMeta,
+  MCPToolMeta,
+  MCPPromptMeta,
+} from '@pikku/core/mcp'
 
 export interface MCPToolEndpoint {
   name: string

package/src/wirings/mcp/mcp-runner.ts

@@ -1,10 +1,4 @@
-import {
-  PikkuWire,
-  type CoreServices,
-  type CoreSingletonServices,
-  type CoreUserSession,
-  type CreateWireServices,
-} from '../../types/core.types.js'
+import type { PikkuWire } from '../../types/core.types.js'
 import type {
   CoreMCPResource,
   CoreMCPPrompt,
@@ -19,7 +13,11 @@ import type {
 } from '../../function/functions.types.js'
 import { getErrorResponse } from '../../errors/error-handler.js'
 import { closeWireServices } from '../../utils.js'
-import { pikkuState } from '../../pikku-state.js'
+import {
+  pikkuState,
+  getSingletonServices,
+  getCreateWireServices,
+} from '../../pikku-state.js'
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js'
 import {
   BadRequestError,
@@ -40,13 +38,7 @@ export class MCPError extends Error {
 }
 
 export type RunMCPEndpointParams<Tools extends string = any> = {
-  singletonServices: CoreSingletonServices
   mcp?: PikkuMCP<Tools>
-  createWireServices?: CreateWireServices<
-    CoreSingletonServices,
-    CoreServices<CoreSingletonServices>,
-    CoreUserSession
-  >
 }
 
 export type JsonRpcError = {
@@ -197,8 +189,10 @@ async function runMCPPikkuFunc(
   name: string,
   mcp: CoreMCPResource | CoreMCPPrompt | undefined,
   pikkuFuncId: string | undefined,
-  { singletonServices, createWireServices, mcp: mcpWire }: RunMCPEndpointParams
+  { mcp: mcpWire }: RunMCPEndpointParams
 ): Promise<JsonRpcResponse> {
+  const singletonServices = getSingletonServices()
+  const createWireServices = getCreateWireServices()
   let wireServices: any
 
   try {

package/src/wirings/mcp/mcp.types.ts

@@ -1,10 +1,10 @@
-import {
+import type {
   CorePermissionGroup,
   CorePikkuFunctionConfig,
   CorePikkuFunctionSessionless,
   CorePikkuPermission,
 } from '../../function/functions.types.js'
-import {
+import type {
   CorePikkuMiddleware,
   MiddlewareMetadata,
   PermissionMetadata,

package/src/wirings/oauth2/oauth2-client.ts

@@ -1,6 +1,6 @@
-import { OAuth2Token, OAuth2AppCredential } from './oauth2.types.js'
-import { OAuth2CredentialConfig } from '../secret/secret.types.js'
-import { SecretService } from '../../services/secret-service.js'
+import type { OAuth2Token, OAuth2AppCredential } from './oauth2.types.js'
+import type { OAuth2CredentialConfig } from '../secret/secret.types.js'
+import type { SecretService } from '../../services/secret-service.js'
 
 /**
  * OAuth2 client that acts as a service.

package/src/wirings/oauth2/wire-oauth2-credential.ts

@@ -1,4 +1,4 @@
-import { CoreOAuth2Credential } from './oauth2.types.js'
+import type { CoreOAuth2Credential } from './oauth2.types.js'
 
 /**
  * No-op function for declaring OAuth2 credentials.

package/src/wirings/queue/index.ts

@@ -16,7 +16,6 @@ export type {
 export {
   wireQueueWorker,
   runQueueJob,
-  createQueueJobRunner,
   getQueueWorkers,
   removeQueueWorker,
   QueueJobDiscardedError,