@h-ai/reach 1.0.0-beta.7 → 1.0.0-beta.9

package/README.en.md

@@ -67,6 +67,8 @@ This example uses the development Console provider. It records delivery metadata
 
 ### Configuration
 
+Provider names must be unique; duplicates fail with CONFIG_ERROR before connections open. `close()` waits for initialization and releases its providers, preventing late publication after shutdown.
+
 #### Console (development/tests)
 
 ```ts

package/README.ja.md

@@ -67,6 +67,8 @@ finally {
 
 ### 設定
 
+Provider 名は一意である必要があり、重複は接続前に CONFIG_ERROR を返します。`close()` は初期化を待って Provider を解放し、終了後の状態やタイマーの再公開を防ぎます。
+
 #### Console（開発・テスト用）
 
 ```ts

package/README.md

@@ -67,6 +67,8 @@ finally {
 
 ### 配置
 
+Provider 名称必须唯一，重复配置在连接前返回 CONFIG_ERROR。`close()` 等待在途初始化并回收其 Provider；关闭返回后不会迟到发布模块或定时器。
+
 #### Console（开发/测试）
 
 ```ts

package/dist/index.d.ts

@@ -1314,7 +1314,9 @@ interface ReachFunctions extends SendOperations {
  *     }
  *     else { const providerMessageId = result.data.messageId }
  *   }
- *   finally { await reach.close() }
+ *   finally {
+ *     await reach.close()
+ *   }
  * }
  * finally {
  *   const closed = await reldb.close()

package/dist/index.js

@@ -57,7 +57,8 @@ var en_US_default = {
   reach_apiResponseTooLarge: "API acknowledgement exceeds the 64 KiB limit",
   reach_apiResponseInvalid: "API acknowledgement must be empty or a JSON object with an optional messageId string",
   reach_apiRequestFailed: "API request failed or timed out; delivery is unconfirmed",
-  reach_apiHttpsRequired: "This API policy requires HTTPS and disallows automatic redirects"
+  reach_apiHttpsRequired: "This API policy requires HTTPS and disallows automatic redirects",
+  reach_config_providerNameDuplicate: "Provider names must be unique"
 };
 
 // messages/ja-JP.json
@@ -109,7 +110,8 @@ var ja_JP_default = {
   reach_apiResponseTooLarge: "API \u5FDC\u7B54\u304C 64 KiB \u306E\u4E0A\u9650\u3092\u8D85\u3048\u3066\u3044\u307E\u3059",
   reach_apiResponseInvalid: "API \u5FDC\u7B54\u306F\u7A7A\u304B\u3001\u7701\u7565\u53EF\u80FD\u306A messageId \u6587\u5B57\u5217\u3092\u6301\u3064 JSON \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059",
   reach_apiRequestFailed: "API \u30EA\u30AF\u30A8\u30B9\u30C8\u304C\u5931\u6557\u307E\u305F\u306F\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F\u3002\u914D\u4FE1\u7D50\u679C\u306F\u672A\u78BA\u8A8D\u3067\u3059",
-  reach_apiHttpsRequired: "\u3053\u306E API \u30DD\u30EA\u30B7\u30FC\u3067\u306F HTTPS \u304C\u5FC5\u8981\u3067\u3001\u81EA\u52D5\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u306F\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059"
+  reach_apiHttpsRequired: "\u3053\u306E API \u30DD\u30EA\u30B7\u30FC\u3067\u306F HTTPS \u304C\u5FC5\u8981\u3067\u3001\u81EA\u52D5\u30EA\u30C0\u30A4\u30EC\u30AF\u30C8\u306F\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059",
+  reach_config_providerNameDuplicate: "Provider \u540D\u306F\u4E00\u610F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"
 };
 
 // messages/zh-CN.json
@@ -161,7 +163,8 @@ var zh_CN_default = {
   reach_apiResponseTooLarge: "API \u56DE\u6267\u8D85\u8FC7 64 KiB \u4E0A\u9650",
   reach_apiResponseInvalid: "API \u56DE\u6267\u5FC5\u987B\u4E3A\u7A7A\u6216\u542B\u53EF\u9009 messageId \u5B57\u7B26\u4E32\u7684 JSON \u5BF9\u8C61",
   reach_apiRequestFailed: "API \u8BF7\u6C42\u5931\u8D25\u6216\u8D85\u65F6\uFF0C\u6295\u9012\u7ED3\u679C\u672A\u786E\u8BA4",
-  reach_apiHttpsRequired: "\u6B64 API \u7B56\u7565\u8981\u6C42 HTTPS \u4E14\u7981\u6B62\u81EA\u52A8\u91CD\u5B9A\u5411"
+  reach_apiHttpsRequired: "\u6B64 API \u7B56\u7565\u8981\u6C42 HTTPS \u4E14\u7981\u6B62\u81EA\u52A8\u91CD\u5B9A\u5411",
+  reach_config_providerNameDuplicate: "Provider \u540D\u79F0\u4E0D\u80FD\u91CD\u590D"
 };
 
 // src/reach-i18n.ts
@@ -279,7 +282,7 @@ var TemplateConfigSchema = z.object({
 });
 var ReachConfigSchema = z.object({
   /** Provider 配置列表 */
-  providers: z.array(ProviderConfigSchema).min(1, reachM("reach_config_providersRequired")),
+  providers: z.array(ProviderConfigSchema).min(1, reachM("reach_config_providersRequired")).refine((providers2) => new Set(providers2.map((provider) => provider.name)).size === providers2.length, reachM("reach_config_providerNameDuplicate")),
   /** 模板配置（通过配置文件注册） */
   templates: z.array(TemplateConfigSchema).optional(),
   /** 免打扰配置 */
@@ -1965,6 +1968,8 @@ var templateRegistry = createTemplateRegistry();
 var sendLogRepo = null;
 var templateRepo = null;
 var initInProgress = false;
+var initCompletion = null;
+var closeInProgress = null;
 function createProvider(config) {
   switch (config.type) {
     case "console":
@@ -2189,7 +2194,7 @@ var reach = {
     }
   },
   async init(config) {
-    if (initInProgress) {
+    if (initInProgress || closeInProgress) {
       logger7.warn("Reach module init already in progress, skipping");
       return err(
         HaiReachError.CONFIG_ERROR,
@@ -2198,9 +2203,11 @@ var reach = {
     }
     initInProgress = true;
     try {
-      return await doInit(config);
+      initCompletion = doInit(config);
+      return await initCompletion;
     } finally {
       initInProgress = false;
+      initCompletion = null;
     }
   },
   async send(message) {
@@ -2220,7 +2227,17 @@ var reach = {
     return providers.size > 0;
   },
   async close() {
-    await doClose();
+    if (closeInProgress)
+      return closeInProgress;
+    closeInProgress = (async () => {
+      await initCompletion;
+      await doClose();
+    })();
+    try {
+      await closeInProgress;
+    } finally {
+      closeInProgress = null;
+    }
   }
 };