Simplify StorageInstanceManager

Author: janbuchar

packages/core/src/service_locator.ts

@@ -267,7 +267,7 @@ export class ServiceLocator implements ServiceLocatorInterface {
 
     getStorageInstanceManager(): StorageInstanceManager {
         if (!ServiceLocator.storageInstanceManager) {
-            ServiceLocator.storageInstanceManager = new StorageInstanceManager(this.getConfiguration());
+            ServiceLocator.storageInstanceManager = new StorageInstanceManager();
         }
         return ServiceLocator.storageInstanceManager;
     }

packages/core/src/storages/dataset.ts

@@ -11,6 +11,7 @@ import type { Awaitable } from '../typedefs.js';
 import { checkStorageAccess } from './access_checking.js';
 import { KeyValueStore } from './key_value_store.js';
 import type { StorageIdentifier, StorageManagerOptions } from './storage_instance_manager.js';
+import { resolveStorageIdentifier } from './storage_instance_manager.js';
 import { purgeDefaultStorages } from './utils.js';
 
 /** @internal */
@@ -718,17 +719,14 @@ export class Dataset<Data extends Dictionary = Dictionary> {
 
         await purgeDefaultStorages({ onlyPurgeOnce: true, client, config: options.config });
 
+        const resolved = await resolveStorageIdentifier('Dataset', identifier, client, options.config);
         const clientCacheKey = client.getStorageClientCacheKey?.() ?? '';
 
-        return serviceLocator
-            .getStorageInstanceManager()
-            .openStorage<Dataset<Data>>(
-                this,
-                identifier,
-                () =>
-                    client.createDatasetClient(typeof identifier === 'string' ? undefined : (identifier ?? undefined)),
-                clientCacheKey,
-            );
+        return serviceLocator.getStorageInstanceManager().openStorage<Dataset<Data>>(this, {
+            ...resolved,
+            clientOpener: () => client.createDatasetClient(resolved),
+            clientCacheKey,
+        });
     }
 
     /**

packages/core/src/storages/key_value_store.ts

@@ -13,6 +13,7 @@ import { serviceLocator } from '../service_locator.js';
 import type { Awaitable } from '../typedefs.js';
 import { checkStorageAccess } from './access_checking.js';
 import type { StorageIdentifier, StorageManagerOptions } from './storage_instance_manager.js';
+import { resolveStorageIdentifier } from './storage_instance_manager.js';
 import { purgeDefaultStorages } from './utils.js';
 
 /**
@@ -614,19 +615,14 @@ export class KeyValueStore {
 
         await purgeDefaultStorages({ onlyPurgeOnce: true, client, config: options.config });
 
+        const resolved = await resolveStorageIdentifier('KeyValueStore', identifier, client, options.config);
         const clientCacheKey = client.getStorageClientCacheKey?.() ?? '';
 
-        return serviceLocator
-            .getStorageInstanceManager()
-            .openStorage<KeyValueStore>(
-                this,
-                identifier,
-                () =>
-                    client.createKeyValueStoreClient(
-                        typeof identifier === 'string' ? undefined : (identifier ?? undefined),
-                    ),
-                clientCacheKey,
-            );
+        return serviceLocator.getStorageInstanceManager().openStorage<KeyValueStore>(this, {
+            ...resolved,
+            clientOpener: () => client.createKeyValueStoreClient(resolved),
+            clientCacheKey,
+        });
     }
 
     /**

packages/core/src/storages/request_provider.ts

@@ -34,6 +34,7 @@ import { Request } from '../request.js';
 import { serviceLocator } from '../service_locator.js';
 import { checkStorageAccess } from './access_checking.js';
 import type { IStorage, StorageIdentifier, StorageManagerOptions } from './storage_instance_manager.js';
+import { resolveStorageIdentifier } from './storage_instance_manager.js';
 import { getRequestId, purgeDefaultStorages, QUERY_HEAD_MIN_LENGTH } from './utils.js';
 
 export type RequestsLike = AsyncIterable<Source | string> | Iterable<Source | string> | (Source | string)[];
@@ -876,19 +877,21 @@ export abstract class RequestProvider implements IStorage, IRequestManager {
 
         await purgeDefaultStorages({ onlyPurgeOnce: true, client, config: options.config });
 
+        const resolved = await resolveStorageIdentifier(
+            'RequestQueue',
+            identifier,
+            client,
+            options.config ?? serviceLocator.getConfiguration(),
+        );
         const clientCacheKey = client.getStorageClientCacheKey?.() ?? '';
 
         const queue = await serviceLocator
             .getStorageInstanceManager()
-            .openStorage<RequestProvider>(
-                this as typeof BuiltRequestProvider,
-                identifier,
-                () =>
-                    client.createRequestQueueClient(
-                        typeof identifier === 'string' ? undefined : (identifier ?? undefined),
-                    ),
+            .openStorage<RequestProvider>(this as typeof BuiltRequestProvider, {
+                ...resolved,
+                clientOpener: () => client.createRequestQueueClient(resolved),
                 clientCacheKey,
-            );
+            });
         queue.proxyConfiguration = options.proxyConfiguration;
 
         // Re-create the request queue client with clientKey and timeoutSecs so that