@requestnetwork/request-client.js 0.43.1-next.1991 → 0.43.1-next.1992
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -2
- package/dist/http-data-access.d.ts +11 -8
- package/dist/http-data-access.d.ts.map +1 -1
- package/dist/http-data-access.js +49 -22
- package/dist/http-data-access.js.map +1 -1
- package/dist/http-metamask-data-access.d.ts +3 -4
- package/dist/http-metamask-data-access.d.ts.map +1 -1
- package/dist/http-metamask-data-access.js +8 -12
- package/dist/http-metamask-data-access.js.map +1 -1
- package/dist/http-request-network.d.ts +3 -3
- package/dist/http-request-network.d.ts.map +1 -1
- package/dist/http-request-network.js +1 -2
- package/dist/http-request-network.js.map +1 -1
- package/dist/report.html +2 -2
- package/dist/requestnetwork.min.js +3 -3
- package/dist/requestnetwork.min.js.map +1 -1
- package/package.json +15 -16
package/README.md
CHANGED
|
@@ -56,8 +56,6 @@ const requestNetwork = new RequestNetwork({
|
|
|
56
56
|
});
|
|
57
57
|
```
|
|
58
58
|
|
|
59
|
-
It can be further configured with option from [Axios](https://github.com/axios/axios#request-config).
|
|
60
|
-
|
|
61
59
|
By default, it uses a local node, on http://localhost:3000.
|
|
62
60
|
|
|
63
61
|
### Use in development, without a node
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { ClientTypes, DataAccessTypes } from '@requestnetwork/types';
|
|
2
|
-
|
|
2
|
+
export type NodeConnectionConfig = {
|
|
3
|
+
baseURL: string;
|
|
4
|
+
headers: Record<string, string>;
|
|
5
|
+
};
|
|
3
6
|
/**
|
|
4
7
|
* Exposes a Data-Access module over HTTP
|
|
5
8
|
*/
|
|
@@ -10,18 +13,17 @@ export default class HttpDataAccess implements DataAccessTypes.IDataAccess {
|
|
|
10
13
|
*/
|
|
11
14
|
protected httpConfig: ClientTypes.IHttpDataAccessConfig;
|
|
12
15
|
/**
|
|
13
|
-
* Configuration that will be sent
|
|
14
|
-
* We can also create a AxiosInstance with axios.create() but it dramatically complicates testing.
|
|
16
|
+
* Configuration that will be sent at each request.
|
|
15
17
|
*/
|
|
16
|
-
protected
|
|
18
|
+
protected nodeConnectionConfig: NodeConnectionConfig;
|
|
17
19
|
/**
|
|
18
20
|
* Creates an instance of HttpDataAccess.
|
|
19
21
|
* @param httpConfig @see ClientTypes.IHttpDataAccessConfig for available options.
|
|
20
|
-
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
22
|
+
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
21
23
|
*/
|
|
22
24
|
constructor({ httpConfig, nodeConnectionConfig, }?: {
|
|
23
25
|
httpConfig?: Partial<ClientTypes.IHttpDataAccessConfig>;
|
|
24
|
-
nodeConnectionConfig?:
|
|
26
|
+
nodeConnectionConfig?: Partial<NodeConnectionConfig>;
|
|
25
27
|
});
|
|
26
28
|
/**
|
|
27
29
|
* Initialize the module. Does nothing, exists only to implement IDataAccess
|
|
@@ -76,11 +78,12 @@ export default class HttpDataAccess implements DataAccessTypes.IDataAccess {
|
|
|
76
78
|
* @param params HTTP GET request parameters
|
|
77
79
|
* @param retryConfig Maximum retry count, delay between retries, exponential backoff delay, and maximum exponential backoff delay
|
|
78
80
|
*/
|
|
79
|
-
protected fetchAndRetry(
|
|
81
|
+
protected fetchAndRetry<T = unknown>(path: string, params: Record<string, unknown>, retryConfig?: {
|
|
80
82
|
maxRetries?: number;
|
|
81
83
|
retryDelay?: number;
|
|
82
84
|
exponentialBackoffDelay?: number;
|
|
83
85
|
maxExponentialBackoffDelay?: number;
|
|
84
|
-
}): Promise<
|
|
86
|
+
}): Promise<T>;
|
|
87
|
+
protected fetch<T = unknown>(method: 'GET' | 'POST', path: string, params: Record<string, unknown> | undefined, body?: Record<string, unknown>): Promise<T>;
|
|
85
88
|
}
|
|
86
89
|
//# sourceMappingURL=http-data-access.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-data-access.d.ts","sourceRoot":"","sources":["../src/http-data-access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"http-data-access.d.ts","sourceRoot":"","sources":["../src/http-data-access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAUrE,MAAM,MAAM,oBAAoB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC;AAExF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,YAAW,eAAe,CAAC,WAAW;IACxE;;;OAGG;IACH,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,qBAAqB,CAAC;IAExD;;OAEG;IACH,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAErD;;;;OAIG;gBAED,EACE,UAAU,EACV,oBAAoB,GACrB,GAAE;QACD,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACxD,oBAAoB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;KAItD;IAiBH;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxC;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;OAKG;IACU,kBAAkB,CAC7B,eAAe,EAAE,eAAe,CAAC,YAAY,EAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,eAAe,CAAC,yBAAyB,CAAC;IAyDrD;;;;;OAKG;IACU,0BAA0B,CACrC,SAAS,EAAE,MAAM,EACjB,mBAAmB,CAAC,EAAE,eAAe,CAAC,oBAAoB,GACzD,OAAO,CAAC,eAAe,CAAC,sBAAsB,CAAC;IAUlD;;;;;OAKG;IACU,kBAAkB,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,CAAC,EAAE,eAAe,CAAC,oBAAoB,GACpD,OAAO,CAAC,eAAe,CAAC,yBAAyB,CAAC;IAOrD;;;;;OAKG;IACU,2BAA2B,CACtC,MAAM,EAAE,MAAM,EAAE,EAChB,cAAc,CAAC,EAAE,eAAe,CAAC,oBAAoB,GACpD,OAAO,CAAC,eAAe,CAAC,yBAAyB,CAAC;IAOrD;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC;IAIvC;;;;;;;OAOG;cACa,aAAa,CAAC,CAAC,GAAG,OAAO,EACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,WAAW,GAAE;QACX,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,0BAA0B,CAAC,EAAE,MAAM,CAAC;KAChC,GACL,OAAO,CAAC,CAAC,CAAC;cAWG,KAAK,CAAC,CAAC,GAAG,OAAO,EAC/B,MAAM,EAAE,KAAK,GAAG,MAAM,EACtB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC3C,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,OAAO,CAAC,CAAC,CAAC;CA8Bd"}
|
package/dist/http-data-access.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const axios_1 = require("axios");
|
|
5
4
|
const events_1 = require("events");
|
|
6
5
|
const http_config_defaults_1 = require("./http-config-defaults");
|
|
7
6
|
const utils_1 = require("@requestnetwork/utils");
|
|
7
|
+
const qs_1 = require("qs");
|
|
8
8
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
9
9
|
const packageJson = require('../package.json');
|
|
10
10
|
/**
|
|
@@ -14,7 +14,7 @@ class HttpDataAccess {
|
|
|
14
14
|
/**
|
|
15
15
|
* Creates an instance of HttpDataAccess.
|
|
16
16
|
* @param httpConfig @see ClientTypes.IHttpDataAccessConfig for available options.
|
|
17
|
-
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
17
|
+
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
18
18
|
*/
|
|
19
19
|
constructor({ httpConfig, nodeConnectionConfig, } = {
|
|
20
20
|
httpConfig: {},
|
|
@@ -23,7 +23,7 @@ class HttpDataAccess {
|
|
|
23
23
|
// Get Request Client version to set it in the header
|
|
24
24
|
const requestClientVersion = packageJson.version;
|
|
25
25
|
this.httpConfig = Object.assign(Object.assign({}, http_config_defaults_1.default), httpConfig);
|
|
26
|
-
this.
|
|
26
|
+
this.nodeConnectionConfig = Object.assign({ baseURL: 'http://localhost:3000', headers: {
|
|
27
27
|
[this.httpConfig.requestClientVersionHeader]: requestClientVersion,
|
|
28
28
|
} }, nodeConnectionConfig);
|
|
29
29
|
}
|
|
@@ -60,11 +60,7 @@ class HttpDataAccess {
|
|
|
60
60
|
// We don't retry this request since it may fail because of a slow Storage
|
|
61
61
|
// For example, if the Ethereum network is slow and we retry the request three times
|
|
62
62
|
// three data will be persisted at the end
|
|
63
|
-
const
|
|
64
|
-
channelId,
|
|
65
|
-
topics,
|
|
66
|
-
transactionData,
|
|
67
|
-
}, this.axiosConfig);
|
|
63
|
+
const data = yield this.fetch('POST', '/persistTransaction', undefined, { channelId, topics, transactionData });
|
|
68
64
|
const transactionHash = (0, utils_1.normalizeKeccak256Hash)(transactionData).value;
|
|
69
65
|
// Create the return result with EventEmitter
|
|
70
66
|
const result = Object.assign(new events_1.EventEmitter(), data);
|
|
@@ -84,14 +80,14 @@ class HttpDataAccess {
|
|
|
84
80
|
}))
|
|
85
81
|
.catch((e) => {
|
|
86
82
|
let error = e;
|
|
87
|
-
if (e.
|
|
83
|
+
if (e.status === 404) {
|
|
88
84
|
error = new Error(`Transaction confirmation not received. Try polling
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
85
|
+
getTransactionsByChannelId() until the transaction is confirmed.
|
|
86
|
+
deferDelay: ${this.httpConfig.getConfirmationDeferDelay}ms,
|
|
87
|
+
maxRetries: ${this.httpConfig.getConfirmationMaxRetry},
|
|
88
|
+
retryDelay: ${this.httpConfig.getConfirmationRetryDelay}ms,
|
|
89
|
+
exponentialBackoffDelay: ${this.httpConfig.getConfirmationExponentialBackoffDelay}ms,
|
|
90
|
+
maxExponentialBackoffDelay: ${this.httpConfig.getConfirmationMaxExponentialBackoffDelay}ms`);
|
|
95
91
|
}
|
|
96
92
|
result.emit('error', error);
|
|
97
93
|
});
|
|
@@ -106,7 +102,10 @@ class HttpDataAccess {
|
|
|
106
102
|
*/
|
|
107
103
|
getTransactionsByChannelId(channelId, timestampBoundaries) {
|
|
108
104
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
109
|
-
return this.fetchAndRetry('/getTransactionsByChannelId', {
|
|
105
|
+
return yield this.fetchAndRetry('/getTransactionsByChannelId', {
|
|
106
|
+
channelId,
|
|
107
|
+
timestampBoundaries,
|
|
108
|
+
});
|
|
110
109
|
});
|
|
111
110
|
}
|
|
112
111
|
/**
|
|
@@ -117,7 +116,10 @@ class HttpDataAccess {
|
|
|
117
116
|
*/
|
|
118
117
|
getChannelsByTopic(topic, updatedBetween) {
|
|
119
118
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
120
|
-
return this.fetchAndRetry('/getChannelsByTopic', {
|
|
119
|
+
return yield this.fetchAndRetry('/getChannelsByTopic', {
|
|
120
|
+
topic,
|
|
121
|
+
updatedBetween,
|
|
122
|
+
});
|
|
121
123
|
});
|
|
122
124
|
}
|
|
123
125
|
/**
|
|
@@ -128,7 +130,10 @@ class HttpDataAccess {
|
|
|
128
130
|
*/
|
|
129
131
|
getChannelsByMultipleTopics(topics, updatedBetween) {
|
|
130
132
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
131
|
-
return this.fetchAndRetry('/getChannelsByMultipleTopics', {
|
|
133
|
+
return yield this.fetchAndRetry('/getChannelsByMultipleTopics', {
|
|
134
|
+
topics,
|
|
135
|
+
updatedBetween,
|
|
136
|
+
});
|
|
132
137
|
});
|
|
133
138
|
}
|
|
134
139
|
/**
|
|
@@ -137,7 +142,7 @@ class HttpDataAccess {
|
|
|
137
142
|
*/
|
|
138
143
|
_getStatus() {
|
|
139
144
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
140
|
-
return this.fetchAndRetry('/information', {});
|
|
145
|
+
return yield this.fetchAndRetry('/information', {});
|
|
141
146
|
});
|
|
142
147
|
}
|
|
143
148
|
/**
|
|
@@ -148,7 +153,7 @@ class HttpDataAccess {
|
|
|
148
153
|
* @param params HTTP GET request parameters
|
|
149
154
|
* @param retryConfig Maximum retry count, delay between retries, exponential backoff delay, and maximum exponential backoff delay
|
|
150
155
|
*/
|
|
151
|
-
fetchAndRetry(
|
|
156
|
+
fetchAndRetry(path, params, retryConfig = {}) {
|
|
152
157
|
var _a, _b, _c, _d;
|
|
153
158
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
154
159
|
retryConfig.maxRetries = (_a = retryConfig.maxRetries) !== null && _a !== void 0 ? _a : this.httpConfig.httpRequestMaxRetry;
|
|
@@ -157,8 +162,30 @@ class HttpDataAccess {
|
|
|
157
162
|
(_c = retryConfig.exponentialBackoffDelay) !== null && _c !== void 0 ? _c : this.httpConfig.httpRequestExponentialBackoffDelay;
|
|
158
163
|
retryConfig.maxExponentialBackoffDelay =
|
|
159
164
|
(_d = retryConfig.maxExponentialBackoffDelay) !== null && _d !== void 0 ? _d : this.httpConfig.httpRequestMaxExponentialBackoffDelay;
|
|
160
|
-
|
|
161
|
-
|
|
165
|
+
return yield (0, utils_1.retry)(() => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.fetch('GET', path, params); }), retryConfig)();
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
fetch(method, path, params, body) {
|
|
169
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
170
|
+
const _a = this.nodeConnectionConfig, { baseURL, headers } = _a, options = tslib_1.__rest(_a, ["baseURL", "headers"]);
|
|
171
|
+
const url = new URL(path, baseURL);
|
|
172
|
+
if (params) {
|
|
173
|
+
// qs.parse doesn't handle well mixes of string and object params
|
|
174
|
+
for (const [key, value] of Object.entries(params)) {
|
|
175
|
+
if (typeof value === 'object') {
|
|
176
|
+
params[key] = JSON.stringify(value);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
url.search = (0, qs_1.stringify)(params);
|
|
180
|
+
}
|
|
181
|
+
const r = yield fetch(url, Object.assign({ method, body: body ? JSON.stringify(body) : undefined, headers: Object.assign({ 'Content-Type': 'application/json' }, headers) }, options));
|
|
182
|
+
if (r.ok) {
|
|
183
|
+
return yield r.json();
|
|
184
|
+
}
|
|
185
|
+
throw Object.assign(new Error(r.statusText), {
|
|
186
|
+
status: r.status,
|
|
187
|
+
statusText: r.statusText,
|
|
188
|
+
});
|
|
162
189
|
});
|
|
163
190
|
}
|
|
164
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-data-access.js","sourceRoot":"","sources":["../src/http-data-access.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"http-data-access.js","sourceRoot":"","sources":["../src/http-data-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ClientTypes, DataAccessTypes } from '@requestnetwork/types';
|
|
2
|
-
import {
|
|
3
|
-
import HttpDataAccess from './http-data-access';
|
|
2
|
+
import HttpDataAccess, { NodeConnectionConfig } from './http-data-access';
|
|
4
3
|
/**
|
|
5
4
|
* Exposes a Data-Access module over HTTP
|
|
6
5
|
*/
|
|
@@ -22,11 +21,11 @@ export default class HttpMetaMaskDataAccess extends HttpDataAccess {
|
|
|
22
21
|
/**
|
|
23
22
|
* Creates an instance of HttpDataAccess.
|
|
24
23
|
* @param httpConfig Http config that will be used by the underlying http-data-access. @see ClientTypes.IHttpDataAccessConfig
|
|
25
|
-
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
24
|
+
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
26
25
|
*/
|
|
27
26
|
constructor({ httpConfig, nodeConnectionConfig, web3, ethereumProviderUrl, }?: {
|
|
28
27
|
httpConfig?: Partial<ClientTypes.IHttpDataAccessConfig>;
|
|
29
|
-
nodeConnectionConfig?:
|
|
28
|
+
nodeConnectionConfig?: NodeConnectionConfig;
|
|
30
29
|
web3?: any;
|
|
31
30
|
ethereumProviderUrl?: string;
|
|
32
31
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-metamask-data-access.d.ts","sourceRoot":"","sources":["../src/http-metamask-data-access.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAiB,eAAe,EAAgB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"http-metamask-data-access.d.ts","sourceRoot":"","sources":["../src/http-metamask-data-access.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAiB,eAAe,EAAgB,MAAM,uBAAuB,CAAC;AAGlG,OAAO,cAAc,EAAE,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1E;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,cAAc;IAChE;;;OAGG;IACI,KAAK,EAAE;QACZ,CAAC,SAAS,EAAE,MAAM,GAAG;YACnB,CAAC,QAAQ,EAAE,MAAM,GAAG;gBAAE,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC;gBAAC,WAAW,EAAE,GAAG,CAAA;aAAE,GAAG,IAAI,CAAC;SAChF,CAAC;KACH,CAAM;IAEP,OAAO,CAAC,QAAQ,CAAmE;IACnF,OAAO,CAAC,WAAW,CAAyC;IAE5D;;;;OAIG;gBAED,EACE,UAAU,EACV,oBAAoB,EACpB,IAAI,EACJ,mBAAmB,GACpB,GAAE;QACD,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACxD,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;QAC5C,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAG9B;IAYH;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxC;;;;;OAKG;IACU,kBAAkB,CAC7B,eAAe,EAAE,eAAe,CAAC,YAAY,EAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,eAAe,CAAC,yBAAyB,CAAC;IAsGrD;;;;;OAKG;IACU,0BAA0B,CACrC,SAAS,EAAE,MAAM,EACjB,mBAAmB,CAAC,EAAE,eAAe,CAAC,oBAAoB,GACzD,OAAO,CAAC,eAAe,CAAC,sBAAsB,CAAC;IAiClD;;;;;;;OAOG;IACI,kCAAkC,CACvC,SAAS,EAAE,MAAM,EACjB,uBAAuB,EAAE,MAAM,EAAE,EACjC,mBAAmB,CAAC,EAAE,eAAe,CAAC,oBAAoB,GACzD,eAAe,CAAC,sBAAsB;CAqC1C"}
|
|
@@ -4,11 +4,9 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const data_access_1 = require("@requestnetwork/data-access");
|
|
5
5
|
const smart_contracts_1 = require("@requestnetwork/smart-contracts");
|
|
6
6
|
const types_1 = require("@requestnetwork/types");
|
|
7
|
-
const axios_1 = require("axios");
|
|
8
7
|
const ethers_1 = require("ethers");
|
|
9
8
|
const events_1 = require("events");
|
|
10
9
|
const http_data_access_1 = require("./http-data-access");
|
|
11
|
-
const utils_1 = require("@requestnetwork/utils");
|
|
12
10
|
/**
|
|
13
11
|
* Exposes a Data-Access module over HTTP
|
|
14
12
|
*/
|
|
@@ -16,11 +14,10 @@ class HttpMetaMaskDataAccess extends http_data_access_1.default {
|
|
|
16
14
|
/**
|
|
17
15
|
* Creates an instance of HttpDataAccess.
|
|
18
16
|
* @param httpConfig Http config that will be used by the underlying http-data-access. @see ClientTypes.IHttpDataAccessConfig
|
|
19
|
-
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
17
|
+
* @param nodeConnectionConfig Configuration options to connect to the node.
|
|
20
18
|
*/
|
|
21
19
|
constructor({ httpConfig, nodeConnectionConfig, web3, ethereumProviderUrl, } = {
|
|
22
20
|
httpConfig: {},
|
|
23
|
-
nodeConnectionConfig: {},
|
|
24
21
|
}) {
|
|
25
22
|
super({ httpConfig, nodeConnectionConfig });
|
|
26
23
|
/**
|
|
@@ -65,7 +62,7 @@ class HttpMetaMaskDataAccess extends http_data_access_1.default {
|
|
|
65
62
|
// create a block and add the transaction in it
|
|
66
63
|
const block = data_access_1.Block.pushTransaction(data_access_1.Block.createEmptyBlock(), transactionData, channelId, topics);
|
|
67
64
|
// store the block on ipfs and get the the ipfs hash and size
|
|
68
|
-
const {
|
|
65
|
+
const { ipfsHash, ipfsSize } = yield this.fetch('POST', '/ipfsAdd', { data: block });
|
|
69
66
|
// get the fee required to submit the hash
|
|
70
67
|
const fee = yield submitterContract.getFeesAmount(ipfsSize);
|
|
71
68
|
// submit the hash to ethereum
|
|
@@ -136,21 +133,20 @@ class HttpMetaMaskDataAccess extends http_data_access_1.default {
|
|
|
136
133
|
* @param timestampBoundaries filter timestamp boundaries
|
|
137
134
|
*/
|
|
138
135
|
getTransactionsByChannelId(channelId, timestampBoundaries) {
|
|
136
|
+
var _a, _b, _c;
|
|
139
137
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
140
|
-
const
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
}));
|
|
144
|
-
}), {
|
|
138
|
+
const data = yield this.fetchAndRetry('/getTransactionsByChannelId', {
|
|
139
|
+
params: { channelId, timestampBoundaries },
|
|
140
|
+
}, {
|
|
145
141
|
maxRetries: this.httpConfig.httpRequestMaxRetry,
|
|
146
142
|
retryDelay: this.httpConfig.httpRequestRetryDelay,
|
|
147
|
-
})
|
|
143
|
+
});
|
|
148
144
|
// get the transactions from the cache
|
|
149
145
|
const transactionsCached = this.getCachedTransactionsAndCleanCache(channelId, data.meta.transactionsStorageLocation, timestampBoundaries);
|
|
150
146
|
// merge cache and data from the node
|
|
151
147
|
return {
|
|
152
148
|
meta: {
|
|
153
|
-
storageMeta: data.meta.storageMeta.concat(transactionsCached.meta.storageMeta),
|
|
149
|
+
storageMeta: (_c = (_a = data.meta.storageMeta) === null || _a === void 0 ? void 0 : _a.concat((_b = transactionsCached.meta.storageMeta) !== null && _b !== void 0 ? _b : [])) !== null && _c !== void 0 ? _c : [],
|
|
154
150
|
transactionsStorageLocation: data.meta.transactionsStorageLocation.concat(transactionsCached.meta.transactionsStorageLocation),
|
|
155
151
|
},
|
|
156
152
|
result: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-metamask-data-access.js","sourceRoot":"","sources":["../src/http-metamask-data-access.ts"],"names":[],"mappings":";;;AAAA,6DAAoD;AACpD,qEAA+E;AAC/E,iDAAkG;AAClG,
|
|
1
|
+
{"version":3,"file":"http-metamask-data-access.js","sourceRoot":"","sources":["../src/http-metamask-data-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { CurrencyInput, ICurrencyManager } from '@requestnetwork/currency';
|
|
2
2
|
import { ClientTypes, DecryptionProviderTypes, SignatureProviderTypes } from '@requestnetwork/types';
|
|
3
|
-
import { AxiosRequestConfig } from 'axios';
|
|
4
3
|
import { PaymentNetworkOptions } from '@requestnetwork/payment-detection';
|
|
5
4
|
import RequestNetwork from './api/request-network';
|
|
5
|
+
import { NodeConnectionConfig } from './http-data-access';
|
|
6
6
|
/**
|
|
7
7
|
* Exposes RequestNetwork module configured to use http-data-access.
|
|
8
8
|
*/
|
|
@@ -11,7 +11,7 @@ export default class HttpRequestNetwork extends RequestNetwork {
|
|
|
11
11
|
* Creates an instance of HttpRequestNetwork.
|
|
12
12
|
*
|
|
13
13
|
* @param options.httpConfig Http config that will be used by the underlying data-access. @see ClientTypes.IHttpDataAccessConfig for available options.
|
|
14
|
-
* @param options.nodeConnectionConfig Configuration options to connect to the node.
|
|
14
|
+
* @param options.nodeConnectionConfig Configuration options to connect to the node.
|
|
15
15
|
* @param options.useMockStorage When true, will use a mock storage in memory. Meant to simplify local development and should never be used in production.
|
|
16
16
|
* @param options.signatureProvider Module to handle the signature. If not given it will be impossible to create new transaction (it requires to sign).
|
|
17
17
|
* @param options.currencies custom currency list
|
|
@@ -20,7 +20,7 @@ export default class HttpRequestNetwork extends RequestNetwork {
|
|
|
20
20
|
constructor({ decryptionProvider, httpConfig, nodeConnectionConfig, signatureProvider, useMockStorage, currencies, currencyManager, paymentOptions, }?: {
|
|
21
21
|
decryptionProvider?: DecryptionProviderTypes.IDecryptionProvider;
|
|
22
22
|
httpConfig?: Partial<ClientTypes.IHttpDataAccessConfig>;
|
|
23
|
-
nodeConnectionConfig?:
|
|
23
|
+
nodeConnectionConfig?: Partial<NodeConnectionConfig>;
|
|
24
24
|
signatureProvider?: SignatureProviderTypes.ISignatureProvider;
|
|
25
25
|
useMockStorage?: boolean;
|
|
26
26
|
currencies?: CurrencyInput[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-request-network.d.ts","sourceRoot":"","sources":["../src/http-request-network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmB,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EACL,WAAW,EAEX,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"http-request-network.d.ts","sourceRoot":"","sources":["../src/http-request-network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmB,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EACL,WAAW,EAEX,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,cAAc,MAAM,uBAAuB,CAAC;AACnD,OAAuB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAI1E;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc;IAC5D;;;;;;;;;OASG;gBAED,EACE,kBAAkB,EAClB,UAAU,EACV,oBAAoB,EACpB,iBAAiB,EACjB,cAAc,EACd,UAAU,EACV,eAAe,EACf,cAAc,GACf,GAAE;QACD,kBAAkB,CAAC,EAAE,uBAAuB,CAAC,mBAAmB,CAAC;QACjE,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACxD,oBAAoB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACrD,iBAAiB,CAAC,EAAE,sBAAsB,CAAC,kBAAkB,CAAC;QAC9D,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;QAC7B,eAAe,CAAC,EAAE,gBAAgB,CAAC;QACnC,cAAc,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;KAIjD;CAYJ"}
|
|
@@ -13,7 +13,7 @@ class HttpRequestNetwork extends request_network_1.default {
|
|
|
13
13
|
* Creates an instance of HttpRequestNetwork.
|
|
14
14
|
*
|
|
15
15
|
* @param options.httpConfig Http config that will be used by the underlying data-access. @see ClientTypes.IHttpDataAccessConfig for available options.
|
|
16
|
-
* @param options.nodeConnectionConfig Configuration options to connect to the node.
|
|
16
|
+
* @param options.nodeConnectionConfig Configuration options to connect to the node.
|
|
17
17
|
* @param options.useMockStorage When true, will use a mock storage in memory. Meant to simplify local development and should never be used in production.
|
|
18
18
|
* @param options.signatureProvider Module to handle the signature. If not given it will be impossible to create new transaction (it requires to sign).
|
|
19
19
|
* @param options.currencies custom currency list
|
|
@@ -21,7 +21,6 @@ class HttpRequestNetwork extends request_network_1.default {
|
|
|
21
21
|
*/
|
|
22
22
|
constructor({ decryptionProvider, httpConfig, nodeConnectionConfig, signatureProvider, useMockStorage, currencies, currencyManager, paymentOptions, } = {
|
|
23
23
|
httpConfig: {},
|
|
24
|
-
nodeConnectionConfig: {},
|
|
25
24
|
useMockStorage: false,
|
|
26
25
|
}) {
|
|
27
26
|
const dataAccess = useMockStorage
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-request-network.js","sourceRoot":"","sources":["../src/http-request-network.ts"],"names":[],"mappings":";;AAAA,uDAA4F;
|
|
1
|
+
{"version":3,"file":"http-request-network.js","sourceRoot":"","sources":["../src/http-request-network.ts"],"names":[],"mappings":";;AAAA,uDAA4F;AAQ5F,2DAAmD;AACnD,yDAA0E;AAC1E,6DAA6D;AAC7D,iDAA6C;AAE7C;;GAEG;AACH,MAAqB,kBAAmB,SAAQ,yBAAc;IAC5D;;;;;;;;;OASG;IACH,YACE,EACE,kBAAkB,EAClB,UAAU,EACV,oBAAoB,EACpB,iBAAiB,EACjB,cAAc,EACd,UAAU,EACV,eAAe,EACf,cAAc,MAUZ;QACF,UAAU,EAAE,EAAE;QACd,cAAc,EAAE,KAAK;KACtB;QAED,MAAM,UAAU,GAAgC,cAAc;YAC5D,CAAC,CAAC,IAAI,4BAAc,CAAC,IAAI,0BAAW,EAAE,CAAC;YACvC,CAAC,CAAC,IAAI,0BAAc,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAE7D,IAAI,CAAC,eAAe,EAAE;YACpB,eAAe,GAAG,IAAI,0BAAe,CAAC,UAAU,IAAI,0BAAe,CAAC,cAAc,EAAE,CAAC,CAAC;SACvF;QAED,KAAK,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC;IAChG,CAAC;CACF;AA7CD,qCA6CC"}
|