diff --git a/app/components-react/windows/settings/General.tsx b/app/components-react/windows/settings/General.tsx index 353b61f0dc30..643fed8a8f1a 100644 --- a/app/components-react/windows/settings/General.tsx +++ b/app/components-react/windows/settings/General.tsx @@ -77,13 +77,17 @@ function ExtraSettings() { isDualOutputScene: DualOutputService.views.hasNodeMap(), })); - const canRunOptimizer = - // HDR Settings are not compliant with the auto-optimizer - !SettingsService.views.hasHDRSettings && - isTwitch && - !isRecordingOrStreaming && - protectedMode && - isSimpleOutputMode; + /** + * Temporarily disable optimizer until migrated to the new API + */ + const canRunOptimizer = false; + // const canRunOptimizer = + // HDR Settings are not compliant with the auto-optimizer + // !SettingsService.views.hasHDRSettings && + // isTwitch && + // !isRecordingOrStreaming && + // protectedMode && + // isSimpleOutputMode; function restartStreamlabelsSession() { StreamlabelsService.restartSession().then(result => { diff --git a/app/services/auto-config/index.ts b/app/services/auto-config/index.ts index a8cf3b206b20..e5d778e6ec01 100644 --- a/app/services/auto-config/index.ts +++ b/app/services/auto-config/index.ts @@ -32,43 +32,48 @@ export class AutoConfigService extends Service { configProgress = new Subject(); async start() { - try { - if (this.userService.views.isTwitchAuthed) { - const service = getPlatformService('twitch') as TwitchService; - const key = await service.fetchStreamKey(); - this.streamSettingsService.setSettings({ key, platform: 'twitch' }); - } else if (this.userService.views.isYoutubeAuthed) { - const service = getPlatformService('youtube') as YoutubeService; - await service.beforeGoLive({ - platforms: { - youtube: { - enabled: true, - useCustomFields: false, - title: 'bandwidthTest', - description: 'bandwidthTest', - privacyStatus: 'private', - categoryId: '1', - }, - }, - advancedMode: true, - customDestinations: [], - }); - } - } catch (e: unknown) { - console.error('Failure fetching stream key for auto config'); - this.handleProgress({ event: 'error', description: 'error_fetching_stream_key' }); - return; - } + /** + * Temporarily disable optimizer until migrated to the new API + */ + return; - obs.NodeObs.InitializeAutoConfig( - (progress: IConfigProgress) => { - this.handleProgress(progress); - this.configProgress.next(progress); - }, - { continent: '', service_name: '' }, - ); + // try { + // if (this.userService.views.isTwitchAuthed) { + // const service = getPlatformService('twitch') as TwitchService; + // const key = await service.fetchStreamKey(); + // this.streamSettingsService.setSettings({ key, platform: 'twitch' }); + // } else if (this.userService.views.isYoutubeAuthed) { + // const service = getPlatformService('youtube') as YoutubeService; + // await service.beforeGoLive({ + // platforms: { + // youtube: { + // enabled: true, + // useCustomFields: false, + // title: 'bandwidthTest', + // description: 'bandwidthTest', + // privacyStatus: 'private', + // categoryId: '1', + // }, + // }, + // advancedMode: true, + // customDestinations: [], + // }); + // } + // } catch (e: unknown) { + // console.error('Failure fetching stream key for auto config'); + // this.handleProgress({ event: 'error', description: 'error_fetching_stream_key' }); + // return; + // } + + // obs.NodeObs.InitializeAutoConfig( + // (progress: IConfigProgress) => { + // this.handleProgress(progress); + // this.configProgress.next(progress); + // }, + // { continent: '', service_name: '' }, + // ); - obs.NodeObs.StartBandwidthTest(); + // obs.NodeObs.StartBandwidthTest(); } async startRecording() { diff --git a/app/services/onboarding.ts b/app/services/onboarding.ts index ea74cf837b50..b56ad17e84fa 100644 --- a/app/services/onboarding.ts +++ b/app/services/onboarding.ts @@ -84,13 +84,14 @@ export const ONBOARDING_STEPS = () => ({ hideButton: true, label: $t('Add a Theme'), }, - [EOnboardingSteps.Optimize]: { - component: 'Optimize', - disableControls: false, - hideSkip: false, - hideButton: true, - label: $t('Optimize'), - }, + // Temporarily skip auto config until migration to new API + // [EOnboardingSteps.Optimize]: { + // component: 'Optimize', + // disableControls: false, + // hideSkip: false, + // hideButton: true, + // label: $t('Optimize'), + // }, [EOnboardingSteps.Prime]: { component: 'Prime', disableControls: false, @@ -193,9 +194,12 @@ class OnboardingViews extends ViewHandler { steps.push(ONBOARDING_STEPS()[EOnboardingSteps.ThemeSelector]); } - if (userViews.isTwitchAuthed || userViews.isYoutubeAuthed || recordingModeEnabled) { - steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Optimize]); - } + /** + * Temporarily disable optimizer until migrated to the new API + */ + // if (userViews.isTwitchAuthed || userViews.isYoutubeAuthed || recordingModeEnabled) { + // steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Optimize]); + // } if (!userViews.isPrime) { steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Prime]); diff --git a/test/regular/obs-importer.ts b/test/regular/obs-importer.ts index 63466b029da6..a5419177ebb4 100644 --- a/test/regular/obs-importer.ts +++ b/test/regular/obs-importer.ts @@ -57,8 +57,9 @@ test('OBS Importer', async t => { await click('div=Import from OBS Studio'); await click('div=Start'); - await waitForDisplayed('h1=Optimize'); - await (await t.context.app.client.$('button=Skip')).click(); + // Temporarily skip auto config test until migration to new API + // await waitForDisplayed('h1=Optimize'); + // await (await t.context.app.client.$('button=Skip')).click(); await (await t.context.app.client.$('div=Choose Starter')).click(); await waitForDisplayed('[data-name=SceneSelector]'); diff --git a/test/regular/onboarding.ts b/test/regular/onboarding.ts index 87c62150ff5a..55c1b3fc2f20 100644 --- a/test/regular/onboarding.ts +++ b/test/regular/onboarding.ts @@ -42,9 +42,10 @@ test('Go through the onboarding and autoconfig', async t => { await sleep(1000); } + // Temporarily skip auto config test until migration to new API // Start auto config - t.true(await (await app.client.$('button=Start')).isExisting()); - await (await app.client.$('button=Start')).click(); + // t.true(await (await app.client.$('button=Start')).isExisting()); + // await (await app.client.$('button=Start')).click(); await (await t.context.app.client.$('div=Choose Starter')).waitForDisplayed({ timeout: 60000 }); // Skip purchasing prime diff --git a/test/screentest/tests/onboarding.ts b/test/screentest/tests/onboarding.ts index 0d49ffcf5342..ce9dc8ccc1e4 100644 --- a/test/screentest/tests/onboarding.ts +++ b/test/screentest/tests/onboarding.ts @@ -33,11 +33,12 @@ test('Onboarding steps', async t => { await makeScreenshots(t, 'Add a Theme'); await (await app.client.$('button=Skip')).click(); - await (await app.client.$('h1=Optimize')).waitForDisplayed(); - await makeScreenshots(t, 'Before optimize'); - await (await app.client.$('button=Start')).click(); - await (await app.client.$('h1=Optimizing... 33%')).waitForDisplayed(); - await makeScreenshots(t, 'Optimization progress'); + // Temporarily skip auto config test until migration to new API + // await (await app.client.$('h1=Optimize')).waitForDisplayed(); + // await makeScreenshots(t, 'Before optimize'); + // await (await app.client.$('button=Start')).click(); + // await (await app.client.$('h1=Optimizing... 33%')).waitForDisplayed(); + // await makeScreenshots(t, 'Optimization progress'); await (await app.client.$('h1=Choose your Streamlabs plan')).waitForDisplayed({ timeout: 15000 }); await makeScreenshots(t, 'Ultra');