starta.microservice 0.1.2862 → 0.1.2872

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.
@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
24
24
  };
25
25
  var _Rabbitmq_logger, _Rabbitmq_connection, _Rabbitmq_channel;
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
- const amqplib_1 = __importDefault(require("amqplib"));
27
+ const amqp_connection_manager_1 = __importDefault(require("amqp-connection-manager"));
28
28
  const config_1 = __importDefault(require("../../config"));
29
29
  class Rabbitmq {
30
30
  constructor(logger) {
@@ -42,7 +42,7 @@ class Rabbitmq {
42
42
  });
43
43
  __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.info("Connecting to rabbit");
44
44
  try {
45
- __classPrivateFieldSet(this, _Rabbitmq_connection, yield amqplib_1.default.connect(config_1.default.rabbitmq.uri), "f");
45
+ __classPrivateFieldSet(this, _Rabbitmq_connection, yield amqp_connection_manager_1.default.connect(config_1.default.rabbitmq.uri), "f");
46
46
  }
47
47
  catch (err) {
48
48
  __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
@@ -52,19 +52,16 @@ class Rabbitmq {
52
52
  return;
53
53
  }
54
54
  __classPrivateFieldGet(this, _Rabbitmq_connection, "f").on("error", function (err) {
55
- __classPrivateFieldSet(self, _Rabbitmq_connection, null, "f");
56
- if ((err === null || err === void 0 ? void 0 : err.message) !== "Connection closing") {
57
- __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
58
- }
55
+ __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
59
56
  });
60
57
  __classPrivateFieldGet(this, _Rabbitmq_connection, "f").on("close", function (err) {
61
- __classPrivateFieldSet(self, _Rabbitmq_connection, null, "f");
62
- if (err) {
63
- __classPrivateFieldGet(self, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
64
- setTimeout(reconnect, timeout);
65
- }
58
+ __classPrivateFieldGet(self, _Rabbitmq_logger, "f").generic.error("rabbit error", err);
66
59
  });
67
- __classPrivateFieldSet(this, _Rabbitmq_channel, yield __classPrivateFieldGet(this, _Rabbitmq_connection, "f").createChannel(), "f");
60
+ __classPrivateFieldSet(this, _Rabbitmq_channel, yield __classPrivateFieldGet(this, _Rabbitmq_connection, "f").createChannel({
61
+ setup: function (channel) {
62
+ return channel.assertQueue('testqueue', { durable: true });
63
+ },
64
+ }), "f");
68
65
  __classPrivateFieldGet(this, _Rabbitmq_logger, "f").generic.info("Connected to rabbit");
69
66
  });
70
67
  }
@@ -122,7 +119,7 @@ class Rabbitmq {
122
119
  }
123
120
  checkLiveness() {
124
121
  return __awaiter(this, void 0, void 0, function* () {
125
- return !!__classPrivateFieldGet(this, _Rabbitmq_connection, "f");
122
+ return __classPrivateFieldGet(this, _Rabbitmq_connection, "f").isConnected();
126
123
  });
127
124
  }
128
125
  createExchanges(exchanges, type = 'direct', durable = true) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/rabbitmq/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/rabbitmq/index.ts"],"names":[],"mappings":"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"}
@@ -140,7 +140,7 @@ declare class Account extends Base {
140
140
  cardBrand?: string;
141
141
  stripeSetupIntentId?: string;
142
142
  stripeCustomerId?: string;
143
- period?: 'monthly' | 'yearly' | 'yearly15';
143
+ period?: 'monthly' | 'yearly';
144
144
  freeLicenses: number;
145
145
  paidLicenses: number;
146
146
  price: number;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "starta.microservice",
3
- "version": "0.1.2862",
3
+ "version": "0.1.2872",
4
4
  "main": "./lib/index.js",
5
5
  "description": "Core library for Starta.one microservice",
6
6
  "author": "Collaboracia OÜ",
@@ -18,6 +18,7 @@
18
18
  "dependencies": {
19
19
  "@types/aws-sdk": "^2.7.0",
20
20
  "@types/multer": "^1.4.7",
21
+ "amqp-connection-manager": "^4.1.13",
21
22
  "amqplib": "^0.8.0",
22
23
  "auth-header": "^1.0.0",
23
24
  "aws-sdk": "^2.1185.0",