@pikku/core 0.11.1 → 0.12.0

package/src/index.ts

@@ -1,32 +1,111 @@
 /**
  * @module @pikku/core
  */
-export * from './types/core.types.js'
-export * from './function/index.js'
-export * from './pikku-request.js'
-export * from './pikku-response.js'
-export * from './services/logger.js'
-export * from './services/schema-service.js'
-export * from './services/jwt-service.js'
-export * from './services/secret-service.js'
-export * from './services/user-session-service.js'
-export * from './services/scheduler-service.js'
-export * from './wirings/http/index.js'
-export * from './wirings/channel/index.js'
-export * from './wirings/scheduler/index.js'
-export * from './wirings/rpc/index.js'
-export * from './wirings/queue/index.js'
-export * from './wirings/workflow/index.js'
-export * from './wirings/mcp/index.js'
-export * from './wirings/cli/index.js'
-export * from './errors/index.js'
-export * from './middleware/index.js'
-export * from './utils.js'
-export * from './time-utils.js'
-export { pikkuState } from './pikku-state.js'
+export type {
+  CommonWireMeta,
+  CoreConfig,
+  CorePikkuMiddleware,
+  CorePikkuMiddlewareConfig,
+  CorePikkuMiddlewareFactory,
+  CorePikkuMiddlewareGroup,
+  CoreServices,
+  CoreSingletonServices,
+  CoreUserSession,
+  CreateConfig,
+  CreateSingletonServices,
+  CreateWireServices,
+  FunctionMeta,
+  FunctionRuntimeMeta,
+  FunctionServicesMeta,
+  FunctionWiresMeta,
+  FunctionsMeta,
+  FunctionsRuntimeMeta,
+  JSONPrimitive,
+  JSONValue,
+  MakeRequired,
+  MiddlewareMetadata,
+  PermissionMetadata,
+  PickOptional,
+  PickRequired,
+  PikkuAIMiddlewareHooks,
+  PikkuWire,
+  PikkuWiringTypes,
+  RequireAtLeastOne,
+  SerializedError,
+  WireServices,
+} from './types/core.types.js'
 export {
-  runMiddleware,
-  addMiddleware,
-  getMiddlewareByName,
-} from './middleware-runner.js'
+  pikkuAIMiddleware,
+  pikkuChannelMiddleware,
+  pikkuChannelMiddlewareFactory,
+  pikkuMiddleware,
+  pikkuMiddlewareFactory,
+} from './types/core.types.js'
+export type {
+  CorePikkuAuth,
+  CorePikkuAuthConfig,
+  CorePikkuFunction,
+  CorePikkuFunctionConfig,
+  CorePikkuPermission,
+  CorePikkuPermissionConfig,
+  CorePikkuPermissionFactory,
+  CorePermissionGroup,
+  ZodLike,
+} from './function/functions.types.js'
+export {
+  pikkuAuth,
+  pikkuPermission,
+  pikkuPermissionFactory,
+} from './function/functions.types.js'
+export { addFunction, getAllFunctionNames } from './function/index.js'
+export { PikkuRequest } from './pikku-request.js'
+export {
+  getRelativeTimeOffsetFromNow,
+  parseDurationString,
+} from './time-utils.js'
+export type { RelativeTimeInput } from './time-utils.js'
+export {
+  formatVersionedId,
+  isVersionedId,
+  parseVersionedId,
+} from './version.js'
+export {
+  pikkuState,
+  initializePikkuState,
+  resetPikkuState,
+  addPackageServiceFactories,
+  getPikkuMetaDir,
+} from './pikku-state.js'
+export { runPikkuFunc } from './function/function-runner.js'
+export { runCLICommand, pikkuCLIRender } from './wirings/cli/cli-runner.js'
+export { fetch } from './wirings/http/http-runner.js'
+export {
+  runMCPTool,
+  runMCPResource,
+  runMCPPrompt,
+} from './wirings/mcp/mcp-runner.js'
+export type {
+  MCPToolResponse,
+  MCPResourceResponse,
+  MCPPromptResponse,
+} from './wirings/mcp/mcp.types.js'
+export { runQueueJob } from './wirings/queue/queue-runner.js'
+export { runScheduledTask } from './wirings/scheduler/scheduler-runner.js'
+export { NotFoundError } from './errors/errors.js'
+export type { EventHubService } from './wirings/channel/eventhub-service.js'
+export type { QueueService } from './wirings/queue/queue.types.js'
+export type { JWTService } from './services/jwt-service.js'
+export type { HTTPMethod } from './wirings/http/http.types.js'
+export type { GraphNodeConfig } from './wirings/workflow/graph/workflow-graph.types.js'
+export { createGraph } from './wirings/workflow/graph/graph-node.js'
+export { workflow as wireWorkflow } from './wirings/workflow/workflow-helpers.js'
+export type { PikkuPackageState } from './types/state.types.js'
+export { runMiddleware, addMiddleware } from './middleware-runner.js'
 export { addPermission } from './permissions.js'
