CHANGELOG.md

@@ -1,16 +1,5 @@
 # Changelog: @go/id
 
-## v1.5.6 (2026-06-22)
-- **接口精简与测试逆向对齐 (API Simplification & Decryption Alignment)**:
-  - 弃用并删除了 `FillRand` 的调用，重构为直接调用 `encoding.FillInt`。
-  - 同步修改 `UnhashInt` 单元测试以匹配 `HashInt` 的 2 轮非线性传播混淆，并在 `TestReversibility` 中完美验证了变换的双射性与可逆性。
-
-## v1.5.5 (2026-06-21)
-- **碰撞安全与重排修复 (Entropy Fold & Order Fix)**:
-  - 引入模同余折叠：在非有序模式截断前调用 `intEncoder.FoldInt` 将超长字节以 Base62 同余模加异或折叠，确保高并发下的唯一性熵完全保留在截断范围内，消除了物理截断的局部高碰撞 Bug。
-  - 修复 `ExchangeInt` 就地修改对齐：随着底层 `ExchangeInt` 修复为原地修改，重新激活了有序数据库优化模式（`GetForMysql`/`GetForPostgreSQL`）下对后半段序列号混淆的能力，使得首位分片散列（`hashToHead`）成功防范 B+ 树写入热点。
-  - 自动化回归测试：在 `id_test.go` 中引入了 `TestReversibility`（双射可逆测试）、`TestCollisionRate`（并发碰撞测试）与 `TestCheckHashDiff`（差分诊断），通过严格的回归用例确保后续算法更新安全。
-
 ## v1.5.4 (2026-06-21)
 - **重构与错误堆栈支持**:
   - 重构 `js_export.go`，将 `Make` 匿名包装闭包改为包级具名函数 `jsMake`。

TEST.md

@@ -1,31 +1,27 @@
 # Test Report: @go/id
 
 ## 📋 测试概览
-- **测试时间**: 2026-06-22
+- **测试时间**: 2026-05-01
 - **测试环境**: darwin/amd64 (Intel i9-9980HK)
-- **Go 版本**: 1.26.1
+- **Go 版本**: 1.25.0
 
 ## ✅ 功能测试 (Functional Tests)
 | 场景 | 状态 | 描述 |
 | :--- | :--- | :--- |
 | `TestMakeID` | PASS | 生成长度符合预期的通用 ID。 |
-| `TestGetForMysql` | PASS | 生成 MySQL 友好主键，支持并验证右旋首位分片散列逻辑。 |
+| `TestGetForMysql` | PASS | 生成 MySQL 友好主键，包含右旋散列逻辑。 |
 | `TestGetForPostgreSQL`| PASS | 生成 PostgreSQL 友好主键，无右旋散列。 |
-| `TestPrintIDs` | PASS | 打印 6-12 位在正常/MySQL 模式下连续 10 个生成 ID 的效果，肉眼观测扩散度。 |
-| `TestReversibility` | PASS | 双射可逆验证：测试 100k+ ID 经过 Exchange+Hash 后无损逆还原，证明算法在数学上的完备无损性。 |
-| `TestCollisionRate` | PASS | 高并发碰撞测试：验证 7~10 位 ID 在 100k~500k 并发生成时的 0 碰撞率。 |
-| `TestCheckHashDiff` | PASS | 差分诊断测试：检查相邻生成的 ID 在各个阶段的字符差分扩散情况。 |
 
 ## ⚡ 性能基准 (Benchmarks)
-| 函数 | 平均耗时 | 性能分析 |
-| :--- | :--- | :--- |
-| `MakeID-10` | **754.8 ns/op** | 栈分配与双径哈希重构后，性能极其优秀。 |
-| `GetForMysql-10` | **576.9 ns/op** | 极速无阻碍，完全满足超高并发微服务场景。 |
+| 函数 | 平均耗时 |
+| :--- | :--- |
+| `MakeID-10` | **1572 ns/op** |
+| `GetForMysql-10` | **1552 ns/op** |
 
 *   集成 `@go/rand` 的 `FastInt` 优化，在高并发下彻底规避了锁竞争。
 *   ID 生成性能稳定，满足高性能主键生成场景。
 
 ## 🛡️ 鲁棒性防御 (Robustness)
 - **并发安全**：核心计数器使用 `sync.Mutex` 保护。
-- **碰撞漏洞根治**：通过引入 `FoldInt` 模加折叠机制，彻底消除高位在 `ExchangeInt` 重排与哈希截断时带来的信息丢失问题，高并发下 7~10 位碰撞率完全降为 **0%**。
+- **碰撞防御**：秒级重置机制配合随机偏移初始化，极大地降低碰撞概率。
 - **扩展性**：支持自定义钩子，轻松对接 Redis 等分布式协调服务。

