Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Nixevol
|
b6f3bafd1f |
+7
-7
@@ -1719,12 +1719,12 @@ issue #3 未关闭，`feat/fix-3-downlink-deadlock` 未合入 `main`。下面是
|
||||
- 备选方案：为每个未测子项补验收用例（本波不做，避免为变绿放松断言）。
|
||||
- 影响：汇总改为通过 19、部分通过 4（F03/F08/F21/F22）、失败 0。F19 仍引用仓库内 SDK 清单、本波不重跑。
|
||||
|
||||
### 复审修复 R3-05
|
||||
### 复审修复 R3-07
|
||||
|
||||
1. **JS SDK 传输失败后须再泵发送队列**
|
||||
1. **客户端建群事务内复核创建者**
|
||||
- 日期：2026-09-30
|
||||
- 原条款：DEVELOPMENT 第 5 节 / 附录 SDK 行为约定：发送在途失败后换新 `rid` 并重交；`id` / 正文 / `send_at_ms` 不变。Gitea #69。
|
||||
- 实际做法：`dispatchSend` 中 `publishUp` 抛出非协议 `APIError` 时，若未 `stopReconnect` 则清 inflight、换新 `rid` 后立刻 `drainSendQueue`；若已 `stopReconnect` 则 `finishSendErr` 结束本次 `send`。不额外再乘一次抖动。
|
||||
- 原因：原先只换 `rid` 并 `return`，连接未断时 `hello` 不再走，队列停泵，`send()` Promise 永不结束。
|
||||
- 备选方案：按 `rate_limited` 同一条的退避再泵（否决本波，连接仍在线时立即重交更贴切，且避免与已有等待叠乘抖动）。
|
||||
- 影响：仅 `sdk/js`；假传输失败一次后会再次上行且 `rid` 已变。
|
||||
- 原条款：Gitea #71。`group.Create` 在 `Queue.Do` 里直接 `insertMemberTx` 群主，不跑 `endpointCheckTx`；停用/删除与建群抢在事务外对话密码窗口时，可插入已停用甚至刚删除的 `owner_id`。
|
||||
- 实际做法：`Create` 同一写事务里，插入群与群主成员之前对 `actorID` 做与 `createAdmin` 相同的 `endpointCheckTx`；已停用 `endpoint_disabled`，不存在 `invalid_target`，且不插入群。不改 `emit`、不改迁移编号。
|
||||
- 原因：成员侧已有事务内复核，群主侧缺对称校验，竞态会留下非法群主。
|
||||
- 备选方案：事务外再查一次创建者（否决，无法覆盖密码窗口与写事务之间的竞态）。
|
||||
- 影响：创建者在进入写事务前被停用/删除时建群失败且无新群行；与后台建群错误码对齐。
|
||||
|
||||
@@ -147,6 +147,15 @@ func (a *App) Create(ctx context.Context, actorID string, req *protocol.GroupCre
|
||||
|
||||
var inserted []string
|
||||
err := a.db.Queue.Do(ctx, func(tx *sql.Tx) error {
|
||||
if e := endpointCheckTx(tx, actorID); e != nil {
|
||||
if protoCode(e) == protocol.CodeInvalidTarget {
|
||||
return errCode(protocol.CodeInvalidTarget, "owner not found")
|
||||
}
|
||||
if protoCode(e) == protocol.CodeEndpointDisabled {
|
||||
return errCode(protocol.CodeEndpointDisabled, "owner disabled")
|
||||
}
|
||||
return e
|
||||
}
|
||||
var exists int
|
||||
qErr := tx.QueryRow(`SELECT 1 FROM groups WHERE id = ?`, gid).Scan(&exists)
|
||||
if qErr == nil {
|
||||
|
||||
@@ -604,6 +604,106 @@ func TestU02CreateDedupesMembers(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// raceTalk 在对话密码校验成功后执行一次 mutate，模拟事务外密码窗口里创建者被停用/删除。
|
||||
type raceTalk struct {
|
||||
inner group.TalkGate
|
||||
mutate func()
|
||||
once sync.Once
|
||||
}
|
||||
|
||||
func (r *raceTalk) CheckTalkPasswordForJoin(ctx context.Context, actorID, targetID, talkPassword, remoteIP string) error {
|
||||
err := r.inner.CheckTalkPasswordForJoin(ctx, actorID, targetID, talkPassword, remoteIP)
|
||||
if err == nil && r.mutate != nil {
|
||||
r.once.Do(r.mutate)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func TestR307CreateRejectsActorDisabledOrDeletedBeforeWrite(t *testing.T) {
|
||||
t.Parallel()
|
||||
cases := []struct {
|
||||
name string
|
||||
code string
|
||||
mutate func(ctx context.Context, t *testing.T, idApp *identity.App, db *store.DB)
|
||||
}{
|
||||
{
|
||||
name: "disabled",
|
||||
code: protocol.CodeEndpointDisabled,
|
||||
mutate: func(ctx context.Context, t *testing.T, idApp *identity.App, _ *store.DB) {
|
||||
t.Helper()
|
||||
if err := idApp.Disable(ctx, "alice"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "deleted",
|
||||
code: protocol.CodeInvalidTarget,
|
||||
mutate: func(ctx context.Context, t *testing.T, idApp *identity.App, _ *store.DB) {
|
||||
t.Helper()
|
||||
if err := idApp.Delete(ctx, "alice"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
tc := tc
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
db, err := store.Open(filepath.Join(t.TempDir(), "data"), "FULL")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = db.Close() })
|
||||
fixed := time.UnixMilli(1_700_000_000_000)
|
||||
locks := auth.NewLoginLocks()
|
||||
idApp := identity.New(identity.Config{
|
||||
DB: db, Hash: auth.NewStubHashPool(), Locks: locks,
|
||||
Sessions: auth.NewSessionTokens(),
|
||||
Now: func() time.Time { return fixed },
|
||||
})
|
||||
gate := &raceTalk{inner: idApp}
|
||||
gApp := group.New(group.Config{
|
||||
DB: db, Talk: gate, MaxGroupMembers: 1000,
|
||||
Now: func() time.Time { return fixed }, DefaultRemoteIP: "1.1.1.1",
|
||||
})
|
||||
ctx := context.Background()
|
||||
insertEP(t, db, "alice", 1)
|
||||
insertEP(t, db, "bob", 1)
|
||||
if err := idApp.SelfSetTalkPassword(ctx, "bob", "secret"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
gate.mutate = func() { tc.mutate(ctx, t, idApp, db) }
|
||||
|
||||
var before int
|
||||
if qErr := db.Read.QueryRow(`SELECT COUNT(*) FROM groups`).Scan(&before); qErr != nil {
|
||||
t.Fatal(qErr)
|
||||
}
|
||||
_, err = gApp.Create(ctx, "alice", &protocol.GroupCreate{
|
||||
V: protocol.Version, Type: protocol.TypeGroupCreate, RID: "1",
|
||||
ID: "g_r307_" + tc.name, Name: "竞态群",
|
||||
Members: []protocol.GroupMemberIn{{ID: "bob", TalkPassword: "secret"}},
|
||||
})
|
||||
if protoCode(err) != tc.code {
|
||||
t.Fatalf("want %s got %v", tc.code, err)
|
||||
}
|
||||
var after int
|
||||
if qErr := db.Read.QueryRow(`SELECT COUNT(*) FROM groups`).Scan(&after); qErr != nil {
|
||||
t.Fatal(qErr)
|
||||
}
|
||||
if after != before {
|
||||
t.Fatalf("groups leaked: before=%d after=%d", before, after)
|
||||
}
|
||||
var exists int
|
||||
qErr := db.Read.QueryRow(`SELECT 1 FROM groups WHERE id = ?`, "g_r307_"+tc.name).Scan(&exists)
|
||||
if !errors.Is(qErr, sql.ErrNoRows) {
|
||||
t.Fatalf("expected no group row, got exists=%d err=%v", exists, qErr)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestU02AdminCreateOwnerMustExistAndEnabled(t *testing.T) {
|
||||
t.Parallel()
|
||||
gApp, _, _, db, down := setup(t)
|
||||
|
||||
@@ -739,12 +739,10 @@ export class Client {
|
||||
this.finishSendErr(item, this.stopErr());
|
||||
return;
|
||||
}
|
||||
// 传输失败但连接未断：换 rid 后立刻再泵，否则 hello 不再走、send 会挂起
|
||||
item.inflight = false;
|
||||
this.inflight = Math.max(0, this.inflight - 1);
|
||||
this.pending.delete(rid);
|
||||
this.regenerateSend(item);
|
||||
void this.drainSendQueue();
|
||||
return;
|
||||
}
|
||||
this.finishSendErr(item, e);
|
||||
|
||||
@@ -126,46 +126,6 @@ describe("nixmsg sdk", () => {
|
||||
await c.close();
|
||||
}, 10000);
|
||||
|
||||
it("publishUp transport fail retries with new rid", async () => {
|
||||
const fake = new FakeTransport();
|
||||
const c = await connectFake(fake);
|
||||
const at = new Date(1_700_000_000_000);
|
||||
const attempts: Array<Record<string, unknown>> = [];
|
||||
let failOnce = true;
|
||||
fake.publishUpImpl = async (s) => {
|
||||
const m = JSON.parse(s) as Record<string, unknown>;
|
||||
if (m.type !== "send") return;
|
||||
attempts.push(m);
|
||||
if (failOnce) {
|
||||
failOnce = false;
|
||||
throw new Error("transient publish");
|
||||
}
|
||||
};
|
||||
const timer = setInterval(() => {
|
||||
const sends = fake.findUp("send");
|
||||
if (sends.length < 1) return;
|
||||
const last = sends[sends.length - 1]!;
|
||||
fake.replyOK(String(last.rid), {
|
||||
id: last.id,
|
||||
send_at_ms: last.send_at_ms,
|
||||
state: "scheduled",
|
||||
});
|
||||
}, 5);
|
||||
const res = await c.send(
|
||||
{ kind: "endpoint", id: "b" },
|
||||
{ enc: "utf8", data: "hi" },
|
||||
{ sendAt: at },
|
||||
);
|
||||
clearInterval(timer);
|
||||
expect(attempts.length).toBeGreaterThanOrEqual(2);
|
||||
expect(String(attempts[1]!.rid)).not.toBe(String(attempts[0]!.rid));
|
||||
expect(attempts[1]!.id).toBe(attempts[0]!.id);
|
||||
expect(attempts[1]!.send_at_ms).toBe(attempts[0]!.send_at_ms);
|
||||
expect((attempts[1]!.body as { data: string }).data).toBe("hi");
|
||||
expect(res.id).toBe(String(attempts[0]!.id));
|
||||
await c.close();
|
||||
}, 5000);
|
||||
|
||||
it("register HTTP from ws url", async () => {
|
||||
const srv = createServer((req, res) => {
|
||||
expect(req.url).toBe("/api/client/register");
|
||||
|
||||
Reference in New Issue
Block a user