Revert "Do not save confi in file cache"

This reverts commit 0702fbb.

packages/data-context/src/DataContext.ts

@@ -5,6 +5,7 @@ import type { NexusGenAbstractTypeMembers } from '@packages/graphql/src/gen/nxs.
 import type { AuthApiShape } from './actions/AuthActions'
 import debugLib from 'debug'
 import fsExtra from 'fs-extra'
+import { CoreDataShape, makeCoreData } from './data/coreDataShape'
 import { DataActions } from './DataActions'
 import {
   AppDataSource,
@@ -26,15 +27,21 @@ export interface DataContextConfig extends DataContextShellConfig {
   os: PlatformName
   launchArgs: LaunchArgs
   launchOptions: OpenProjectLaunchOptions
+  /**
+   * Default is to
+   */
+  coreData?: CoreDataShape
   /**
    * Injected from the server
    */
   appApi: AppApiShape
   authApi: AuthApiShape
-  projectApi: (ctx: DataContext) => ProjectApiShape
+  projectApi: ProjectApiShape
 }
 
 export class DataContext extends DataContextShell {
+  private _coreData: CoreDataShape
+
   @cached
   get fs () {
     return fsExtra
@@ -47,6 +54,7 @@ export class DataContext extends DataContextShell {
 
   constructor (private config: DataContextConfig) {
     super(config)
+    this._coreData = config.coreData ?? makeCoreData()
   }
 
   async initializeData () {
@@ -90,6 +98,10 @@ export class DataContext extends DataContextShell {
     return this.config.launchOptions
   }
 
+  get coreData () {
+    return this._coreData
+  }
+
   get user () {
     return this.coreData.user
   }
@@ -176,7 +188,7 @@ export class DataContext extends DataContextShell {
     return {
       appApi: this.config.appApi,
       authApi: this.config.authApi,
-      projectApi: this.config.projectApi(this),
+      projectApi: this.config.projectApi,
       busApi: this.config.rootBus,
     }
   }

packages/data-context/src/DataContextShell.ts

@@ -3,14 +3,9 @@ import type { Server } from 'http'
 import type { AddressInfo } from 'net'
 import { DataEmitterActions } from './actions/DataEmitterActions'
 import { cached } from './util/cached'
-import { CoreDataShape, makeCoreData } from './data/coreDataShape'
 
 export interface DataContextShellConfig {
   rootBus: EventEmitter
-    /**
-   * Default is to
-   */
-     coreData?: CoreDataShape
 }
 
 // Used in places where we have to create a "shell" data context,
@@ -19,11 +14,8 @@ export class DataContextShell {
   private _gqlServer?: Server
   private _appServerPort: number | undefined
   private _gqlServerPort: number | undefined
-  private _coreData: CoreDataShape
 
-  constructor (private shellConfig: DataContextShellConfig = { rootBus: new EventEmitter }) {
-    this._coreData = shellConfig.coreData ?? makeCoreData()
-  }
+  constructor (private shellConfig: DataContextShellConfig = { rootBus: new EventEmitter }) {}
 
   setAppServerPort (port: number | undefined) {
     this._appServerPort = port
@@ -53,10 +45,6 @@ export class DataContextShell {
     }
   }
 
-  get coreData () {
-    return this._coreData
-  }
-
   destroy () {
     this._gqlServer?.close()
   }

packages/data-context/src/actions/ProjectActions.ts

@@ -25,6 +25,7 @@ export interface ProjectApiShape {
   clearProjectPreferences(projectTitle: string): Promise<unknown>
   clearAllProjectPreferences(): Promise<unknown>
   closeActiveProject(): Promise<unknown>
+  getProjectConfig (projectRoot: string): Promise<FullConfig | null>
   error(type: string, ...args: any): Error
 }
 

packages/data-context/src/data/coreDataShape.ts

@@ -63,29 +63,20 @@ export interface BaseErrorDataShape {
   stack?: string
 }
 
-export interface ActiveProjectConfig {
-  settings: Cypress.ConfigOptions
-  envFile: Cypress.ObjectLike
-}
-
 export interface CoreDataShape {
   baseError: BaseErrorDataShape | null
   dev: DevStateShape
   app: AppDataShape
   wizard: WizardDataShape
   user: AuthenticatedUserShape | null
   electron: ElectronShape
-  activeProjectConfig: {
-    [key: string]: ActiveProjectConfig | null
-  }
 }
 
 /**
  * All state for the app should live here for now
  */
 export function makeCoreData (): CoreDataShape {
   return {
-    activeProjectConfig: {},
     baseError: null,
     dev: {
       refreshState: null,

packages/data-context/src/sources/ProjectDataSource.ts

@@ -88,6 +88,13 @@ export class ProjectDataSource {
     // Check first the config files, to be sure there are no 2 config files
     const configFile = await this.getDefaultConfigFilePath(projectRoot)
 
+    // Check if we have already cached the config
+    const config = await this.api.getProjectConfig(projectRoot)
+
+    if (config) {
+      return config
+    }
+
     return this.configLoader({
       configFile,
     }).load(projectRoot)

packages/server/lib/cache.js

@@ -145,6 +145,19 @@ module.exports = {
     return fileUtil.set({ USER: {} })
   },
 
+  // We may need to set this value every time the config file is read, or updated
+  // having it on the cache, will help us preventing to read the file on a cp
+  // to get the projectId
+  setProjectConfig (projectRoot, config) {
+    return fileUtil.set({ PROJECTS_CONFIG: { [projectRoot]: config } })
+  },
+
+  getProjectConfig (projectRoot) {
+    return fileUtil.get('PROJECTS_CONFIG').then((projects) => {
+      return projects && projects[projectRoot] ? projects[projectRoot] : null
+    })
+  },
+
   removeLatestProjects () {
     return fileUtil.set({ PROJECTS: [] })
   },

packages/server/lib/config.ts

@@ -14,6 +14,7 @@ import * as settings from './util/settings'
 import Debug from 'debug'
 import pathHelpers from './util/path_helpers'
 import findSystemNode from './util/find_system_node'
+import { setProjectConfig } from './cache'
 
 export interface ConfigSettingsConfig {
   testingType: TestingType
@@ -24,7 +25,6 @@ const debug = Debug('cypress:server:config')
 
 import { options, breakingOptions } from './config_options'
 import { getProcessEnvVars } from './util/config'
-import type { DataContextShell } from '@packages/data-context/src/DataContextShell'
 
 export const CYPRESS_ENV_PREFIX = 'CYPRESS_'
 
@@ -204,29 +204,12 @@ export type FullConfig =
     resolved: ResolvedConfigurationOptions
   }
 
-export function get (projectRoot, options: {configFile?: string | false } = { configFile: undefined }, ctx?: DataContextShell): Promise<FullConfig> {
-  return Promise.resolve(ctx?.coreData.activeProjectConfig[projectRoot])
-  .then((config) => {
-    if (config) {
-      return Promise.resolve([config.settings, config.envFile])
-    }
-
-    return Promise.all([
-      settings.read(projectRoot, options).then(validateFile(options.configFile ?? 'cypress.config.{ts|js}')),
-      settings.readEnv(projectRoot).then(validateFile('cypress.env.json')),
-    ])
-  })
+export function get (projectRoot, options: {configFile?: string | false } = { configFile: undefined }): Promise<FullConfig> {
+  return Promise.all([
+    settings.read(projectRoot, options).then(validateFile(options.configFile ?? 'cypress.config.{ts|js}')),
+    settings.readEnv(projectRoot).then(validateFile('cypress.env.json')),
+  ])
   .spread((settings, envFile) => {
-    if (ctx) {
-      ctx.coreData.activeProjectConfig = {
-        ...ctx.coreData.activeProjectConfig,
-        [projectRoot]: {
-          settings,
-          envFile,
-        },
-      }
-    }
-
     return set({
       projectName: getNameFromRoot(projectRoot),
       projectRoot,
@@ -235,16 +218,17 @@ export function get (projectRoot, options: {configFile?: string | false } = { co
       options,
     })
   })
+  .then((fullConfig) => {
+    return setProjectConfig(projectRoot, fullConfig).then(() => {
+      return fullConfig
+    })
+  })
   .catch((e) => {
     // Cleanup the cache if there's an error to prevent showing stale data
-    if (ctx?.coreData.activeProjectConfig) {
-      ctx.coreData.activeProjectConfig = {
-        ...ctx.coreData.activeProjectConfig,
-        [projectRoot]: null,
-      }
-    }
-
-    throw e
+    return setProjectConfig(projectRoot, null)
+    .then(() => {
+      throw e
+    })
   })
 }
 

packages/server/lib/makeDataContext.ts

@@ -38,51 +38,52 @@ export function makeDataContext (options: MakeDataContextOptions) {
         return user.logOut()
       },
     },
-    projectApi (ctx: DataContext) {
-      return {
-        getConfig (projectRoot: string, options?: SettingsOptions) {
-          return config.get(projectRoot, options, ctx)
-        },
-        launchProject (browser: FoundBrowser, spec: Cypress.Spec, options?: LaunchOpts) {
-          return openProject.launch({ ...browser }, spec, options)
-        },
-        initializeProject (args: LaunchArgs, options: OpenProjectLaunchOptions, browsers: FoundBrowser[]) {
-          return openProject.create(args.projectRoot, args, options, browsers)
-        },
-        insertProjectToCache (projectRoot: string) {
-          cache.insertProject(projectRoot)
-        },
-        getProjectRootsFromCache () {
-          return cache.getProjectRoots()
-        },
-        findSpecs (payload: FindSpecs) {
-          return specsUtil.findSpecs(payload)
-        },
-        clearLatestProjectsCache () {
-          return cache.removeLatestProjects()
-        },
-        getProjectPreferencesFromCache () {
-          return cache.getProjectPreferences()
-        },
-        clearProjectPreferences (projectTitle: string) {
-          return cache.removeProjectPreferences(projectTitle)
-        },
-        clearAllProjectPreferences () {
-          return cache.removeAllProjectPreferences()
-        },
-        insertProjectPreferencesToCache (projectTitle: string, preferences: Preferences) {
-          cache.insertProjectPreferences(projectTitle, preferences)
-        },
-        removeProjectFromCache (path: string) {
-          return cache.removeProject(path)
-        },
-        closeActiveProject () {
-          return openProject.closeActiveProject()
-        },
-        error (type: string, ...args: any) {
-          throw errors.throw(type, ...args)
-        },
-      }
+    projectApi: {
+      getConfig (projectRoot: string, options?: SettingsOptions) {
+        return config.get(projectRoot, options)
+      },
+      launchProject (browser: FoundBrowser, spec: Cypress.Spec, options?: LaunchOpts) {
+        return openProject.launch({ ...browser }, spec, options)
+      },
+      initializeProject (args: LaunchArgs, options: OpenProjectLaunchOptions, browsers: FoundBrowser[]) {
+        return openProject.create(args.projectRoot, args, options, browsers)
+      },
+      insertProjectToCache (projectRoot: string) {
+        cache.insertProject(projectRoot)
+      },
+      getProjectRootsFromCache () {
+        return cache.getProjectRoots()
+      },
+      findSpecs (payload: FindSpecs) {
+        return specsUtil.findSpecs(payload)
+      },
+      getProjectConfig (projectRoot: string) {
+        return cache.getProjectConfig(projectRoot)
+      },
+      clearLatestProjectsCache () {
+        return cache.removeLatestProjects()
+      },
+      getProjectPreferencesFromCache () {
+        return cache.getProjectPreferences()
+      },
+      clearProjectPreferences (projectTitle: string) {
+        return cache.removeProjectPreferences(projectTitle)
+      },
+      clearAllProjectPreferences () {
+        return cache.removeAllProjectPreferences()
+      },
+      insertProjectPreferencesToCache (projectTitle: string, preferences: Preferences) {
+        cache.insertProjectPreferences(projectTitle, preferences)
+      },
+      removeProjectFromCache (path: string) {
+        return cache.removeProject(path)
+      },
+      closeActiveProject () {
+        return openProject.closeActiveProject()
+      },
+      error (type: string, ...args: any) {
+        throw errors.throw(type, ...args)
+      },
     },
   })
 }

packages/server/lib/project-base.ts

@@ -34,6 +34,7 @@ import { SpecsStore } from './specs-store'
 import { checkSupportFile, getDefaultConfigFilePath } from './project_utils'
 import type { FoundBrowser, OpenProjectLaunchOptions } from '@packages/types'
 import { DataContextShell } from '@packages/data-context/src/DataContextShell'
+import { getProjectConfig } from './cache'
 
 // Cannot just use RuntimeConfigOptions as is because some types are not complete.
 // Instead, this is an interface of values that have been manually validated to exist
@@ -705,7 +706,7 @@ export class ProjectBase<TServer extends Server> extends EE {
       this.options.configFile = await getDefaultConfigFilePath(this.projectRoot)
     }
 
-    let theCfg: Cfg = await config.get(this.projectRoot, this.options, this.ctx)
+    let theCfg: Cfg = await config.get(this.projectRoot, this.options)
 
     if (!theCfg.browsers || theCfg.browsers.length === 0) {
       // @ts-ignore - we don't know if the browser is headed or headless at this point.
@@ -860,10 +861,10 @@ export class ProjectBase<TServer extends Server> extends EE {
   async getProjectId () {
     await this.verifyExistence()
 
-    const config = this.ctx.coreData.activeProjectConfig[this.projectRoot]
+    const config = await getProjectConfig(this.projectRoot)
 
-    if (config?.settings.projectId) {
-      return config.settings.projectId
+    if (config?.projectId) {
+      return config.projectId
     }
 
     const readSettings = await settings.read(this.projectRoot, this.options)

packages/server/lib/util/settings.ts

@@ -6,6 +6,7 @@ import { fs } from '../util/fs'
 import { requireAsync } from './require_async'
 import Debug from 'debug'
 import type { SettingsOptions } from '@packages/types'
+import { getProjectConfig } from '../cache'
 
 const debug = Debug('cypress:server:settings')
 
@@ -130,7 +131,13 @@ export function configFile (options: SettingsOptions = {}) {
 }
 
 export function id (projectRoot, options = {}) {
-  return read(projectRoot, options)
+  return getProjectConfig(projectRoot).then((config) => {
+    if (config) {
+      return Promise.resolve(config)
+    }
+
+    return read(projectRoot, options)
+  })
   .then((config) => config.projectId)
   .catch(() => {
     return null