@com-chain/jsc3l 2.0.1-rc.24 → 2.0.1-rc.26
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/build/rest/ajaxReq.js +12 -4
- package/build/rest/ajaxReq.js.map +1 -1
- package/package.json +3 -3
- package/src/rest/ajaxReq.ts +66 -4
package/build/rest/ajaxReq.js
CHANGED
|
@@ -34,6 +34,12 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
|
|
|
34
34
|
};
|
|
35
35
|
import { ttlcache } from '../cache';
|
|
36
36
|
import { APIError } from '../exception';
|
|
37
|
+
import { addUnwrapFn, unwrapObject } from '@0k/cache';
|
|
38
|
+
// PHP's max_input_vars (default 1000) silently truncates POST
|
|
39
|
+
// parameters beyond the limit. Each batched ethCall produces 3
|
|
40
|
+
// form fields (blockNb, ethCall[data], ethCall[to]), so we cap
|
|
41
|
+
// the batch size well below ⌊1000 / 3⌋ to stay safe.
|
|
42
|
+
const MAX_BATCH_SIZE = 256;
|
|
37
43
|
class URL {
|
|
38
44
|
}
|
|
39
45
|
URL.SERVER = 'api.php';
|
|
@@ -74,14 +80,14 @@ let AjaxReqAbstract = (() => {
|
|
|
74
80
|
throw new Error("Unexpected value");
|
|
75
81
|
}
|
|
76
82
|
if (cmpEthCallAt(data, req.data)) {
|
|
77
|
-
return postPromises.get(req.data);
|
|
83
|
+
return postPromises.get(unwrapObject(req.data));
|
|
78
84
|
}
|
|
79
85
|
break;
|
|
80
86
|
}
|
|
81
87
|
if (req.data.hasOwnProperty("batch")) {
|
|
82
88
|
for (const reqData of req.data.batch) {
|
|
83
89
|
if (cmpEthCallAt(data, reqData)) {
|
|
84
|
-
return postPromises.get(reqData);
|
|
90
|
+
return postPromises.get(unwrapObject(reqData));
|
|
85
91
|
}
|
|
86
92
|
}
|
|
87
93
|
break;
|
|
@@ -108,7 +114,8 @@ let AjaxReqAbstract = (() => {
|
|
|
108
114
|
added = true;
|
|
109
115
|
break;
|
|
110
116
|
}
|
|
111
|
-
if (req.data.hasOwnProperty("batch")
|
|
117
|
+
if (req.data.hasOwnProperty("batch") &&
|
|
118
|
+
req.data.batch.length < MAX_BATCH_SIZE) {
|
|
112
119
|
req.data.batch.push(data);
|
|
113
120
|
req.resolve.push(resolve);
|
|
114
121
|
req.reject.push(reject);
|
|
@@ -123,7 +130,7 @@ let AjaxReqAbstract = (() => {
|
|
|
123
130
|
// give the handle to potential other deferred
|
|
124
131
|
setTimeout(bindQueuePost, 0);
|
|
125
132
|
});
|
|
126
|
-
postPromises.set(data, promise);
|
|
133
|
+
postPromises.set(unwrapObject(data), promise);
|
|
127
134
|
return promise;
|
|
128
135
|
}
|
|
129
136
|
async queuePost() {
|
|
@@ -239,4 +246,5 @@ let AjaxReqAbstract = (() => {
|
|
|
239
246
|
_a;
|
|
240
247
|
})();
|
|
241
248
|
export default AjaxReqAbstract;
|
|
249
|
+
;
|
|
242
250
|
//# sourceMappingURL=ajaxReq.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajaxReq.js","sourceRoot":"","sources":["../../src/rest/ajaxReq.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"ajaxReq.js","sourceRoot":"","sources":["../../src/rest/ajaxReq.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@com-chain/jsc3l",
|
|
3
|
-
"version": "2.0.1-rc.
|
|
3
|
+
"version": "2.0.1-rc.26",
|
|
4
4
|
"description": "JavaScript Com-Chain Communication Library",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -43,10 +43,10 @@
|
|
|
43
43
|
"ts-node": "^10.9.2",
|
|
44
44
|
"ts-patch": "^3.2.1",
|
|
45
45
|
"typescript": "^5.9.2",
|
|
46
|
-
"vitest": "^1.
|
|
46
|
+
"vitest": "^3.1.2"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@0k/cache": "^0.0
|
|
49
|
+
"@0k/cache": "^0.2.0",
|
|
50
50
|
"bignumber.js": "^2.4.0",
|
|
51
51
|
"ethereumjs-tx": "^1.3.7",
|
|
52
52
|
"scryptsy": "^2.1.0",
|
package/src/rest/ajaxReq.ts
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { ttlcache } from '../cache'
|
|
2
2
|
|
|
3
3
|
import { APIError } from '../exception'
|
|
4
|
+
import { addUnwrapFn, unwrapObject } from '@0k/cache'
|
|
5
|
+
|
|
6
|
+
// PHP's max_input_vars (default 1000) silently truncates POST
|
|
7
|
+
// parameters beyond the limit. Each batched ethCall produces 3
|
|
8
|
+
// form fields (blockNb, ethCall[data], ethCall[to]), so we cap
|
|
9
|
+
// the batch size well below ⌊1000 / 3⌋ to stay safe.
|
|
10
|
+
const MAX_BATCH_SIZE = 256
|
|
4
11
|
|
|
5
12
|
class URL {
|
|
6
13
|
static SERVER = 'api.php';
|
|
@@ -51,14 +58,14 @@ export default abstract class AjaxReqAbstract {
|
|
|
51
58
|
throw new Error("Unexpected value")
|
|
52
59
|
}
|
|
53
60
|
if (cmpEthCallAt(data, req.data)) {
|
|
54
|
-
return postPromises.get(req.data)
|
|
61
|
+
return postPromises.get(unwrapObject(req.data))
|
|
55
62
|
}
|
|
56
63
|
break
|
|
57
64
|
}
|
|
58
65
|
if (req.data.hasOwnProperty("batch")) {
|
|
59
66
|
for (const reqData of req.data.batch) {
|
|
60
67
|
if (cmpEthCallAt(data, reqData)) {
|
|
61
|
-
return postPromises.get(reqData)
|
|
68
|
+
return postPromises.get(unwrapObject(reqData))
|
|
62
69
|
}
|
|
63
70
|
}
|
|
64
71
|
break
|
|
@@ -86,7 +93,8 @@ export default abstract class AjaxReqAbstract {
|
|
|
86
93
|
added = true
|
|
87
94
|
break
|
|
88
95
|
}
|
|
89
|
-
if (req.data.hasOwnProperty("batch")
|
|
96
|
+
if (req.data.hasOwnProperty("batch") &&
|
|
97
|
+
req.data.batch.length < MAX_BATCH_SIZE) {
|
|
90
98
|
(req.data.batch as Function[]).push(data);
|
|
91
99
|
(req.resolve as Function[]).push(resolve);
|
|
92
100
|
(req.reject as Function[]).push(reject)
|
|
@@ -102,7 +110,7 @@ export default abstract class AjaxReqAbstract {
|
|
|
102
110
|
// give the handle to potential other deferred
|
|
103
111
|
setTimeout(bindQueuePost, 0)
|
|
104
112
|
})
|
|
105
|
-
postPromises.set(data, promise)
|
|
113
|
+
postPromises.set(unwrapObject(data), promise)
|
|
106
114
|
return promise
|
|
107
115
|
}
|
|
108
116
|
|
|
@@ -231,3 +239,57 @@ export default abstract class AjaxReqAbstract {
|
|
|
231
239
|
|
|
232
240
|
}
|
|
233
241
|
|
|
242
|
+
|
|
243
|
+
/* @skip-prod-transpilation */
|
|
244
|
+
if (import.meta.vitest) {
|
|
245
|
+
const { describe, it, expect, vi } = import.meta.vitest
|
|
246
|
+
const UNWRAP_KEY = Symbol.for('@0k/cache/config')
|
|
247
|
+
|
|
248
|
+
class TestAjaxReq extends AjaxReqAbstract {
|
|
249
|
+
endpoint = {
|
|
250
|
+
post: vi.fn(),
|
|
251
|
+
get: vi.fn(),
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
describe('AjaxReq dedup', () => {
|
|
256
|
+
it('reuses the pending promise even when the pending request object is proxied', () => {
|
|
257
|
+
vi.useFakeTimers()
|
|
258
|
+
const unwrapFns = globalThis[UNWRAP_KEY] as Function[]
|
|
259
|
+
const originalLength = unwrapFns.length
|
|
260
|
+
try {
|
|
261
|
+
addUnwrapFn((o: any) => (o?.__v_raw ? o.__v_raw : o))
|
|
262
|
+
const ajaxReq = new TestAjaxReq()
|
|
263
|
+
const ownerRequest = {
|
|
264
|
+
ethCallAt: {
|
|
265
|
+
to: '0xcontract',
|
|
266
|
+
data: '0xabcdef',
|
|
267
|
+
},
|
|
268
|
+
blockNb: 'pending',
|
|
269
|
+
}
|
|
270
|
+
const ownerPromise = ajaxReq.post(ownerRequest)
|
|
271
|
+
|
|
272
|
+
ajaxReq.pendingPosts[0].data = new Proxy(ownerRequest, {
|
|
273
|
+
get (target, prop, receiver) {
|
|
274
|
+
if (prop === '__v_raw') return target
|
|
275
|
+
return Reflect.get(target, prop, receiver)
|
|
276
|
+
},
|
|
277
|
+
})
|
|
278
|
+
|
|
279
|
+
const followerRequest = {
|
|
280
|
+
ethCallAt: {
|
|
281
|
+
to: '0xcontract',
|
|
282
|
+
data: '0xabcdef',
|
|
283
|
+
},
|
|
284
|
+
blockNb: 'pending',
|
|
285
|
+
}
|
|
286
|
+
const followerPromise = ajaxReq.post(followerRequest)
|
|
287
|
+
|
|
288
|
+
expect(followerPromise).toBe(ownerPromise)
|
|
289
|
+
} finally {
|
|
290
|
+
unwrapFns.length = originalLength
|
|
291
|
+
vi.useRealTimers()
|
|
292
|
+
}
|
|
293
|
+
})
|
|
294
|
+
})
|
|
295
|
+
}
|