@oh-my-pi/pi-utils 18.1.2 → 18.1.3

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [18.1.3] - 2026-09-02
+
+### Fixed
+
+- Fixed retry-hint extraction for body-level millisecond hints and absolute quota-reset timestamps ([#10325](https://github.com/can1357/oh-my-pi/pull/10325) by [@usr-bin-roygbiv](https://github.com/usr-bin-roygbiv)).
+
 ## [18.1.0] - 2026-09-01
 
 ### Added

package/dist/types/fetch-retry.d.ts

@@ -14,6 +14,8 @@
  *  - `Please retry in 250ms` / `Please retry in 12s`
  *  - `"retryDelay": "34.074824224s"` (JSON error detail field)
  *  - `try again in 250ms` / `try again in 12s` / `try again in 5 min` / `try again in ~158 min`
+ *  - `retry-after-ms=98497000`
+ *  - `Your limit will reset at 2026-09-01 09:44:51` / `将在 2026-09-01 09:44:51 重置`
  *
  * Returns `undefined` if no signal is found.
  */

package/dist/types/index.d.ts

@@ -15,6 +15,7 @@ export * from "./json-parse.js";
 export * as logger from "./logger.js";
 export * from "./loop-phase.js";
 export * from "./math-delimiters.js";
+export * from "./materialize-string.js";
 export * from "./mermaid-ascii.js";
 export * from "./mime.js";
 export * from "./path.js";

package/dist/types/materialize-string.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Copy text into independent UTF-16 backing storage before a bounded substring outlives its source.
+ *
+ * The UTF-16 round trip preserves every JavaScript code unit, including lone
+ * surrogates that a UTF-8 round trip would replace.
+ */
+export declare function materializeString(text: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-utils",
-	"version": "18.1.2",
+	"version": "18.1.3",
 	"description": "Shared utilities for pi packages",
 	"homepage": "https://omp.sh",
 	"author": "Stencil Labs, Inc.",
@@ -31,7 +31,7 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "18.1.2"
+		"@oh-my-pi/pi-natives": "18.1.3"
 	},
 	"devDependencies": {
 		"@types/bun": "^1.3.14"

package/src/fetch-retry.ts

@@ -12,6 +12,12 @@ const RETRY_DELAY_FIELD_PATTERN = /"retryDelay":\s*"([0-9.]+)(ms|s)"/i;
 const TRY_AGAIN_PATTERN = /try again in\s+~?\s*([0-9.]+)\s*(ms|sec|s|minutes?|mins?|m|hours?|hrs?|h)\b/i;
 // "Your limit will reset in 13 minutes" / "reset in 13 minutes" / "will reset in 2h"
 const WILL_RESET_IN_PATTERN = /(?:will\s+)?reset in\s+~?\s*([0-9.]+)\s*(ms|sec|s|minutes?|mins?|m|hours?|hrs?|h)\b/i;
+// "Your limit will reset at 2026-09-01 09:44:51" / "reset at 2026-09-01T09:44:51Z"
+const WILL_RESET_AT_PATTERN =
+	/(?:will\s+)?reset at\s+([0-9]{4}-[0-9]{2}-[0-9]{2}[ T][0-9]{2}:[0-9]{2}:[0-9]{2}(?:\.[0-9]+)?(?:Z|[+-][0-9]{2}:?[0-9]{2})?)/i;
+const CN_RESET_AT_PATTERN = /将在\s*([0-9]{4}-[0-9]{2}-[0-9]{2}\s+[0-9]{2}:[0-9]{2}:[0-9]{2})\s*重置/;
+// "retry-after-ms=98497000"
+const RETRY_AFTER_MS_BODY_PATTERN = /\bretry-after-ms=([0-9]+)\b/i;
 
 /**
  * Server-suggested retry delay extraction. Merges the patterns historically used
@@ -29,6 +35,8 @@ const WILL_RESET_IN_PATTERN = /(?:will\s+)?reset in\s+~?\s*([0-9.]+)\s*(ms|sec|s
  *  - `Please retry in 250ms` / `Please retry in 12s`
  *  - `"retryDelay": "34.074824224s"` (JSON error detail field)
  *  - `try again in 250ms` / `try again in 12s` / `try again in 5 min` / `try again in ~158 min`
+ *  - `retry-after-ms=98497000`
+ *  - `Your limit will reset at 2026-09-01 09:44:51` / `将在 2026-09-01 09:44:51 重置`
  *
  * Returns `undefined` if no signal is found.
  */
@@ -85,11 +93,38 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 			if (totalMs > 0) return totalMs;
 		}
 	}
+	for (const pattern of [WILL_RESET_AT_PATTERN, CN_RESET_AT_PATTERN]) {
+		const match = pattern.exec(body);
+		if (match?.[1]) {
+			// Provider timestamps without an explicit offset are interpreted as UTC.
+			const normalized = match[1].replace(" ", "T");
+			const hasOffset = /(?:Z|[+-][0-9]{2}:?[0-9]{2})$/i.test(normalized);
+			const parsed = Date.parse(hasOffset ? normalized : `${normalized}Z`);
+			if (!Number.isNaN(parsed) && parsed > Date.now()) {
+				return parsed - Date.now();
+			}
+		}
+	}
 	// Account-reset hints ("will reset in …") take precedence over short
 	// retry hints ("please retry in 5s"): a body carrying both must honour the
 	// longer account window, not the shorter generic one. QUOTA_RESET_PATTERN
 	// ("reset after …") above already runs first and stays first.
-	for (const pattern of [WILL_RESET_IN_PATTERN, PLEASE_RETRY_PATTERN, RETRY_DELAY_FIELD_PATTERN, TRY_AGAIN_PATTERN]) {
+	const accountResetMatch = WILL_RESET_IN_PATTERN.exec(body);
+	if (accountResetMatch?.[1]) {
+		const value = Number.parseFloat(accountResetMatch[1]);
+		if (Number.isFinite(value) && value > 0) {
+			const unitMs = unitToMs(accountResetMatch[2]!);
+			if (unitMs !== undefined) return value * unitMs;
+		}
+	}
+
+	const retryAfterMsMatch = RETRY_AFTER_MS_BODY_PATTERN.exec(body);
+	if (retryAfterMsMatch?.[1]) {
+		const ms = Number(retryAfterMsMatch[1]);
+		if (Number.isFinite(ms) && ms > 0) return ms;
+	}
+
+	for (const pattern of [PLEASE_RETRY_PATTERN, RETRY_DELAY_FIELD_PATTERN, TRY_AGAIN_PATTERN]) {
 		const match = pattern.exec(body);
 		if (match?.[1]) {
 			const value = Number.parseFloat(match[1]);

package/src/index.ts

@@ -15,6 +15,7 @@ export * from "./json-parse";
 export * as logger from "./logger";
 export * from "./loop-phase";
 export * from "./math-delimiters";
+export * from "./materialize-string";
 export * from "./mermaid-ascii";
 export * from "./mime";
 export * from "./path";

package/src/materialize-string.ts

@@ -0,0 +1,10 @@
+/**
+ * Copy text into independent UTF-16 backing storage before a bounded substring outlives its source.
+ *
+ * The UTF-16 round trip preserves every JavaScript code unit, including lone
+ * surrogates that a UTF-8 round trip would replace.
+ */
+export function materializeString(text: string): string {
+	if (text.length === 0) return "";
+	return Buffer.from(text, "utf16le").toString("utf16le");
+}