@zintrust/core 0.1.12 → 0.1.14

package/src/tools/notification/Service.js

@@ -1,16 +1,89 @@
+import notificationConfig from '../../config/notification.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { NotificationConfig } from './config.js';
+import { ConsoleDriver } from './drivers/Console.js';
+import { SlackDriver } from './drivers/Slack.js';
+import { TwilioDriver } from './drivers/Twilio.js';
+import { NotificationChannelRegistry } from './NotificationChannelRegistry.js';
 import { NotificationRegistry } from './Registry.js';
+const assertValidRecipientAndMessage = (recipient, message) => {
+    if (typeof recipient !== 'string' || recipient.trim() === '') {
+        throw ErrorFactory.createValidationError('Recipient required');
+    }
+    if (typeof message !== 'string' || message.trim() === '') {
+        throw ErrorFactory.createValidationError('Message required');
+    }
+};
+const resolveChannelConfig = (channelName) => {
+    const selected = String(channelName ?? '').trim();
+    const hasSelection = selected.length > 0;
+    return hasSelection && NotificationChannelRegistry.has(selected)
+        ? NotificationChannelRegistry.get(selected)
+        : notificationConfig.getDriverConfig(selected);
+};
+const sendTermii = async (cfg, recipient, message, options) => {
+    const apiKey = String(cfg.apiKey ?? '');
+    if (apiKey.trim() === '') {
+        throw ErrorFactory.createConfigError('TERMII_API_KEY is not configured');
+    }
+    const url = String(cfg.endpoint ?? '').trim();
+    if (url === '') {
+        throw ErrorFactory.createConfigError('TERMII_ENDPOINT is not configured');
+    }
+    const payload = {
+        to: recipient,
+        from: cfg.sender,
+        sms: message,
+        api_key: apiKey,
+        ...options,
+    };
+    const res = await globalThis.fetch(url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload),
+    });
+    if (!res.ok) {
+        const txt = await res.text().catch(() => '');
+        throw ErrorFactory.createTryCatchError(`Termii request failed (${res.status})`, {
+            status: res.status,
+            body: txt,
+        });
+    }
+    return res.json().catch(() => ({}));
+};
 export const NotificationService = Object.freeze({
     async send(recipient, message, options = {}) {
-        if (!recipient || typeof recipient !== 'string')
-            throw ErrorFactory.createValidationError('Recipient required');
-        if (!message || typeof message !== 'string')
-            throw ErrorFactory.createValidationError('Message required');
+        assertValidRecipientAndMessage(recipient, message);
         const driverName = NotificationConfig.getDriver();
         const driver = NotificationRegistry.get(driverName);
         return driver.send(recipient, message, options);
     },
+    async sendVia(channelName, recipient, message, options = {}) {
+        assertValidRecipientAndMessage(recipient, message);
+        const cfg = resolveChannelConfig(channelName);
+        switch (cfg.driver) {
+            case 'console':
+                return ConsoleDriver.send(recipient, message, options);
+            case 'slack': {
+                const slackCfg = cfg;
+                const payload = { text: message, ...options };
+                return SlackDriver.send({ webhookUrl: slackCfg.webhookUrl }, payload);
+            }
+            case 'twilio': {
+                const twilioCfg = cfg;
+                return TwilioDriver.send({
+                    accountSid: twilioCfg.accountSid,
+                    authToken: twilioCfg.authToken,
+                    from: twilioCfg.fromNumber,
+                }, { to: recipient, body: message });
+            }
+            case 'termii': {
+                return sendTermii(cfg, recipient, message, options);
+            }
+            default:
+                throw ErrorFactory.createConfigError(`Notification: unsupported driver: ${String(cfg?.driver)}`);
+        }
+    },
     listDrivers() {
         return NotificationRegistry.list();
     },

package/src/tools/notification/drivers/SlackNotification.d.ts

@@ -0,0 +1,8 @@
+export declare const SlackNotificationDriver: Readonly<{
+    send(_recipient: string, message: string, options?: Record<string, unknown>): Promise<{
+        ok: boolean;
+        status?: number;
+    }>;
+}>;
+export default SlackNotificationDriver;
+//# sourceMappingURL=SlackNotification.d.ts.map

package/src/tools/notification/drivers/SlackNotification.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SlackNotification.d.ts","sourceRoot":"","sources":["../../../../../src/tools/notification/drivers/SlackNotification.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,uBAAuB;qBACX,MAAM,WAAW,MAAM,YAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;EAUhF,CAAC;AAEH,eAAe,uBAAuB,CAAC"}

package/src/tools/notification/drivers/SlackNotification.js

@@ -0,0 +1,13 @@
+import notificationConfig from '../../../config/notification.js';
+import { SlackDriver } from '../drivers/Slack.js';
+export const SlackNotificationDriver = Object.freeze({
+    async send(_recipient, message, options = {}) {
+        const cfg = notificationConfig.providers.slack;
+        const payload = {
+            text: message,
+            ...options,
+        };
+        return SlackDriver.send({ webhookUrl: cfg.webhookUrl }, payload);
+    },
+});
+export default SlackNotificationDriver;

package/src/tools/notification/drivers/TwilioNotification.d.ts

@@ -0,0 +1,8 @@
+export declare const TwilioNotificationDriver: Readonly<{
+    send(recipient: string, message: string): Promise<{
+        ok: boolean;
+        status?: number;
+    }>;
+}>;
+export default TwilioNotificationDriver;
+//# sourceMappingURL=TwilioNotification.d.ts.map

package/src/tools/notification/drivers/TwilioNotification.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TwilioNotification.d.ts","sourceRoot":"","sources":["../../../../../src/tools/notification/drivers/TwilioNotification.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB;oBACb,MAAM,WAAW,MAAM;;;;EAY7C,CAAC;AAEH,eAAe,wBAAwB,CAAC"}

package/src/tools/notification/drivers/TwilioNotification.js

@@ -0,0 +1,13 @@
+import notificationConfig from '../../../config/notification.js';
+import { TwilioDriver } from '../drivers/Twilio.js';
+export const TwilioNotificationDriver = Object.freeze({
+    async send(recipient, message) {
+        const cfg = notificationConfig.providers.twilio;
+        return TwilioDriver.send({
+            accountSid: cfg.accountSid,
+            authToken: cfg.authToken,
+            from: cfg.fromNumber,
+        }, { to: recipient, body: message });
+    },
+});
+export default TwilioNotificationDriver;

package/src/tools/queue/Queue.d.ts

@@ -12,6 +12,7 @@ interface IQueueDriver {
 }
 export declare const Queue: Readonly<{
     register(name: string, driver: IQueueDriver): void;
+    reset(): void;
     get(name?: string): IQueueDriver;
     enqueue<T = unknown>(queue: string, payload: T, driverName?: string): Promise<string>;
     dequeue<T = unknown>(queue: string, driverName?: string): Promise<QueueMessage<T> | undefined>;

package/src/tools/queue/Queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/Queue.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,OAAO,IAAI;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAErF,UAAU,YAAY;IACpB,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC1E,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAID,eAAO,MAAM,KAAK;mBACD,MAAM,UAAU,YAAY;eAIhC,MAAM,GAAG,YAAY;YAUlB,CAAC,mBAAmB,MAAM,WAAW,CAAC,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAK7E,CAAC,mBACN,MAAM,eACA,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;eAKtB,MAAM,MAAM,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;kBAKpD,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAK9C,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAI9D,CAAC;AAEH,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/Queue.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,OAAO,IAAI;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAErF,UAAU,YAAY;IACpB,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC1E,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAID,eAAO,MAAM,KAAK;mBACD,MAAM,UAAU,YAAY;aAIlC,IAAI;eAIF,MAAM,GAAG,YAAY;YAUlB,CAAC,mBAAmB,MAAM,WAAW,CAAC,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAK7E,CAAC,mBACN,MAAM,eACA,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;eAKtB,MAAM,MAAM,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;kBAKpD,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAK9C,MAAM,eAAe,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;EAI9D,CAAC;AAEH,eAAe,KAAK,CAAC"}

package/src/tools/queue/Queue.js

@@ -4,6 +4,9 @@ export const Queue = Object.freeze({
     register(name, driver) {
         drivers.set(name.toLowerCase(), driver);
     },
+    reset() {
+        drivers.clear();
+    },
     get(name) {
         const driverName = (name ?? process.env['QUEUE_DRIVER'] ?? 'inmemory')
             .toString()

package/src/tools/queue/QueueRuntimeRegistration.d.ts

@@ -0,0 +1,11 @@
+import type { QueueConfig } from '../../config/queue';
+/**
+ * Register queue drivers from runtime config.
+ *
+ * This follows the framework's config-driven availability pattern:
+ * - Built-in drivers are registered so `QUEUE_DRIVER=sync|inmemory|redis` works out of the box.
+ * - If the configured default is registered, it is ALSO registered as 'default'.
+ * - Unknown/unregistered driver names still throw when selected.
+ */
+export declare function registerQueuesFromRuntimeConfig(config: QueueConfig): void;
+//# sourceMappingURL=QueueRuntimeRegistration.d.ts.map

package/src/tools/queue/QueueRuntimeRegistration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueueRuntimeRegistration.d.ts","sourceRoot":"","sources":["../../../../src/tools/queue/QueueRuntimeRegistration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMjD;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAgBzE"}

package/src/tools/queue/QueueRuntimeRegistration.js

@@ -0,0 +1,28 @@
+import { InMemoryQueue } from '../queue/drivers/InMemory.js';
+import { RedisQueue } from '../queue/drivers/Redis.js';
+import { Queue } from '../queue/Queue.js';
+/**
+ * Register queue drivers from runtime config.
+ *
+ * This follows the framework's config-driven availability pattern:
+ * - Built-in drivers are registered so `QUEUE_DRIVER=sync|inmemory|redis` works out of the box.
+ * - If the configured default is registered, it is ALSO registered as 'default'.
+ * - Unknown/unregistered driver names still throw when selected.
+ */
+export function registerQueuesFromRuntimeConfig(config) {
+    // Built-in drivers (core)
+    Queue.register('inmemory', InMemoryQueue);
+    // Project templates use QUEUE_DRIVER=sync; treat this as an alias of in-memory.
+    Queue.register('sync', InMemoryQueue);
+    Queue.register('redis', RedisQueue);
+    const defaultName = (config.default ?? '').toString().trim().toLowerCase();
+    if (defaultName.length === 0)
+        return;
+    try {
+        const drv = Queue.get(defaultName);
+        Queue.register('default', drv);
+    }
+    catch {
+        // Best-effort: external drivers may be registered by optional packages.
+    }
+}

package/src/tools/storage/StorageDiskRegistry.d.ts

@@ -0,0 +1,14 @@
+declare function register(name: string, config: unknown): void;
+declare function has(name: string): boolean;
+declare function get(name: string): unknown;
+declare function list(): string[];
+declare function reset(): void;
+export declare const StorageDiskRegistry: Readonly<{
+    register: typeof register;
+    has: typeof has;
+    get: typeof get;
+    list: typeof list;
+    reset: typeof reset;
+}>;
+export default StorageDiskRegistry;
+//# sourceMappingURL=StorageDiskRegistry.d.ts.map

package/src/tools/storage/StorageDiskRegistry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StorageDiskRegistry.d.ts","sourceRoot":"","sources":["../../../../src/tools/storage/StorageDiskRegistry.ts"],"names":[],"mappings":"AASA,iBAAS,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAIrD;AAED,iBAAS,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElC;AAED,iBAAS,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOlC;AAED,iBAAS,IAAI,IAAI,MAAM,EAAE,CAExB;AAED,iBAAS,KAAK,IAAI,IAAI,CAErB;AAED,eAAO,MAAM,mBAAmB;;;;;;EAM9B,CAAC;AAEH,eAAe,mBAAmB,CAAC"}

package/src/tools/storage/StorageDiskRegistry.js

@@ -0,0 +1,36 @@
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+const registry = new Map();
+const normalizeKey = (name) => String(name ?? '')
+    .trim()
+    .toLowerCase();
+function register(name, config) {
+    const key = normalizeKey(name);
+    if (key === '')
+        return;
+    registry.set(key, config);
+}
+function has(name) {
+    return registry.has(normalizeKey(name));
+}
+function get(name) {
+    const key = normalizeKey(name);
+    const cfg = registry.get(key);
+    if (cfg === undefined) {
+        throw ErrorFactory.createConfigError(`Storage disk not registered: ${name}`);
+    }
+    return cfg;
+}
+function list() {
+    return Array.from(registry.keys()).sort((a, b) => a.localeCompare(b));
+}
+function reset() {
+    registry.clear();
+}
+export const StorageDiskRegistry = Object.freeze({
+    register,
+    has,
+    get,
+    list,
+    reset,
+});
+export default StorageDiskRegistry;

package/src/tools/storage/StorageRuntimeRegistration.d.ts

@@ -0,0 +1,10 @@
+import type { StorageConfigRuntime, StorageDriverConfig } from '../../config/type';
+export type StorageRuntimeConfig = StorageConfigRuntime & {
+    getDriverConfig?: (name?: string) => StorageDriverConfig;
+};
+export declare function registerDisksFromRuntimeConfig(config: StorageRuntimeConfig): void;
+export declare const StorageRuntimeRegistration: Readonly<{
+    registerDisksFromRuntimeConfig: typeof registerDisksFromRuntimeConfig;
+}>;
+export default StorageRuntimeRegistration;
+//# sourceMappingURL=StorageRuntimeRegistration.d.ts.map

package/src/tools/storage/StorageRuntimeRegistration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StorageRuntimeRegistration.d.ts","sourceRoot":"","sources":["../../../../src/tools/storage/StorageRuntimeRegistration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAG9E,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,GAAG;IACxD,eAAe,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,mBAAmB,CAAC;CAC1D,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAmBjF;AAED,eAAO,MAAM,0BAA0B;;EAErC,CAAC;AAEH,eAAe,0BAA0B,CAAC"}

package/src/tools/storage/StorageRuntimeRegistration.js

@@ -0,0 +1,23 @@
+import { StorageDiskRegistry } from './StorageDiskRegistry.js';
+export function registerDisksFromRuntimeConfig(config) {
+    for (const [name, driverConfig] of Object.entries(config.drivers)) {
+        StorageDiskRegistry.register(name, driverConfig);
+    }
+    // Alias reserved name `default` to the configured default.
+    // Prefer config.getDriverConfig() so we preserve its fallback semantics.
+    let resolvedDefault;
+    if (typeof config.getDriverConfig === 'function') {
+        resolvedDefault = config.getDriverConfig('default');
+    }
+    else {
+        const values = Object.values(config.drivers);
+        resolvedDefault = config.drivers[config.default] ?? values[0];
+    }
+    if (resolvedDefault !== undefined) {
+        StorageDiskRegistry.register('default', resolvedDefault);
+    }
+}
+export const StorageRuntimeRegistration = Object.freeze({
+    registerDisksFromRuntimeConfig,
+});
+export default StorageRuntimeRegistration;

package/src/tools/storage/index.d.ts

@@ -17,4 +17,5 @@ export declare const Storage: Readonly<{
     tempUrl(disk: string | undefined, path: string, options?: TempUrlOptions): Promise<string>;
 }>;
 export default Storage;
+export { StorageDiskRegistry } from './StorageDiskRegistry';
 //# sourceMappingURL=index.d.ts.map

package/src/tools/storage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/storage/index.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;CAAE,CAAC;AAsCrE,eAAO,MAAM,OAAO;mBACH,MAAM,GAAG,WAAW;cAqCnB,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAW7E,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAW/C,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;iBASnD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cASzD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,MAAM;kBAY/B,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;EAqBhG,CAAC;AAEH,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/storage/index.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;CAAE,CAAC;AAsFrE,eAAO,MAAM,OAAO;mBACH,MAAM,GAAG,WAAW;cAuCnB,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAW7E,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;iBAW/C,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;iBASnD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cASzD,MAAM,GAAG,SAAS,QAAQ,MAAM,GAAG,MAAM;kBAY/B,MAAM,GAAG,SAAS,QAAQ,MAAM,YAAY,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;EAqBhG,CAAC;AAEH,eAAe,OAAO,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC"}

package/src/tools/storage/index.js

@@ -1,6 +1,7 @@
 import { storageConfig } from '../../config/storage.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { LocalDriver } from './drivers/Local.js';
+import { StorageDiskRegistry } from './StorageDiskRegistry.js';
 import { StorageDriverRegistry } from './StorageDriverRegistry.js';
 const normalizers = {
     local: (raw) => ({
@@ -33,14 +34,46 @@ const normalizers = {
 const normalizeDiskConfig = (driverName, raw) => {
     return normalizers[driverName]?.(raw) ?? raw;
 };
+const resolveDiskConfigFromRegistry = (name) => {
+    const selected = String(name ?? '').trim();
+    const hasSelection = name !== undefined && selected.length > 0;
+    const registryKey = hasSelection ? selected : 'default';
+    if (!StorageDiskRegistry.has(registryKey))
+        return undefined;
+    return StorageDiskRegistry.get(registryKey);
+};
+const resolveDiskConfigFromStorageConfig = (name) => {
+    const maybeGetDriverConfig = storageConfig
+        .getDriverConfig;
+    if (typeof maybeGetDriverConfig !== 'function')
+        return undefined;
+    // Important: call as a method to preserve `this` binding.
+    return storageConfig.getDriverConfig(name);
+};
+const resolveDiskConfigFromLegacyConfig = (name) => {
+    const selected = String(name ?? '').trim();
+    const hasSelection = name !== undefined && selected.length > 0;
+    const drivers = storageConfig.drivers ?? {};
+    const defaultName = String(storageConfig.default ?? 'local').trim();
+    const requestedName = hasSelection ? selected : defaultName;
+    const diskName = requestedName === 'default' ? defaultName : requestedName;
+    if (diskName !== '' && Object.prototype.hasOwnProperty.call(drivers, diskName)) {
+        return drivers[diskName];
+    }
+    if (hasSelection && selected !== 'default') {
+        throw ErrorFactory.createConfigError(`Storage disk not configured: ${diskName}`);
+    }
+    return (drivers['local'] ??
+        Object.values(drivers)[0]);
+};
 export const Storage = Object.freeze({
     getDisk(name) {
-        const diskName = name ?? storageConfig.default;
-        // disk is config object; dispatch based on requested name
-        const drivers = storageConfig.drivers;
-        const config = drivers[diskName];
-        if (config === undefined)
-            throw ErrorFactory.createValidationError('Storage: unknown disk', { disk: diskName });
+        const config = resolveDiskConfigFromRegistry(name) ??
+            resolveDiskConfigFromStorageConfig(name) ??
+            resolveDiskConfigFromLegacyConfig(name);
+        if (config === undefined) {
+            throw ErrorFactory.createConfigError('Storage: no disks are configured');
+        }
         const driverName = String(config['driver'] ?? '')
             .trim()
             .toLowerCase();
@@ -114,3 +147,4 @@ export const Storage = Object.freeze({
     },
 });
 export default Storage;
+export { StorageDiskRegistry } from './StorageDiskRegistry.js';