suanpan_node_sdk 2.0.0-beta.31 → 2.0.0-beta.35

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.
Files changed (44) hide show
  1. package/dist/api/index.d.ts +1 -6
  2. package/dist/api/index.js +2 -9
  3. package/dist/api/index.js.map +1 -1
  4. package/dist/core/message/channel.d.ts +9 -1
  5. package/dist/core/message/channel.js +0 -4
  6. package/dist/core/message/channel.js.map +1 -1
  7. package/dist/core/message/channelFactory.d.ts +4 -0
  8. package/dist/core/message/channelFactory.js +12 -0
  9. package/dist/core/message/channelFactory.js.map +1 -0
  10. package/dist/core/message/index.d.ts +6 -0
  11. package/dist/core/message/index.js +19 -0
  12. package/dist/core/message/index.js.map +1 -0
  13. package/dist/core/message/message.d.ts +8 -0
  14. package/dist/core/message/message.js +4 -0
  15. package/dist/core/message/message.js.map +1 -1
  16. package/dist/core/message/messageChain.d.ts +9 -0
  17. package/dist/core/message/messageChain.js +30 -0
  18. package/dist/core/message/messageChain.js.map +1 -0
  19. package/dist/core/message/messageListener.d.ts +4 -0
  20. package/dist/core/message/messageListener.js +13 -0
  21. package/dist/core/message/messageListener.js.map +1 -0
  22. package/dist/core/message/messagebuilder.d.ts +13 -0
  23. package/dist/core/message/messagebuilder.js +48 -0
  24. package/dist/core/message/messagebuilder.js.map +1 -0
  25. package/dist/core/message/mq/redis.d.ts +22 -0
  26. package/dist/core/{mq.js → message/mq/redis.js} +89 -71
  27. package/dist/core/message/mq/redis.js.map +1 -0
  28. package/dist/core/storage/minio.js +1 -1
  29. package/dist/core/storage/minio.js.map +1 -1
  30. package/dist/core/storage/oss.js +2 -7
  31. package/dist/core/storage/oss.js.map +1 -1
  32. package/dist/core/storage/storageFlusher.d.ts +0 -3
  33. package/dist/core/storage/storageFlusher.js +1 -2
  34. package/dist/core/storage/storageFlusher.js.map +1 -1
  35. package/dist/core/storage/storageLogger.js +0 -1
  36. package/dist/core/storage/storageLogger.js.map +1 -1
  37. package/dist/types/streamTypes.d.ts +15 -16
  38. package/dist/types/streamTypes.js.map +1 -1
  39. package/package.json +1 -1
  40. package/dist/core/message/connection.d.ts +0 -2
  41. package/dist/core/message/connection.js +0 -19
  42. package/dist/core/message/connection.js.map +0 -1
  43. package/dist/core/mq.d.ts +0 -21
  44. package/dist/core/mq.js.map +0 -1
@@ -1,5 +1,6 @@
1
1
  export * from '../types';
2
2
  export * from '../core/port';
3
+ export * from '../core/message';
3
4
  export * from '../core/parameter';
4
5
  export * from '../core/eventLogger';
5
6
  export * from '../core/storage/storagePath';
@@ -9,9 +10,3 @@ import { ScriptManager } from '../core/script/script-manager';
9
10
  export declare const ScriptManagement: {
10
11
  ScriptManager: typeof ScriptManager;
11
12
  };
12
- export declare const sp: {
13
- /** @deprecated this method has deprecated and use onMessage(message => {}) instead */
14
- onCall: (callBack: import("../types").SyncCallBack | import("../types").AsyncCallBack) => void;
15
- onMessage: (callBack: import("../types").AsyncMessageFn | import("../types").SyncMessageFn) => void;
16
- sendMessage: (sendData: import("../types").SendData) => Promise<void>;
17
- };
package/dist/api/index.js CHANGED
@@ -34,9 +34,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
34
34
  return (mod && mod.__esModule) ? mod : { "default": mod };
35
35
  };
36
36
  Object.defineProperty(exports, "__esModule", { value: true });
37
- exports.sp = exports.ScriptManagement = void 0;
37
+ exports.ScriptManagement = void 0;
38
38
  __exportStar(require("../types"), exports);
39
39
  __exportStar(require("../core/port"), exports);
40
+ __exportStar(require("../core/message"), exports);
40
41
  __exportStar(require("../core/parameter"), exports);
41
42
  __exportStar(require("../core/eventLogger"), exports);
42
43
  __exportStar(require("../core/storage/storagePath"), exports);
@@ -44,14 +45,6 @@ __exportStar(require("../core/storage/storageLogger"), exports);
44
45
  __exportStar(require("../core/storage/wrapperStorage"), exports);
45
46
  const script_manager_1 = require("../core/script/script-manager");
46
47
  exports.ScriptManagement = { ScriptManager: script_manager_1.ScriptManager };
