fix(shutdown): handle simultaneous shutdown

djMax · djMax · commit f8d68a1c7ca8 · 2023-10-23T21:40:52.000-04:00
diff --git a/src/index.ts b/src/index.ts
@@ -166,16 +166,17 @@ export async function getReusableApp<
 }
 
 export async function clearReusableApp() {
+  const oldApp = app;
+  app = undefined;
+  appService = undefined;
   try {
-    if (app) {
-      await shutdownApp(app);
+    if (oldApp) {
+      await shutdownApp(oldApp);
     }
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error('Shared app shutdown failed', error);
   }
-  app = undefined;
-  appService = undefined;
 }
 
 export async function getSimulatedContext<Config extends ConfigurationSchema = ConfigurationSchema>(

Original file line number	Diff line number	Diff line change
`@@ -166,16 +166,17 @@ export async function getReusableApp<`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`export async function clearReusableApp() {`
	`169`	`+ const oldApp = app;`
	`170`	`+ app = undefined;`
	`171`	`+ appService = undefined;`
`169`	`172`	`try {`
`170`		`- if (app) {`
`171`		`- await shutdownApp(app);`
	`173`	`+ if (oldApp) {`
	`174`	`+ await shutdownApp(oldApp);`
`172`	`175`	`}`
`173`	`176`	`} catch (error) {`
`174`	`177`	`// eslint-disable-next-line no-console`
`175`	`178`	`console.error('Shared app shutdown failed', error);`
`176`	`179`	`}`
`177`		`- app = undefined;`
`178`		`- appService = undefined;`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`export async function getSimulatedContext<Config extends ConfigurationSchema = ConfigurationSchema>(`