suanpan_node_sdk 2.0.0-beta.9 → 2.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.
Files changed (224) hide show
  1. package/README.md +662 -70
  2. package/dist/api/index.d.ts +12 -0
  3. package/dist/api/index.js +55 -0
  4. package/dist/api/index.js.map +1 -0
  5. package/dist/core/common/constant.d.ts +6 -0
  6. package/dist/{constant.js → core/common/constant.js} +7 -2
  7. package/dist/core/common/constant.js.map +1 -0
  8. package/dist/{common → core/common}/exec.d.ts +0 -0
  9. package/dist/{common → core/common}/exec.js +0 -0
  10. package/dist/core/common/exec.js.map +1 -0
  11. package/dist/core/common/log.d.ts +3 -0
  12. package/dist/core/common/log.js +16 -0
  13. package/dist/core/common/log.js.map +1 -0
  14. package/dist/core/event/index.d.ts +6 -0
  15. package/dist/core/event/index.js +11 -0
  16. package/dist/core/event/index.js.map +1 -0
  17. package/dist/core/logkit/index.d.ts +33 -0
  18. package/dist/core/logkit/index.js +126 -0
  19. package/dist/core/logkit/index.js.map +1 -0
  20. package/dist/core/message/channel.d.ts +7 -0
  21. package/dist/core/message/channel.js +3 -0
  22. package/dist/core/message/channel.js.map +1 -0
  23. package/dist/core/message/channelFactory.d.ts +4 -0
  24. package/dist/core/message/channelFactory.js +11 -0
  25. package/dist/core/message/channelFactory.js.map +1 -0
  26. package/dist/core/message/index.d.ts +6 -0
  27. package/dist/core/message/index.js +19 -0
  28. package/dist/core/message/index.js.map +1 -0
  29. package/dist/core/message/message.d.ts +19 -0
  30. package/dist/core/message/message.js +60 -0
  31. package/dist/core/message/message.js.map +1 -0
  32. package/dist/core/message/messageBuilder.d.ts +12 -0
  33. package/dist/core/message/messageBuilder.js +51 -0
  34. package/dist/core/message/messageBuilder.js.map +1 -0
  35. package/dist/core/message/messageChain.d.ts +9 -0
  36. package/dist/core/message/messageChain.js +30 -0
  37. package/dist/core/message/messageChain.js.map +1 -0
  38. package/dist/core/message/messageListener.d.ts +4 -0
  39. package/dist/core/message/messageListener.js +12 -0
  40. package/dist/core/message/messageListener.js.map +1 -0
  41. package/dist/core/message/mq/index.d.ts +9 -0
  42. package/dist/core/message/mq/index.js +51 -0
  43. package/dist/core/message/mq/index.js.map +1 -0
  44. package/dist/core/message/mq/redis.d.ts +10 -0
  45. package/dist/core/message/mq/redis.js +92 -0
  46. package/dist/core/message/mq/redis.js.map +1 -0
  47. package/dist/core/parameter/commandArgs.d.ts +2 -0
  48. package/dist/core/parameter/commandArgs.js +23 -0
  49. package/dist/core/parameter/commandArgs.js.map +1 -0
  50. package/dist/core/parameter/environment.d.ts +84 -0
  51. package/dist/core/parameter/environment.js +102 -0
  52. package/dist/core/parameter/environment.js.map +1 -0
  53. package/dist/core/parameter/index.d.ts +7 -0
  54. package/dist/core/parameter/index.js +34 -0
  55. package/dist/core/parameter/index.js.map +1 -0
  56. package/dist/{script → core/script}/script-babel/babel.d.ts +0 -0
  57. package/dist/{script → core/script}/script-babel/babel.js +0 -0
  58. package/dist/core/script/script-babel/babel.js.map +1 -0
  59. package/dist/{script → core/script}/script-babel/plugin.d.ts +0 -0
  60. package/dist/{script → core/script}/script-babel/plugin.js +0 -0
  61. package/dist/core/script/script-babel/plugin.js.map +1 -0
  62. package/dist/{script → core/script}/script-constant.d.ts +0 -0
  63. package/dist/{script → core/script}/script-constant.js +0 -0
  64. package/dist/core/script/script-constant.js.map +1 -0
  65. package/dist/{script → core/script}/script-context.d.ts +1 -1
  66. package/dist/{script → core/script}/script-context.js +1 -1
  67. package/dist/core/script/script-context.js.map +1 -0
  68. package/dist/{script → core/script}/script-front.d.ts +0 -0
  69. package/dist/{script → core/script}/script-front.js +0 -0
  70. package/dist/core/script/script-front.js.map +1 -0
  71. package/dist/{script → core/script}/script-insert.d.ts +0 -0
  72. package/dist/{script → core/script}/script-insert.js +1 -1
  73. package/dist/core/script/script-insert.js.map +1 -0
  74. package/dist/{script → core/script}/script-manager.d.ts +0 -0
  75. package/dist/{script → core/script}/script-manager.js +2 -2
  76. package/dist/core/script/script-manager.js.map +1 -0
  77. package/dist/{script → core/script}/script-storage.d.ts +1 -1
  78. package/dist/{script → core/script}/script-storage.js +2 -2
  79. package/dist/core/script/script-storage.js.map +1 -0
  80. package/dist/{script → core/script}/script-support.d.ts +0 -0
  81. package/dist/{script → core/script}/script-support.js +1 -1
  82. package/dist/core/script/script-support.js.map +1 -0
  83. package/dist/{script → core/script}/script-template.d.ts +0 -0
  84. package/dist/{script → core/script}/script-template.js +0 -0
  85. package/dist/core/script/script-template.js.map +1 -0
  86. package/dist/{port.d.ts → core/service/port.d.ts} +1 -0
  87. package/dist/{port.js → core/service/port.js} +23 -8
  88. package/dist/core/service/port.js.map +1 -0
  89. package/dist/{latestStorage → core/storage}/minio.d.ts +7 -3
  90. package/dist/{latestStorage → core/storage}/minio.js +54 -14
  91. package/dist/core/storage/minio.js.map +1 -0
  92. package/dist/{latestStorage → core/storage}/oss.d.ts +5 -1
  93. package/dist/{latestStorage → core/storage}/oss.js +54 -3
  94. package/dist/core/storage/oss.js.map +1 -0
  95. package/dist/core/storage/storage.d.ts +37 -0
  96. package/dist/{latestStorage → core/storage}/storage.js +3 -15
  97. package/dist/core/storage/storage.js.map +1 -0
  98. package/dist/core/storage/storageFlusher.d.ts +12 -0
  99. package/dist/core/storage/storageFlusher.js +53 -0
  100. package/dist/core/storage/storageFlusher.js.map +1 -0
  101. package/dist/core/storage/storageLogger.d.ts +14 -0
  102. package/dist/core/storage/storageLogger.js +100 -0
  103. package/dist/core/storage/storageLogger.js.map +1 -0
  104. package/dist/core/storage/storagePath.d.ts +16 -0
  105. package/dist/core/storage/storagePath.js +50 -0
  106. package/dist/core/storage/storagePath.js.map +1 -0
  107. package/dist/core/storage/wrapperStorage.d.ts +6 -0
  108. package/dist/{latestStorage → core/storage}/wrapperStorage.js +5 -5
  109. package/dist/core/storage/wrapperStorage.js.map +1 -0
  110. package/dist/core/utils/flusher.d.ts +18 -0
  111. package/dist/core/utils/flusher.js +63 -0
  112. package/dist/core/utils/flusher.js.map +1 -0
  113. package/dist/core/utils/index.d.ts +55 -0
  114. package/dist/core/utils/index.js +238 -0
  115. package/dist/core/utils/index.js.map +1 -0
  116. package/dist/core/utils/number.d.ts +2 -0
  117. package/dist/core/utils/number.js +20 -0
  118. package/dist/core/utils/number.js.map +1 -0
  119. package/dist/{common → core/utils}/retry.d.ts +0 -0
  120. package/dist/{common → core/utils}/retry.js +0 -0
  121. package/dist/core/utils/retry.js.map +1 -0
  122. package/dist/core/utils/support.d.ts +3 -0
  123. package/dist/core/utils/support.js +28 -0
  124. package/dist/core/utils/support.js.map +1 -0
  125. package/dist/{web → core/web}/app.d.ts +0 -0
  126. package/dist/{web → core/web}/app.js +2 -2
  127. package/dist/core/web/app.js.map +1 -0
  128. package/dist/{web → core/web}/server.d.ts +0 -0
  129. package/dist/{web → core/web}/server.js +10 -10
  130. package/dist/core/web/server.js.map +1 -0
  131. package/dist/main.d.ts +5 -88
  132. package/dist/main.js +9 -37
  133. package/dist/main.js.map +1 -1
  134. package/dist/types/conmonTypes.d.ts +21 -0
  135. package/dist/types/conmonTypes.js +17 -0
  136. package/dist/types/conmonTypes.js.map +1 -0
  137. package/dist/types/index.d.ts +3 -0
  138. package/dist/types/index.js +16 -0
  139. package/dist/types/index.js.map +1 -0
  140. package/dist/types/{storage-types.d.ts → storageTypes.d.ts} +23 -9
  141. package/dist/types/{storage-types.js → storageTypes.js} +1 -1
  142. package/dist/types/storageTypes.js.map +1 -0
  143. package/dist/types/streamTypes.d.ts +21 -0
  144. package/dist/types/streamTypes.js +3 -0
  145. package/dist/types/streamTypes.js.map +1 -0
  146. package/package.json +3 -1
  147. package/dist/arguments.d.ts +0 -72
  148. package/dist/arguments.js +0 -69
  149. package/dist/arguments.js.map +0 -1
  150. package/dist/commandArgs.d.ts +0 -10
  151. package/dist/commandArgs.js +0 -18
  152. package/dist/commandArgs.js.map +0 -1
  153. package/dist/common/exec.js.map +0 -1
  154. package/dist/common/file.d.ts +0 -1
  155. package/dist/common/file.js +0 -18
  156. package/dist/common/file.js.map +0 -1
  157. package/dist/common/log.d.ts +0 -3
  158. package/dist/common/log.js +0 -11
  159. package/dist/common/log.js.map +0 -1
  160. package/dist/common/retry.js.map +0 -1
  161. package/dist/common/streamUtility.d.ts +0 -7
  162. package/dist/common/streamUtility.js +0 -42
  163. package/dist/common/streamUtility.js.map +0 -1
  164. package/dist/common/util.d.ts +0 -45
  165. package/dist/common/util.js +0 -175
  166. package/dist/common/util.js.map +0 -1
  167. package/dist/constant.d.ts +0 -1
  168. package/dist/constant.js.map +0 -1
  169. package/dist/dyParameter.d.ts +0 -5
  170. package/dist/dyParameter.js +0 -34
  171. package/dist/dyParameter.js.map +0 -1
  172. package/dist/eventLogger.d.ts +0 -29
  173. package/dist/eventLogger.js +0 -123
  174. package/dist/eventLogger.js.map +0 -1
  175. package/dist/global.d.ts +0 -9
  176. package/dist/global.js +0 -39
  177. package/dist/global.js.map +0 -1
  178. package/dist/latestStorage/minio.js.map +0 -1
  179. package/dist/latestStorage/oss.js.map +0 -1
  180. package/dist/latestStorage/path.d.ts +0 -9
  181. package/dist/latestStorage/path.js +0 -30
  182. package/dist/latestStorage/path.js.map +0 -1
  183. package/dist/latestStorage/storage.d.ts +0 -27
  184. package/dist/latestStorage/storage.js.map +0 -1
  185. package/dist/latestStorage/wrapperStorage.d.ts +0 -7
  186. package/dist/latestStorage/wrapperStorage.js.map +0 -1
  187. package/dist/mq.d.ts +0 -55
  188. package/dist/mq.js +0 -158
  189. package/dist/mq.js.map +0 -1
  190. package/dist/parameter.d.ts +0 -14
  191. package/dist/parameter.js +0 -94
  192. package/dist/parameter.js.map +0 -1
  193. package/dist/port.js.map +0 -1
  194. package/dist/previousStorage/local.d.ts +0 -12
  195. package/dist/previousStorage/local.js +0 -90
  196. package/dist/previousStorage/local.js.map +0 -1
  197. package/dist/previousStorage/minio.d.ts +0 -10
  198. package/dist/previousStorage/minio.js +0 -201
  199. package/dist/previousStorage/minio.js.map +0 -1
  200. package/dist/previousStorage/oss.d.ts +0 -27
  201. package/dist/previousStorage/oss.js +0 -153
  202. package/dist/previousStorage/oss.js.map +0 -1
  203. package/dist/previousStorage/storage.d.ts +0 -21
  204. package/dist/previousStorage/storage.js +0 -21
  205. package/dist/previousStorage/storage.js.map +0 -1
  206. package/dist/script/script-babel/babel.js.map +0 -1
  207. package/dist/script/script-babel/plugin.js.map +0 -1
  208. package/dist/script/script-constant.js.map +0 -1
  209. package/dist/script/script-context.js.map +0 -1
  210. package/dist/script/script-front.js.map +0 -1
  211. package/dist/script/script-insert.js.map +0 -1
  212. package/dist/script/script-manager.js.map +0 -1
  213. package/dist/script/script-storage.js.map +0 -1
  214. package/dist/script/script-support.js.map +0 -1
  215. package/dist/script/script-template.js.map +0 -1
  216. package/dist/socketSever.d.ts +0 -1
  217. package/dist/socketSever.js +0 -47
  218. package/dist/socketSever.js.map +0 -1
  219. package/dist/staticServer.d.ts +0 -5
  220. package/dist/staticServer.js +0 -30
  221. package/dist/staticServer.js.map +0 -1
  222. package/dist/types/storage-types.js.map +0 -1
  223. package/dist/web/app.js.map +0 -1
  224. package/dist/web/server.js.map +0 -1
