Unblock subsequent Singleton.createInstance() (#3225)

- Also fix clusters with unknown workspaces

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/common/utils/singleton.ts

@@ -46,13 +46,16 @@ export class Singleton {
   static createInstance<T, R extends any[]>(this: StaticThis<T, R>, ...args: R): T {
     if (!Singleton.instances.has(this)) {
       if (Singleton.creating.length > 0) {
-        throw new TypeError("Cannot create a second singleton while creating a first");
+        throw new TypeError(`Cannot create a second singleton (${this.name}) while creating a first (${Singleton.creating})`);
       }
 
+      try {
         Singleton.creating = this.name;
         Singleton.instances.set(this, new this(...args));
+      } finally {
         Singleton.creating = "";
       }
+    }
 
     return Singleton.instances.get(this) as T;
   }

src/migrations/helpers.ts

@@ -46,6 +46,8 @@ export function joinMigrations(...declarations: MigrationDeclaration[]): Migrati
     iter.map(
       migrations,
       ([v, fns]) => [v, (store: Conf<any>) => {
+        migrationLog(`Running ${v} migration for ${store.path}`);
+
         for (const fn of fns) {
           fn(store);
         }

src/migrations/hotbar-store/5.0.0-beta.10.ts

@@ -75,6 +75,11 @@ export default {
         for (const workspaceId of cluster.workspaces ?? [cluster.workspace].filter(Boolean)) {
           const workspaceHotbar = workspaceHotbars.get(workspaceId);
 
+          if (!workspaceHotbar) {
+            migrationLog(`Cluster ${uid} has unknown workspace ID, skipping`);
+            continue;
+          }
+
           migrationLog(`Adding cluster ${uid} to ${workspaceHotbar.name}`);
 
           if (workspaceHotbar?.items.length < defaultHotbarCells) {