wowok 2.1.31 → 2.1.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/w/call/order.js +25 -10
- package/dist/cjs/w/call/order.js.map +1 -1
- package/dist/cjs/w/messenger/crypto.d.ts +8 -1
- package/dist/cjs/w/messenger/crypto.js +14 -3
- package/dist/cjs/w/messenger/crypto.js.map +1 -1
- package/dist/cjs/w/messenger/index.d.ts +1 -1
- package/dist/cjs/w/messenger/index.js.map +1 -1
- package/dist/cjs/w/messenger/messenger-api.d.ts +76 -3
- package/dist/cjs/w/messenger/messenger-api.js +199 -9
- package/dist/cjs/w/messenger/messenger-api.js.map +1 -1
- package/dist/cjs/w/messenger/messenger-manager.js +18 -0
- package/dist/cjs/w/messenger/messenger-manager.js.map +1 -1
- package/dist/cjs/w/messenger/storage.d.ts +17 -0
- package/dist/cjs/w/messenger/storage.js +48 -0
- package/dist/cjs/w/messenger/storage.js.map +1 -1
- package/dist/cjs/w/messenger/types.d.ts +102 -4
- package/dist/cjs/w/messenger/types.js.map +1 -1
- package/dist/esm/w/call/order.js +25 -10
- package/dist/esm/w/call/order.js.map +1 -1
- package/dist/esm/w/messenger/crypto.d.ts +8 -1
- package/dist/esm/w/messenger/crypto.js +14 -3
- package/dist/esm/w/messenger/crypto.js.map +1 -1
- package/dist/esm/w/messenger/index.d.ts +1 -1
- package/dist/esm/w/messenger/index.js.map +1 -1
- package/dist/esm/w/messenger/messenger-api.d.ts +76 -3
- package/dist/esm/w/messenger/messenger-api.js +199 -9
- package/dist/esm/w/messenger/messenger-api.js.map +1 -1
- package/dist/esm/w/messenger/messenger-manager.js +18 -0
- package/dist/esm/w/messenger/messenger-manager.js.map +1 -1
- package/dist/esm/w/messenger/storage.d.ts +17 -0
- package/dist/esm/w/messenger/storage.js +48 -0
- package/dist/esm/w/messenger/storage.js.map +1 -1
- package/dist/esm/w/messenger/types.d.ts +102 -4
- package/dist/esm/w/messenger/types.js.map +1 -1
- package/package.json +1 -1
package/dist/cjs/w/call/order.js
CHANGED
|
@@ -6,7 +6,6 @@ import { GetAccountOrMark_Address, GetManyAccountOrMark_Address, } from "../loca
|
|
|
6
6
|
import { LocalMark } from "../local/local.js";
|
|
7
7
|
import { ArbStatus, ObjectType, query_objects } from "../query/object.js";
|
|
8
8
|
import { query_received } from "../query/received.js";
|
|
9
|
-
import { queryObjectWithType } from "../query/util.js";
|
|
10
9
|
import { parseObjectType, validObjects } from "../util.js";
|
|
11
10
|
import { description_change, MAX_PROPOSITION_COUNT, objection, principal_confirm, proposition_change, } from "./arb.js";
|
|
12
11
|
import { CallBase } from "./base.js";
|
|
@@ -74,15 +73,24 @@ export class CallOrder extends CallBase {
|
|
|
74
73
|
}
|
|
75
74
|
async get_service(env) {
|
|
76
75
|
if (!this.service && this.content) {
|
|
77
|
-
const
|
|
78
|
-
|
|
76
|
+
const service_result = await query_objects({
|
|
77
|
+
objects: [this.content.service],
|
|
78
|
+
no_cache: env.no_cache,
|
|
79
|
+
network: env.network,
|
|
80
|
+
});
|
|
81
|
+
if (service_result.objects && service_result.objects.length === 1) {
|
|
82
|
+
const s = service_result.objects[0];
|
|
83
|
+
if (!s.type || s.type !== ObjectType.Service) {
|
|
84
|
+
W_ERROR(WErrors.IsValidArgType, `object ${this.content.service} type ${s.type} is not Service`);
|
|
85
|
+
}
|
|
86
|
+
const ty = parseObjectType(s.type_raw, "service::Service");
|
|
87
|
+
if (!ty) {
|
|
88
|
+
W_ERROR(WErrors.IsValidArgType, `Service ${this.content.service} type ${s.type_raw} is not valid`);
|
|
89
|
+
}
|
|
79
90
|
this.service = {
|
|
80
91
|
object: s,
|
|
81
|
-
type:
|
|
92
|
+
type: ty,
|
|
82
93
|
};
|
|
83
|
-
if (!this.service.type) {
|
|
84
|
-
W_ERROR(WErrors.IsValidArgType, `CallOrder_Data.data.order_required_info error on service ${JSON.stringify(this.service.object)} type`);
|
|
85
|
-
}
|
|
86
94
|
}
|
|
87
95
|
}
|
|
88
96
|
if (!this.service) {
|
|
@@ -180,11 +188,18 @@ export class CallOrder extends CallBase {
|
|
|
180
188
|
}
|
|
181
189
|
}
|
|
182
190
|
async get_arb(env, arb_address) {
|
|
183
|
-
const
|
|
184
|
-
|
|
191
|
+
const arb_result = await query_objects({
|
|
192
|
+
objects: [arb_address],
|
|
193
|
+
no_cache: env.no_cache,
|
|
194
|
+
network: env.network,
|
|
195
|
+
});
|
|
196
|
+
if (!arb_result.objects || arb_result.objects.length !== 1) {
|
|
185
197
|
W_ERROR(WErrors.InvalidParam, `Arb ${arb_address} not found`);
|
|
186
198
|
}
|
|
187
|
-
const arb_data =
|
|
199
|
+
const arb_data = arb_result.objects[0];
|
|
200
|
+
if (!arb_data.type || arb_data.type !== ObjectType.Arb) {
|
|
201
|
+
W_ERROR(WErrors.IsValidArgType, `object ${arb_address} type ${arb_data.type} is not Arb`);
|
|
202
|
+
}
|
|
188
203
|
const ty = parseObjectType(arb_data.type_raw, "arb::Arb");
|
|
189
204
|
if (!ty) {
|
|
190
205
|
W_ERROR(WErrors.IsValidArgType, `Arb ${arb_address} type ${arb_data.type_raw} is not valid`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../../../src/w/call/order.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../../../src/w/call/order.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,14 @@ export declare function hashSha256(data: Uint8Array): Uint8Array;
|
|
|
13
13
|
export declare function hashMessage(data: string): string;
|
|
14
14
|
/**
|
|
15
15
|
* 计算明文哈希(用于 Merkle Tree 证明)
|
|
16
|
-
* plaintext_hash = SHA256(plaintext + client_timestamp + guardAddress + passportAddress)
|
|
16
|
+
* plaintext_hash = SHA256(plaintext + lastReceivedLeafIndex + client_timestamp + guardAddress + passportAddress)
|
|
17
|
+
*
|
|
18
|
+
* 【注意】顺序必须与服务器端一致:
|
|
19
|
+
* 1. plaintext
|
|
20
|
+
* 2. lastReceivedLeafIndex (if >= 0)
|
|
21
|
+
* 3. clientTimestamp
|
|
22
|
+
* 4. guardAddress (if present)
|
|
23
|
+
* 5. passportAddress (if present)
|
|
17
24
|
*/
|
|
18
25
|
export declare function hashPlaintext(plaintext: string, clientTimestamp: number, guardAddress?: string, passportAddress?: string, lastReceivedLeafIndex?: number): string;
|
|
19
26
|
/**
|
|
@@ -52,17 +52,28 @@ export function hashMessage(data) {
|
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
54
54
|
* 计算明文哈希(用于 Merkle Tree 证明)
|
|
55
|
-
* plaintext_hash = SHA256(plaintext + client_timestamp + guardAddress + passportAddress)
|
|
55
|
+
* plaintext_hash = SHA256(plaintext + lastReceivedLeafIndex + client_timestamp + guardAddress + passportAddress)
|
|
56
|
+
*
|
|
57
|
+
* 【注意】顺序必须与服务器端一致:
|
|
58
|
+
* 1. plaintext
|
|
59
|
+
* 2. lastReceivedLeafIndex (if >= 0)
|
|
60
|
+
* 3. clientTimestamp
|
|
61
|
+
* 4. guardAddress (if present)
|
|
62
|
+
* 5. passportAddress (if present)
|
|
56
63
|
*/
|
|
57
64
|
export function hashPlaintext(plaintext, clientTimestamp, guardAddress, passportAddress, lastReceivedLeafIndex) {
|
|
58
|
-
let data = plaintext
|
|
59
|
-
//
|
|
65
|
+
let data = plaintext;
|
|
66
|
+
// 1. 先添加 lastReceivedLeafIndex(如果 >= 0)
|
|
60
67
|
if (lastReceivedLeafIndex !== undefined && lastReceivedLeafIndex >= 0) {
|
|
61
68
|
data += lastReceivedLeafIndex.toString();
|
|
62
69
|
}
|
|
70
|
+
// 2. 添加 clientTimestamp
|
|
71
|
+
data += clientTimestamp.toString();
|
|
72
|
+
// 3. 添加 guardAddress(如果有)
|
|
63
73
|
if (guardAddress) {
|
|
64
74
|
data += guardAddress;
|
|
65
75
|
}
|
|
76
|
+
// 4. 添加 passportAddress(如果有)
|
|
66
77
|
if (passportAddress) {
|
|
67
78
|
data += passportAddress;
|
|
68
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../../src/w/messenger/crypto.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,sCAAsC;AAItC;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,oCAAoC;AACpC;;GAEG;AACH,SAAS,aAAa,CACrB,SAAqB,EACrB,OAAmB,EACnB,SAAqB;IAErB,IAAI,CAAC;QACJ,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAED,6BAA6B;AAC7B;;GAEG;AACH,MAAM,UAAU,mCAAmC,CAClD,gBAA4B;IAE5B,MAAM,eAAe,GAAG,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;IAC3C,MAAM,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEjE,OAAO;QACN,eAAe;QACf,gBAAgB;QAChB,iBAAiB;QACjB,gBAAgB;KAChB,CAAC;AACH,CAAC;AAED,6BAA6B;AAE7B;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAgB;IAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,IAAY;IACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC5B,SAAiB,EACjB,eAAuB,EACvB,YAAqB,EACrB,eAAwB,EACxB,qBAA8B;IAE9B,IAAI,IAAI,GAAG,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;IAClD,sCAAsC;IACtC,IAAI,qBAAqB,KAAK,SAAS,IAAI,qBAAqB,IAAI,CAAC,EAAE,CAAC;QACvE,IAAI,IAAI,qBAAqB,CAAC,QAAQ,EAAE,CAAC;IAC1C,CAAC;IACD,IAAI,YAAY,EAAE,CAAC;QAClB,IAAI,IAAI,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,eAAe,EAAE,CAAC;QACrB,IAAI,IAAI,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,OAAO,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,6BAA6B;AAE7B;;GAEG;AACH,MAAM,UAAU,aAAa;IAC5B,OAAO,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,KAAiB;IAC9C,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAc;IAC3C,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,KAAiB;IAC3C,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW;IACrC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAgB;IACvD,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAe;IACtD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAC9B,GAAG,CAAC,UAAU,EACd,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAC/B,CAAC;IACF,OAAO,MAAqB,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,CAAkB,EAAE,CAAkB;IACjE,IAAI,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC;IAChD,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACtC,aAAqB,EACrB,eAAuB;IAEvB,MAAM,kBAAkB,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAC;IACpD,aAAa,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,CAAC;IAEvD,MAAM,QAAQ,GAAG,IAAI,UAAU,CAC9B,kBAAkB,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CACjD,CAAC;IACF,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACjC,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC9B,OAAO,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,uCAAuC;AAEvC;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,KAAa;IACrD,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACtE,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxB,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAC7B,QAAgB,EAChB,QAAgB,EAChB,SAAiB;IAEjB,mCAAmC;IACnC,MAAM,aAAa,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEzD,2BAA2B;IAC3B,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAC;IACpD,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,uBAAuB;IACpE,MAAM,cAAc,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,CAAC;IAEvD,wCAAwC;IACxC,MAAM,QAAQ,GAAG,IAAI,UAAU,CAC9B,aAAa,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CACnE,CAAC;IACF,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAE1E,OAAO,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAChC,QAAgB,EAChB,KAIC;IAED,IAAI,OAAO,GAAG,QAAQ,CAAC;IAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,UAAU;YACV,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACP,UAAU;YACV,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAED,OAAO,OAAO,KAAK,KAAK,CAAC,IAAI,CAAC;AAC/B,CAAC;AAcD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,iBAAiB,CAChC,QAME,EACF,WAAoB;IAEpB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,iBAAiB;IACjB,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CACnC,CAAC;IAEF,UAAU;IACV,MAAM,QAAQ,GAAG,WAAW,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEtD,IAAI,gBAAgB,GAAG,QAAQ,CAAC;IAEhC,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,iCAAiC;QACjC,IAAI,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,gBAAgB,CAAC,WAAW,EAAE,EAAE,CAAC;YACnE,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,kCAAkC,GAAG,CAAC,SAAS,uBAAuB,gBAAgB,SAAS,GAAG,CAAC,QAAQ,EAAE;gBACpH,YAAY,EAAE,gBAAgB;gBAC9B,UAAU,EAAE,GAAG,CAAC,QAAQ;aACxB,CAAC;QACH,CAAC;QAED,+CAA+C;QAC/C,MAAM,MAAM,GAAG,sBAAsB,CACpC,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,aAAa,EACjB,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,SAAS,CACb,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnB,wBAAwB;YACxB,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,GAAG,MAAM,CAAC,KAAK,iBAAiB,GAAG,CAAC,SAAS,EAAE;gBACtD,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,UAAU,EAAE,MAAM,CAAC,UAAU;aAC7B,CAAC;QACH,CAAC;QAED,iCAAiC;QACjC,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACxB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,sBAAsB,CACrC,QAAgB,EAChB,OAAe,EACf,aAAqB,EACrB,eAAuB,EACvB,SAAiB;IAEjB,aAAa;IACb,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,kBAAkB;SACzB,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,iBAAiB;SACxB,CAAC;IACH,CAAC;IACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACpB,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,uBAAuB;SAC9B,CAAC;IACH,CAAC;IACD,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;QAC/D,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,yBAAyB;SAChC,CAAC;IACH,CAAC;IACD,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACnD,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,mBAAmB;SAC1B,CAAC;IACH,CAAC;IAED,iBAAiB;IACjB,MAAM,QAAQ,GAAG,uBAAuB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAEzE,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEnE,IAAI,YAAY,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;QAC1D,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,uCAAuC,YAAY,SAAS,OAAO,EAAE;YAC5E,YAAY,EAAE,YAAY;YAC1B,UAAU,EAAE,OAAO;SACnB,CAAC;IACH,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACxB,CAAC;AAmDD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,aAAa,CAC5B,MAAiC;IAEjC,MAAM,EACL,SAAS,EACT,SAAS,EACT,aAAa,EACb,SAAS,EACT,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,cAAc,GACd,GAAG,MAAM,CAAC;IAEX,4BAA4B;IAC5B,sCAAsC;IACtC,MAAM,qBAAqB,GAAG,aAAa,CAC1C,SAAS,EACT,SAAS,EACT,YAAY,EACZ,eAAe,EACf,qBAAqB,CACrB,CAAC;IAEF,uBAAuB;IACvB,MAAM,aAAa,GAAG,CAAC,IAAY,EAAU,EAAE;QAC9C,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,IAAI,aAAa,CAAC,qBAAqB,CAAC,KAAK,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAC3E,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,uCAAuC,SAAS,cAAc,aAAa,SAAS,qBAAqB,EAAE;YAClH,WAAW,EAAE,WAAW;SACxB,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,IAAI,cAAc,EAAE,CAAC;QACpB,+BAA+B;QAC/B,8CAA8C;QAC9C,qCAAqC;QACrC,IAAI,cAAc,CAAC,aAAa,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC;YACjE,4BAA4B;YAC5B,MAAM,QAAQ,GAAG,uBAAuB,CACvC,aAAa,EACb,cAAc,CAAC,eAAe,CAC9B,CAAC;YACF,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,EAAE;gBAC9C,IAAI,EAAE,cAAc,CAAC,OAAO;gBAC5B,QAAQ,EAAE,cAAc,CAAC,aAAa;gBACtC,OAAO,EAAE,cAAc,CAAC,YAAY;aACpC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjB,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,gDAAgD,SAAS,EAAE;oBAClE,WAAW,EAAE,QAAQ;iBACrB,CAAC;YACH,CAAC;QACF,CAAC;QAED,qBAAqB;QACrB,iBAAiB;QACjB,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;QACvD,IAAI,CAAC,eAAe,EAAE,CAAC;YACtB,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,oEAAoE,SAAS,EAAE;gBACtF,WAAW,EAAE,QAAQ;aACrB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC9B,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,4DAA4D,SAAS,EAAE;gBAC9E,WAAW,EAAE,QAAQ;aACrB,CAAC;QACH,CAAC;QACD,MAAM,SAAS,GAAG,sBAAsB,CACvC,cAAc,CAAC,QAAQ,EACvB,cAAc,CAAC,OAAO,EACtB,aAAa,EACb,eAAe,EACf,cAAc,CAAC,SAAS,CACxB,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,+CAA+C,SAAS,KAAK,SAAS,CAAC,KAAK,EAAE;gBACrF,WAAW,EAAE,QAAQ;aACrB,CAAC;QACH,CAAC;IACF,CAAC;IAED,yBAAyB;IACzB,IAAI,eAAe,IAAI,eAAe,EAAE,CAAC;QACxC,2BAA2B;QAC3B,MAAM,SAAS,GAAG,cAAc,EAAE,eAAe,CAAC;QAClD,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,kEAAkE,SAAS,EAAE;gBACpF,WAAW,EAAE,QAAQ;aACrB,CAAC;QACH,CAAC;QACD,UAAU;QACV,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,CAAC;YAC9B,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,yDAAyD,SAAS,EAAE;gBAC3E,WAAW,EAAE,QAAQ;aACrB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,CAAC;YAC/B,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,0DAA0D,SAAS,EAAE;gBAC5E,WAAW,EAAE,QAAQ;aACrB,CAAC;QACH,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,OAAO,IAAI,SAAS,IAAI,eAAe,EAAE,CAAC;QACxG,MAAM,cAAc,GAAG,sBAAsB,CAC5C,eAAe,EACf,QAAQ,EACR,eAAe,CACf,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE,CAAC;YACrB,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,oDAAoD,SAAS,EAAE;gBACtE,WAAW,EAAE,QAAQ;aACrB,CAAC;QACH,CAAC;IACF,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACxB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CACrC,YAAoB,EACpB,OAAe,EACf,YAAoB;IAEpB,IAAI,CAAC;QACJ,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAuDD;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAChC,QAAwC;IAExC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,iBAAiB;IACjB,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CACnC,CAAC;IAEF,SAAS;IACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAE9B,8BAA8B;QAC9B,IAAI,GAAG,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,aAAa,CACjC,GAAG,CAAC,SAAS,IAAI,EAAE,EACnB,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,YAAY,EAChB,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,qBAAqB,CACzB,CAAC;YAEF,IACC,YAAY,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,aAAa,CAAC,WAAW,EAAE,EAC7D,CAAC;gBACF,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,uCAAuC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE;oBACpE,kBAAkB,EAAE,CAAC;oBACrB,WAAW,EAAE,WAAW;iBACxB,CAAC;YACH,CAAC;QACF,CAAC;QAED,kCAAkC;QAClC,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YACrB,4BAA4B;YAC5B,MAAM,QAAQ,GAAG,uBAAuB,CACvC,GAAG,CAAC,aAAa,EACjB,GAAG,CAAC,SAAS,CACb,CAAC;YACF,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,EAAE;gBAC9C,IAAI,EAAE,GAAG,CAAC,UAAU;gBACpB,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,QAAQ;gBAClC,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,OAAO;aAChC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjB,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,gDAAgD,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE;oBAC7E,kBAAkB,EAAE,CAAC;oBACrB,WAAW,EAAE,QAAQ;iBACrB,CAAC;YACH,CAAC;QACF,CAAC;QAED,yBAAyB;QACzB,IAAI,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;YAChD,UAAU;YACV,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;gBACrB,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,kCAAkC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE;oBAC/D,kBAAkB,EAAE,CAAC;oBACrB,WAAW,EAAE,QAAQ;iBACrB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;gBACpB,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,iCAAiC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE;oBAC9D,kBAAkB,EAAE,CAAC;oBACrB,WAAW,EAAE,QAAQ;iBACrB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACnB,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,gCAAgC,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE;oBAC7D,kBAAkB,EAAE,CAAC;oBACrB,WAAW,EAAE,QAAQ;iBACrB,CAAC;YACH,CAAC;YACD,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;YAC7F,MAAM,cAAc,GAAG,sBAAsB,CAC5C,GAAG,CAAC,eAAe,EACnB,QAAQ,EACR,GAAG,CAAC,eAAe,CACnB,CAAC;YAEF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrB,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,oDAAoD,GAAG,CAAC,EAAE,aAAa,CAAC,EAAE;oBACjF,kBAAkB,EAAE,CAAC;oBACrB,WAAW,EAAE,QAAQ;iBACrB,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IAED,qBAAqB;IACrB,MAAM,WAAW,GAAG,iBAAiB,CACpC,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,0BAA0B;QACpD,OAAO,EAAE,GAAG,CAAC,UAAU;QACvB,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,eAAe,EAAE,GAAG,CAAC,SAAS;KAC9B,CAAC,CAAC,CACH,CAAC;IAEF,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO;YACN,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,WAAW,EAAE,OAAO;SACpB,CAAC;IACH,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACxB,CAAC"}
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../../src/w/messenger/crypto.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,5 +19,5 @@
|
|
|
19
19
|
export { MessengerManager } from "./messenger-manager.js";
|
|
20
20
|
export { Messenger } from "./messenger.js";
|
|
21
21
|
export * from "./messenger-api.js";
|
|
22
|
-
export type { Message, MessageFilter, SendMessageResult, DecryptedMessage, MessengerConfig, MessageListResult, ConversationInfo, WtsGenerationParams, WtsFileResult, MessageContentType, } from "./types.js";
|
|
22
|
+
export type { Message, MessageFilter, ConversationsFilter, SendMessageResult, DecryptedMessage, MessengerConfig, MessageListResult, ConversationInfo, WtsGenerationParams, WtsFileResult, MessageContentType, } from "./types.js";
|
|
23
23
|
export { MessageType, MessageDirection, MessageStatus, MessengerErrorCode, DEFAULT_MESSENGER_CONFIG, MessengerError, DEFAULT_QUERY_LIMIT, MAX_QUERY_LIMIT, } from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/w/messenger/index.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,sCAAsC;AAEtC;;;;;;;;;;;;;;;;;GAiBG;AAEH,2BAA2B;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,sCAAsC;AACtC,cAAc,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/w/messenger/index.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,sCAAsC;AAEtC;;;;;;;;;;;;;;;;;GAiBG;AAEH,2BAA2B;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,sCAAsC;AACtC,cAAc,oBAAoB,CAAC;AAiBnC,8BAA8B;AAC9B,OAAO,EACN,WAAW,EACX,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,wBAAwB,EACxB,cAAc,EACd,mBAAmB,EACnB,eAAe,GACf,MAAM,YAAY,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
2)回滚机制。因为要保证机密的环境,所以要有回滚机制(能否一直解密PREKEY_MESSAGE同时更新本地会话?),PREKEY_MESSAGE的优先级大于wisper message,只要解密成功,即刻更新最新的会话密钥(能否实现?)。
|
|
5
5
|
3)对此重试和解密失败池子,现有的3秒*3次(只要有会话消息)就很好。请围绕核心目标和原则;遍历所有可能的情形,设计新的握手和解密方案。
|
|
6
6
|
*/
|
|
7
|
-
import type { ConversationInfo, Message, MessageFilter, SendMessageResult, WtsFileResult, WtsGenerationParams, WtsToHtmlOptions, WtsVerificationResult, ListOperationResponse, GetSettingsResponse } from "./types.js";
|
|
7
|
+
import type { ConversationInfo, ConversationsFilter, Message, MessageFilter, SendMessageResult, WtsFileResult, WtsGenerationParams, WtsToHtmlOptions, WtsVerificationResult, ListOperationResponse, GetSettingsResponse } from "./types.js";
|
|
8
8
|
import { MessengerManager } from "./messenger-manager.js";
|
|
9
9
|
import type { ENTRYPOINT } from "../../client/network.js";
|
|
10
10
|
import type { AccountOrMark_Address, ManyAccountOrMark_Address } from "../local/index.js";
|
|
@@ -13,7 +13,66 @@ import type { AccountOrMark_Address, ManyAccountOrMark_Address } from "../local/
|
|
|
13
13
|
* 首次调用时会自动启动后台服务
|
|
14
14
|
*/
|
|
15
15
|
export declare function getMessengerManager(): MessengerManager;
|
|
16
|
-
|
|
16
|
+
/**
|
|
17
|
+
* 获取会话列表
|
|
18
|
+
*
|
|
19
|
+
* 查询当前账号的所有会话,支持多种过滤和排序选项。
|
|
20
|
+
* 返回的 unreadCount 基于 viewedAt 字段计算。
|
|
21
|
+
*
|
|
22
|
+
* @param filter 过滤条件(可选)
|
|
23
|
+
* @returns 会话信息列表,按指定方式排序
|
|
24
|
+
*
|
|
25
|
+
* @example
|
|
26
|
+
* // 获取所有会话(默认按最后消息时间排序,每个会话2条预览,自动标记为已查看)
|
|
27
|
+
* const conversations = await watch_conversations();
|
|
28
|
+
*
|
|
29
|
+
* // 只获取有未读消息的会话
|
|
30
|
+
* const unreadConversations = await watch_conversations({ unreadOnly: true });
|
|
31
|
+
*
|
|
32
|
+
* // 获取最近7天的会话,包含5条预览消息,跳过自动标记
|
|
33
|
+
* const recent = await watch_conversations({
|
|
34
|
+
* startTime: Date.now() - 7 * 24 * 60 * 60 * 1000,
|
|
35
|
+
* previewMessageCount: 5,
|
|
36
|
+
* skipAutoMarkViewed: true
|
|
37
|
+
* });
|
|
38
|
+
*/
|
|
39
|
+
export declare function watch_conversations(filter?: ConversationsFilter): Promise<ConversationInfo[]>;
|
|
40
|
+
/**
|
|
41
|
+
* 标记消息为已查看
|
|
42
|
+
*
|
|
43
|
+
* 将指定消息标记为当前用户已查看,设置 viewedAt 为当前时间戳。
|
|
44
|
+
* 通常用于用户主动查看消息后调用。
|
|
45
|
+
*
|
|
46
|
+
* @param messageIds 消息ID列表(至少1条)
|
|
47
|
+
* @param account 账号地址或名称(可选,默认当前账号)
|
|
48
|
+
* @returns 成功标记的消息数量
|
|
49
|
+
*
|
|
50
|
+
* @example
|
|
51
|
+
* // 标记单条消息
|
|
52
|
+
* await mark_messages_as_viewed(["msg-123"]);
|
|
53
|
+
*
|
|
54
|
+
* // 标记多条消息
|
|
55
|
+
* await mark_messages_as_viewed(["msg-1", "msg-2", "msg-3"]);
|
|
56
|
+
*/
|
|
57
|
+
export declare function mark_messages_as_viewed(messageIds: string[], account?: string): Promise<number>;
|
|
58
|
+
/**
|
|
59
|
+
* 标记整个会话为已查看
|
|
60
|
+
*
|
|
61
|
+
* 将指定会话中的所有未查看消息标记为已查看。
|
|
62
|
+
* 通常用于用户点击进入聊天界面时调用。
|
|
63
|
+
*
|
|
64
|
+
* @param peerAddress 对方地址或名称标记
|
|
65
|
+
* @param account 账号地址或名称(可选,默认当前账号)
|
|
66
|
+
* @returns 成功标记的消息数量
|
|
67
|
+
*
|
|
68
|
+
* @example
|
|
69
|
+
* // 标记与某人的所有消息为已查看
|
|
70
|
+
* await mark_conversation_as_viewed("0x123...");
|
|
71
|
+
*
|
|
72
|
+
* // 使用名称标记
|
|
73
|
+
* await mark_conversation_as_viewed("alice");
|
|
74
|
+
*/
|
|
75
|
+
export declare function mark_conversation_as_viewed(peerAddress: string | AccountOrMark_Address, account?: string): Promise<number>;
|
|
17
76
|
/**
|
|
18
77
|
* 发送消息
|
|
19
78
|
*
|
|
@@ -52,8 +111,22 @@ export declare function send_file(from: string | undefined | null, to: AccountOr
|
|
|
52
111
|
/**
|
|
53
112
|
* 查询消息
|
|
54
113
|
*
|
|
55
|
-
*
|
|
114
|
+
* 支持按已读状态过滤,可自动标记为已查看。
|
|
115
|
+
*
|
|
116
|
+
* @param filter 过滤条件(可选)
|
|
56
117
|
* @returns Message 数组
|
|
118
|
+
*
|
|
119
|
+
* @example
|
|
120
|
+
* // 获取所有未读消息(不自动标记)
|
|
121
|
+
* const unread = await watch_messages({ viewed: false, skipAutoMarkViewed: true });
|
|
122
|
+
*
|
|
123
|
+
* // 获取并自动标记为已查看(用户进入聊天界面)
|
|
124
|
+
* const messages = await watch_messages({
|
|
125
|
+
* peerAddress: "0x123...",
|
|
126
|
+
* });
|
|
127
|
+
*
|
|
128
|
+
* // 获取已查看的消息
|
|
129
|
+
* const viewed = await watch_messages({ viewed: true });
|
|
57
130
|
*/
|
|
58
131
|
export declare function watch_messages(filter?: MessageFilter): Promise<Message[]>;
|
|
59
132
|
export declare function pull_messages(account?: string | undefined | null, limit?: number): Promise<Message[]>;
|
|
@@ -5,7 +5,7 @@ import { Account } from "../local/account.js";
|
|
|
5
5
|
import { W_ERROR, WErrors } from "../exception.js";
|
|
6
6
|
import { LocalMark } from "../local/local.js";
|
|
7
7
|
import { MessageStorage } from "./storage.js";
|
|
8
|
-
import { MessengerError, MessengerErrorCode, CHAIN_PROOF_TYPE,
|
|
8
|
+
import { MessengerError, MessengerErrorCode, CHAIN_PROOF_TYPE, MessageDirection, } from "./types.js";
|
|
9
9
|
import { createHash } from "crypto";
|
|
10
10
|
import * as fs from "fs";
|
|
11
11
|
import * as path from "path";
|
|
@@ -84,10 +84,33 @@ function registerCleanupHandler() {
|
|
|
84
84
|
}
|
|
85
85
|
registerCleanupHandler();
|
|
86
86
|
// startBackgroundTimer(); // 暂时注释掉,避免干扰测试
|
|
87
|
-
|
|
88
|
-
|
|
87
|
+
/**
|
|
88
|
+
* 获取会话列表
|
|
89
|
+
*
|
|
90
|
+
* 查询当前账号的所有会话,支持多种过滤和排序选项。
|
|
91
|
+
* 返回的 unreadCount 基于 viewedAt 字段计算。
|
|
92
|
+
*
|
|
93
|
+
* @param filter 过滤条件(可选)
|
|
94
|
+
* @returns 会话信息列表,按指定方式排序
|
|
95
|
+
*
|
|
96
|
+
* @example
|
|
97
|
+
* // 获取所有会话(默认按最后消息时间排序,每个会话2条预览,自动标记为已查看)
|
|
98
|
+
* const conversations = await watch_conversations();
|
|
99
|
+
*
|
|
100
|
+
* // 只获取有未读消息的会话
|
|
101
|
+
* const unreadConversations = await watch_conversations({ unreadOnly: true });
|
|
102
|
+
*
|
|
103
|
+
* // 获取最近7天的会话,包含5条预览消息,跳过自动标记
|
|
104
|
+
* const recent = await watch_conversations({
|
|
105
|
+
* startTime: Date.now() - 7 * 24 * 60 * 60 * 1000,
|
|
106
|
+
* previewMessageCount: 5,
|
|
107
|
+
* skipAutoMarkViewed: true
|
|
108
|
+
* });
|
|
109
|
+
*/
|
|
110
|
+
export async function watch_conversations(filter) {
|
|
111
|
+
const address = await Account.Instance().get_address(filter?.account);
|
|
89
112
|
if (!address) {
|
|
90
|
-
W_ERROR(WErrors.AccountNotFound, `watch_conversations.account ${account}`);
|
|
113
|
+
W_ERROR(WErrors.AccountNotFound, `watch_conversations.account ${filter?.account}`);
|
|
91
114
|
}
|
|
92
115
|
const myAddress = address.toLowerCase();
|
|
93
116
|
// 【修改】使用 MessengerManager 确保账号已就绪并拉取消息
|
|
@@ -102,6 +125,9 @@ export async function watch_conversations(account) {
|
|
|
102
125
|
const messageStorage = new MessageStorage(myAddress);
|
|
103
126
|
const allMessages = messageStorage.getAllMessages(myAddress);
|
|
104
127
|
const conversations = new Map();
|
|
128
|
+
// 默认参数
|
|
129
|
+
const previewMessageCount = filter?.previewMessageCount ?? 2;
|
|
130
|
+
const skipAutoMarkViewed = filter?.skipAutoMarkViewed ?? false;
|
|
105
131
|
for (const msg of allMessages) {
|
|
106
132
|
const peerAddress = msg.fromAddress.toLowerCase() === myAddress
|
|
107
133
|
? msg.toAddress
|
|
@@ -113,20 +139,154 @@ export async function watch_conversations(account) {
|
|
|
113
139
|
messageCount: 0,
|
|
114
140
|
unreadCount: 0,
|
|
115
141
|
lastMessagePreview: msg.plaintext,
|
|
142
|
+
messages: [],
|
|
116
143
|
});
|
|
117
144
|
}
|
|
118
145
|
const conv = conversations.get(peerAddress);
|
|
146
|
+
conv.messages.push(msg);
|
|
119
147
|
conv.messageCount++;
|
|
120
148
|
if (msg.createdAt > conv.lastMessageAt) {
|
|
121
149
|
conv.lastMessageAt = msg.createdAt;
|
|
122
150
|
conv.lastMessagePreview = msg.plaintext;
|
|
123
151
|
}
|
|
124
|
-
|
|
125
|
-
|
|
152
|
+
// 未读判断:接收到的消息且没有 viewedAt
|
|
153
|
+
if (msg.direction === MessageDirection.RECEIVED &&
|
|
154
|
+
msg.viewedAt === undefined) {
|
|
126
155
|
conv.unreadCount++;
|
|
127
156
|
}
|
|
128
157
|
}
|
|
129
|
-
|
|
158
|
+
// 构建结果数组
|
|
159
|
+
const result = [];
|
|
160
|
+
for (const [, conv] of conversations) {
|
|
161
|
+
// 时间段过滤
|
|
162
|
+
if (filter?.startTime !== undefined &&
|
|
163
|
+
conv.lastMessageAt < filter.startTime) {
|
|
164
|
+
continue;
|
|
165
|
+
}
|
|
166
|
+
if (filter?.endTime !== undefined &&
|
|
167
|
+
conv.lastMessageAt > filter.endTime) {
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
// 未读过滤
|
|
171
|
+
if (filter?.unreadOnly && conv.unreadCount === 0) {
|
|
172
|
+
continue;
|
|
173
|
+
}
|
|
174
|
+
// 准备预览消息
|
|
175
|
+
const previewMessages = [];
|
|
176
|
+
if (previewMessageCount > 0) {
|
|
177
|
+
// 按时间倒序取最新的消息
|
|
178
|
+
const sortedMessages = conv.messages.sort((a, b) => b.createdAt - a.createdAt);
|
|
179
|
+
const selectedMessages = sortedMessages.slice(0, previewMessageCount);
|
|
180
|
+
previewMessages.push(...selectedMessages.reverse());
|
|
181
|
+
// 自动标记为已查看(如果不是跳过模式)
|
|
182
|
+
if (!skipAutoMarkViewed) {
|
|
183
|
+
const unviewedIds = selectedMessages
|
|
184
|
+
.filter((m) => m.direction === MessageDirection.RECEIVED &&
|
|
185
|
+
m.viewedAt === undefined)
|
|
186
|
+
.map((m) => m.messageId);
|
|
187
|
+
if (unviewedIds.length > 0) {
|
|
188
|
+
messageStorage.updateMessagesViewed(unviewedIds);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
result.push({
|
|
193
|
+
peerAddress: conv.peerAddress,
|
|
194
|
+
lastMessageAt: conv.lastMessageAt,
|
|
195
|
+
messageCount: conv.messageCount,
|
|
196
|
+
unreadCount: conv.unreadCount,
|
|
197
|
+
lastMessagePreview: conv.lastMessagePreview,
|
|
198
|
+
...(previewMessageCount > 0 && { previewMessages }),
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
// 排序
|
|
202
|
+
const sortBy = filter?.sortBy ?? "lastMessageAt";
|
|
203
|
+
const sortOrder = filter?.sortOrder ?? "desc";
|
|
204
|
+
result.sort((a, b) => {
|
|
205
|
+
let comparison = 0;
|
|
206
|
+
switch (sortBy) {
|
|
207
|
+
case "lastMessageAt":
|
|
208
|
+
comparison = a.lastMessageAt - b.lastMessageAt;
|
|
209
|
+
break;
|
|
210
|
+
case "unreadCount":
|
|
211
|
+
comparison = a.unreadCount - b.unreadCount;
|
|
212
|
+
break;
|
|
213
|
+
case "messageCount":
|
|
214
|
+
comparison = a.messageCount - b.messageCount;
|
|
215
|
+
break;
|
|
216
|
+
}
|
|
217
|
+
return sortOrder === "asc" ? comparison : -comparison;
|
|
218
|
+
});
|
|
219
|
+
return result;
|
|
220
|
+
}
|
|
221
|
+
/**
|
|
222
|
+
* 标记消息为已查看
|
|
223
|
+
*
|
|
224
|
+
* 将指定消息标记为当前用户已查看,设置 viewedAt 为当前时间戳。
|
|
225
|
+
* 通常用于用户主动查看消息后调用。
|
|
226
|
+
*
|
|
227
|
+
* @param messageIds 消息ID列表(至少1条)
|
|
228
|
+
* @param account 账号地址或名称(可选,默认当前账号)
|
|
229
|
+
* @returns 成功标记的消息数量
|
|
230
|
+
*
|
|
231
|
+
* @example
|
|
232
|
+
* // 标记单条消息
|
|
233
|
+
* await mark_messages_as_viewed(["msg-123"]);
|
|
234
|
+
*
|
|
235
|
+
* // 标记多条消息
|
|
236
|
+
* await mark_messages_as_viewed(["msg-1", "msg-2", "msg-3"]);
|
|
237
|
+
*/
|
|
238
|
+
export async function mark_messages_as_viewed(messageIds, account) {
|
|
239
|
+
if (!messageIds || messageIds.length === 0) {
|
|
240
|
+
return 0;
|
|
241
|
+
}
|
|
242
|
+
const address = await Account.Instance().get_address(account);
|
|
243
|
+
if (!address) {
|
|
244
|
+
W_ERROR(WErrors.AccountNotFound, `mark_messages_as_viewed.account ${account}`);
|
|
245
|
+
}
|
|
246
|
+
const myAddress = address.toLowerCase();
|
|
247
|
+
const messageStorage = new MessageStorage(myAddress);
|
|
248
|
+
return messageStorage.updateMessagesViewed(messageIds);
|
|
249
|
+
}
|
|
250
|
+
/**
|
|
251
|
+
* 标记整个会话为已查看
|
|
252
|
+
*
|
|
253
|
+
* 将指定会话中的所有未查看消息标记为已查看。
|
|
254
|
+
* 通常用于用户点击进入聊天界面时调用。
|
|
255
|
+
*
|
|
256
|
+
* @param peerAddress 对方地址或名称标记
|
|
257
|
+
* @param account 账号地址或名称(可选,默认当前账号)
|
|
258
|
+
* @returns 成功标记的消息数量
|
|
259
|
+
*
|
|
260
|
+
* @example
|
|
261
|
+
* // 标记与某人的所有消息为已查看
|
|
262
|
+
* await mark_conversation_as_viewed("0x123...");
|
|
263
|
+
*
|
|
264
|
+
* // 使用名称标记
|
|
265
|
+
* await mark_conversation_as_viewed("alice");
|
|
266
|
+
*/
|
|
267
|
+
export async function mark_conversation_as_viewed(peerAddress, account) {
|
|
268
|
+
const address = await Account.Instance().get_address(account);
|
|
269
|
+
if (!address) {
|
|
270
|
+
W_ERROR(WErrors.AccountNotFound, `mark_conversation_as_viewed.account ${account}`);
|
|
271
|
+
}
|
|
272
|
+
const myAddress = address.toLowerCase();
|
|
273
|
+
// 解析对方地址
|
|
274
|
+
const peerAddr = await GetAccountOrMark_Address(peerAddress);
|
|
275
|
+
if (!peerAddr) {
|
|
276
|
+
W_ERROR(WErrors.AccountNotFound, `mark_conversation_as_viewed.peerAddress ${peerAddress} is not a valid account/address`);
|
|
277
|
+
}
|
|
278
|
+
const peerAddrLower = peerAddr.toLowerCase();
|
|
279
|
+
const messageStorage = new MessageStorage(myAddress);
|
|
280
|
+
const sessionMessages = messageStorage.getMessagesBySession(myAddress, peerAddrLower);
|
|
281
|
+
// 筛选出未查看的接收消息
|
|
282
|
+
const unviewedIds = sessionMessages
|
|
283
|
+
.filter((m) => m.direction === MessageDirection.RECEIVED &&
|
|
284
|
+
m.viewedAt === undefined)
|
|
285
|
+
.map((m) => m.messageId);
|
|
286
|
+
if (unviewedIds.length === 0) {
|
|
287
|
+
return 0;
|
|
288
|
+
}
|
|
289
|
+
return messageStorage.updateMessagesViewed(unviewedIds);
|
|
130
290
|
}
|
|
131
291
|
/**
|
|
132
292
|
* 发送消息
|
|
@@ -204,8 +364,22 @@ export async function send_file(from, to, filePath, options) {
|
|
|
204
364
|
/**
|
|
205
365
|
* 查询消息
|
|
206
366
|
*
|
|
207
|
-
*
|
|
367
|
+
* 支持按已读状态过滤,可自动标记为已查看。
|
|
368
|
+
*
|
|
369
|
+
* @param filter 过滤条件(可选)
|
|
208
370
|
* @returns Message 数组
|
|
371
|
+
*
|
|
372
|
+
* @example
|
|
373
|
+
* // 获取所有未读消息(不自动标记)
|
|
374
|
+
* const unread = await watch_messages({ viewed: false, skipAutoMarkViewed: true });
|
|
375
|
+
*
|
|
376
|
+
* // 获取并自动标记为已查看(用户进入聊天界面)
|
|
377
|
+
* const messages = await watch_messages({
|
|
378
|
+
* peerAddress: "0x123...",
|
|
379
|
+
* });
|
|
380
|
+
*
|
|
381
|
+
* // 获取已查看的消息
|
|
382
|
+
* const viewed = await watch_messages({ viewed: true });
|
|
209
383
|
*/
|
|
210
384
|
export async function watch_messages(filter) {
|
|
211
385
|
if (filter?.account !== undefined) {
|
|
@@ -225,7 +399,22 @@ export async function watch_messages(filter) {
|
|
|
225
399
|
if (!isInitialized) {
|
|
226
400
|
await manager.start();
|
|
227
401
|
}
|
|
228
|
-
|
|
402
|
+
const messages = await manager.watch(filter);
|
|
403
|
+
// 自动标记为已查看(如果不是跳过模式)
|
|
404
|
+
const skipAutoMarkViewed = filter?.skipAutoMarkViewed ?? false;
|
|
405
|
+
if (!skipAutoMarkViewed && messages.length > 0 && filter?.account) {
|
|
406
|
+
const myAddress = filter.account.toLowerCase();
|
|
407
|
+
const messageStorage = new MessageStorage(myAddress);
|
|
408
|
+
// 筛选出未查看的接收消息
|
|
409
|
+
const unviewedIds = messages
|
|
410
|
+
.filter((m) => m.direction === MessageDirection.RECEIVED &&
|
|
411
|
+
m.viewedAt === undefined)
|
|
412
|
+
.map((m) => m.messageId);
|
|
413
|
+
if (unviewedIds.length > 0) {
|
|
414
|
+
messageStorage.updateMessagesViewed(unviewedIds);
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
return messages;
|
|
229
418
|
}
|
|
230
419
|
export async function pull_messages(account, limit) {
|
|
231
420
|
const address = await Account.Instance().get_address(account);
|
|
@@ -969,6 +1158,7 @@ export async function proof_message(account, messageId, network) {
|
|
|
969
1158
|
createdAt: message.createdAt,
|
|
970
1159
|
guardAddress: message.guardAddress,
|
|
971
1160
|
passportAddress: message.passportAddress,
|
|
1161
|
+
lastReceivedLeafIndex: message.lastReceivedLeafIndex,
|
|
972
1162
|
serverSignature: message.serverSignature,
|
|
973
1163
|
serverPublicKey: message.serverPublicKey,
|
|
974
1164
|
};
|