chore: merge js, py and r session controller classes to base session controller class

api/src/controllers/internal/Session.ts

@@ -19,13 +19,41 @@ import {
 
 const execFilePromise = promisify(execFile)
 
-abstract class SessionController {
+export class SessionController {
   protected sessions: Session[] = []
 
   protected getReadySessions = (): Session[] =>
     this.sessions.filter((sess: Session) => sess.ready && !sess.consumed)
 
-  protected abstract createSession(): Promise<Session>
+  protected async createSession(): Promise<Session> {
+    const sessionId = generateUniqueFileName(generateTimestamp())
+    const sessionFolder = path.join(getSessionsFolder(), sessionId)
+
+    const creationTimeStamp = sessionId.split('-').pop() as string
+    // death time of session is 15 mins from creation
+    const deathTimeStamp = (
+      parseInt(creationTimeStamp) +
+      15 * 60 * 1000 -
+      1000
+    ).toString()
+
+    const session: Session = {
+      id: sessionId,
+      ready: true,
+      inUse: true,
+      consumed: false,
+      completed: false,
+      creationTimeStamp,
+      deathTimeStamp,
+      path: sessionFolder
+    }
+
+    const headersPath = path.join(session.path, 'stpsrv_header.txt')
+    await createFile(headersPath, 'Content-type: text/plain')
+
+    this.sessions.push(session)
+    return session
+  }
 
   public async getSession() {
     const readySessions = this.getReadySessions()
@@ -167,158 +195,17 @@ ${autoExecContent}`
   }
 }
 
-export class JSSessionController extends SessionController {
-  protected async createSession(): Promise<Session> {
-    const sessionId = generateUniqueFileName(generateTimestamp())
-    const sessionFolder = path.join(getSessionsFolder(), sessionId)
-
-    const creationTimeStamp = sessionId.split('-').pop() as string
-    // death time of session is 15 mins from creation
-    const deathTimeStamp = (
-      parseInt(creationTimeStamp) +
-      15 * 60 * 1000 -
-      1000
-    ).toString()
-
-    const session: Session = {
-      id: sessionId,
-      ready: true,
-      inUse: true,
-      consumed: false,
-      completed: false,
-      creationTimeStamp,
-      deathTimeStamp,
-      path: sessionFolder
-    }
-
-    const headersPath = path.join(session.path, 'stpsrv_header.txt')
-    await createFile(headersPath, 'Content-type: text/plain')
-
-    this.sessions.push(session)
-    return session
-  }
-}
-
-export class PythonSessionController extends SessionController {
-  protected async createSession(): Promise<Session> {
-    const sessionId = generateUniqueFileName(generateTimestamp())
-    const sessionFolder = path.join(getSessionsFolder(), sessionId)
-
-    const creationTimeStamp = sessionId.split('-').pop() as string
-    // death time of session is 15 mins from creation
-    const deathTimeStamp = (
-      parseInt(creationTimeStamp) +
-      15 * 60 * 1000 -
-      1000
-    ).toString()
-
-    const session: Session = {
-      id: sessionId,
-      ready: true,
-      inUse: true,
-      consumed: false,
-      completed: false,
-      creationTimeStamp,
-      deathTimeStamp,
-      path: sessionFolder
-    }
-
-    const headersPath = path.join(session.path, 'stpsrv_header.txt')
-    await createFile(headersPath, 'Content-type: text/plain')
-
-    this.sessions.push(session)
-    return session
-  }
-}
-
-export class RSessionController extends SessionController {
-  protected async createSession(): Promise<Session> {
-    const sessionId = generateUniqueFileName(generateTimestamp())
-    const sessionFolder = path.join(getSessionsFolder(), sessionId)
-
-    const creationTimeStamp = sessionId.split('-').pop() as string
-    // death time of session is 15 mins from creation
-    const deathTimeStamp = (
-      parseInt(creationTimeStamp) +
-      15 * 60 * 1000 -
-      1000
-    ).toString()
-
-    const session: Session = {
-      id: sessionId,
-      ready: true,
-      inUse: true,
-      consumed: false,
-      completed: false,
-      creationTimeStamp,
-      deathTimeStamp,
-      path: sessionFolder
-    }
-
-    const headersPath = path.join(session.path, 'stpsrv_header.txt')
-    await createFile(headersPath, 'Content-type: text/plain')
-
-    this.sessions.push(session)
-    return session
-  }
-}
-
 export const getSessionController = (
   runTime: RunTimeType
-):
+): SessionController => {
-  | SASSessionController
+  if (process.sessionController) return process.sessionController
-  | JSSessionController
-  | PythonSessionController
-  | RSessionController => {
-  if (runTime === RunTimeType.SAS) {
-    return getSASSessionController()
-  }
 
-  if (runTime === RunTimeType.JS) {
+  process.sessionController =
-    return getJSSessionController()
+    runTime === RunTimeType.SAS
-  }
+      ? new SASSessionController()
+      : new SessionController()
 
-  if (runTime === RunTimeType.PY) {
+  return process.sessionController
-    return getPythonSessionController()
-  }
-
-  if (runTime === RunTimeType.R) {
-    return getRSessionController()
-  }
-
-  throw new Error('No Runtime is configured')
-}
-
-const getSASSessionController = (): SASSessionController => {
-  if (process.sasSessionController) return process.sasSessionController
-
-  process.sasSessionController = new SASSessionController()
-
-  return process.sasSessionController
-}
-
-const getJSSessionController = (): JSSessionController => {
-  if (process.jsSessionController) return process.jsSessionController
-
-  process.jsSessionController = new JSSessionController()
-
-  return process.jsSessionController
-}
-
-const getPythonSessionController = (): PythonSessionController => {
-  if (process.pythonSessionController) return process.pythonSessionController
-
-  process.pythonSessionController = new PythonSessionController()
-
-  return process.pythonSessionController
-}
-
-const getRSessionController = (): RSessionController => {
-  if (process.rSessionController) return process.rSessionController
-
-  process.rSessionController = new RSessionController()
-
-  return process.rSessionController
 }
 
 const autoExecContent = `

api/src/routes/api/spec/stp.spec.ts

@@ -21,9 +21,8 @@ import {
 } from '../../../utils'
 import { createFile, generateTimestamp, deleteFolder } from '@sasjs/utils'
 import {
-  SASSessionController,
+  SessionController,
-  JSSessionController,
+  SASSessionController
-  PythonSessionController
 } from '../../../controllers/internal'
 import * as ProcessProgramModule from '../../../controllers/internal/processProgram'
 import { Session } from '../../../types'
@@ -472,11 +471,7 @@ const setupMocks = async () => {
     .mockImplementation(mockedGetSession)
 
   jest
-    .spyOn(JSSessionController.prototype, 'getSession')
+    .spyOn(SASSessionController.prototype, 'getSession')
-    .mockImplementation(mockedGetSession)
-
-  jest
-    .spyOn(PythonSessionController.prototype, 'getSession')
     .mockImplementation(mockedGetSession)
 
   jest

api/src/types/system/process.d.ts

@@ -7,10 +7,7 @@ declare namespace NodeJS {
     driveLoc: string
     logsLoc: string
     logsUUID: string
-    sasSessionController?: import('../../controllers/internal').SASSessionController
+    sessionController?: import('../../controllers/internal').SessionController
-    jsSessionController?: import('../../controllers/internal').JSSessionController
-    pythonSessionController?: import('../../controllers/internal').PythonSessionController
-    rSessionController?: import('../../controllers/internal').RSessionController
     appStreamConfig: import('../').AppStreamConfig
     logger: import('@sasjs/utils/logger').Logger
     runTimes: import('../../utils').RunTimeType[]