enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2025-01-03 18:38:08 +03:00
Code Issues Projects Releases Wiki Activity

Fix broken login flow (#9965)

Browse Source 
* kill the electron process instead of restarting

limit the port range with single one

Make ENSO_CLOUD_REDIRECT optional, use window.location.origin by default

* Revert server changes

* limit the amount of ports in server
This commit is contained in:
Sergei Garin 2024-05-22 16:56:42 +03:00 committed by GitHub
parent 202f7e1a49
commit 91a2afb098
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/gui2/vite.config.ts
View File

@ -12,7 +12,6 @@ import { defineConfig, type Plugin } from 'vite'
// @ts-expect-error
import * as tailwindConfig from 'enso-dashboard/tailwind.config'
import { createGatewayServer } from './ydoc-server'
const localServerPort = 8080
const projectManagerUrl = 'ws://127.0.0.1:30535'
const IS_CLOUD_BUILD = process.env.CLOUD_BUILD === 'true'
@ -60,7 +59,7 @@ export default defineConfig({
},
},
define: {
...getDefines(localServerPort),
...getDefines(),
IS_CLOUD_BUILD: JSON.stringify(IS_CLOUD_BUILD),
PROJECT_MANAGER_URL: JSON.stringify(projectManagerUrl),
YDOC_SERVER_URL: IS_POLYGLOT_YDOC_SERVER ? JSON.stringify('defined') : undefined,

1
app/ide-desktop/.example.env
View File

@ -1,4 +1,3 @@
ENSO_CLOUD_REDIRECT=http://localhost:8080
ENSO_CLOUD_ENVIRONMENT=production
ENSO_CLOUD_API_URL=https://aaaaaaaaaa.execute-api.mars.amazonaws.com
ENSO_CLOUD_CHAT_URL=wss://chat.example.com

2
app/ide-desktop/lib/client/src/bin/server.ts
View File

@ -75,7 +75,7 @@ export class Config {
/** Determine the initial available communication endpoint, starting from the specified port,
* to provide file hosting services. */
async function findPort(port: number): Promise<number> {
return await portfinder.getPortPromise({ port, startPort: port })
return await portfinder.getPortPromise({ port, startPort: port, stopPort: port + 4 })
}
// ==============

18
app/ide-desktop/lib/client/src/index.ts
View File

@ -223,8 +223,8 @@ class App {
await logger.asyncGroupMeasured('Starting the application', async () => {
// Note that we want to do all the actions synchronously, so when the window
// appears, it serves the website immediately.
await this.startBackendIfEnabled()
await this.startContentServerIfEnabled()
await this.startBackendIfEnabled()
await this.createWindowIfEnabled(windowSize)
this.initIpc()
await this.loadWindowContent()
@ -236,8 +236,10 @@ class App {
authentication.initModule(() => this.window!)
})
} catch (err) {
console.error('Failed to initialize the application, shutting down. Error:', err)
logger.error('Failed to initialize the application, shutting down. Error: ', err)
electron.app.quit()
} finally {
logger.groupEnd()
}
}
@ -281,18 +283,24 @@ class App {
/** Start the content server, which will serve the application content (HTML) to the window. */
async startContentServerIfEnabled() {
await this.runIfEnabled(this.args.options.server, async () => {
await logger.asyncGroupMeasured('Starting the content server.', async () => {
await logger
.asyncGroupMeasured('Starting the content server.', async () => {
const serverCfg = new server.Config({
dir: paths.ASSETS_PATH,
port: this.args.groups.server.options.port.value,
externalFunctions: {
uploadProjectBundle: projectManagement.uploadBundle,
runProjectManagerCommand: (cliArguments, body?: NodeJS.ReadableStream) =>
projectManager.runCommand(this.args, cliArguments, body),
runProjectManagerCommand: (
cliArguments,
body?: NodeJS.ReadableStream
) => projectManager.runCommand(this.args, cliArguments, body),
},
})
this.server = await server.Server.create(serverCfg)
})
.finally(() => {
logger.groupEnd()
})
})
}

26
app/ide-desktop/lib/client/watch.ts
View File

@ -109,18 +109,32 @@ process.on('SIGINT', () => {
})
})
while (true) {
/**
* Starts the electron process with the IDE.
*/
function startElectronProcess() {
console.log('Spawning Electron process.')
const electronProcess = childProcess.spawn('electron', ELECTRON_ARGS, {
stdio: 'inherit',
shell: true,
// eslint-disable-next-line @typescript-eslint/naming-convention
env: Object.assign({ NODE_MODULES_PATH }, process.env),
})
console.log('Waiting for Electron process to finish.')
const result = await new Promise((resolve, reject) => {
electronProcess.on('close', resolve)
electronProcess.on('error', reject)
electronProcess.on('close', code => {
if (code === 0) {
electronProcess.removeAllListeners()
process.exit(0)
}
})
electronProcess.on('error', error => {
console.error('Electron process failed:', error)
console.error('Killing electron process.')
electronProcess.removeAllListeners()
electronProcess.kill()
process.exit(1)
})
console.log('Electron process finished. Exit code: ', result)
}
startElectronProcess()

6
app/ide-desktop/lib/common/src/appConfig.js
View File

@ -86,13 +86,13 @@ function stringify(value) {
* - the unique identifier for the cloud environment, for use in Sentry logs
* - Stripe, Sentry and Amplify public keys */
// eslint-disable-next-line @typescript-eslint/no-magic-numbers
export function getDefines(serverPort = 8080) {
export function getDefines() {
return {
/* eslint-disable @typescript-eslint/naming-convention */
'process.env.ENSO_CLOUD_REDIRECT': stringify(
// The actual environment variable does not necessarily exist.
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
process.env.ENSO_CLOUD_REDIRECT ?? `http://localhost:${serverPort}`
process.env.ENSO_CLOUD_REDIRECT
),
'process.env.ENSO_CLOUD_ENVIRONMENT': stringify(
// The actual environment variable does not necessarily exist.
@ -124,11 +124,9 @@ export function getDefines(serverPort = 8080) {
}
}
const SERVER_PORT = 8080
const DUMMY_DEFINES = {
/* eslint-disable @typescript-eslint/naming-convention */
'process.env.NODE_ENV': 'production',
'process.env.ENSO_CLOUD_REDIRECT': `http://localhost:${SERVER_PORT}`,
'process.env.ENSO_CLOUD_ENVIRONMENT': 'production',
'process.env.ENSO_CLOUD_API_URL': 'https://mock',
'process.env.ENSO_CLOUD_SENTRY_DSN':

7
app/ide-desktop/lib/dashboard/src/authentication/service.ts
View File

@ -167,10 +167,11 @@ function loadAmplifyConfig(
// needs to be registered.
setDeepLinkHandler(logger, navigate)
}
const redirectUrl = process.env.ENSO_CLOUD_REDIRECT ?? window.location.origin
/** Load the platform-specific Amplify configuration. */
const signInOutRedirect = supportsDeepLinks
? `${common.DEEP_LINK_SCHEME}://auth`
: process.env.ENSO_CLOUD_REDIRECT
const signInOutRedirect = supportsDeepLinks ? `${common.DEEP_LINK_SCHEME}://auth` : redirectUrl
return process.env.ENSO_CLOUD_COGNITO_USER_POOL_ID == null ||
process.env.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID == null ||
process.env.ENSO_CLOUD_COGNITO_DOMAIN == null ||

2
app/ide-desktop/lib/dashboard/vite.config.ts
View File

@ -45,7 +45,7 @@ export default vite.defineConfig({
IS_VITE: JSON.stringify(true),
// The sole hardcoded usage of `global` in aws-amplify.
'global.TYPED_ARRAY_SUPPORT': JSON.stringify(true),
...appConfig.getDefines(SERVER_PORT),
...appConfig.getDefines(),
},
})

2
app/ide-desktop/lib/types/globals.d.ts vendored
View File

@ -147,7 +147,7 @@ declare global {
// === Cloud environment variables ===
// @ts-expect-error The index signature is intentional to disallow unknown env vars.
readonly ENSO_CLOUD_REDIRECT: string
readonly ENSO_CLOUD_REDIRECT?: string
// When unset, the `.env` loader tries to load `.env` rather than `.<name>.env`.
// Set to the empty string to load `.env`.
// @ts-expect-error The index signature is intentional to disallow unknown env vars.