@@ -13,7 +13,7 @@ const got = require('got');
13
13
  const OSS = require('ali-oss');
14
14
  const Minio = require('minio');
15
15
  const crypto = require('crypto');
16
- const { getConfig, jsonParse, readableToString } = require('../common/util');
16
+ const { getConfig, tryJSONParse, readableToString } = require('../utils');
17
17
  let ossClient;
18
18
  let stsToken;
19
19
  const minioBucketName = 'suanpan';
@@ -209,7 +209,7 @@ function downloadToLocal(objectName, localPath) {
209
209
  function getJson(objectName) {
210
210
  return __awaiter(this, void 0, void 0, function* () {
211
211
  const str = yield getString(objectName);
212
- return jsonParse(str);
212
+ return tryJSONParse(str, str);
213
213
  });
214
214
  }
215
215
  /**
@@ -0,0 +1 @@
1
+ {"version":3,"file":"script-storage.js","sourceRoot":"","sources":["../../../src/core/script/script-storage.js"],"names":[],"mappings":"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"}
File without changes
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  const _ = require('lodash');
12
12
  const uuidGen = require('uuid/v1');
13
13
  const { POST_OUT, PORT_IN_REG, PORT_OUT_REG, SEND_MSG_TYPE } = require('./script-constant');
14
- const { stringifyIfNecessary } = require('../common/util');
14
+ const { stringifyIfNecessary } = require('../utils');
15
15
  function validate(when, targetNodeId, targetPortId) {
16
16
  if (!_.isString(targetNodeId) || !_.isString(targetPortId)) {
17
17
  throw new Error('targetNodeId or targetPortId must be string.');
@@ -0,0 +1 @@
1
+ {"version":3,"file":"script-support.js","sourceRoot":"","sources":["../../../src/core/script/script-support.js"],"names":[],"mappings":"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"}
File without changes
@@ -0,0 +1 @@
1
+ {"version":3,"file":"script-template.js","sourceRoot":"","sources":["../../../src/core/script/script-template.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAE3G,SAAS,gBAAgB,CAAE,MAAM;IAC/B,OAAO;;;;;;;;;;;;;MAaH,YAAY;MACZ,QAAQ;MACR,uBAAuB;;;;;QAKrB,QAAQ,eAAe,QAAQ;;aAE1B,QAAQ;;;qBAGA,QAAQ;;;;;;;;;;;;;;;QAerB,uBAAuB;IAC3B,uBAAuB;;;;;IAKvB,YAAY;;;;;;;IAOZ,QAAQ,6CAA6C,MAAM;;;;;;;IAO3D,QAAQ,6CAA6C,QAAQ;;;mBAG9C,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC"}
@@ -4,4 +4,5 @@ export declare class PortService {
4
4
  private static httpRequest;
5
5
  static getHostFreePort(): Promise<number>;
6
6
  static registerPort(logicalPort: number, realPort: number): Promise<void>;
7
+ static registerPortUntilSuccess(logicPort: number): Promise<number>;
7
8
  }
@@ -13,19 +13,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.PortService = void 0;
16
- const g = require("./global");
17
- const log_1 = __importDefault(require("./common/log"));
16
+ const log_1 = __importDefault(require("../common/log"));
18
17
  const get_port_1 = __importDefault(require("get-port"));
18
+ const environment_1 = require("../parameter/environment");
19
+ const utils_1 = require("../utils");
19
20
  const axios_1 = __importDefault(require("axios"));
20
- const args = require("./arguments");
21
- const retry_1 = require("./common/retry");
21
+ const support_1 = require("../utils/support");
22
22
  const lookupFrom = parseInt(process.env.SP_PORT_START || '50000');
23
23
  const lookupTo = parseInt(process.env.SP_PORT_END || '60000');
24
24
  class PortService {
25
25
  static httpRequest(options) {
26
26
  return __awaiter(this, void 0, void 0, function* () {
27
27
  let res;
28
- yield retry_1.promiseRetry((retry, times) => __awaiter(this, void 0, void 0, function* () {
28
+ yield utils_1.promiseRetry((retry, times) => __awaiter(this, void 0, void 0, function* () {
29
29
  try {
30
30
  res = yield axios_1.default.request(options);
31
31
  }
@@ -50,7 +50,7 @@ class PortService {
50
50
  }
51
51
  static registerPort(logicalPort, realPort) {
52
52
  return __awaiter(this, void 0, void 0, function* () {
53
- const { userId, appId, nodeId } = args.stream;
53
+ const { userId, appId, nodeId } = environment_1.Environment.stream;
54
54
  const requestConfig = {
55
55
  url: `${this.suanpanUrl}/app/service/register`,
56
56
  method: 'POST',
@@ -58,7 +58,7 @@ class PortService {
58
58
  userId, appId, nodeId,
59
59
  nodePort: logicalPort, port: realPort
60
60
  },
61
- headers: g.header
61
+ headers: support_1.buildUserIdHeaderField()
62
62
  };
63
63
  const registerPortResponse = yield this.httpRequest(requestConfig);
64
64
  if (!registerPortResponse.success) {
@@ -66,8 +66,23 @@ class PortService {
66
66
  }
67
67
  });
68
68
  }
69
+ static registerPortUntilSuccess(logicPort) {
70
+ return __awaiter(this, void 0, void 0, function* () {
71
+ for (;;) {
72
+ try {
73
+ const availableHostPort = yield PortService.getHostFreePort();
74
+ yield PortService.registerPort(logicPort, availableHostPort);
75
+ return availableHostPort;
76
+ }
77
+ catch (e) {
78
+ log_1.default.error(e.message);
79
+ }
80
+ yield utils_1.sleep(200);
81
+ }
82
+ });
83
+ }
69
84
  }
70
85
  exports.PortService = PortService;
71
- PortService.suanpanUrl = g.affinity;
86
+ PortService.suanpanUrl = support_1.buildSpAffinityUrl();
72
87
  PortService.loopupRange = get_port_1.default.makeRange(lookupFrom, lookupTo);
73
88
  //# sourceMappingURL=port.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/core/service/port.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAAmC;AACnC,wDAAqC;AAErC,0DAAuD;AACvD,oCAA+C;AAC/C,kDAAiE;AACjE,8CAA8E;AAO9E,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC,CAAC;AAClE,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,CAAC;AAC9D,MAAa,WAAW;IAKd,MAAM,CAAO,WAAW,CAAI,OAA2B;;YAC7D,IAAI,GAAsB,CAAC;YAC3B,MAAM,oBAAY,CAAC,CAAO,KAAK,EAAE,KAAa,EAAE,EAAE;gBAChD,IAAI;oBACF,GAAG,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;iBACpC;gBAAC,OAAO,EAAE,EAAE;oBACX,aAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;oBACjD,aAAM,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC;oBACpC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACX;YACH,CAAC,CAAA,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,IAAI,CAAC;QAClB,CAAC;KAAA;IAED,MAAM,CAAO,eAAe;;YAC1B,IAAI;gBACF,OAAO,MAAM,kBAAa,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACxD;YAAC,OAAO,EAAO,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;aACjE;QACH,CAAC;KAAA;IAED,MAAM,CAAO,YAAY,CAAC,WAAmB,EAAE,QAAgB;;YAC7D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,yBAAW,CAAC,MAAM,CAAC;YAErD,MAAM,aAAa,GAAuB;gBACxC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,uBAAuB;gBAC9C,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE;oBACJ,MAAM,EAAE,KAAK,EAAE,MAAM;oBACrB,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ;iBACtC;gBACD,OAAO,EAAE,gCAAsB,EAAE;aAClC,CAAC;YAEF,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAuB,aAAa,CAAC,CAAC;YAEzF,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;aAC3C;QACH,CAAC;KAAA;IAED,MAAM,CAAO,wBAAwB,CAAC,SAAiB;;YACrD,SAAS;gBACP,IAAI;oBACF,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;oBAC9D,MAAM,WAAW,CAAC,YAAY,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;oBAC7D,OAAO,iBAAiB,CAAC;iBAC1B;gBAAC,OAAO,CAAM,EAAE;oBACf,aAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,MAAM,aAAK,CAAC,GAAG,CAAC,CAAC;aAClB;QACH,CAAC;KAAA;;AA1DH,kCAoFC;AAlFyB,sBAAU,GAAW,4BAAkB,EAAE,CAAC;AAC1C,uBAAW,GAAG,kBAAa,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC"}
@@ -1,18 +1,22 @@
1
1
  /// <reference types="node" />
2
2
  import * as Minio from 'minio';
3
+ import type { ObjectItem } from '../../types';
4
+ import type { Readable as ReadableStream } from 'stream';
3
5
  import { AbstractStorage } from './storage';
4
- import type { ObjectItem } from '../types/storage-types';
5
6
  export declare class MinioStorage extends AbstractStorage {
6
- private bucketName;
7
+ private _bucketName;
7
8
  protected buildClient(): Promise<Minio.Client>;
8
9
  updateBucketName(bucketName: string): void;
10
+ append(objectName: string, content: string): Promise<any>;
9
11
  getObjectToBuffer(objectName: string): Promise<Buffer>;
10
- getObjectToStream(objectName: string): Promise<import("stream").Readable>;
12
+ getObjectToStream(objectName: string): Promise<ReadableStream>;
11
13
  getObjectToString(objectName: string): Promise<string>;
14
+ getObjectToJSON(objectName: string): Promise<any>;
12
15
  putObject(objectName: string, data: ReadableStream | Buffer | string): Promise<void>;
13
16
  fPutObject(objectName: string, filePath: string): Promise<void>;
14
17
  fGetObject(objectName: string, filePath: string): Promise<void>;
15
18
  listObjects(prefix: string, recursive?: boolean): Promise<ObjectItem[]>;
16
19
  deleteObject(objectName: string): Promise<void>;
17
20
  deleteMultiObjects(objectNames: string[]): Promise<void>;
21
+ checkObjectNameExist(objectName: string): Promise<boolean>;
18
22
  }
@@ -27,18 +27,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
27
27
  step((generator = generator.apply(thisArg, _arguments || [])).next());
28
28
  });
29
29
  };
30
+ var __importDefault = (this && this.__importDefault) || function (mod) {
31
+ return (mod && mod.__esModule) ? mod : { "default": mod };
32
+ };
30
33
  Object.defineProperty(exports, "__esModule", { value: true });
31
34
  exports.MinioStorage = void 0;
35
+ const lodash_1 = __importDefault(require("lodash"));
32
36
  const Minio = __importStar(require("minio"));
37
+ const log_1 = __importDefault(require("../common/log"));
38
+ const environment_1 = require("../parameter/environment");
33
39
  const storage_1 = require("./storage");
34
- const streamUtility_1 = require("../common/streamUtility");
35
- const spArguments = require("../arguments");
36
- const { bucketName: defaultBucketName, endpoint } = spArguments.minio;
40
+ const utils_1 = require("../utils");
41
+ const { bucketName: defaultBucketName, endpoint } = environment_1.Environment.minio;
37
42
  const { hostname: HOST_NAME, port: PORT, protocol: PROTOCOL } = new URL(endpoint);
38
43
  class MinioStorage extends storage_1.AbstractStorage {
39
44
  constructor() {
40
45
  super(...arguments);
41
- this.bucketName = defaultBucketName;
46
+ this._bucketName = defaultBucketName;
42
47
  }
43
48
  buildClient() {
44
49
  var _a, _b;
@@ -55,42 +60,61 @@ class MinioStorage extends storage_1.AbstractStorage {
55
60
  });
56
61
  }
57
62
  updateBucketName(bucketName) {
58
- this.bucketName = bucketName;
63
+ this._bucketName = bucketName;
64
+ }
65
+ append(objectName, content) {
66
+ return __awaiter(this, void 0, void 0, function* () {
67
+ let originalContent = '';
68
+ try {
69
+ originalContent = yield this.getObjectToString(objectName);
70
+ }
71
+ catch (e) {
72
+ log_1.default.warn(`❗️Storage AppendWarning ==> ${e.code}: ${e.message} objectName: ${objectName}`);
73
+ }
74
+ const data = `${originalContent}${content}`;
75
+ yield this.putObject(objectName, data);
76
+ });
59
77
  }
60
78
  getObjectToBuffer(objectName) {
61
79
  return __awaiter(this, void 0, void 0, function* () {
62
80
  const stream = yield this.getObjectToStream(objectName);
63
- return streamUtility_1.convertStreamToBuffer(stream);
81
+ return utils_1.convertStreamToBuffer(stream);
64
82
  });
65
83
  }
66
84
  getObjectToStream(objectName) {
67
85
  return __awaiter(this, void 0, void 0, function* () {
68
86
  const minioClient = yield this.getClient();
69
- return yield minioClient.getObject(this.bucketName, objectName);
87
+ return yield minioClient.getObject(this._bucketName, objectName);
70
88
  });
71
89
  }
72
90
  getObjectToString(objectName) {
73
91
  return __awaiter(this, void 0, void 0, function* () {
74
92
  const stream = yield this.getObjectToStream(objectName);
75
- return yield streamUtility_1.convertStreamToString(stream);
93
+ return yield utils_1.convertStreamToString(stream);
94
+ });
95
+ }
96
+ getObjectToJSON(objectName) {
97
+ return __awaiter(this, void 0, void 0, function* () {
98
+ const str = yield this.getObjectToString(objectName);
99
+ return utils_1.tryJSONParse(str, str);
76
100
  });
77
101
  }
78
102
  putObject(objectName, data) {
79
103
  return __awaiter(this, void 0, void 0, function* () {
80
104
  const minioClient = yield this.getClient();
81
- yield minioClient.putObject(this.bucketName, objectName, data);
105
+ yield minioClient.putObject(this._bucketName, objectName, data);
82
106
  });
83
107
  }
84
108
  fPutObject(objectName, filePath) {
85
109
  return __awaiter(this, void 0, void 0, function* () {
86
110
  const minioClient = yield this.getClient();
87
- yield minioClient.fPutObject(this.bucketName, objectName, filePath, {});
111
+ yield minioClient.fPutObject(this._bucketName, objectName, filePath, {});
88
112
  });
89
113
  }
90
114
  fGetObject(objectName, filePath) {
91
115
  return __awaiter(this, void 0, void 0, function* () {
92
116
  const minioClient = yield this.getClient();
93
- yield minioClient.fGetObject(this.bucketName, objectName, filePath);
117
+ yield minioClient.fGetObject(this._bucketName, objectName, filePath);
94
118
  });
95
119
  }
96
120
  listObjects(prefix, recursive = true) {
@@ -98,7 +122,7 @@ class MinioStorage extends storage_1.AbstractStorage {
98
122
  const mnClient = yield this.getClient();
99
123
  return new Promise((resolve, reject) => {
100
124
  const objectList = [];
101
- const stream = mnClient.listObjectsV2(this.bucketName, prefix, recursive);
125
+ const stream = mnClient.listObjectsV2(this._bucketName, prefix, recursive);
102
126
  stream.on('data', (bucketItem) => { objectList.push(bucketItem); });
103
127
  stream.on('error', reject);
104
128
  stream.on('end', (err) => {
@@ -121,13 +145,29 @@ class MinioStorage extends storage_1.AbstractStorage {
121
145
  deleteObject(objectName) {
122
146
  return __awaiter(this, void 0, void 0, function* () {
123
147
  const minioClient = yield this.getClient();
124
- yield minioClient.removeObject(this.bucketName, objectName);
148
+ yield minioClient.removeObject(this._bucketName, objectName);
125
149
  });
126
150
  }
127
151
  deleteMultiObjects(objectNames) {
128
152
  return __awaiter(this, void 0, void 0, function* () {
129
153
  const minioClient = yield this.getClient();
130
- yield minioClient.removeObjects(this.bucketName, objectNames);
154
+ yield minioClient.removeObjects(this._bucketName, objectNames);
155
+ });
156
+ }
157
+ checkObjectNameExist(objectName) {
158
+ return __awaiter(this, void 0, void 0, function* () {
159
+ const minioClient = yield this.getClient();
160
+ let bucketExist = false;
161
+ try {
162
+ yield minioClient.getObject(this._bucketName, objectName);
163
+ bucketExist = true;
164
+ }
165
+ catch (ex) {
166
+ if (ex.code && !lodash_1.default.includes(['NoSuchKey', 'NotFound'], ex.code)) {
167
+ throw ex;
168
+ }
169
+ }
170
+ return bucketExist;
131
171
  });
132
172
  }
133
173
  }
@@ -0,0 +1 @@
1
+ {"version":3,"file":"minio.js","sourceRoot":"","sources":["../../../src/core/storage/minio.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,20 @@
1
1
  /// <reference types="node" />
2
2
  import OSS from 'ali-oss';
3
3
  import { AbstractStorage } from './storage';
4
- import type { ObjectItem } from '../types/storage-types';
4
+ import type { ObjectItem } from '../../types';
5
+ import type { Readable as ReadableStream } from 'stream';
5
6
  export declare class OSSStorage extends AbstractStorage {
6
7
  protected buildClient(): Promise<OSS>;
8
+ append(objectName: string, content: string): Promise<any>;
7
9
  getObjectToBuffer(objectName: string): Promise<Buffer>;
8
10
  getObjectToStream(objectName: string): Promise<any>;
9
11
  getObjectToString(objectName: string): Promise<string>;
12
+ getObjectToJSON(objectName: string): Promise<any>;
10
13
  putObject(objectName: string, data: String | Buffer | ReadableStream): Promise<void>;
11
14
  fPutObject(objectName: string, filePath: string): Promise<void>;
12
15
  fGetObject(objectName: string, filePath: string): Promise<void>;
13
16
  listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
14
17
  deleteObject(objectName: string): Promise<void>;
15
18
  deleteMultiObjects(objectNames: string[]): Promise<void>;
19
+ checkObjectNameExist(objectName: string): Promise<boolean>;
16
20
  }
@@ -1,4 +1,23 @@
1
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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
2
21
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
22
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
23
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -13,9 +32,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
32
  };
14
33
  Object.defineProperty(exports, "__esModule", { value: true });
15
34
  exports.OSSStorage = void 0;
35
+ const lodash_1 = __importDefault(require("lodash"));
16
36
  const ali_oss_1 = __importDefault(require("ali-oss"));
37
+ const util = __importStar(require("../utils"));
38
+ const utils_1 = require("../utils");
17
39
  const storage_1 = require("./storage");
18
- const streamUtility_1 = require("../common/streamUtility");
19
40
  class OSSStorage extends storage_1.AbstractStorage {
20
41
  buildClient() {
21
42
  var _a, _b;
@@ -30,6 +51,12 @@ class OSSStorage extends storage_1.AbstractStorage {
30
51
  });
31
52
  });
32
53
  }
54
+ append(objectName, content) {
55
+ return __awaiter(this, void 0, void 0, function* () {
56
+ const ossClient = yield this.getClient();
57
+ yield ossClient.append(objectName, Buffer.from(content));
58
+ });
59
+ }
33
60
  getObjectToBuffer(objectName) {
34
61
  return __awaiter(this, void 0, void 0, function* () {
35
62
  const ossClient = yield this.getClient();
@@ -47,17 +74,26 @@ class OSSStorage extends storage_1.AbstractStorage {
47
74
  getObjectToString(objectName) {
48
75
  return __awaiter(this, void 0, void 0, function* () {
49
76
  const stream = yield this.getObjectToStream(objectName);
50
- return yield streamUtility_1.convertStreamToString(stream);
77
+ return yield util.convertStreamToString(stream);
78
+ });
79
+ }
80
+ getObjectToJSON(objectName) {
81
+ return __awaiter(this, void 0, void 0, function* () {
82
+ const str = yield this.getObjectToString(objectName);
83
+ return utils_1.tryJSONParse(str, str);
51
84
  });
52
85
  }
53
86
  putObject(objectName, data) {
54
87
  return __awaiter(this, void 0, void 0, function* () {
55
88
  const ossClient = yield this.getClient();
56
- yield ossClient.put(objectName, data);
89
+ yield ossClient.put(objectName, lodash_1.default.isString(data) ? Buffer.from(data) : data);
57
90
  });
58
91
  }
59
92
  fPutObject(objectName, filePath) {
60
93
  return __awaiter(this, void 0, void 0, function* () {
94
+ if (util.fileExists(filePath)) {
95
+ throw new Error(`Local file path(${filePath}) is not exist.`);
96
+ }
61
97
  const ossClient = yield this.getClient();
62
98
  yield ossClient.put(objectName, filePath);
63
99
  });
@@ -100,6 +136,21 @@ class OSSStorage extends storage_1.AbstractStorage {
100
136
  })));
101
137
  });
102
138
  }
139
+ checkObjectNameExist(objectName) {
140
+ return __awaiter(this, void 0, void 0, function* () {
141
+ const ossClient = yield this.getClient();
142
+ try {
143
+ yield ossClient.head(objectName);
144
+ return true;
145
+ }
146
+ catch (e) {
147
+ if ((e === null || e === void 0 ? void 0 : e.name) === 'NoSuchKeyError') {
148
+ return false;
149
+ }
150
+ throw e;
151
+ }
152
+ });
153
+ }
103
154
  }
104
155
  exports.OSSStorage = OSSStorage;
105
156
  //# sourceMappingURL=oss.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"oss.js","sourceRoot":"","sources":["../../../src/core/storage/oss.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,37 @@
1
+ /// <reference types="node" />
2
+ import type { Stream } from 'stream';
3
+ import type { StsToken, ObjectItem } from '../../types';
4
+ export interface ObjectStorage {
5
+ append(objectName: string, content: String): Promise<any>;
6
+ getObjectToBuffer(objectName: string): Promise<Buffer>;
7
+ getObjectToStream(objectName: string): Promise<Stream | null>;
8
+ getObjectToString(objectName: string): Promise<string>;
9
+ getObjectToJSON(objectName: string): Promise<unknown>;
10
+ fGetObject(objectName: string, filePath: string): Promise<any>;
11
+ fPutObject(objectName: string, filePath: string): Promise<void>;
12
+ putObject(objectName: string, data: any): Promise<void>;
13
+ listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
14
+ deleteObject(objectName: string): Promise<void>;
15
+ deleteMultiObjects(objectNames: string[]): Promise<void>;
16
+ checkObjectNameExist(objectName: string): Promise<boolean>;
17
+ }
18
+ export declare abstract class AbstractStorage implements ObjectStorage {
19
+ private client;
20
+ private lastToken;
21
+ protected isTokenExpiration(tokenExpiration: string): boolean;
22
+ protected getClient(): Promise<unknown>;
23
+ protected getStsToken(): Promise<StsToken>;
24
+ protected abstract buildClient(): Promise<any>;
25
+ abstract append(objectName: string, content: String): Promise<any>;
26
+ abstract getObjectToBuffer(objectName: string): Promise<Buffer>;
27
+ abstract getObjectToStream(objectName: string): Promise<Stream | null>;
28
+ abstract getObjectToString(objectName: string): Promise<string>;
29
+ abstract getObjectToJSON(objectName: string): Promise<unknown>;
30
+ abstract fGetObject(objectName: string, filePath: string): Promise<void>;
31
+ abstract fPutObject(objectName: string, filePath: string): Promise<void>;
32
+ abstract putObject(objectName: string, data: any): Promise<void>;
33
+ abstract listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
34
+ abstract deleteObject(objectName: string): Promise<void>;
35
+ abstract deleteMultiObjects(objectNames: string[]): Promise<void>;
36
+ abstract checkObjectNameExist(objectName: string): Promise<boolean>;
37
+ }
@@ -15,20 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.AbstractStorage = void 0;
16
16
  const got_1 = __importDefault(require("got"));
17
17
  const moment_1 = __importDefault(require("moment"));
18
- const path_1 = require("./path");
19
- const g = require("../global");
20
- const spWebHost = g.affinity;
21
- const requestHeader = g.header;
18
+ const support_1 = require("../utils/support");
22
19
  class AbstractStorage {
23
- constructor() {
24
- this.userPath = path_1.StoragePath.UserPath;
25
- this.appPath = path_1.StoragePath.AppPath;
26
- this.nodePath = path_1.StoragePath.NodePath;
27
- this.logPath = path_1.StoragePath.LogPath;
28
- this.appLogPath = path_1.StoragePath.AppLogPath;
29
- this.nodeLogPath = path_1.StoragePath.NodeLogPath;
30
- this.appTempDir = path_1.StoragePath.AppTempDir;
31
- }
32
20
  isTokenExpiration(tokenExpiration) {
33
21
  return moment_1.default(moment_1.default.now()).isAfter(moment_1.default(tokenExpiration));
34
22
  }
@@ -45,8 +33,8 @@ class AbstractStorage {
45
33
  getStsToken() {
46
34
  return __awaiter(this, void 0, void 0, function* () {
47
35
  const gotOptions = {
48
- prefixUrl: spWebHost,
49
- headers: requestHeader
36
+ prefixUrl: support_1.buildSpAffinityUrl(),
37
+ headers: support_1.buildUserIdHeaderField()
50
38
  };
51
39
  const response = yield got_1.default('oss/token', gotOptions);
52
40
  const stsToken = JSON.parse(response.body);
@@ -0,0 +1 @@
1
+ {"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/core/storage/storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,oDAA4B;AAG5B,8CAA8E;AAqB9E,MAAsB,eAAe;IAKzB,iBAAiB,CAAE,eAAuB;QAClD,OAAO,gBAAM,CAAC,gBAAM,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAM,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/D,CAAC;IAEe,SAAS;;;YAEvB,MAAM,eAAe,GAAG,MAAA,MAAC,IAAI,CAAC,SAAsB,0CAAE,WAAW,0CAAE,UAAU,CAAC;YAE9E,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE;gBAC/E,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;aACxC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC;;KACpB;IAEe,WAAW;;YACzB,MAAM,UAAU,GAAG;gBACjB,SAAS,EAAE,4BAAkB,EAAE;gBAC/B,OAAO,EAAE,gCAAsB,EAAE;aAClC,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,aAAG,CAAC,WAAW,EAAE,UAAiB,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC1B,OAAO,QAAoB,CAAC;QAC9B,CAAC;KAAA;CAqBF;AAjDD,0CAiDC"}
@@ -0,0 +1,12 @@
1
+ import { FlushOptions } from '../utils/flusher';
2
+ export declare type StorageFlushOptions = {
3
+ storageFilePath: string;
4
+ } & FlushOptions;
5
+ export declare class StorageLogFlusher {
6
+ private options;
7
+ private bFlusher;
8
+ constructor(options: StorageFlushOptions);
9
+ onFlush: (logItems: string[]) => Promise<void>;
10
+ add(content: string): void;
11
+ flush(): void;
12
+ }
@@ -0,0 +1,53 @@
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
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.StorageLogFlusher = void 0;
16
+ const lodash_1 = __importDefault(require("lodash"));
17
+ const log_1 = __importDefault(require("../common/log"));
18
+ const wrapperStorage_1 = require("./wrapperStorage");
19
+ const flusher_1 = require("../utils/flusher");
20
+ class StorageLogFlusher {
21
+ constructor(options) {
22
+ this.options = options;
23
+ this.onFlush = (logItems) => __awaiter(this, void 0, void 0, function* () {
24
+ if (lodash_1.default.isEmpty(logItems)) {
25
+ return;
26
+ }
27
+ log_1.default.info(`⬇ StorageLogFlusher ==> append ${logItems} to ${this.options.storageFilePath}`);
28
+ try {
29
+ const joinWithLineBreak = logItems.reduce((acc, cur) => {
30
+ acc += `${cur}\r\n`;
31
+ return acc;
32
+ }, '');
33
+ yield wrapperStorage_1.Storage.Instance.append(this.options.storageFilePath, joinWithLineBreak);
34
+ }
35
+ catch (e) {
36
+ log_1.default.warn(`write log to storage failed ${e}`);
37
+ }
38
+ });
39
+ this.bFlusher = new flusher_1.BufferFlusher({
40
+ maxItems: options.maxItems,
41
+ flushInterval: options.flushInterval
42
+ });
43
+ this.bFlusher.on('flush', this.onFlush);
44
+ }
45
+ add(content) {
46
+ this.bFlusher.add(content);
47
+ }
48
+ flush() {
49
+ this.bFlusher.flush();
50
+ }
51
+ }
52
+ exports.StorageLogFlusher = StorageLogFlusher;
53
+ //# sourceMappingURL=storageFlusher.js.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,14 @@
1
+ import { StorageLoggerOptions } from '../../types';
2
+ export declare class ObjectStorageLogger {
3
+ private options;
4
+ private _logger;
5
+ private _minLevel;
6
+ private _flusher;
7
+ constructor(options: StorageLoggerOptions);
8
+ private _validate;
9
+ private log;
10
+ info: (message: string, flush?: boolean) => void;
11
+ debug: (message: string, flush?: boolean) => void;
12
+ warn: (message: string, flush?: boolean) => void;
13
+ error: (message: string, flush?: boolean) => void;
14
+ }