suanpan_node_sdk 3.0.1 → 3.0.3

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.
@@ -25,6 +25,8 @@ class RedisClient {
25
25
  readWriteSeparation: true
26
26
  });
27
27
  }
28
+ // https://github.com/redis/node-redis/issues/2021
29
+ // https://github.com/luin/ioredis/issues/1646
28
30
  subscribeQueue(queueName, callback) {
29
31
  return __awaiter(this, void 0, void 0, function* () {
30
32
  const options = {
@@ -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;IAEY,cAAc,CAAC,SAAiB,EAAE,QAAgC;;YAC7E,MAAM,OAAO,GAA0B;gBACrC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aACrC,CAAC;YACF,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;AAlCD,kCAkCC"}
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;;YAC7E,MAAM,OAAO,GAA0B;gBACrC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aACrC,CAAC;YACF,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;AApCD,kCAoCC"}
@@ -29,8 +29,8 @@ class StreamPubSub {
29
29
  return this._channel;
30
30
  }
31
31
  _getHandlers(eventHeaders) {
32
- const topic = eventHeaders.EventName;
33
- const headerAppId = eventHeaders.AppId;
32
+ const topic = eventHeaders.event_name;
33
+ const headerAppId = eventHeaders.app_id;
34
34
  if (environment_1.Environment.stream.appId === headerAppId) {
35
35
  const handlers = this._topicHandlersMap.get(topic);
36
36
  if (handlers) {
@@ -45,8 +45,8 @@ class StreamPubSub {
45
45
  this._channelSubscribed = true; // modify "_channelSubscribed" to true before "subscribe", otherwise it will cause the problem of creating queues multiple times
46
46
  yield this._getChannel().subscribe((appEventStream) => __awaiter(this, void 0, void 0, function* () {
47
47
  const appEvent = appEventStream.data;
48
- const payload = appEvent.Data;
49
- const headers = utils_1.tryJSONParse(appEvent.Header);
48
+ const payload = appEvent.data;
49
+ const headers = utils_1.tryJSONParse(appEvent.header);
50
50
  const handlers = this._getHandlers(headers);
51
51
  if (handlers) {
52
52
  for (const handler of handlers) {
@@ -65,13 +65,13 @@ class StreamPubSub {
65
65
  */
66
66
  publish(topic, payload) {
67
67
  const header = {
68
- AppId: environment_1.Environment.stream.appId,
69
- NodeId: environment_1.Environment.stream.nodeId,
70
- EventName: topic
68
+ app_id: environment_1.Environment.stream.appId,
69
+ node_id: environment_1.Environment.stream.nodeId,
70
+ event_name: topic
71
71
  };
72
72
  const appEvent = {
73
- Data: payload,
74
- Header: JSON.stringify(header)
73
+ data: payload,
74
+ header: JSON.stringify(header)
75
75
  };
76
76
  this._getChannel().sendMessage(appEvent);
77
77
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/message/pubsub/index.ts"],"names":[],"mappings":"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"}
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;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,QAAQ,EAAE;gBAAE,OAAO,QAAQ,CAAC;aAAE;SACnC;QACD,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;IAEa,iBAAiB;;YAC7B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC5B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC,gIAAgI;gBAChK,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,SAAS,CAAiB,CAAM,cAA8B,EAAE,EAAE;oBACzF,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC;oBACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;oBAC9B,MAAM,OAAO,GAAG,oBAAY,CAAc,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;oBAC5C,IAAI,QAAQ,EAAE;wBACZ,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;4BAC9B,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;yBACxB;qBACF;gBACH,CAAC,CAAA,CAAC,CAAC;aACJ;QACH,CAAC;KAAA;IAED;;;;;OAKG;IACH,OAAO,CAAC,KAAa,EAAE,OAAe;QACpC,MAAM,MAAM,GAAgB;YAC1B,MAAM,EAAE,yBAAW,CAAC,MAAM,CAAC,KAAK;YAChC,OAAO,EAAE,yBAAW,CAAC,MAAM,CAAC,MAAM;YAClC,UAAU,EAAE,KAAK;SAClB,CAAC;QACF,MAAM,QAAQ,GAAa;YACzB,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SAC/B,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,KAAa,EAAE,OAAgB;QACvC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;YACvB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAC/C;QACD,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAExB,IAAI,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,IAAI,KAAK,UAAU,UAAU,CAAC,IAAI,GAAsB,CAAC;YACjE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC9C;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,KAAa;QAC1B,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,CAAC;SACxC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,EAAE;YAAE,OAAO,KAAK,CAAC;SAAE;QAChC,OAAO,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,KAAY;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACnB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACrC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,KAAsB;QACtC,KAAK,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC1E,IAAI,cAAc,KAAK,KAAK,EAAE;gBAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;gBACnD,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBACjD,IAAI,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;wBACnC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;wBACnC,MAAM;qBACP;iBACF;gBACD,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,OAAgB;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,KAAK,CAAC;SACd;QACD,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACjD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;CACF;AAEY,QAAA,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC"}
@@ -28,7 +28,7 @@ app.use((err, req, res, next) => {
28
28
  });
29
29
  app.post('/internal/trap', express_async_handler_1.default((req, res) => __awaiter(void 0, void 0, void 0, function* () {
30
30
  const { userId, id: appId } = req.body;
31
- logger_1.default.info(`userId: ${userId}, appId: ${appId}`);
31
+ logger_1.default.info(`node trap userId: ${userId}, appId: ${appId}`);
32
32
  if (userId === environment_1.Environment.stream.userId && appId === environment_1.Environment.stream.appId) {
33
33
  res.json({ sucess: true, message: 'Process exited successfully.' });
34
34
  process.exit(98);
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/core/web/app.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,8DAAsC;AACtC,kFAAiD;AAEjD,0DAAuD;AAEvD,MAAM,GAAG,GAAG,iBAAO,EAAE,CAAC;AAEtB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AACxB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAEjD,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAC9B,gBAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7C,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE;KAC1B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,+BAAY,CAAC,CAAO,GAAoB,EAAE,GAAqB,EAAE,EAAE;IAE5F,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IAEvC,gBAAM,CAAC,IAAI,CAAC,WAAW,MAAM,YAAY,KAAK,EAAE,CAAC,CAAC;IAElD,IAAI,MAAM,KAAK,yBAAW,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,KAAK,yBAAW,CAAC,MAAM,CAAC,KAAK,EAAE;QAC9E,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAClB;IAED,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,yDAAyD,EAAE,CAAC,CAAC;AAClG,CAAC,CAAA,CAAC,CAAC,CAAC;AAEJ,kBAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/core/web/app.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,8DAAsC;AACtC,kFAAiD;AAEjD,0DAAuD;AAEvD,MAAM,GAAG,GAAG,iBAAO,EAAE,CAAC;AAEtB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AACxB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAEjD,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAC9B,gBAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7C,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE;KAC1B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,+BAAY,CAAC,CAAO,GAAoB,EAAE,GAAqB,EAAE,EAAE;IAE5F,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IAEvC,gBAAM,CAAC,IAAI,CAAC,qBAAqB,MAAM,YAAY,KAAK,EAAE,CAAC,CAAC;IAE5D,IAAI,MAAM,KAAK,yBAAW,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,KAAK,yBAAW,CAAC,MAAM,CAAC,KAAK,EAAE;QAC9E,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAClB;IAED,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,yDAAyD,EAAE,CAAC,CAAC;AAClG,CAAC,CAAA,CAAC,CAAC,CAAC;AAEJ,kBAAe,GAAG,CAAC"}
@@ -33,22 +33,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
33
33
  Object.defineProperty(exports, "__esModule", { value: true });
34
34
  process.env.SUPPRESS_NO_CONFIG_WARNING = 'true';
35
35
  const http = __importStar(require("http"));
36
+ const util = __importStar(require("../utils"));
36
37
  const app_1 = __importDefault(require("./app"));
37
38
  const config_1 = __importDefault(require("config"));
38
39
  const logger_1 = __importDefault(require("../common/logger"));
39
40
  const helper_1 = require("../utils/helper");
40
41
  const constant_1 = require("../common/constant");
42
+ function getPort() {
43
+ return __awaiter(this, void 0, void 0, function* () {
44
+ const logicPort = config_1.default.has(constant_1.APP_NODE_SDK_PORT_CONFIG) ? config_1.default.get(constant_1.APP_NODE_SDK_PORT_CONFIG) : constant_1.DEFAULT_NODE_SDK_PORT;
45
+ if (util.isDesktop()) {
46
+ const realFreePort = yield helper_1.Helpers.registerPortUntilSuccess(logicPort);
47
+ return realFreePort;
48
+ }
49
+ return logicPort;
50
+ });
51
+ }
52
+ // 客户端/云端 - 组件均启 http server
41
53
  class Server {
42
54
  static setup() {
43
55
  return __awaiter(this, void 0, void 0, function* () {
44
- const logicPort = config_1.default.has(constant_1.APP_NODE_SDK_PORT_CONFIG) ? config_1.default.get(constant_1.APP_NODE_SDK_PORT_CONFIG) : constant_1.DEFAULT_NODE_SDK_PORT;
45
- logger_1.default.info(`registering nodePort: ${logicPort}...`);
46
- const realFreePort = yield helper_1.Helpers.registerPortUntilSuccess(logicPort);
47
- logger_1.default.info(`assigned host port ${realFreePort}`);
56
+ const port = yield getPort();
48
57
  const server = http.createServer(app_1.default);
49
- server.listen(realFreePort, () => {
50
- logger_1.default.info(`Web server listening on port ${realFreePort}`);
51
- logger_1.default.info('Web server started');
58
+ server.listen(port, () => {
59
+ logger_1.default.info(`Web server listening 0.0.0.0:${port}`);
52
60
  });
53
61
  server.on('error', (e) => {
54
62
  logger_1.default.error(`node sdk error: ${e.message}`);
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/core/web/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,MAAM,CAAC;AAEhD,2CAA6B;AAC7B,gDAAwB;AACxB,oDAA4B;AAC5B,8DAAsC;AACtC,4CAA0C;AAC1C,iDAAqF;AAErF,MAAqB,MAAM;IAEzB,MAAM,CAAO,KAAK;;YAEhB,MAAM,SAAS,GAAW,gBAAM,CAAC,GAAG,CAAC,mCAAwB,CAAC,CAAC,CAAC,CAAC,gBAAM,CAAC,GAAG,CAAC,mCAAwB,CAAC,CAAC,CAAC,CAAC,gCAAqB,CAAC;YAE9H,gBAAM,CAAC,IAAI,CAAC,yBAAyB,SAAS,KAAK,CAAC,CAAC;YACrD,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;YACvE,gBAAM,CAAC,IAAI,CAAC,sBAAsB,YAAY,EAAE,CAAC,CAAC;YAElD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,aAAG,CAAC,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,EAAE;gBAC/B,gBAAM,CAAC,IAAI,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;gBAC5D,gBAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBACvB,gBAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AAtBD,yBAsBC"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/core/web/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,MAAM,CAAC;AAEhD,2CAA6B;AAC7B,+CAAiC;AAEjC,gDAAwB;AACxB,oDAA4B;AAC5B,8DAAsC;AAEtC,4CAA0C;AAC1C,iDAAqF;AAErF,SAAe,OAAO;;QACpB,MAAM,SAAS,GAAW,gBAAM,CAAC,GAAG,CAAC,mCAAwB,CAAC,CAAC,CAAC,CAAC,gBAAM,CAAC,GAAG,CAAC,mCAAwB,CAAC,CAAC,CAAC,CAAC,gCAAqB,CAAC;QAC9H,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;YACpB,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;YACvE,OAAO,YAAY,CAAC;SACrB;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA;AAED,4BAA4B;AAC5B,MAAqB,MAAM;IAEzB,MAAM,CAAO,KAAK;;YAChB,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,aAAG,CAAC,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;gBACvB,gBAAM,CAAC,IAAI,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBACvB,gBAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AAfD,yBAeC"}
package/dist/main.js CHANGED
@@ -21,15 +21,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
21
21
  __setModuleDefault(result, mod);
22
22
  return result;
23
23
  };
24
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
25
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
26
- return new (P || (P = Promise))(function (resolve, reject) {
27
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
28
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
29
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
30
- step((generator = generator.apply(thisArg, _arguments || [])).next());
31
- });
32
- };
33
24
  var __importDefault = (this && this.__importDefault) || function (mod) {
34
25
  return (mod && mod.__esModule) ? mod : { "default": mod };
35
26
  };
@@ -42,9 +33,7 @@ const logger_1 = __importDefault(require("./core/common/logger"));
42
33
  logger_1.default.info(`suanpan sdk version: ${exports.version}`);
43
34
  const util = __importStar(require("./core/utils"));
44
35
  const server_1 = __importDefault(require("./core/web/server"));
45
- if (util.isDesktop() && !util.isDesktopMaster()) {
46
- (() => __awaiter(void 0, void 0, void 0, function* () {
47
- yield server_1.default.setup();
48
- }))();
36
+ if (!util.isUseMaster()) {
37
+ server_1.default.setup();
49
38
  }
50
39
  //# sourceMappingURL=main.js.map
package/dist/main.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAsB;AAEtB,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC5B,QAAA,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;AAErC,kEAA0C;AAC1C,gBAAM,CAAC,IAAI,CAAC,wBAAwB,eAAO,EAAE,CAAC,CAAC;AAE/C,mDAAqC;AACrC,+DAAuC;AAEvC,IAAI,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE;IAC/C,CAAC,GAAS,EAAE;QACV,MAAM,gBAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC,CAAA,CAAC,EAAE,CAAC;CACN"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAsB;AAEtB,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC5B,QAAA,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;AAErC,kEAA0C;AAC1C,gBAAM,CAAC,IAAI,CAAC,wBAAwB,eAAO,EAAE,CAAC,CAAC;AAE/C,mDAAqC;AACrC,+DAAuC;AAEvC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;IACvB,gBAAM,CAAC,KAAK,EAAE,CAAC;CAChB"}
@@ -1,11 +1,11 @@
1
1
  export declare type EventHeader = {
2
- AppId: string;
3
- NodeId: string;
4
- EventName: string;
2
+ app_id: string;
3
+ node_id: string;
4
+ event_name: string;
5
5
  };
6
6
  export declare type AppEvent = {
7
- Header: string;
8
- Data: string;
7
+ header: string;
8
+ data: string;
9
9
  };
10
10
  export declare type Topic = string;
11
11
  export declare type Handler = (payload: string) => void | Promise<void>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "suanpan_node_sdk",
3
- "version": "3.0.1",
3
+ "version": "3.0.3",
4
4
  "description": "suanpan sdk for node.js",
5
5
  "main": "dist/main.js",
6
6
  "types": "dist/main.d.ts",