+export { isSerializable, stopSingletonServices } from './utils.js'
+export {
+  type ScheduledTaskInfo,
+  type ScheduledTaskSummary,
+  type SchedulerRuntimeHandlers,
+} from './services/scheduler-service.js'
+export { SchedulerService } from './services/scheduler-service.js'

package/src/middleware/auth-apikey.test.ts

@@ -3,7 +3,10 @@ import assert from 'node:assert/strict'
 import { authAPIKey } from './auth-apikey.js'
 import { resetPikkuState } from '../pikku-state.js'
 import { CoreUserSession } from '../types/core.types.js'
-import { PikkuSessionService } from '../services/user-session-service.js'
+import {
+  PikkuSessionService,
+  createMiddlewareSessionWireProps,
+} from '../services/user-session-service.js'
 
 beforeEach(() => {
   resetPikkuState()
@@ -43,7 +46,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({ 'x-api-key': 'my-api-key' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -75,7 +78,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({}, { apiKey: 'query-api-key' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -111,7 +114,7 @@ describe('authAPIKey middleware', () => {
           ),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -143,7 +146,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({}, { apiKey: 'query-fallback' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -171,7 +174,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({}),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -199,7 +202,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({ 'x-api-key': 'invalid-key' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -234,7 +237,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({ 'x-api-key': 'some-key' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -258,7 +261,7 @@ describe('authAPIKey middleware', () => {
 
     await middleware(
       { jwt: jwtService } as any,
-      { session: SessionService } as any,
+      { ...createMiddlewareSessionWireProps(SessionService) } as any,
       async () => {
         nextCalled = true
       }
@@ -281,7 +284,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({ 'x-api-key': 'some-key' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -313,7 +316,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({}, { apiKey: 'query-key' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true
@@ -346,7 +349,7 @@ describe('authAPIKey middleware', () => {
           request: createMockHTTPRequest({ 'x-api-key': 'header-key' }),
           response: createMockHTTPResponse(),
         },
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
       } as any,
       async () => {
         nextCalled = true

package/src/middleware/auth-apikey.ts

@@ -21,8 +21,8 @@ export const authAPIKey = pikkuMiddlewareFactory<{
   source: 'header' | 'query' | 'all'
 }>(({ source }) =>
   pikkuMiddleware(
-    async ({ jwt: jwtService }, { http, session: SessionService }, next) => {
-      if (!http?.request || !SessionService || SessionService.get()) {
+    async ({ jwt: jwtService }, { http, setSession, session }, next) => {
+      if (!http?.request || !setSession || session) {
         return next()
       }
 
@@ -37,7 +37,7 @@ export const authAPIKey = pikkuMiddlewareFactory<{
       if (apiKey && jwtService) {
         const userSession = await jwtService.decode(apiKey)
         if (userSession) {
-          SessionService.setInitial(userSession)
+          setSession?.(userSession)
         }
       }
 

package/src/middleware/auth-bearer.test.ts

@@ -3,7 +3,10 @@ import assert from 'node:assert/strict'
 import { authBearer } from './auth-bearer.js'
 import { resetPikkuState } from '../pikku-state.js'
 import { CoreUserSession } from '../types/core.types.js'
-import { PikkuSessionService } from '../services/user-session-service.js'
+import {
+  PikkuSessionService,
+  createMiddlewareSessionWireProps,
+} from '../services/user-session-service.js'
 import { InvalidSessionError } from '../errors/errors.js'
 
 beforeEach(() => {
@@ -39,7 +42,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: jwtService } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             authorization: 'Bearer jwt-token',
@@ -73,7 +76,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: jwtService } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             Authorization: 'Bearer jwt-token-2',
@@ -116,7 +119,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: jwtService } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             authorization: 'Bearer my-static-token',
@@ -147,7 +150,7 @@ describe('authBearer middleware', () => {
         await middleware(
           { jwt: jwtService } as any,
           {
-            session: SessionService,
+            ...createMiddlewareSessionWireProps(SessionService),
             http: {
               request: createMockHTTPRequest({
                 authorization: 'Basic some-token',
@@ -179,7 +182,7 @@ describe('authBearer middleware', () => {
         await middleware(
           { jwt: jwtService } as any,
           {
-            session: SessionService,
+            ...createMiddlewareSessionWireProps(SessionService),
             http: {
               request: createMockHTTPRequest({
                 authorization: 'Bearer',
@@ -211,7 +214,7 @@ describe('authBearer middleware', () => {
         await middleware(
           { jwt: jwtService } as any,
           {
-            session: SessionService,
+            ...createMiddlewareSessionWireProps(SessionService),
             http: {
               request: createMockHTTPRequest({
                 authorization: 'BearerToken',
@@ -242,7 +245,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: jwtService } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             authorization: 'Bearer invalid-token',
@@ -282,7 +285,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: jwtService } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             authorization: 'Bearer wrong-token',
@@ -319,7 +322,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: jwtService } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             authorization: 'Bearer some-token',
@@ -349,7 +352,7 @@ describe('authBearer middleware', () => {
 
     await middleware(
       { jwt: jwtService } as any,
-      { session: SessionService } as any,
+      { ...createMiddlewareSessionWireProps(SessionService) } as any,
       async () => {
         nextCalled = true
       }
@@ -372,7 +375,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: jwtService } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({}),
           response: createMockHTTPResponse(),
@@ -396,7 +399,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: undefined } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             authorization: 'Bearer some-token',
@@ -428,7 +431,7 @@ describe('authBearer middleware', () => {
     await middleware(
       { jwt: undefined } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             authorization: 'Bearer static-token',

package/src/middleware/auth-bearer.ts

@@ -40,38 +40,36 @@ export const authBearer = pikkuMiddlewareFactory<{
     userSession: CoreUserSession
   }
 }>(({ token } = {}) =>
-  pikkuMiddleware(async ({ jwt: jwtService }, { http, session }, next) => {
-    // Skip if session already exists.
-    if (!http?.request || !session || session.get()) {
-      return next()
-    }
+  pikkuMiddleware(
+    async ({ jwt: jwtService }, { http, setSession, session }, next) => {
+      if (!http?.request || !setSession || session) {
+        return next()
+      }
 
-    const authHeader =
-      http.request.header('authorization') ||
-      http.request.header('Authorization')
+      const authHeader =
+        http.request.header('authorization') ||
+        http.request.header('Authorization')
 
-    if (authHeader) {
-      const [scheme, bearerToken] = authHeader.split(' ')
-      if (scheme !== 'Bearer' || !bearerToken) {
-        throw new InvalidSessionError()
-      }
+      if (authHeader) {
+        const [scheme, bearerToken] = authHeader.split(' ')
+        if (scheme !== 'Bearer' || !bearerToken) {
+          throw new InvalidSessionError()
+        }
 
-      let userSession: CoreUserSession | null = null
+        let userSession: CoreUserSession | null = null
 
-      // If static token provided, validate against it
-      if (token && bearerToken === token.value) {
-        userSession = token.userSession
-      }
-      // Otherwise, default to JWT decoding
-      else if (jwtService && !token) {
-        userSession = await jwtService.decode(bearerToken)
-      }
+        if (token && bearerToken === token.value) {
+          userSession = token.userSession
+        } else if (jwtService && !token) {
+          userSession = await jwtService.decode(bearerToken)
+        }
 
-      if (userSession) {
-        session.setInitial(userSession)
+        if (userSession) {
+          setSession?.(userSession)
+        }
       }
-    }
 
-    return next()
-  })
+      return next()
+    }
+  )
 )

package/src/middleware/auth-cookie.test.ts

@@ -3,7 +3,10 @@ import assert from 'node:assert/strict'
 import { authCookie } from './auth-cookie.js'
 import { resetPikkuState } from '../pikku-state.js'
 import { CoreUserSession } from '../types/core.types.js'
-import { PikkuSessionService } from '../services/user-session-service.js'
+import {
+  PikkuSessionService,
+  createMiddlewareSessionWireProps,
+} from '../services/user-session-service.js'
 
 beforeEach(() => {
   resetPikkuState()
@@ -66,7 +69,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({ session: 'cookie-jwt-value' }),
           response: mockResponse,
@@ -107,7 +110,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({}),
           response: mockResponse,
@@ -151,7 +154,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({ session: 'existing-jwt' }),
           response: mockResponse,
@@ -192,7 +195,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({}),
           response: mockResponse,
@@ -230,7 +233,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({ session: 'invalid-jwt' }),
           response: mockResponse,
@@ -274,7 +277,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({ session: 'some-jwt' }),
           response: mockResponse,
@@ -309,7 +312,7 @@ describe('authCookie middleware', () => {
         jwt: jwtService,
         logger: createMockLogger(),
       } as any,
-      { session: SessionService } as any,
+      { ...createMiddlewareSessionWireProps(SessionService) } as any,
       async () => {
         nextCalled = true
       }
@@ -337,7 +340,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({ session: 'some-jwt' }),
           response: mockResponse,
@@ -371,7 +374,7 @@ describe('authCookie middleware', () => {
         logger: mockLogger,
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({}),
           response: mockResponse,
@@ -415,7 +418,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({}),
           response: undefined,
@@ -456,7 +459,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({
             my_custom_cookie: 'custom-cookie-value',
@@ -498,7 +501,7 @@ describe('authCookie middleware', () => {
         logger: createMockLogger(),
       } as any,
       {
-        session: SessionService,
+        ...createMiddlewareSessionWireProps(SessionService),
         http: {
           request: createMockHTTPRequest({}),
           response: mockResponse,

package/src/middleware/auth-cookie.ts

@@ -41,35 +41,33 @@ export const authCookie = pikkuMiddlewareFactory<{
   pikkuMiddleware(
     async (
       { jwt: jwtService, logger },
-      { http, session: SessionService },
+      { http, setSession, getSession, session, hasSessionChanged },
       next
     ) => {
-      if (!http?.request || !SessionService || SessionService.get()) {
+      if (!http?.request || !setSession || session) {
         return next()
       }
 
-      // Try to decode session from cookie
       const cookieValue = http.request.cookie(name)
       if (cookieValue && jwtService) {
         const userSession = await jwtService.decode(cookieValue)
         if (userSession) {
-          SessionService.setInitial(userSession)
+          setSession?.(userSession)
         }
       }
 
       await next()
 
-      // Set the cookie in the response if the session has changed
       if (!http?.response) {
         return
       }
 
-      if (SessionService.sessionChanged) {
-        const session = SessionService.get()
+      if (hasSessionChanged?.()) {
+        const currentSession = await getSession?.()
         if (jwtService) {
           http.response.cookie(
             name,
-            await jwtService.encode(expiresIn, session),
+            await jwtService.encode(expiresIn, currentSession),
             {
               ...options,
               expires: getRelativeTimeOffsetFromNow(expiresIn),