47
- const mq_1 = require("../core/mq");
48
- const mqSender = new mq_1.MQSender();
49
- exports.sp = {
50
- /** @deprecated this method has deprecated and use onMessage(message => {}) instead */
51
- onCall: mqSender.onCall,
52
- onMessage: mqSender.onMessage,
53
- sendMessage: mqSender.sendSuccessMessage
54
- };
55
48
  const util = __importStar(require("../core/utils"));
56
49
  const server_1 = __importDefault(require("../core/web/server"));
57
50
  if (util.isDesktop()) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,+CAA6B;AAC7B,oDAAkC;AAClC,sDAAoC;AACpC,8DAA4C;AAC5C,gEAA8C;AAC9C,iEAA+C;AAE/C,kEAA8D;AACjD,QAAA,gBAAgB,GAAG,EAAE,aAAa,EAAb,8BAAa,EAAE,CAAC;AAElD,mCAAsC;AACtC,MAAM,QAAQ,GAAG,IAAI,aAAQ,EAAE,CAAC;AAEnB,QAAA,EAAE,GAAG;IAChB,sFAAsF;IACtF,MAAM,EAAE,QAAQ,CAAC,MAAM;IACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;IAC7B,WAAW,EAAE,QAAQ,CAAC,kBAAkB;CACzC,CAAC;AAEF,oDAAsC;AACtC,gEAAwC;AAExC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;IACpB,CAAC,GAAS,EAAE;QACV,MAAM,gBAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC,CAAA,CAAC,EAAE,CAAC;CACN"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,+CAA6B;AAC7B,kDAAgC;AAChC,oDAAkC;AAClC,sDAAoC;AACpC,8DAA4C;AAC5C,gEAA8C;AAC9C,iEAA+C;AAE/C,kEAA8D;AACjD,QAAA,gBAAgB,GAAG,EAAE,aAAa,EAAb,8BAAa,EAAE,CAAC;AAElD,oDAAsC;AACtC,gEAAwC;AAExC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;IACpB,CAAC,GAAS,EAAE;QACV,MAAM,gBAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC,CAAA,CAAC,EAAE,CAAC;CACN"}
@@ -1,2 +1,10 @@
1
- export declare class Channel {
1
+ import type { Message } from './message';
2
+ import type { MessageChain } from './messageChain';
3
+ export declare type MessageHandler = (message: Message, chain: MessageChain) => void | Promise<void>;
4
+ export interface MessageChannel {
5
+ sendMessage(message: Message): Promise<void>;
6
+ }
7
+ export interface SubscribableChannel extends MessageChannel {
8
+ subscribe(handler: MessageHandler): boolean;
9
+ unsubscribe(handler: MessageHandler): boolean;
2
10
  }
@@ -1,7 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Channel = void 0;
4
- class Channel {
5
- }
6
- exports.Channel = Channel;
7
3
  //# sourceMappingURL=channel.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/core/message/channel.ts"],"names":[],"mappings":";;;AACA,MAAa,OAAO;CAGnB;AAHD,0BAGC"}
1
+ {"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/core/message/channel.ts"],"names":[],"mappings":""}
@@ -0,0 +1,4 @@
1
+ import type { MessageChannel } from './channel';
2
+ export declare class MessageChannelFactory {
3
+ static getMessageChannel(): MessageChannel;
4
+ }
@@ -0,0 +1,12 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MessageChannelFactory = void 0;
4
+ const redis_1 = require("./mq/redis");
5
+ class MessageChannelFactory {
6
+ static getMessageChannel() {
7
+ // TODO:
8
+ return new redis_1.RedisStreamChannel();
9
+ }
10
+ }
11
+ exports.MessageChannelFactory = MessageChannelFactory;
12
+ //# sourceMappingURL=channelFactory.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"channelFactory.js","sourceRoot":"","sources":["../../../src/core/message/channelFactory.ts"],"names":[],"mappings":";;;AACA,sCAAgD;AAEhD,MAAa,qBAAqB;IAChC,MAAM,CAAC,iBAAiB;QACtB,QAAQ;QACR,OAAO,IAAI,0BAAkB,EAAE,CAAC;IAClC,CAAC;CACF;AALD,sDAKC"}
@@ -0,0 +1,6 @@
1
+ export * from './channel';
2
+ export * from './channelFactory';
3
+ export * from './message';
4
+ export * from './messagebuilder';
5
+ export * from './messageChain';
6
+ export * from './messageListener';
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
+ };
12
+ Object.defineProperty(exports, "__esModule", { value: true });
13
+ __exportStar(require("./channel"), exports);
14
+ __exportStar(require("./channelFactory"), exports);
15
+ __exportStar(require("./message"), exports);
16
+ __exportStar(require("./messagebuilder"), exports);
17
+ __exportStar(require("./messageChain"), exports);
18
+ __exportStar(require("./messageListener"), exports);
19
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/message/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,mDAAiC;AAEjC,4CAA0B;AAC1B,mDAAiC;AACjC,iDAA+B;AAC/B,oDAAkC"}
@@ -1,2 +1,10 @@
1
+ import type { JSONObject } from '../../types';
2
+ export interface MessageHeaders {
3
+ requestId: string;
4
+ extra: string;
5
+ }
1
6
  export declare class Message {
7
+ payload: JSONObject;
8
+ headers: MessageHeaders;
9
+ constructor(headers: MessageHeaders, payload: JSONObject);
2
10
  }
