suanpan_node_sdk 3.1.0 → 3.1.1
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/core/message/connection/channels/subscribable-channel.d.ts +2 -2
- package/dist/core/message/connection/channels/subscribable-channel.js +2 -2
- package/dist/core/message/connection/channels/subscribable-channel.js.map +1 -1
- package/dist/core/message/connection/redis.d.ts +1 -1
- package/dist/core/message/connection/redis.js +7 -1
- package/dist/core/message/connection/redis.js.map +1 -1
- package/dist/core/message/pubsub/index.js +5 -2
- package/dist/core/message/pubsub/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,10 +5,10 @@ export interface SubscribeCallback<M> extends SubscribeQueueCallback {
|
|
|
5
5
|
(messages: M): Promise<void>;
|
|
6
6
|
}
|
|
7
7
|
export interface ISubscribableChannel<T> extends IMessageChannel<T> {
|
|
8
|
-
subscribe<M extends QueueMessage>(handler: SubscribeCallback<M
|
|
8
|
+
subscribe<M extends QueueMessage>(handler: SubscribeCallback<M>, group?: string, consumer?: string): Promise<void>;
|
|
9
9
|
}
|
|
10
10
|
export declare class SubscribableChannel<T> extends MessageChannel<T> implements ISubscribableChannel<T> {
|
|
11
11
|
private recieiveQueue;
|
|
12
12
|
constructor(conn: RedisClient, recieiveQueue: string, sendQueue: string);
|
|
13
|
-
subscribe<M extends QueueMessage>(handler: SubscribeCallback<M
|
|
13
|
+
subscribe<M extends QueueMessage>(handler: SubscribeCallback<M>, group?: string, consumer?: string): Promise<void>;
|
|
14
14
|
}
|
|
@@ -16,9 +16,9 @@ class SubscribableChannel extends message_channel_1.MessageChannel {
|
|
|
16
16
|
super(conn, sendQueue);
|
|
17
17
|
this.recieiveQueue = recieiveQueue;
|
|
18
18
|
}
|
|
19
|
-
subscribe(handler) {
|
|
19
|
+
subscribe(handler, group, consumer) {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
yield this.conn.subscribeQueue(this.recieiveQueue, handler);
|
|
21
|
+
yield this.conn.subscribeQueue(this.recieiveQueue, handler, group, consumer);
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribable-channel.js","sourceRoot":"","sources":["../../../../../src/core/message/connection/channels/subscribable-channel.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uDAAoE;AAYpE,MAAa,mBAAuB,SAAQ,gCAAiB;IAI3D,YAAY,IAAiB,EAAE,aAAqB,EAAE,SAAiB;QACrE,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAEK,SAAS,CAAyB,OAA6B;;
|
|
1
|
+
{"version":3,"file":"subscribable-channel.js","sourceRoot":"","sources":["../../../../../src/core/message/connection/channels/subscribable-channel.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uDAAoE;AAYpE,MAAa,mBAAuB,SAAQ,gCAAiB;IAI3D,YAAY,IAAiB,EAAE,aAAqB,EAAE,SAAiB;QACrE,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAEK,SAAS,CAAyB,OAA6B,EAAE,KAAc,EAAE,QAAiB;;YACtG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/E,CAAC;KAAA;CACF;AAZD,kDAYC"}
|
|
@@ -3,6 +3,6 @@ export declare type RedisOptions = Pick<ConstructorOptions, 'host' | 'port'>;
|
|
|
3
3
|
export declare class RedisClient {
|
|
4
4
|
private _client;
|
|
5
5
|
constructor(options?: RedisOptions);
|
|
6
|
-
subscribeQueue(queueName: string, callback: SubscribeQueueCallback): Promise<void>;
|
|
6
|
+
subscribeQueue(queueName: string, callback: SubscribeQueueCallback, group?: string, consumer?: string): Promise<void>;
|
|
7
7
|
sendMessage<T>(queue: string, data: T): Promise<void>;
|
|
8
8
|
}
|
|
@@ -27,11 +27,17 @@ class RedisClient {
|
|
|
27
27
|
}
|
|
28
28
|
// https://github.com/redis/node-redis/issues/2021
|
|
29
29
|
// https://github.com/luin/ioredis/issues/1646
|
|
30
|
-
subscribeQueue(queueName, callback) {
|
|
30
|
+
subscribeQueue(queueName, callback, group, consumer) {
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
32
|
const options = {
|
|
33
33
|
queue: queueName, callback, count: 1
|
|
34
34
|
};
|
|
35
|
+
if (group) {
|
|
36
|
+
options.group = group;
|
|
37
|
+
}
|
|
38
|
+
if (consumer) {
|
|
39
|
+
options.consumer = consumer;
|
|
40
|
+
}
|
|
35
41
|
yield this._client.subscribeQueue(options);
|
|
36
42
|
});
|
|
37
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/core/message/connection/redis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iEAAyC;AAEzC,uCAAqC;AACrC,6DAA0D;AAC1D,2CAA+H;AAI/H,MAAa,WAAW;IAItB,YAAmB,OAAsB;QACvC,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAU,CAAC;YAC5B,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAW,CAAC,EAAE,CAAC,IAAI;YAClD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAW,CAAC,EAAE,CAAC,IAAI;YAClD,mBAAmB,EAAE,IAAI;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,kDAAkD;IAClD,8CAA8C;IACjC,cAAc,CAAC,SAAiB,EAAE,QAAgC;;
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/core/message/connection/redis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iEAAyC;AAEzC,uCAAqC;AACrC,6DAA0D;AAC1D,2CAA+H;AAI/H,MAAa,WAAW;IAItB,YAAmB,OAAsB;QACvC,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAU,CAAC;YAC5B,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAW,CAAC,EAAE,CAAC,IAAI;YAClD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAW,CAAC,EAAE,CAAC,IAAI;YAClD,mBAAmB,EAAE,IAAI;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,kDAAkD;IAClD,8CAA8C;IACjC,cAAc,CAAC,SAAiB,EAAE,QAAgC,EAAE,KAAc,EAAE,QAAiB;;YAChH,MAAM,OAAO,GAA0B;gBACrC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aACrC,CAAC;YAEF,IAAI,KAAK,EAAE;gBACT,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;aACvB;YAED,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;aAC7B;YAED,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;KAAA;IAEY,WAAW,CAAI,KAAa,EAAE,IAAO;;YAChD,MAAM,MAAM,GAAG,yBAAW,CAAC,EAAE,CAAC,kBAAkB,CAAC;YACjD,MAAM,eAAe,GAAG,yBAAW,CAAC,EAAE,CAAC,wBAAwB,CAAC;YAChE,MAAM,WAAW,GAAuB;gBACtC,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;gBACxC,eAAe,EAAE,cAAM,CAAC,eAAe,CAAC;aACzC,CAAC;YACF,IAAI;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;aAC7C;YAAC,OAAO,CAAC,EAAE;gBACV,gBAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,EAAE,CAAC,CAAC;gBAClD,MAAM,CAAC,CAAC;aACT;QACH,CAAC;KAAA;CACF;AA7CD,kCA6CC"}
|
|
@@ -31,7 +31,8 @@ class StreamPubSub {
|
|
|
31
31
|
_getHandlers(eventHeaders) {
|
|
32
32
|
const topic = eventHeaders.event_name;
|
|
33
33
|
const headerAppId = eventHeaders.app_id;
|
|
34
|
-
|
|
34
|
+
// 使用字符串比较，确保类型一致性
|
|
35
|
+
if (String(environment_1.Environment.stream.appId) === String(headerAppId)) {
|
|
35
36
|
const handlers = this._topicHandlersMap.get(topic);
|
|
36
37
|
if (handlers) {
|
|
37
38
|
return handlers;
|
|
@@ -43,6 +44,8 @@ class StreamPubSub {
|
|
|
43
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
45
|
if (!this._channelSubscribed) {
|
|
45
46
|
this._channelSubscribed = true; // modify "_channelSubscribed" to true before "subscribe", otherwise it will cause the problem of creating queues multiple times
|
|
47
|
+
const group = environment_1.Environment.stream.nodeId; // 使用 nodeId 作为消费者组
|
|
48
|
+
const consumer = `${environment_1.Environment.stream.nodeId}-${environment_1.Environment.stream.appId}`; // 使用 nodeId-appId 作为消费者ID
|
|
46
49
|
yield this._getChannel().subscribe((appEventStream) => __awaiter(this, void 0, void 0, function* () {
|
|
47
50
|
const appEvent = appEventStream.data;
|
|
48
51
|
const payload = appEvent.data;
|
|
@@ -53,7 +56,7 @@ class StreamPubSub {
|
|
|
53
56
|
yield handler(payload);
|
|
54
57
|
}
|
|
55
58
|
}
|
|
56
|
-
}));
|
|
59
|
+
}), group, consumer);
|
|
57
60
|
}
|
|
58
61
|
});
|
|
59
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/message/pubsub/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAiD;AACjD,6DAA0D;AAC1D,uCAA2C;AAI3C,MAAM,YAAY;IAQhB,YAAoB,gBAAgB,yBAAW,CAAC,EAAE,CAAC,UAAU,EAAU,YAAY,yBAAW,CAAC,EAAE,CAAC,UAAU;QAAxF,kBAAa,GAAb,aAAa,CAA4B;QAAU,cAAS,GAAT,SAAS,CAA4B;QALpG,uBAAkB,GAAG,KAAK,CAAC;QAE3B,sBAAiB,GAA6B,IAAI,GAAG,EAAE,CAAC;QACxD,wBAAmB,GAAkC,IAAI,GAAG,EAAE,CAAC;IAEyC,CAAC;IAEzG,WAAW;QACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,kBAAU,CAAC,aAAa,EAAE;iBACvC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;SAClE;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEO,YAAY,CAAC,YAAyB;QAC5C,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC;QACtC,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC;QACxC,IAAI,yBAAW,CAAC,MAAM,CAAC,KAAK,KAAK,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/message/pubsub/index.ts"],"names":[],"mappings":"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"}
|