sa2kit 1.6.24 → 1.6.26

package/dist/universalFile/server/index.mjs

@@ -1,5 +1,5 @@
 export { LocalStorageProvider } from '../../chunk-GSTLV3MB.mjs';
-export { AliyunOSSProvider } from '../../chunk-OHUE7EL6.mjs';
+export { AliyunOSSProvider } from '../../chunk-SWWRT5FN.mjs';
 import { CDNProviderError } from '../../chunk-ZGVB35L2.mjs';
 import { createLogger } from '../../chunk-KQGP6BTS.mjs';
 import { StorageProviderError, FileUploadError, FileProcessingError } from '../../chunk-CIVO4R6N.mjs';
@@ -2980,6 +2980,7 @@ var UniversalFileService = class extends EventEmitter {
   async initialize() {
     logger6.info("\u{1F680} [UniversalFileService] \u5F00\u59CB\u521D\u59CB\u5316\u6587\u4EF6\u670D\u52A1...");
     try {
+      await this.validateConfiguration();
       await this.initializeStorageProviders();
       await this.initializeCDNProviders();
       await this.initializeFileProcessors();
@@ -2995,9 +2996,21 @@ var UniversalFileService = class extends EventEmitter {
   async reinitializeStorageProviders() {
     logger6.info("\u{1F504} [UniversalFileService] \u91CD\u65B0\u521D\u59CB\u5316\u5B58\u50A8\u63D0\u4F9B\u8005...");
     try {
-      const ossProvider = this.storageProviders.get("aliyun-oss");
-      if (ossProvider && "reinitialize" in ossProvider) {
-        logger6.info("\u{1F504} [UniversalFileService] \u91CD\u65B0\u521D\u59CB\u5316\u963F\u91CC\u4E91OSS\u63D0\u4F9B\u8005...");
+      for (const [type, provider] of this.storageProviders) {
+        if ("reinitialize" in provider) {
+          try {
+            logger6.info(`\u{1F504} [UniversalFileService] \u91CD\u65B0\u521D\u59CB\u5316\u5B58\u50A8\u63D0\u4F9B\u8005: ${type}...`);
+            const config = this.config.storageProviders?.[type];
+            if (config) {
+              await provider.reinitialize(config);
+              logger6.info(`\u2705 [UniversalFileService] \u5B58\u50A8\u63D0\u4F9B\u8005\u91CD\u65B0\u521D\u59CB\u5316\u5B8C\u6210: ${type}`);
+            } else {
+              logger6.warn(`\u26A0\uFE0F [UniversalFileService] \u5B58\u50A8\u63D0\u4F9B\u8005\u914D\u7F6E\u4E0D\u5B58\u5728: ${type}`);
+            }
+          } catch (error) {
+            logger6.error(`\u274C [UniversalFileService] \u5B58\u50A8\u63D0\u4F9B\u8005\u91CD\u65B0\u521D\u59CB\u5316\u5931\u8D25: ${type}`, error);
+          }
+        }
       }
       logger6.info("\u2705 [UniversalFileService] \u5B58\u50A8\u63D0\u4F9B\u8005\u91CD\u65B0\u521D\u59CB\u5316\u5B8C\u6210");
     } catch (error) {
@@ -3314,6 +3327,42 @@ var UniversalFileService = class extends EventEmitter {
     this.off(eventType, listener);
   }
   // ============= 私有方法 =============
+  /**
+   * 验证配置是否完整
+   */
+  async validateConfiguration() {
+    logger6.info("\u{1F50D} [UniversalFileService] \u9A8C\u8BC1\u914D\u7F6E\u6587\u4EF6...");
+    if (!this.config) {
+      throw new Error("\u6587\u4EF6\u670D\u52A1\u914D\u7F6E\u4E3A\u7A7A");
+    }
+    if (!this.config.storage) {
+      throw new Error("\u5B58\u50A8\u914D\u7F6E\u4E3A\u7A7A");
+    }
+    if (this.config.storage.type === "aliyun-oss") {
+      const ossConfig = this.config.storage;
+      if (!ossConfig.accessKeyId || !ossConfig.accessKeySecret || !ossConfig.bucket || !ossConfig.region) {
+        logger6.warn("\u26A0\uFE0F [UniversalFileService] OSS\u914D\u7F6E\u4E0D\u5B8C\u6574\uFF0C\u7B49\u5F85\u914D\u7F6E\u52A0\u8F7D...");
+        const maxRetries = 30;
+        const retryInterval = 1e3;
+        for (let i = 0; i < maxRetries; i++) {
+          await new Promise((resolve) => setTimeout(resolve, retryInterval));
+          const updatedConfig = this.config.storage;
+          if (updatedConfig.accessKeyId && updatedConfig.accessKeySecret && updatedConfig.bucket && updatedConfig.region) {
+            logger6.info("\u2705 [UniversalFileService] OSS\u914D\u7F6E\u52A0\u8F7D\u5B8C\u6210");
+            break;
+          }
+          if (i === maxRetries - 1) {
+            throw new Error("OSS\u914D\u7F6E\u52A0\u8F7D\u8D85\u65F6\uFF1A\u7F3A\u5C11\u5FC5\u9700\u7684\u914D\u7F6E\u9879 (accessKeyId, accessKeySecret, bucket, region)");
+          }
+          logger6.debug(`\u7B49\u5F85OSS\u914D\u7F6E\u52A0\u8F7D\u4E2D... (${i + 1}/${maxRetries})`);
+        }
+      }
+    }
+    if (!this.config.defaultStorage) {
+      this.config.defaultStorage = this.config.storage.type;
+    }
+    logger6.info("\u2705 [UniversalFileService] \u914D\u7F6E\u9A8C\u8BC1\u5B8C\u6210");
+  }
   async initializeStorageProviders() {
     logger6.info("\u{1F4E6} [UniversalFileService] \u5F00\u59CB\u521D\u59CB\u5316\u5B58\u50A8\u63D0\u4F9B\u8005...");
     if (this.storageProviders.size === 0) {
@@ -3342,7 +3391,7 @@ var UniversalFileService = class extends EventEmitter {
     try {
       if (this.config.storage) {
         if (this.config.storage.type === "aliyun-oss" && this.config.storage.enabled) {
-          const { AliyunOSSProvider: AliyunOSSProvider2 } = await import('../../AliyunOSSProvider-2UZRIGT3.mjs');
+          const { AliyunOSSProvider: AliyunOSSProvider2 } = await import('../../AliyunOSSProvider-YKT256D6.mjs');
           const ossProvider = new AliyunOSSProvider2();
           this.registerStorageProvider(ossProvider);
           logger6.info("\u2705 [UniversalFileService] \u963F\u91CC\u4E91OSS\u63D0\u4F9B\u8005\u6CE8\u518C\u6210\u529F");
@@ -3560,6 +3609,28 @@ var UniversalFileService = class extends EventEmitter {
       throw new FileUploadError("\u65E0\u6743\u9650\u5220\u9664\u6B64\u6587\u4EF6");
     }
   }
+  /**
+   * 检查服务是否完全可用（包括存储提供者）
+   */
+  isFullyInitialized() {
+    const hasStorageProvider = Array.from(this.storageProviders.values()).some(
+      (provider) => provider.type === "aliyun-oss" || provider.type === "local"
+    );
+    return hasStorageProvider;
+  }
+  /**
+   * 等待服务完全初始化（带超时）
+   */
+  async waitForInitialization(timeoutMs = 3e4) {
+    const startTime = Date.now();
+    while (!this.isFullyInitialized()) {
+      if (Date.now() - startTime > timeoutMs) {
+        throw new Error(`\u670D\u52A1\u521D\u59CB\u5316\u8D85\u65F6 (${timeoutMs}ms)`);
+      }
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    logger6.info("\u2705 [UniversalFileService] \u670D\u52A1\u5B8C\u5168\u521D\u59CB\u5316\u5C31\u7EEA");
+  }
 };
 var logger7 = createLogger("CacheManager");
 var CacheManager = class {
@@ -4980,8 +5051,13 @@ async function createFileServiceWithFactory(options = {}) {
   }
   const service = new UniversalFileService(finalConfig);
   if (autoInitialize) {
-    await service.initialize();
-    logger10.info("\u2705 \u6587\u4EF6\u670D\u52A1\u521B\u5EFA\u5E76\u521D\u59CB\u5316\u5B8C\u6210");
+    try {
+      await service.initialize();
+      logger10.info("\u2705 \u6587\u4EF6\u670D\u52A1\u521B\u5EFA\u5E76\u521D\u59CB\u5316\u5B8C\u6210");
+    } catch (initError) {
+      logger10.warn("\u26A0\uFE0F \u6587\u4EF6\u670D\u52A1\u521D\u59CB\u5316\u5931\u8D25\uFF0C\u5C06\u63D0\u4F9B\u5EF6\u8FDF\u521D\u59CB\u5316\u7684\u652F\u6301:", initError);
+      logger10.info("\u{1F4A1} \u63D0\u793A\uFF1A\u53EF\u8C03\u7528 service.reinitializeStorageProviders() \u6765\u91CD\u65B0\u521D\u59CB\u5316\u5B58\u50A8\u63D0\u4F9B\u8005");
+    }
   } else {
     logger10.info("\u2705 \u6587\u4EF6\u670D\u52A1\u521B\u5EFA\u5B8C\u6210");
   }