@@ -2,6 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Message = void 0;
4
4
  class Message {
5
+ constructor(headers, payload) {
6
+ this.headers = headers;
7
+ this.payload = payload;
8
+ }
5
9
  }
6
10
  exports.Message = Message;
7
11
  //# sourceMappingURL=message.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/core/message/message.ts"],"names":[],"mappings":";;;AACA,MAAa,OAAO;CAGnB;AAHD,0BAGC"}
1
+ {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/core/message/message.ts"],"names":[],"mappings":";;;AAKA,MAAa,OAAO;IAGlB,YAAY,OAAuB,EAAE,OAAmB;QACtD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAPD,0BAOC"}
@@ -0,0 +1,9 @@
1
+ import type { Message } from './message';
2
+ import type { JSONObject } from '../../types';
3
+ import type { MessageChannel } from './channel';
4
+ export declare class MessageChain {
5
+ private message;
6
+ private channel;
7
+ constructor(message: Message, channel: MessageChannel);
8
+ send(payload: JSONObject): Promise<void>;
9
+ }
@@ -0,0 +1,30 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.MessageChain = void 0;
13
+ const messagebuilder_1 = require("./messagebuilder");
14
+ class MessageChain {
15
+ constructor(message, channel) {
16
+ this.message = message;
17
+ this.channel = channel;
18
+ }
19
+ send(payload) {
20
+ return __awaiter(this, void 0, void 0, function* () {
21
+ const responseMessage = messagebuilder_1.MessageBuilder
22
+ .fromMessageHeaders(this.message)
23
+ .withPayload(payload)
24
+ .build();
25
+ yield this.channel.sendMessage(responseMessage);
26
+ });
27
+ }
28
+ }
29
+ exports.MessageChain = MessageChain;
30
+ //# sourceMappingURL=messageChain.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messageChain.js","sourceRoot":"","sources":["../../../src/core/message/messageChain.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkD;AAKlD,MAAa,YAAY;IAEvB,YAAoB,OAAgB,EAAU,OAAuB;QAAjD,YAAO,GAAP,OAAO,CAAS;QAAU,YAAO,GAAP,OAAO,CAAgB;IAAI,CAAC;IAEpE,IAAI,CAAC,OAAmB;;YAC5B,MAAM,eAAe,GAAG,+BAAc;iBACnC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC;iBAChC,WAAW,CAAC,OAAO,CAAC;iBACpB,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAClD,CAAC;KAAA;CACF;AAXD,oCAWC"}
@@ -0,0 +1,4 @@
1
+ import type { MessageHandler } from './channel';
2
+ export declare class MessageListener {
3
+ static onMessage(handler: MessageHandler): void;
4
+ }
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MessageListener = void 0;
4
+ const redis_1 = require("./mq/redis");
5
+ class MessageListener {
6
+ static onMessage(handler) {
7
+ // TODO: factory
8
+ const channel = new redis_1.RedisStreamChannel();
9
+ channel.subscribe(handler);
10
+ }
11
+ }
12
+ exports.MessageListener = MessageListener;
13
+ //# sourceMappingURL=messageListener.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messageListener.js","sourceRoot":"","sources":["../../../src/core/message/messageListener.ts"],"names":[],"mappings":";;;AACA,sCAAgD;AAEhD,MAAa,eAAe;IAC1B,MAAM,CAAC,SAAS,CAAC,OAAuB;QACtC,gBAAgB;QAChB,MAAM,OAAO,GAAG,IAAI,0BAAkB,EAAE,CAAC;QACzC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;CACF;AAND,0CAMC"}
@@ -0,0 +1,13 @@
1
+ import type { JSONObject } from '../../types';
2
+ import { Message } from './message';
3
+ export declare class MessageBuilder {
4
+ private static _payload;
5
+ private static _headers;
6
+ static fromMessage(message: Message): typeof MessageBuilder;
7
+ static fromMessagePayload(message: Message): typeof MessageBuilder;
8
+ static fromMessageHeaders(message: Message): typeof MessageBuilder;
9
+ static withPayload(payload: JSONObject): typeof MessageBuilder;
10
+ static setHeader(key: string, value: string): typeof MessageBuilder;
11
+ static setHeaderIfAbsent(key: string, value: string): typeof MessageBuilder;
12
+ static build(): Message;
13
+ }
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MessageBuilder = void 0;
4
+ const utils_1 = require("../utils");
5
+ const message_1 = require("./message");
6
+ const DEFAULT_MESSAGE_HEADERS = { requestId: '', extra: '' };
7
+ class MessageBuilder {
8
+ static fromMessage(message) {
9
+ this._payload = message.payload;
10
+ return this;
11
+ }
12
+ static fromMessagePayload(message) {
13
+ this.fromMessage(message);
14
+ return this;
15
+ }
16
+ static fromMessageHeaders(message) {
17
+ for (const [headerName, headerValue] of Object.entries(message.headers)) {
18
+ this.setHeader(headerName, headerValue);
19
+ }
20
+ return this;
21
+ }
22
+ static withPayload(payload) {
23
+ this._payload = payload;
24
+ return this;
25
+ }
26
+ static setHeader(key, value) {
27
+ this._headers[key] = value;
28
+ return this;
29
+ }
30
+ static setHeaderIfAbsent(key, value) {
31
+ if (!this._headers[key]) {
32
+ this._headers[key] = value;
33
+ }
34
+ return this;
35
+ }
36
+ static build() {
37
+ if (!this._payload) {
38
+ throw new Error('payload must be passed in.');
39
+ }
40
+ if (!this._headers.requestId) {
41
+ this._headers.requestId = utils_1.generateUUID().split('-').join('');
42
+ }
43
+ return new message_1.Message(this._headers, this._payload);
44
+ }
45
+ }
46
+ exports.MessageBuilder = MessageBuilder;
47
+ MessageBuilder._headers = DEFAULT_MESSAGE_HEADERS;
48
+ //# sourceMappingURL=messagebuilder.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messagebuilder.js","sourceRoot":"","sources":["../../../src/core/message/messagebuilder.ts"],"names":[],"mappings":";;;AACA,oCAAwC;AAExC,uCAAoD;AAEpD,MAAM,uBAAuB,GAAmB,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAC,CAAC;AAE5E,MAAa,cAAc;IAKzB,MAAM,CAAC,WAAW,CAAC,OAAgB;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,OAAgB;QACxC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,OAAgB;QACxC,KAAK,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACvE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;SACzC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,OAAmB;QACpC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,KAAa;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,GAAW,EAAE,KAAa;QACjD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAK;QACV,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC/C;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,oBAAY,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC9D;QACD,OAAO,IAAI,iBAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;;AA/CH,wCAgDC;AA7CgB,uBAAQ,GAAG,uBAAuB,CAAC"}
@@ -0,0 +1,22 @@
1
+ /// <reference types="node" />
2
+ import * as events from 'events';
3
+ import { SendData } from '../../../types';
4
+ import type { Message } from '../message';
5
+ import type { MessageHandler } from '../channel';
6
+ import type { SubscribableChannel } from '../channel';
7
+ export declare class RedisStreamChannel extends events.EventEmitter implements SubscribableChannel {
8
+ private _client;
9
+ private defaultSendOptions;
10
+ constructor();
11
+ private getDefaultSendOptions;
12
+ private initMQClient;
13
+ private _takeInputPorts;
14
+ private _takeOutPorts;
15
+ private _send;
16
+ private _buildSendOptions;
17
+ private _sendFailureMessage;
18
+ sendSuccessMessage: (sendData: SendData) => Promise<void>;
19
+ subscribe(handler: MessageHandler): boolean;
20
+ unsubscribe(handler: MessageHandler): boolean;
21
+ sendMessage(message: Message): Promise<void>;
22
+ }
@@ -31,63 +31,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
31
31
  return (mod && mod.__esModule) ? mod : { "default": mod };
32
32
  };