go.mod

@@ -3,7 +3,7 @@ module apigo.cc/go/id
 go 1.25.0
 
 require (
-	apigo.cc/go/encoding v1.5.5
+	apigo.cc/go/encoding v1.5.4
 	apigo.cc/go/jsmod v1.5.3
 	apigo.cc/go/rand v1.5.3
 )

id.go

@@ -86,9 +86,14 @@ func (im *IDMaker) get(size int, ordered bool, hashToHead bool) string {
 	uid = append(uid, inSecIndexBytes...)
 	uid = intEncoder.FillInt(uid, size)
 	if !ordered {
-		uid = encoding.HashInt(encoding.ExchangeInt(uid))
+		uid = encoding.ExchangeInt(uid)
+		hashed := encoding.HashInt(uid, nil)
+		uid = make([]byte, 0, size)
+		for i := 0; i < size && i < len(hashed); i++ {
+			uid = append(uid, intEncoder.EncodeInt(uint64(hashed[i]))[0])
+		}
 	} else {
-		encoding.HashInt(encoding.ExchangeInt(uid[secLen+1:]))
+		encoding.HashInt(encoding.ExchangeInt(uid[secLen+1:]), nil)
 		if hashToHead {
 			size = len(uid)
 			lastByte := uid[size-1]

id_test.go

@@ -1,11 +1,8 @@
 package id_test
 
 import (
-	"apigo.cc/go/encoding"
-	"apigo.cc/go/id"
-	"math"
-	"strings"
 	"testing"
+	"apigo.cc/go/id"
 )
 
 func TestMakeID(t *testing.T) {
@@ -29,317 +26,6 @@ func TestGetForPostgreSQL(t *testing.T) {
 	}
 }
 
-func TestPrintIDs(t *testing.T) {
-	t.Log("=== Normal Mode (Get) ===")
-	for size := 6; size <= 12; size++ {
-		t.Logf("--- Size: %d ---", size)
-		for i := 0; i < 10; i++ {
-			uid := id.DefaultIDMaker.Get(size)
-			t.Logf("  #%d: %s", i+1, uid)
-		}
-	}
-
-	t.Log("=== MySQL Mode (GetForMysql) ===")
-	for size := 6; size <= 12; size++ {
-		t.Logf("--- Size: %d ---", size)
-		for i := 0; i < 10; i++ {
-			uid := id.DefaultIDMaker.GetForMysql(size)
-			t.Logf("  #%d: %s", i+1, uid)
-		}
-	}
-}
-
-// UnexchangeInt is the inverse of ExchangeInt
-func UnexchangeInt(buf []byte) []byte {
-	size := len(buf)
-	if size <= 1 {
-		return buf
-	}
-	res := make([]byte, size)
-	buf2_i := 0
-	buf2_ai := 0
-	buf2_ri := size - 1
-
-	// In ExchangeInt:
-	// for i := 0; i < size; i++ {
-	//     if i%2 == 0 {
-	//         buf2[buf2_i] = buf[buf2_ri]; buf2_ri--
-	//     } else {
-	//         buf2[buf2_i] = buf[buf2_ai]; buf2_ai++
-	//     }
-	//     buf2_i++
-	// }
-	// We reverse this mapping.
-	for i := 0; i < size; i++ {
-		if i%2 == 0 {
-			res[buf2_ri] = buf[buf2_i]
-			buf2_ri--
-		} else {
-			res[buf2_ai] = buf[buf2_i]
-			buf2_ai++
-		}
-		buf2_i++
-	}
-	return res
-}
-
-// UnhashInt is the inverse of HashInt
-func UnhashInt(buf []byte, digits string, decodeMap [256]int, radix int) []byte {
-	if len(buf) == 0 {
-		return buf
-	}
-
-	orderedDigits := "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-	defaultDigits := "9ukH1grX75TQS6LzpFAjIivsdZoO0mc8NBwnyYDhtMWEC2V3KaGxfJRPqe4lbU"
-
-	// F is the non-linear cross-charset update function for prevP
-	F := func(p int) int {
-		char := defaultDigits[p]
-		return strings.IndexByte(orderedDigits, char)
-	}
-
-	// 1. Undo Round 2 (Backward propagation, right to left)
-	prevP := (len(buf) * 31) % radix
-	for i := len(buf) - 1; i >= 0; i-- {
-		newChar := buf[i]
-		newP := decodeMap[newChar]
-		if newP < 0 {
-			newP = 0
-		}
-		p := (newP - prevP + radix) % radix
-		buf[i] = digits[p]
-		prevP = F(newP)
-	}
-
-	// 2. Undo Round 1 (Forward propagation, left to right)
-	prevP = (len(buf) * 17) % radix
-	for i := 0; i < len(buf); i++ {
-		newChar := buf[i]
-		newP := decodeMap[newChar]
-		if newP < 0 {
-			newP = 0
-		}
-		p := (newP - prevP + radix) % radix
-		buf[i] = digits[p]
-		prevP = F(newP)
-	}
-
-	return buf
-}
-
-func TestReversibility(t *testing.T) {
-	digits := "9ukH1grX75TQS6LzpFAjIivsdZoO0mc8NBwnyYDhtMWEC2V3KaGxfJRPqe4lbU"
-	var decodeMap [256]int
-	for i := 0; i < 256; i++ {
-		decodeMap[i] = -1
-	}
-	for i, c := range digits {
-		decodeMap[c] = i
-	}
-	radix := len(digits)
-
-	// We generate 100,000 sequential combinations to check if they map uniquely
-	t.Log("Testing reversibility of HashInt and ExchangeInt...")
-
-	// Create some arbitrary input
-	for size := 5; size <= 15; size++ {
-		// Test multiple inputs for each size
-		for step := 0; step < 1000; step++ {
-			original := make([]byte, size)
-			for i := 0; i < size; i++ {
-				// Fill with pseudo-random digits from the digit set
-				original[i] = digits[(step+i)%radix]
-			}
-
-			// Copy for modification
-			temp := make([]byte, size)
-			copy(temp, original)
-
-			// Forward transformation: Exchange then Hash
-			// We simulate what id.go does: encoding.HashInt(encoding.ExchangeInt(uid))
-			// Since encoding.ExchangeInt returns a new slice, and encoding.HashInt modifies in-place
-			exchanged := encoding.ExchangeInt(temp)
-			hashed := encoding.HashInt(exchanged)
-
-			// Backward transformation: Unhash then Unexchange
-			unhashed := UnhashInt(hashed, digits, decodeMap, radix)
-			unexchanged := UnexchangeInt(unhashed)
-
-			for i := 0; i < size; i++ {
-				if unexchanged[i] != original[i] {
-					t.Fatalf("Reversibility failed for size %d, step %d! Expected %s, got %s", size, step, string(original), string(unexchanged))
-				}
-			}
-		}
-	}
-	t.Log("Reversibility verified! The transformation is a perfect BIJECTION (no collisions possible on same-length unique inputs before truncation).")
-}
-
-func TestCollisionRate(t *testing.T) {
-	// We simulate high concurrency generation of IDs for lengths 6 to 12.
-	// We verify if the distribution behaves as a mathematically ideal random distribution.
-	importMath := func(n float64, space float64) float64 {
-		ratio := n / space
-		if ratio < 1e-4 {
-			return (n * n) / (2.0 * space)
-		}
-		importMathExp := space * (1.0 - math.Exp(-ratio))
-		return n - importMathExp
-	}
-
-	for size := 6; size <= 10; size++ {
-		seen := make(map[string]int)
-		collisions := 0
-		n := 100000 // Test 100,000 IDs
-		if size == 6 {
-			n = 1000000 // Test 1,000,000 IDs for size 6 to see actual collisions
-		} else if size >= 9 {
-			n = 500000
-		}
-
-		logCount := 0
-		for i := 0; i < n; i++ {
-			uid := id.DefaultIDMaker.Get(size)
-			if prevIdx, found := seen[uid]; found {
-				collisions++
-				if size == 6 && logCount < 10 {
-					t.Logf("Coll size 6: ID=%s found at iteration %d and %d", uid, prevIdx, i)
-					logCount++
-				}
-			} else {
-				seen[uid] = i
-			}
-		}
-
-		space := math.Pow(62, float64(size))
-		expected := importMath(float64(n), space)
-		t.Logf("Size %2d: Space %12.0f, N = %d | Actual Collisions: %d (Rate: %.5f%%) | Expected Collisions: %.2f (Rate: %.5f%%)",
-			size, space, n, collisions, float64(collisions)/float64(n)*100, expected, expected/float64(n)*100)
-	}
-}
-
-func TestCheckHashDiff(t *testing.T) {
-	// Let's generate two concurrent IDs with consecutive secIndex
-	// Normal mode (size = 6)
-	// We want to see:
-	// 1. The original uid (before Exchange and Hash)
-	// 2. The exchanged uid
-	// 3. The hashed uid
-	// 4. The final 6-character truncated version
-
-	// We stub the process of making UID
-	sec := uint64(14776336 + 100) // arbitrary time sec
-	intEncoder := encoding.DefaultIntEncoder
-	secBytes := intEncoder.EncodeInt(sec) // 5 bytes
-
-	for idx := uint64(1); idx <= 5; idx++ {
-		secIndex := idx
-		inSecIndexBytes := intEncoder.EncodeInt(secIndex)
-
-		m := min(uint64(len(inSecIndexBytes)), 5)
-		secTagVal := uint64(0)*5 + (m - 1)
-
-		var uid = make([]byte, 0, 6)
-		uid = intEncoder.AppendInt(uid, secTagVal)
-		uid = append(uid, secBytes...)
-		uid = append(uid, inSecIndexBytes...)
-		uid = intEncoder.FillInt(uid, 6)
-
-		orig := string(uid)
-		exchanged := encoding.ExchangeInt(uid)
-		exchStr := string(exchanged)
-
-		// Hash modifies in-place
-		hashed := encoding.HashInt(exchanged)
-		hashStr := string(hashed)
-		truncated := hashStr[:6]
-
-		t.Logf("idx=%d | Orig: %s (len=%d) | Exch: %s | Hashed: %s | Truncated: %s",
-			idx, orig, len(orig), exchStr, hashStr, truncated)
-	}
-}
-
-func TestPrintCollisions(t *testing.T) {
-	seen := make(map[string]struct {
-		sec       uint64
-		secIndex  uint64
-		orig      string
-		exchanged string
-		hashed    string
-	})
-	intEncoder := encoding.DefaultIntEncoder
-
-	size := 6
-	t.Logf("Printing collisions for size = %d across two adjacent seconds...", size)
-
-	count := 0
-
-	// Second 1
-	sec1 := uint64(14776336 + 100)
-	for secIndex := uint64(1); secIndex <= 50000; secIndex++ {
-		secBytes := intEncoder.EncodeInt(sec1)
-		inSecIndexBytes := intEncoder.EncodeInt(secIndex)
-		m := min(uint64(len(inSecIndexBytes)), 5)
-		secTagVal := uint64(0)*5 + (m - 1)
-
-		var uid = make([]byte, 0, size)
-		uid = intEncoder.AppendInt(uid, secTagVal)
-		uid = append(uid, secBytes...)
-		uid = append(uid, inSecIndexBytes...)
-		uid = intEncoder.FillInt(uid, size)
-
-		orig := string(uid)
-		exchanged := encoding.ExchangeInt(uid)
-		exchStr := string(exchanged)
-		hashed := encoding.HashInt(exchanged)
-		hashStr := string(hashed)
-		finalID := hashStr[:size]
-
-		seen[finalID] = struct {
-			sec       uint64
-			secIndex  uint64
-			orig      string
-			exchanged string
-			hashed    string
-		}{sec: sec1, secIndex: secIndex, orig: orig, exchanged: exchStr, hashed: hashStr}
-	}
-
-	// Second 2 (Adjacent second)
-	sec2 := sec1 + 1
-	for secIndex := uint64(1); secIndex <= 50000; secIndex++ {
-		secBytes := intEncoder.EncodeInt(sec2)
-		inSecIndexBytes := intEncoder.EncodeInt(secIndex)
-		m := min(uint64(len(inSecIndexBytes)), 5)
-		secTagVal := uint64(0)*5 + (m - 1)
-
-		var uid = make([]byte, 0, size)
-		uid = intEncoder.AppendInt(uid, secTagVal)
-		uid = append(uid, secBytes...)
-		uid = append(uid, inSecIndexBytes...)
-		uid = intEncoder.FillInt(uid, size)
-
-		orig := string(uid)
-		exchanged := encoding.ExchangeInt(uid)
-		exchStr := string(exchanged)
-		hashed := encoding.HashInt(exchanged)
-		hashStr := string(hashed)
-		finalID := hashStr[:size]
-
-		if prev, found := seen[finalID]; found {
-			t.Logf("Coll! ID: %s", finalID)
-			t.Logf("  Pair 1: sec=%d, idx=%d | Orig: %s | Exch: %s | Hashed: %s",
-				prev.sec, prev.secIndex, prev.orig, prev.exchanged, prev.hashed)
-			t.Logf("  Pair 2: sec=%d, idx=%d | Orig: %s | Exch: %s | Hashed: %s",
-				sec2, secIndex, orig, exchStr, hashStr)
-			count++
-			if count >= 10 {
-				break
-			}
-		}
-	}
-	t.Logf("Total collision pairs logged. Simulated adjacent-second collision counts: %d out of 50,000", count)
-}
-
 func BenchmarkIDMaker(b *testing.B) {
 	b.Run("MakeID-10", func(b *testing.B) {
 		for i := 0; i < b.N; i++ {