diff --git a/package.json b/package.json index ffd5cade..f7e72479 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coderoad", - "version": "0.18.3", + "version": "0.18.4", "description": "Play interactive coding tutorials in your editor", "keywords": [ "tutorial", diff --git a/src/actions/onStartup.ts b/src/actions/onStartup.ts index 74bd70da..54bfd9ea 100644 --- a/src/actions/onStartup.ts +++ b/src/actions/onStartup.ts @@ -5,6 +5,7 @@ import Context from '../services/context/context' import { send } from '../commands' import { WORKSPACE_ROOT, TUTORIAL_URL } from '../environment' import fetch from 'node-fetch' +import logger from '../services/logger' const onStartup = async (context: Context): Promise => { try { @@ -36,10 +37,12 @@ const onStartup = async (context: Context): Promise => { // NEW: no stored tutorial, must start new tutorial if (!tutorial || !tutorial.version) { if (TUTORIAL_URL) { + logger(`Using tutorial url from env: ${TUTORIAL_URL}`) // if a tutorial URL is added, launch on startup try { const tutorialRes = await fetch(TUTORIAL_URL) - const tutorial = await tutorialRes.json() + const tutorial: TT.Tutorial = await tutorialRes.json() + logger(`Tutorial: ${tutorial?.summary?.title} (${tutorial?.version})`) send({ type: 'START_TUTORIAL_FROM_URL', payload: { tutorial } }) return } catch (e: any) { @@ -54,6 +57,7 @@ const onStartup = async (context: Context): Promise => { // CONTINUE_FROM_PROGRESS const { position } = await context.onContinue(tutorial) + logger(`Continuing tutorial from progress: level ${position?.levelId} step ${position?.stepId}`) // communicate to client the tutorial & stepProgress state send({ type: 'LOAD_STORED_TUTORIAL', payload: { env, tutorial, position } }) } catch (e: any) { diff --git a/src/actions/onTutorialConfigContinue.ts b/src/actions/onTutorialConfigContinue.ts index 5ab560c9..ba84ad83 100644 --- a/src/actions/onTutorialConfigContinue.ts +++ b/src/actions/onTutorialConfigContinue.ts @@ -8,9 +8,9 @@ import logger from '../services/logger' import { setupWebhook } from '../services/hooks/webhooks' const onTutorialConfigContinue = async (action: T.Action, context: Context): Promise => { - logger(`Continuing tutorial from progress: ${JSON.stringify(action.payload)}`) try { const tutorialToContinue: TT.Tutorial | null = context.tutorial.get() + logger(`Tutorial: ${tutorialToContinue?.summary?.title} (${tutorialToContinue?.version})`) if (!tutorialToContinue) { throw new Error('Invalid tutorial to continue') } diff --git a/src/services/hooks/utils/runCommands.ts b/src/services/hooks/utils/runCommands.ts index c7bd2cde..f64090dd 100644 --- a/src/services/hooks/utils/runCommands.ts +++ b/src/services/hooks/utils/runCommands.ts @@ -18,7 +18,7 @@ const runCommands = async (commands: string[] = []): Promise => { logger(`Command output: ${JSON.stringify(result)}`) } catch (error: any) { logger(`Command failed: ${error.message}`) - send({ type: 'COMMAND_FAIL', payload: { process: { ...process, status: 'FAIL' } } }) + send({ type: '', payload: { process: { ...process, status: 'FAIL' } } }) return } send({ type: 'COMMAND_SUCCESS', payload: { process: { ...process, status: 'SUCCESS' } } }) diff --git a/web-app/package.json b/web-app/package.json index f4cd558e..90b875fb 100644 --- a/web-app/package.json +++ b/web-app/package.json @@ -1,6 +1,6 @@ { "name": "coderoad-app", - "version": "0.18.3", + "version": "0.18.4", "private": true, "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'",