33
33
  Object.defineProperty(exports, "__esModule", { value: true });
34
- exports.MQSender = void 0;
34
+ exports.RedisStreamChannel = void 0;
35
35
  const lodash_1 = __importDefault(require("lodash"));
36
36
  const events = __importStar(require("events"));
37
- const log_1 = __importDefault(require("./common/log"));
38
- const eventLogger_1 = require("./eventLogger");
39
- const environment_1 = require("./parameter/environment");
40
- const utils_1 = require("./utils");
37
+ const log_1 = __importDefault(require("../.././common/log"));
38
+ const eventLogger_1 = require("../../eventLogger");
39
+ const environment_1 = require("../../parameter/environment");
40
+ const messageChain_1 = require("../messageChain");
41
+ const messagebuilder_1 = require("../messagebuilder");
42
+ const utils_1 = require("../../utils");
41
43
  const suanpan_mq_1 = require("suanpan-mq");
42
- const types_1 = require("../types");
43
- class MQSender extends events.EventEmitter {
44
+ const types_1 = require("../../../types");
45
+ const PORT_IN_REG = /^in[1-9][0-9]*$/;
46
+ const PORT_OUT_REG = /^out[1-9][0-9]*$/;
47
+ class RedisStreamChannel extends events.EventEmitter {
44
48
  constructor() {
45
49
  super();
46
- this.onStreamHandler = (callBack) => __awaiter(this, void 0, void 0, function* () {
47
- this.on(types_1.MessageReachedEvent.NAME, (event) => __awaiter(this, void 0, void 0, function* () {
48
- const req = this.buildRequestData(event.request);
49
- const res = {
50
- send: this.buildSender()
51
- };
52
- try {
53
- yield callBack(req, res);
54
- }
55
- catch (e) {
56
- const eventLogger = eventLogger_1.EventLogger.Instance;
57
- eventLogger.error(e);
58
- yield this.sendFailureMessage({ requestId: event.request.id, out1: `Node error caught: ${e.message}` });
59
- }
60
- }));
61
- });
62
50
  this.sendSuccessMessage = (sendData) => __awaiter(this, void 0, void 0, function* () {
63
- this.initMQClinet();
51
+ this.initMQClient();
64
52
  sendData.success = 'true';
65
- const options = this.buildSendOptions(sendData);
53
+ const options = this._buildSendOptions(sendData);
66
54
  yield this._send(options);
67
55
  });
68
- /** @deprecated this method has deprecated and use onMessage(message => {}) instead */
69
- this.onCall = (callBack) => {
70
- this.initMQClinet();
71
- this.onStreamHandler(callBack);
72
- };
73
- this.onMessage = (callBack) => {
74
- this.initMQClinet();
75
- this.on(types_1.MessageReachedEvent.NAME, (event) => __awaiter(this, void 0, void 0, function* () {
76
- const streamMessage = {};
77
- streamMessage.header = {
78
- requestId: event.request.id || utils_1.generateUUID().split('-').join('')
79
- };
80
- streamMessage.body = this.takeInputPorts(event.request);
81
- try {
82
- yield callBack(streamMessage);
83
- }
84
- catch (e) {
85
- const eventLogger = eventLogger_1.EventLogger.Instance;
86
- eventLogger.error(e);
87
- yield this.sendFailureMessage({ requestId: event.request.id, out1: `Node error caught: ${e.message}` });
88
- }
89
- }));
90
- };
91
56
  this.defaultSendOptions = this.getDefaultSendOptions();
92
57
  }
93
58
  getDefaultSendOptions() {
@@ -105,10 +70,10 @@ class MQSender extends events.EventEmitter {
105
70
  trimImmediately: utils_1.isTrue(trimImmediately)
106
71
  };
107
72
  }
108
- initMQClinet() {
109
- if (!this._mqClient) {
73
+ initMQClient() {
74
+ if (!this._client) {
110
75
  const host = environment_1.Environment.mq.host;
111
- this._mqClient = new suanpan_mq_1.SPMQClient({ host, readWriteSeparation: true });
76
+ this._client = new suanpan_mq_1.SPMQClient({ host, readWriteSeparation: true });
112
77
  const queue = environment_1.Environment.mq.receiveQueue;
113
78
  const callback = (messages) => __awaiter(this, void 0, void 0, function* () {
114
79
  if (messages.data) {
@@ -117,32 +82,30 @@ class MQSender extends events.EventEmitter {
117
82
  });
118
83
  // https://github.com/chylvina/AiLab/blob/58b7d302f5657042e8226cc3168dfee23dc35758/suanpan/stream/__init__.py#L118-L135
119
84
  const queueOption = { queue, callback, count: 1 };
120
- this._mqClient.subscribeQueue(queueOption);
85
+ this._client.subscribeQueue(queueOption);
121
86
  }
122
87
  }
123
- takeInputPorts(request) {
88
+ _takeInputPorts(request) {
124
89
  return lodash_1.default.pickBy(request, (value, key) => {
125
- return key.startsWith('in');
90
+ return key.match(PORT_IN_REG);
126
91
  });
127
92
  }
128
- buildRequestData(request) {
129
- const req = {};
130
- req.id = request.id;
131
- const data = this.takeInputPorts(request);
132
- req.msg = data;
133
- return req;
93
+ _takeOutPorts(request) {
94
+ return lodash_1.default.pickBy(request, (value, key) => {
95
+ return key.match(PORT_OUT_REG);
96
+ });
134
97
  }
135
98
  _send(options) {
136
99
  return __awaiter(this, void 0, void 0, function* () {
137
100
  try {
138
- yield this._mqClient.sendMessage(options);
101
+ yield this._client.sendMessage(options);
139
102
  }
140
103
  catch (e) {
141
104
  log_1.default.error(`send message failed, reason: ${e}`);
142
105
  }
143
106
  });
144
107
  }
145
- buildSendOptions(sendData) {
108
+ _buildSendOptions(sendData) {
146
109
  const sendOptions = lodash_1.default.cloneDeep(this.defaultSendOptions);
147
110
  const data = sendOptions.data;
148
111
  data.success = sendData.success || 'true';
@@ -154,20 +117,75 @@ class MQSender extends events.EventEmitter {
154
117
  }
155
118
  return sendOptions;
156
119
  }
157
- sendFailureMessage(sendData = { out1: 'An error occurred in the node' }) {
120
+ _sendFailureMessage(sendData = { out1: 'An error occurred in the node' }) {
158
121
  return __awaiter(this, void 0, void 0, function* () {
159
- this.initMQClinet();
122
+ this.initMQClient();
160
123
  sendData.success = 'false';
161
- const options = this.buildSendOptions(sendData);
124
+ const options = this._buildSendOptions(sendData);
162
125
  yield this._send(options);
163
126
  });
164
127
  }
165
- buildSender() {
166
- return (sendData) => __awaiter(this, void 0, void 0, function* () {
167
- const options = this.buildSendOptions(sendData);
168
- yield this._send(options);
128
+ subscribe(handler) {
129
+ try {
130
+ this.initMQClient();
131
+ this.on(types_1.MessageReachedEvent.NAME, (event) => __awaiter(this, void 0, void 0, function* () {
132
+ const inputPortsMap = this._takeInputPorts(event.request);
133
+ const requestMessage = messagebuilder_1.MessageBuilder
134
+ .withPayload(inputPortsMap)
135
+ .setHeaderIfAbsent('requestId', event.request.id)
136
+ .setHeaderIfAbsent('extra', event.request.extra)
137
+ .build();
138
+ const chain = new messageChain_1.MessageChain(requestMessage, this);
139
+ try {
140
+ yield handler(requestMessage, chain);
141
+ }
142
+ catch (e) {
143
+ const eventLogger = eventLogger_1.EventLogger.Instance;
144
+ eventLogger.error(e);
145
+ yield this._sendFailureMessage({ requestId: event.request.id, out1: `Node error caught: ${e.message}` });
146
+ }
147
+ }));
148
+ return true;
149
+ }
150
+ catch (e) {
151
+ log_1.default.error(`Subscription failed. ${e}`);
152
+ return false;
153
+ }
154
+ }
155
+ unsubscribe(handler) {
156
+ throw new Error('Method not implemented.');
157
+ }
158
+ sendMessage(message) {
159
+ return __awaiter(this, void 0, void 0, function* () {
160
+ this.initMQClient();
161
+ const nodeId = environment_1.Environment.stream.nodeId;
162
+ const maxlen = environment_1.Environment.mq.sendQueueMaxLength;
163
+ const trimImmediately = environment_1.Environment.mq.sendQueueTrimImmediately;
164
+ const data = {};
165
+ const messageHeaders = message.headers;
166
+ data.request_id = (messageHeaders === null || messageHeaders === void 0 ? void 0 : messageHeaders.requestId) || utils_1.generateUUID().split('-').join('');
167
+ data.extra = messageHeaders === null || messageHeaders === void 0 ? void 0 : messageHeaders.extra;
168
+ data.success = 'true';
169
+ const responseStream = {
170
+ node_id: nodeId,
171
+ type: 'call',
172
+ success: 'success',
173
+ data: Object.assign(data, message.payload)
174
+ };
175
+ const sendOptions = {
176
+ queue: environment_1.Environment.mq.sendQueue,
177
+ data: responseStream,
178
+ maxlen: maxlen ? parseInt(maxlen) : 2000,
179
+ trimImmediately: utils_1.isTrue(trimImmediately)
180
+ };
181
+ try {
182
+ yield this._client.sendMessage(sendOptions);
183
+ }
184
+ catch (e) {
185
+ log_1.default.error(`send message failed, reason: ${e}`);
186
+ }
169
187
  });
170
188
  }
171
189
  }
172
- exports.MQSender = MQSender;
173
- //# sourceMappingURL=mq.js.map
190
+ exports.RedisStreamChannel = RedisStreamChannel;
191
+ //# sourceMappingURL=redis.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/core/message/mq/redis.ts"],"names":[],"mappings":"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"}
@@ -69,7 +69,7 @@ class MinioStorage extends storage_1.AbstractStorage {
69
69
  originalContent = yield this.getObjectToString(objectName);
70
70
  }
71
71
  catch (e) {
72
- log_1.default.debug(`❗️Storage AppendWarning ==> ${e.code}: ${e.message} objectName: ${objectName}`);
72
+ log_1.default.warn(`❗️Storage AppendWarning ==> ${e.code}: ${e.message} objectName: ${objectName}`);
73
73
  }
74
74
  const data = `${originalContent}${content}`;
75
75
  yield this.putObject(objectName, data);
@@ -1 +1 @@
1
- {"version":3,"file":"minio.js","sourceRoot":"","sources":["../../../src/core/storage/minio.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"minio.js","sourceRoot":"","sources":["../../../src/core/storage/minio.ts"],"names":[],"mappings":"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"}
@@ -85,19 +85,14 @@ class OSSStorage extends storage_1.AbstractStorage {
85
85
  }
86
86
  putObject(objectName, data) {
87
87
  return __awaiter(this, void 0, void 0, function* () {
88
- if (lodash_1.default.isString(data)) {
89
- if (!util.fileExists(data)) {
90
- throw new Error(`File(${data}) is not exist.`);
91
- }
92
- }
93
88
  const ossClient = yield this.getClient();
94
- yield ossClient.put(objectName, data);
89
+ yield ossClient.put(objectName, lodash_1.default.isString(data) ? Buffer.from(data) : data);
95
90
  });
96
91
  }
97
92
  fPutObject(objectName, filePath) {
98
93
  return __awaiter(this, void 0, void 0, function* () {
99
94
  if (util.fileExists(filePath)) {
100
- throw new Error(`File (${filePath}) is not exist.`);
95
+ throw new Error(`Local file path(${filePath}) is not exist.`);
101
96
  }
102
97
  const ossClient = yield this.getClient();
103
98
  yield ossClient.put(objectName, filePath);
@@ -1 +1 @@
1
- {"version":3,"file":"oss.js","sourceRoot":"","sources":["../../../src/core/storage/oss.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oss.js","sourceRoot":"","sources":["../../../src/core/storage/oss.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,10 @@
1
- import type { Logger } from 'log4js';
2
1
  import { FlushOptions } from '../utils/flusher';
3
2
  export declare type StorageFlushOptions = {
4
3
  storageFilePath: string;
5
- logger?: Logger;
6
4
  } & FlushOptions;
7
5
  export declare class StorageLogFlusher {
8
6
  private options;
9
7
  private bFlusher;
10
- private _logger;
11
8
  constructor(options: StorageFlushOptions);
12
9
  onFlush: (logItems: string[]) => Promise<void>;
13
10
  add(content: string): void;
@@ -24,7 +24,7 @@ class StorageLogFlusher {
24
24
  if (lodash_1.default.isEmpty(logItems)) {
25
25
  return;
26
26
  }
27
- this._logger.debug(`⬇ StorageLogFlusher ==> append ${logItems} to ${this.options.storageFilePath}`);
27
+ log_1.default.info(`⬇ StorageLogFlusher ==> append ${logItems} to ${this.options.storageFilePath}`);
28
28
  try {
29
29
  const joinWithLineBreak = logItems.reduce((acc, cur) => {
30
30
  acc += `${cur}\r\n`;
@@ -36,7 +36,6 @@ class StorageLogFlusher {
36
36
  log_1.default.warn(`write log to storage failed ${e}`);
37
37
  }
38
38
  });
39
- this._logger = options.logger || log_1.default;
40
39
  this.bFlusher = new flusher_1.BufferFlusher({
41
40
  maxItems: options.maxItems,
42
41
  flushInterval: options.flushInterval
@@ -1 +1 @@
1
- {"version":3,"file":"storageFlusher.js","sourceRoot":"","sources":["../../../src/core/storage/storageFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,wDAAmC;AAEnC,qDAA2C;AAC3C,8CAA+D;AAO/D,MAAa,iBAAiB;IAK5B,YAAoB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAShD,YAAO,GAAG,CAAO,QAAkB,EAAE,EAAE;YACrC,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;aAAE;YAEpC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kCAAkC,QAAQ,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;YAEpG,IAAI;gBACF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;oBACrD,GAAG,IAAI,GAAG,GAAG,MAAM,CAAC;oBACpB,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CAAC;gBAEP,MAAM,wBAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;aAChF;YAAC,OAAO,CAAC,EAAE;gBACV,aAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;aACjD;QACH,CAAC,CAAA,CAAC;QAvBA,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,aAAM,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAa,CAAC;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAmBD,GAAG,CAAC,OAAe;QACjB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF;AAtCD,8CAsCC"}
1
+ {"version":3,"file":"storageFlusher.js","sourceRoot":"","sources":["../../../src/core/storage/storageFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,wDAAmC;AACnC,qDAA2C;AAC3C,8CAA+D;AAK/D,MAAa,iBAAiB;IAI5B,YAAoB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAQhD,YAAO,GAAG,CAAO,QAAkB,EAAE,EAAE;YACrC,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;aAAE;YAEpC,aAAM,CAAC,IAAI,CAAC,kCAAkC,QAAQ,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;YAE7F,IAAI;gBACF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;oBACrD,GAAG,IAAI,GAAG,GAAG,MAAM,CAAC;oBACpB,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CAAC;gBAEP,MAAM,wBAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;aAChF;YAAC,OAAO,CAAC,EAAE;gBACV,aAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;aACjD;QACH,CAAC,CAAA,CAAC;QAtBA,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAa,CAAC;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAmBD,GAAG,CAAC,OAAe;QACjB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF;AApCD,8CAoCC"}
@@ -75,7 +75,6 @@ class ObjectStorageLogger {
75
75
  }
76
76
  this._flusher = new storageFlusher_1.StorageLogFlusher({
77
77
  storageFilePath: options.storagePath,
78
- logger: this._logger,
79
78
  maxItems: options.maxItems,
80
79
  flushInterval: options.flushInterval
81
80
  });
@@ -1 +1 @@
1
- {"version":3,"file":"storageLogger.js","sourceRoot":"","sources":["../../../src/core/storage/storageLogger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"storageLogger.js","sourceRoot":"","sources":["../../../src/core/storage/storageLogger.ts"],"names":[],"mappings":"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"}
@@ -1,38 +1,37 @@
1
- export interface RequestStream {
1
+ export declare type Inx = 'in1' | 'in2' | 'in3' | 'in4' | 'in5';
2
+ export declare type Outx = 'out1' | 'out2' | 'out3' | 'out4' | 'out5';
3
+ export declare type InputPortsMap<T> = {
4
+ [inx in Inx]?: T;
5
+ };
6
+ export declare type OutPortsMap<T> = {
7
+ [outx in Outx]?: T;
8
+ };
9
+ export interface RequestStream extends InputPortsMap<string> {
2
10
  id: string;
3
- type?: string;
4
- in1?: string;
11
+ type: string;
12
+ extra: string;
5
13
  }
6
- export interface ResponseStream {
14
+ export interface ResponseStream extends OutPortsMap<string> {
7
15
  request_id: string;
8
16
  node_id: string;
9
17
  success?: 'true' | 'false';
10
18
  type?: string;
11
- out1?: string;
12
19
  extra?: string;
13
20
  msg?: string;
14
21
  }
15
- export declare type Inx = 'in1' | 'in2' | 'in3' | 'in4' | 'in5';
16
- export declare type Outx = 'out1' | 'out2' | 'out3' | 'out4' | 'out5';
17
- export declare type InputPortsMap = {
18
- [inx in Inx]?: string;
19
- };
20
- export declare type OutPortsMap = {
21
- [inx in Outx]?: string;
22
- };
23
- export declare type SendData = OutPortsMap & {
22
+ export declare type SendData = OutPortsMap<string> & {
24
23
  success?: 'true' | 'false';
25
24
  requestId?: string;
26
25
  };
27
26
  export declare type RequestData = {
28
27
  id: string;
29
- msg: InputPortsMap;
28
+ msg: InputPortsMap<string>;
30
29
  };
31
30
  export interface ResponseData {
32
31
  send(data: any): void;
33
32
  }
34
33
  export declare type StreamMessage = {
35
- body: InputPortsMap;
34
+ body: InputPortsMap<string>;
36
35
  header: {
37
36
  requestId: string;
38
37
  };
@@ -1 +1 @@
1
- {"version":3,"file":"streamTypes.js","sourceRoot":"","sources":["../../src/types/streamTypes.ts"],"names":[],"mappings":";;;AA6DA,MAAa,mBAAmB;IAE9B,YAAmB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;IAAG,CAAC;;AAF/C,kDAGC;AAFe,wBAAI,GAAG,iBAAiB,CAAA"}
1
+ {"version":3,"file":"streamTypes.js","sourceRoot":"","sources":["../../src/types/streamTypes.ts"],"names":[],"mappings":";;;AAmDA,MAAa,mBAAmB;IAE9B,YAAmB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;IAAG,CAAC;;AAF/C,kDAGC;AAFe,wBAAI,GAAG,iBAAiB,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "suanpan_node_sdk",
3
- "version": "2.0.0-beta.31",
3
+ "version": "2.0.0-beta.35",
4
4
  "description": "suanpan sdk for node.js",
5
5
  "main": "dist/main.js",
6
6
  "types": "dist/main.d.ts",
@@ -1,2 +0,0 @@
1
- export declare class Connection {
2
- }
@@ -1,19 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Connection = void 0;
4
- class Connection {
5
- }
6
- exports.Connection = Connection;
7
- class ConnectionFactory {
8
- static newConnection() {
9
- }
10
- }
11
- class MessageService {
12
- }
13
- class QueueMessageService extends MessageService {
14
- }
15
- class HttpMessageService extends MessageService {
16
- }
17
- class ConsumerService {
18
- }
19
- //# sourceMappingURL=connection.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/core/message/connection.ts"],"names":[],"mappings":";;;AACA,MAAa,UAAU;CAEtB;AAFD,gCAEC;AAGD,MAAM,iBAAiB;IAErB,MAAM,CAAC,aAAa;IAEpB,CAAC;CACF;AAOD,MAAM,cAAc;CAEnB;AAED,MAAM,mBAAoB,SAAQ,cAAc;CAE/C;AAED,MAAM,kBAAmB,SAAQ,cAAc;CAE9C;AAGD,MAAM,eAAe;CAEpB"}
package/dist/core/mq.d.ts DELETED
@@ -1,21 +0,0 @@
1
- /// <reference types="node" />
2
- import * as events from 'events';
3
- import { AsyncCallBack, AsyncMessageFn, SendData, SyncCallBack, SyncMessageFn } from '../types';
4
- export declare class MQSender extends events.EventEmitter {
5
- private _mqClient;
6
- private defaultSendOptions;
7
- constructor();
8
- private getDefaultSendOptions;
9
- private initMQClinet;
10
- private takeInputPorts;
11
- private buildRequestData;
12
- private _send;
13
- private buildSendOptions;
14
- private sendFailureMessage;
15
- private buildSender;
16
- private onStreamHandler;
17
- sendSuccessMessage: (sendData: SendData) => Promise<void>;
18
- /** @deprecated this method has deprecated and use onMessage(message => {}) instead */
19
- onCall: (callBack: SyncCallBack | AsyncCallBack) => void;
20
- onMessage: (callBack: AsyncMessageFn | SyncMessageFn) => void;
21
- }
@@ -1 +0,0 @@
1
- {"version":3,"file":"mq.js","sourceRoot":"","sources":["../../src/core/mq.ts"],"names":[],"mappings":"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"}