@gurge/sdk 0.3.23 → 0.3.25
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/common/src/data-structures/Hinkal/hinkalWithdraw.cjs +1 -1
- package/common/src/data-structures/Hinkal/hinkalWithdraw.d.ts +1 -3
- package/common/src/data-structures/Hinkal/hinkalWithdraw.mjs +22 -30
- package/common/src/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs +1 -1
- package/common/src/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs +42 -26
- package/common/src/functions/pre-transaction/buildCommitmentValidationData.cjs +1 -1
- package/common/src/functions/pre-transaction/buildCommitmentValidationData.mjs +49 -38
- package/common/src/functions/pre-transaction/outputUtxoProcessing.cjs +1 -1
- package/common/src/functions/pre-transaction/outputUtxoProcessing.mjs +25 -20
- package/common/src/functions/snarkjs/constructGeneralZkProof.cjs +1 -1
- package/common/src/functions/snarkjs/constructGeneralZkProof.mjs +65 -70
- package/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.cjs +1 -1
- package/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.mjs +10 -21
- package/common/src/functions/snarkjs/generateZkProof.cjs +1 -1
- package/common/src/functions/snarkjs/generateZkProof.mjs +12 -23
- package/common/src/functions/snarkjs/generateZkProofEnclave.cjs +1 -1
- package/common/src/functions/snarkjs/generateZkProofEnclave.mjs +11 -14
- package/common/src/functions/snarkjs/generateZkProofSelf.cjs +1 -1
- package/common/src/functions/snarkjs/generateZkProofSelf.mjs +14 -20
- package/common/src/functions/utils/hinkalTiming.utils.cjs +1 -1
- package/common/src/functions/utils/hinkalTiming.utils.d.ts +4 -2
- package/common/src/functions/utils/hinkalTiming.utils.mjs +13 -10
- package/common/src/functions/web3/events/getInputUtxoAndBalance.cjs +1 -1
- package/common/src/functions/web3/events/getInputUtxoAndBalance.mjs +82 -35
- package/common/src/webworker/package.json +1 -1
- package/common/src/webworker/performTaskWithWorker.cjs +1 -1
- package/common/src/webworker/performTaskWithWorker.mjs +14 -14
- package/common/src/webworker/viteWorkerURL.constant.cjs +3 -3
- package/common/src/webworker/viteWorkerURL.constant.mjs +3 -3
- package/package.json +1 -1
- package/react-native/HinkalWebViewWorker.cjs +16 -4
- package/react-native/HinkalWebViewWorker.mjs +69 -49
- package/react-native/bridge/HinkalRNWorker.cjs +1 -1
- package/react-native/bridge/HinkalRNWorker.d.ts +1 -0
- package/react-native/bridge/HinkalRNWorker.mjs +16 -11
- package/sdk/package.json.cjs +1 -1
- package/sdk/package.json.mjs +1 -1
|
@@ -9,31 +9,53 @@ import { getInputUtxosEnclave as u } from "./getInputUtxosEnclave.mjs";
|
|
|
9
9
|
import { hashEthereumAddress as d } from "../../utils/addresses.mjs";
|
|
10
10
|
import { getScheduledTransactionsNullifierIndexes as f } from "../../../API/scheduled-transactions-calls.mjs";
|
|
11
11
|
import { addressToHexFormat as p } from "../../utils/tron.utils.mjs";
|
|
12
|
-
import {
|
|
12
|
+
import { createRnDeltaTiming as m } from "../../utils/hinkalTiming.utils.mjs";
|
|
13
|
+
import { Mutex as h } from "async-mutex";
|
|
13
14
|
//#region libs/shared/common/src/functions/web3/events/getInputUtxoAndBalance.ts
|
|
14
|
-
var
|
|
15
|
+
var g = new h(), _ = async (e, t) => {
|
|
16
|
+
if (e.allowParallelBalanceLocalDecryption) return t();
|
|
17
|
+
let n = m("utxoPrep.mutex");
|
|
18
|
+
return g.isLocked() && n.log("waiting-for-lock"), g.runExclusive(async () => {
|
|
19
|
+
n.log("lock-acquired");
|
|
20
|
+
try {
|
|
21
|
+
return await t();
|
|
22
|
+
} finally {
|
|
23
|
+
n.log("lock-released");
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}, v = async (e, t, n, r, a, o, c, l, u) => _(e, async () => {
|
|
27
|
+
let d = m("utxoPrep.decrypt");
|
|
15
28
|
u += 1;
|
|
16
|
-
let
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
|
|
29
|
+
let f = o.slice(u);
|
|
30
|
+
d.log("batchProcess-start", {
|
|
31
|
+
outputsSlice: f.length,
|
|
32
|
+
cached: c.length
|
|
33
|
+
});
|
|
34
|
+
let { lastOutput: p, additionalEncryptedOutputs: h } = await e.utxoUtils.batchProcess(f, l, t, n);
|
|
35
|
+
d.log("batchProcess-done", { additionalEncryptedOutputs: h.length });
|
|
36
|
+
let g = [...c, ...h], _ = m("wallet.checkAddress");
|
|
37
|
+
await i(e, r), _.log("during-decrypt"), s({
|
|
38
|
+
lastOutput: p,
|
|
39
|
+
encryptedOutputs: g
|
|
40
|
+
}, e, n, a), d.log("cache-write", { encryptedOutputs: g.length });
|
|
41
|
+
let v = await e.utxoUtils.buildBatchProcess(g, t, n);
|
|
42
|
+
return d.log("buildBatchProcess-done", { utxoCount: v.length }), v;
|
|
43
|
+
}), y = async (e, t, n, r) => {
|
|
22
44
|
let { utxos: i, encryptedOutputs: a, lastOutput: o } = await u(e, n, t);
|
|
23
45
|
return s({
|
|
24
46
|
encryptedOutputs: a,
|
|
25
47
|
lastOutput: o
|
|
26
48
|
}, e, n, r), i;
|
|
27
|
-
},
|
|
49
|
+
}, b = async (e, t, n, r, i, a, o, s, c) => {
|
|
28
50
|
try {
|
|
29
|
-
return await
|
|
51
|
+
return await y(e, t, n, i);
|
|
30
52
|
} catch {
|
|
31
|
-
return
|
|
53
|
+
return v(e, t, n, r, i, a, o, s, c);
|
|
32
54
|
}
|
|
33
|
-
},
|
|
55
|
+
}, x = (e) => {
|
|
34
56
|
if (Array.isArray(e)) return e;
|
|
35
57
|
if (e !== void 0) return [e];
|
|
36
|
-
},
|
|
58
|
+
}, S = async (e, t, n) => await e.utxoUtils.batchFilterUtxosWithNullifier(t, n), C = (e, t, n, i, a, o, s, c) => {
|
|
37
59
|
for (e.sort((e, t) => e.amount <= t.amount ? 1 : -1); e.length < t || e.length > t && e.length < 6;) if (e.push(new r({
|
|
38
60
|
amount: 0n,
|
|
39
61
|
erc20TokenAddress: o,
|
|
@@ -42,17 +64,42 @@ var h = new m(), g = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
|
|
|
42
64
|
spendingPublicKey: a,
|
|
43
65
|
isNewStyle: !0
|
|
44
66
|
})), n) for (; e.length > 6;) e.splice(e.length - 1);
|
|
45
|
-
},
|
|
46
|
-
let u =
|
|
47
|
-
|
|
48
|
-
let
|
|
49
|
-
await
|
|
50
|
-
let
|
|
51
|
-
|
|
52
|
-
let
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
67
|
+
}, w = async ({ hinkal: e, chainId: t, passedShieldedPublicKey: n = void 0, ethAddress: r = void 0, resetCacheBefore: s = !1, allowRemoteDecryption: c = !1, useBlockedUtxos: l = !1 }) => {
|
|
68
|
+
let u = m("utxoPrep");
|
|
69
|
+
u.log("start");
|
|
70
|
+
let d = r;
|
|
71
|
+
d ? u.log("wallet.getEthereumAddress-skipped", { ethAddressPassed: !0 }) : (d = await e.getEthereumAddress(), u.log("wallet.getEthereumAddress"));
|
|
72
|
+
let f = n ?? e.userKeys.getShieldedPublicKey(), { userKeys: p } = e, h = e.encryptedOutputsByChain[t], g = e.nullifiersByChain[t], _ = Array.from(h);
|
|
73
|
+
s && o(e, t, f);
|
|
74
|
+
let { encryptedOutputs: y, lastOutput: x } = a(e, t, f);
|
|
75
|
+
u.log("cache.read", { cachedEncryptedOutputs: y.length });
|
|
76
|
+
let C = m("wallet.checkAddress");
|
|
77
|
+
await i(e, d), C.log("before-decrypt");
|
|
78
|
+
let w = x !== "", T = _.findIndex((e) => e.value === x);
|
|
79
|
+
u.log("findLastOutputIndex", {
|
|
80
|
+
hinkalOutputs: _.length,
|
|
81
|
+
lastOutputIndex: T
|
|
82
|
+
});
|
|
83
|
+
let E = T > -1, D = !w && T === -1, O = e.areMerkleTreeUpdatesDisabled(), k = !O && (E || !c && D), A = !O && c && D, j = !k && !A;
|
|
84
|
+
u.log("branch", {
|
|
85
|
+
decryptLocally: k,
|
|
86
|
+
decryptRemotely: A,
|
|
87
|
+
useCache: j,
|
|
88
|
+
outputsSlice: T > -1 ? _.length - (T + 1) : 0
|
|
89
|
+
});
|
|
90
|
+
let M = [];
|
|
91
|
+
k ? (M = await v(e, p, t, d, f, _, y, x, T), u.log("decryptLocally-done", { utxoCount: M.length })) : A ? (M = await b(e, p, t, d, f, _, y, x, T), u.log("decryptRemotely-done", { utxoCount: M.length })) : j && (M = await e.utxoUtils.buildBatchProcess(y, p, t), u.log("useCache-buildBatchProcess-done", { utxoCount: M.length }));
|
|
92
|
+
let N = m("wallet.checkAddress");
|
|
93
|
+
await i(e, d), N.log("after-decrypt");
|
|
94
|
+
let P = await S(e, M, g);
|
|
95
|
+
u.log("filterSpentUtxos", {
|
|
96
|
+
allUtxos: M.length,
|
|
97
|
+
inputUtxos: P.length
|
|
98
|
+
});
|
|
99
|
+
let F = l ? P.filter((e) => e.isBlocked) : P.filter((e) => !e.isBlocked);
|
|
100
|
+
return u.log("done", { inputUtxos: F.length }), { inputUtxos: F };
|
|
101
|
+
}, T = async ({ hinkal: e, chainId: n, passedShieldedPublicKey: r = void 0, ethAddress: i = void 0, resetCacheBefore: a = !1, allowRemoteDecryption: o = !1 }) => {
|
|
102
|
+
let s = i ?? await e.getEthereumAddressByChain(n), c = d(t(n) ? p(s) : s), { inputUtxos: l } = await w({
|
|
56
103
|
hinkal: e,
|
|
57
104
|
chainId: n,
|
|
58
105
|
passedShieldedPublicKey: r,
|
|
@@ -67,15 +114,15 @@ var h = new m(), g = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
|
|
|
67
114
|
nullifiers: l.map((e) => e.getNullifier())
|
|
68
115
|
});
|
|
69
116
|
return { inputUtxos: u.map((e) => l[e]).filter((e) => !!e) };
|
|
70
|
-
},
|
|
71
|
-
let g = s ?? t.userKeys.getShieldedPrivateKey(), _ = t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint, { inputUtxos: v } = h ? await
|
|
117
|
+
}, E = async ({ hinkal: t, tokenWithId: r, minInput: i = 2, sliceIfMore6: a = !0, chainId: o, passedShieldedPrivateKey: s = void 0, passedShieldedPublicKey: u = void 0, ethAddress: d = void 0, resetCacheBefore: f = !1, ensuredTokensWithId: p, allowRemoteDecryption: m = !1, useBlockedUtxos: h = !1 }) => {
|
|
118
|
+
let g = s ?? t.userKeys.getShieldedPrivateKey(), _ = t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint, { inputUtxos: v } = h ? await T({
|
|
72
119
|
hinkal: t,
|
|
73
120
|
chainId: o,
|
|
74
121
|
ethAddress: d,
|
|
75
122
|
passedShieldedPrivateKey: s,
|
|
76
123
|
resetCacheBefore: f,
|
|
77
124
|
allowRemoteDecryption: m
|
|
78
|
-
}) : await
|
|
125
|
+
}) : await w({
|
|
79
126
|
hinkal: t,
|
|
80
127
|
tokenWithId: r,
|
|
81
128
|
minInput: i,
|
|
@@ -86,27 +133,27 @@ var h = new m(), g = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
|
|
|
86
133
|
ethAddress: d,
|
|
87
134
|
resetCacheBefore: f,
|
|
88
135
|
allowRemoteDecryption: m
|
|
89
|
-
}), y =
|
|
136
|
+
}), y = x(r), b = /* @__PURE__ */ new Map();
|
|
90
137
|
v.forEach((e) => {
|
|
91
138
|
let t = e.getTokenAddress(o);
|
|
92
139
|
if (y && !y.some((e) => n(e.erc20TokenAddress, t))) return;
|
|
93
140
|
let r = c(o, {
|
|
94
141
|
erc20TokenAddress: t,
|
|
95
142
|
tokenId: 0
|
|
96
|
-
}), i =
|
|
97
|
-
|
|
143
|
+
}), i = b.get(r) ?? [];
|
|
144
|
+
b.set(r, [...i, e]);
|
|
98
145
|
}), p?.forEach((e) => {
|
|
99
146
|
let t = c(o, {
|
|
100
147
|
erc20TokenAddress: e.erc20TokenAddress,
|
|
101
148
|
tokenId: 0
|
|
102
149
|
});
|
|
103
|
-
|
|
150
|
+
b.set(t, b.get(t) ?? []);
|
|
104
151
|
});
|
|
105
|
-
for (let [t, n] of
|
|
152
|
+
for (let [t, n] of b) {
|
|
106
153
|
let r = t.split("-")[0], s = Number(t.split("-")[1]), c = e(o), u = c ? r : void 0;
|
|
107
|
-
|
|
154
|
+
C(n, i, a, g, _, c ? l(r).compressedAddress.toLowerCase() : r.toLowerCase(), s, u);
|
|
108
155
|
}
|
|
109
|
-
return
|
|
156
|
+
return b;
|
|
110
157
|
};
|
|
111
158
|
//#endregion
|
|
112
|
-
export {
|
|
159
|
+
export { b as attemptGetInputUtxosRemotely, w as getInputUtxoAndBalance, T as getInputUtxoAndBalanceOfStuckUtxos, E as getInputUtxoAndBalancePerToken, y as getInputUtxosRemotely };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
const e=require(`../constants/vite.constants.cjs`),t=require(`../constants/chains.constants.cjs`),n=require(
|
|
1
|
+
const e=require(`../constants/vite.constants.cjs`),t=require(`../constants/chains.constants.cjs`),n=require(`../functions/utils/hinkalTiming.utils.cjs`),r=require(`./workerFactory.cjs`);var i=async i=>{let a=i.payload?.type??`unknown`,o=n.createRnDeltaTiming(`webView.task:${i.type}:${a}`),s=await r.WorkerFactory.getWebWorker(i.type);return o.log(`rn-worker-created`),new Promise((n,r)=>{let a={};if(typeof window<`u`&&window.location){let{origin:e,protocol:t,host:n,port:r,hostname:i,href:o}=window.location;a={origin:e,protocol:t,host:n,port:r,hostname:i,href:o}}s.onMessage(e=>{o.log(`rn-result-received`),n(e),s.terminate()}),s.onError(e=>{o.log(`rn-error`),r(e),s.terminate()});let c={payload:i.payload,metadata:{hostLocation:a,constants:{chains:{chainIds:t.chainIds},isDevelopment:e.isDevelopment}}};s.postMessage(c),o.log(`rn-postMessage-sent`)})};exports.performTaskWithWorker=i;
|
|
@@ -1,39 +1,39 @@
|
|
|
1
1
|
import { isDevelopment as e } from "../constants/vite.constants.mjs";
|
|
2
2
|
import { chainIds as t } from "../constants/chains.constants.mjs";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { createRnDeltaTiming as n } from "../functions/utils/hinkalTiming.utils.mjs";
|
|
4
|
+
import { WorkerFactory as r } from "./workerFactory.mjs";
|
|
5
5
|
//#region libs/shared/common/src/webworker/performTaskWithWorker.ts
|
|
6
6
|
var i = async (i) => {
|
|
7
|
-
let a =
|
|
8
|
-
return
|
|
9
|
-
let
|
|
7
|
+
let a = i.payload?.type ?? "unknown", o = n(`webView.task:${i.type}:${a}`), s = await r.getWebWorker(i.type);
|
|
8
|
+
return o.log("rn-worker-created"), new Promise((n, r) => {
|
|
9
|
+
let a = {};
|
|
10
10
|
if (typeof window < "u" && window.location) {
|
|
11
|
-
let { origin: e, protocol: t, host: n, port: r, hostname: i, href:
|
|
12
|
-
|
|
11
|
+
let { origin: e, protocol: t, host: n, port: r, hostname: i, href: o } = window.location;
|
|
12
|
+
a = {
|
|
13
13
|
origin: e,
|
|
14
14
|
protocol: t,
|
|
15
15
|
host: n,
|
|
16
16
|
port: r,
|
|
17
17
|
hostname: i,
|
|
18
|
-
href:
|
|
18
|
+
href: o
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}),
|
|
24
|
-
|
|
21
|
+
s.onMessage((e) => {
|
|
22
|
+
o.log("rn-result-received"), n(e), s.terminate();
|
|
23
|
+
}), s.onError((e) => {
|
|
24
|
+
o.log("rn-error"), r(e), s.terminate();
|
|
25
25
|
});
|
|
26
26
|
let c = {
|
|
27
27
|
payload: i.payload,
|
|
28
28
|
metadata: {
|
|
29
|
-
hostLocation:
|
|
29
|
+
hostLocation: a,
|
|
30
30
|
constants: {
|
|
31
31
|
chains: { chainIds: t },
|
|
32
32
|
isDevelopment: e
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
};
|
|
36
|
-
|
|
36
|
+
s.postMessage(c), o.log("rn-postMessage-sent");
|
|
37
37
|
});
|
|
38
38
|
};
|
|
39
39
|
//#endregion
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
|
|
15
15
|
|
|
16
16
|
const n = async () => ({
|
|
17
|
-
[e.ZKProof]: await getWorkerURL(domain + '/0.3.
|
|
18
|
-
[e.SnarkJS]: await getWorkerURL(domain + '/0.3.
|
|
19
|
-
[e.UTXO]: await getWorkerURL(domain + '/0.3.
|
|
17
|
+
[e.ZKProof]: await getWorkerURL(domain + '/0.3.25/' + 'zkProofWorkerLauncher.js'),
|
|
18
|
+
[e.SnarkJS]: await getWorkerURL(domain + '/0.3.25/' + 'snarkjsWorkerLauncher.js'),
|
|
19
|
+
[e.UTXO]: await getWorkerURL(domain + '/0.3.25/' + 'utxoWorkerLauncher.js'),
|
|
20
20
|
});
|
|
21
21
|
exports.getWorkerViteURL = n;
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
|
|
15
15
|
|
|
16
16
|
const n = async () => ({
|
|
17
|
-
[e.ZKProof]: await getWorkerURL(domain + '/0.3.
|
|
18
|
-
[e.SnarkJS]: await getWorkerURL(domain + '/0.3.
|
|
19
|
-
[e.UTXO]: await getWorkerURL(domain + '/0.3.
|
|
17
|
+
[e.ZKProof]: await getWorkerURL(domain + '/0.3.25/' + 'zkProofWorkerLauncher.js'),
|
|
18
|
+
[e.SnarkJS]: await getWorkerURL(domain + '/0.3.25/' + 'snarkjsWorkerLauncher.js'),
|
|
19
|
+
[e.UTXO]: await getWorkerURL(domain + '/0.3.25/' + 'utxoWorkerLauncher.js'),
|
|
20
20
|
});
|
|
21
21
|
export { n as getWorkerViteURL };
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
require(`../_virtual/_rolldown/runtime.cjs`);const e=require(`../common/src/webworker/workerFactory.cjs`),
|
|
1
|
+
require(`../_virtual/_rolldown/runtime.cjs`);const e=require(`../common/src/functions/utils/hinkalTiming.utils.cjs`),t=require(`../common/src/webworker/workerFactory.cjs`),n=require(`./workerCDNUrls.cjs`),r=require(`./bridge/serialization.utils.cjs`),i=require(`./bridge/HinkalRNWorker.cjs`);let a=require(`react`),o=require(`react-native`),s=require(`react-native-webview`),c=require(`react/jsx-runtime`);var l=`${new URL(Object.values(n.WORKER_CDN_URLS)[0]).origin}/`;t.WorkerFactory.rnWorkerFactory=e=>new i.HinkalRNWorker(e);var u=`
|
|
2
2
|
if (!window.__hinkalPageBoot) (function(){
|
|
3
3
|
window.__hinkalPageBoot = true;
|
|
4
|
-
var URLS = ${JSON.stringify(
|
|
4
|
+
var URLS = ${JSON.stringify(n.WORKER_CDN_URLS)};
|
|
5
5
|
var BLOBS = {};
|
|
6
6
|
|
|
7
7
|
function replacer(_key, value){
|
|
@@ -22,6 +22,9 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
22
22
|
var out = {}; for (var i = 0; i < keys.length; i++) out[keys[i]] = revive(value[keys[i]]); return out;
|
|
23
23
|
}
|
|
24
24
|
function post(payload){ try { window.ReactNativeWebView.postMessage(JSON.stringify(payload, replacer)); } catch(_){} }
|
|
25
|
+
function postPhase(requestId, variant, phase, t0){
|
|
26
|
+
post({ type: 'TIMING', requestId: requestId, variant: variant, phase: phase, ms: Date.now() - t0 });
|
|
27
|
+
}
|
|
25
28
|
function describe(error){
|
|
26
29
|
if (!error) return 'worker error';
|
|
27
30
|
if (error.message) return error.message;
|
|
@@ -60,10 +63,17 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
60
63
|
var variant = envelope && envelope.variant;
|
|
61
64
|
var message = revive(envelope && envelope.message);
|
|
62
65
|
var url = URLS[variant];
|
|
66
|
+
var t0 = Date.now();
|
|
67
|
+
postPhase(requestId, variant, 'handleMessage-start', t0);
|
|
63
68
|
if (!url) return post({ requestId: requestId, type: 'ERROR', error: 'Unknown variant: ' + variant });
|
|
64
69
|
|
|
65
70
|
var worker;
|
|
66
|
-
try {
|
|
71
|
+
try {
|
|
72
|
+
var blob = await blobUrl(url);
|
|
73
|
+
postPhase(requestId, variant, 'cdn-blob-ready', t0);
|
|
74
|
+
worker = spawn(blob);
|
|
75
|
+
postPhase(requestId, variant, 'inner-worker-spawned', t0);
|
|
76
|
+
}
|
|
67
77
|
catch (error) { return post({ requestId: requestId, type: 'ERROR', error: 'spawn failed: ' + describe(error) }); }
|
|
68
78
|
|
|
69
79
|
var done = false, ready = false, pending = message;
|
|
@@ -74,6 +84,7 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
74
84
|
if (data && typeof data === 'object') {
|
|
75
85
|
if (data.__hinkalWorkerReady) {
|
|
76
86
|
ready = true;
|
|
87
|
+
postPhase(requestId, variant, 'inner-worker-ready', t0);
|
|
77
88
|
try { worker.postMessage(pending); pending = null; }
|
|
78
89
|
catch (error) { post({ requestId: requestId, type: 'ERROR', error: 'postMessage failed: ' + describe(error) }); finish(); }
|
|
79
90
|
return;
|
|
@@ -85,6 +96,7 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
85
96
|
}
|
|
86
97
|
}
|
|
87
98
|
post({ requestId: requestId, type: 'RESULT', data: data });
|
|
99
|
+
postPhase(requestId, variant, 'inner-worker-done', t0);
|
|
88
100
|
finish();
|
|
89
101
|
};
|
|
90
102
|
worker.onerror = function(event){
|
|
@@ -95,4 +107,4 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
95
107
|
|
|
96
108
|
post({ type: 'READY' });
|
|
97
109
|
})();
|
|
98
|
-
true;`,
|
|
110
|
+
true;`,d=`<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body><script>${u}<\/script></body></html>`,f=o.StyleSheet.create({hiddenHost:{position:`absolute`,height:1,width:1,left:-9999,top:-9999,opacity:0}}),p=()=>{let t=(0,a.useRef)(null),n=(0,a.useRef)({ready:!1,queue:[]}),i=(0,a.useCallback)((e,n,i)=>{let a;try{a=JSON.stringify({requestId:e,variant:n,message:i},r.bigIntReplacer)}catch(t){o.DeviceEventEmitter.emit(`FROM_WEBVIEW_WORKER`,{requestId:e,type:`ERROR`,error:`serialize failed: ${t?.message??t}`});return}t.current?.injectJavaScript(`window.handleMessage && window.handleMessage(${a}); true;`)},[]);(0,a.useEffect)(()=>{let e=o.DeviceEventEmitter.addListener(`TO_WEBVIEW_WORKER`,e=>{let t={requestId:e?.__requestId??``,variant:e?.variant??``,message:e?.message};n.current.ready?i(t.requestId,t.variant,t.message):n.current.queue.push(t)});return()=>e.remove()},[i]);let p=(0,a.useCallback)(t=>{let a;try{a=r.reviveBigInts(JSON.parse(t.nativeEvent.data))}catch(e){o.DeviceEventEmitter.emit(`FROM_WEBVIEW_WORKER`,{type:`ERROR`,error:e?.message??`parse error`});return}if(a?.type===`READY`){n.current.ready=!0;let e=n.current.queue;n.current.queue=[],e.forEach(({requestId:e,variant:t,message:n})=>i(e,t,n));return}if(a?.type===`TIMING`){e.logRnDeltaEvent(`webView.${a.variant}`,a.phase,{requestId:a.requestId,ms:a.ms});return}o.DeviceEventEmitter.emit(`FROM_WEBVIEW_WORKER`,a)},[i]);return(0,c.jsx)(o.View,{pointerEvents:`none`,style:f.hiddenHost,children:(0,c.jsx)(s.WebView,{ref:t,source:{html:d,baseUrl:l},originWhitelist:[`*`],javaScriptEnabled:!0,domStorageEnabled:!0,androidLayerType:`hardware`,onMessage:p,onLoad:()=>t.current?.injectJavaScript(u)})})};module.exports=p;
|
|
@@ -1,18 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
1
|
+
import { logRnDeltaEvent as e } from "../common/src/functions/utils/hinkalTiming.utils.mjs";
|
|
2
|
+
import { WorkerFactory as t } from "../common/src/webworker/workerFactory.mjs";
|
|
3
|
+
import { WORKER_CDN_URLS as n } from "./workerCDNUrls.mjs";
|
|
4
|
+
import { bigIntReplacer as r, reviveBigInts as i } from "./bridge/serialization.utils.mjs";
|
|
5
|
+
import { HinkalRNWorker as a } from "./bridge/HinkalRNWorker.mjs";
|
|
6
|
+
import { useCallback as o, useEffect as s, useRef as c } from "react";
|
|
7
|
+
import { DeviceEventEmitter as l, StyleSheet as u, View as d } from "react-native";
|
|
8
|
+
import { WebView as f } from "react-native-webview";
|
|
9
|
+
import { jsx as p } from "react/jsx-runtime";
|
|
9
10
|
//#region libs/shared/sdk/src/react-native/HinkalWebViewWorker.tsx
|
|
10
|
-
var
|
|
11
|
-
|
|
12
|
-
var
|
|
11
|
+
var m = `${new URL(Object.values(n)[0]).origin}/`;
|
|
12
|
+
t.rnWorkerFactory = (e) => new a(e);
|
|
13
|
+
var h = `
|
|
13
14
|
if (!window.__hinkalPageBoot) (function(){
|
|
14
15
|
window.__hinkalPageBoot = true;
|
|
15
|
-
var URLS = ${JSON.stringify(
|
|
16
|
+
var URLS = ${JSON.stringify(n)};
|
|
16
17
|
var BLOBS = {};
|
|
17
18
|
|
|
18
19
|
function replacer(_key, value){
|
|
@@ -33,6 +34,9 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
33
34
|
var out = {}; for (var i = 0; i < keys.length; i++) out[keys[i]] = revive(value[keys[i]]); return out;
|
|
34
35
|
}
|
|
35
36
|
function post(payload){ try { window.ReactNativeWebView.postMessage(JSON.stringify(payload, replacer)); } catch(_){} }
|
|
37
|
+
function postPhase(requestId, variant, phase, t0){
|
|
38
|
+
post({ type: 'TIMING', requestId: requestId, variant: variant, phase: phase, ms: Date.now() - t0 });
|
|
39
|
+
}
|
|
36
40
|
function describe(error){
|
|
37
41
|
if (!error) return 'worker error';
|
|
38
42
|
if (error.message) return error.message;
|
|
@@ -58,10 +62,17 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
58
62
|
var variant = envelope && envelope.variant;
|
|
59
63
|
var message = revive(envelope && envelope.message);
|
|
60
64
|
var url = URLS[variant];
|
|
65
|
+
var t0 = Date.now();
|
|
66
|
+
postPhase(requestId, variant, 'handleMessage-start', t0);
|
|
61
67
|
if (!url) return post({ requestId: requestId, type: 'ERROR', error: 'Unknown variant: ' + variant });
|
|
62
68
|
|
|
63
69
|
var worker;
|
|
64
|
-
try {
|
|
70
|
+
try {
|
|
71
|
+
var blob = await blobUrl(url);
|
|
72
|
+
postPhase(requestId, variant, 'cdn-blob-ready', t0);
|
|
73
|
+
worker = spawn(blob);
|
|
74
|
+
postPhase(requestId, variant, 'inner-worker-spawned', t0);
|
|
75
|
+
}
|
|
65
76
|
catch (error) { return post({ requestId: requestId, type: 'ERROR', error: 'spawn failed: ' + describe(error) }); }
|
|
66
77
|
|
|
67
78
|
var done = false, ready = false, pending = message;
|
|
@@ -72,6 +83,7 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
72
83
|
if (data && typeof data === 'object') {
|
|
73
84
|
if (data.__hinkalWorkerReady) {
|
|
74
85
|
ready = true;
|
|
86
|
+
postPhase(requestId, variant, 'inner-worker-ready', t0);
|
|
75
87
|
try { worker.postMessage(pending); pending = null; }
|
|
76
88
|
catch (error) { post({ requestId: requestId, type: 'ERROR', error: 'postMessage failed: ' + describe(error) }); finish(); }
|
|
77
89
|
return;
|
|
@@ -83,6 +95,7 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
83
95
|
}
|
|
84
96
|
}
|
|
85
97
|
post({ requestId: requestId, type: 'RESULT', data: data });
|
|
98
|
+
postPhase(requestId, variant, 'inner-worker-done', t0);
|
|
86
99
|
finish();
|
|
87
100
|
};
|
|
88
101
|
worker.onerror = function(event){
|
|
@@ -93,82 +106,89 @@ if (!window.__hinkalPageBoot) (function(){
|
|
|
93
106
|
|
|
94
107
|
post({ type: 'READY' });
|
|
95
108
|
})();
|
|
96
|
-
true;`,
|
|
109
|
+
true;`, g = `<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body><script>${h}<\/script></body></html>`, _ = u.create({ hiddenHost: {
|
|
97
110
|
position: "absolute",
|
|
98
111
|
height: 1,
|
|
99
112
|
width: 1,
|
|
100
113
|
left: -9999,
|
|
101
114
|
top: -9999,
|
|
102
115
|
opacity: 0
|
|
103
|
-
} }),
|
|
104
|
-
let
|
|
116
|
+
} }), v = () => {
|
|
117
|
+
let t = c(null), n = c({
|
|
105
118
|
ready: !1,
|
|
106
119
|
queue: []
|
|
107
|
-
}),
|
|
120
|
+
}), a = o((e, n, i) => {
|
|
108
121
|
let a;
|
|
109
122
|
try {
|
|
110
123
|
a = JSON.stringify({
|
|
111
|
-
requestId:
|
|
112
|
-
variant:
|
|
124
|
+
requestId: e,
|
|
125
|
+
variant: n,
|
|
113
126
|
message: i
|
|
114
|
-
},
|
|
115
|
-
} catch (
|
|
116
|
-
|
|
117
|
-
requestId:
|
|
127
|
+
}, r);
|
|
128
|
+
} catch (t) {
|
|
129
|
+
l.emit("FROM_WEBVIEW_WORKER", {
|
|
130
|
+
requestId: e,
|
|
118
131
|
type: "ERROR",
|
|
119
|
-
error: `serialize failed: ${
|
|
132
|
+
error: `serialize failed: ${t?.message ?? t}`
|
|
120
133
|
});
|
|
121
134
|
return;
|
|
122
135
|
}
|
|
123
|
-
|
|
136
|
+
t.current?.injectJavaScript(`window.handleMessage && window.handleMessage(${a}); true;`);
|
|
124
137
|
}, []);
|
|
125
|
-
|
|
126
|
-
let e =
|
|
127
|
-
let
|
|
138
|
+
s(() => {
|
|
139
|
+
let e = l.addListener("TO_WEBVIEW_WORKER", (e) => {
|
|
140
|
+
let t = {
|
|
128
141
|
requestId: e?.__requestId ?? "",
|
|
129
142
|
variant: e?.variant ?? "",
|
|
130
143
|
message: e?.message
|
|
131
144
|
};
|
|
132
|
-
|
|
145
|
+
n.current.ready ? a(t.requestId, t.variant, t.message) : n.current.queue.push(t);
|
|
133
146
|
});
|
|
134
147
|
return () => e.remove();
|
|
135
|
-
}, [
|
|
136
|
-
let
|
|
137
|
-
let
|
|
148
|
+
}, [a]);
|
|
149
|
+
let u = o((t) => {
|
|
150
|
+
let r;
|
|
138
151
|
try {
|
|
139
|
-
|
|
152
|
+
r = i(JSON.parse(t.nativeEvent.data));
|
|
140
153
|
} catch (e) {
|
|
141
|
-
|
|
154
|
+
l.emit("FROM_WEBVIEW_WORKER", {
|
|
142
155
|
type: "ERROR",
|
|
143
156
|
error: e?.message ?? "parse error"
|
|
144
157
|
});
|
|
145
158
|
return;
|
|
146
159
|
}
|
|
147
|
-
if (
|
|
148
|
-
|
|
149
|
-
let e =
|
|
150
|
-
|
|
160
|
+
if (r?.type === "READY") {
|
|
161
|
+
n.current.ready = !0;
|
|
162
|
+
let e = n.current.queue;
|
|
163
|
+
n.current.queue = [], e.forEach(({ requestId: e, variant: t, message: n }) => a(e, t, n));
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
if (r?.type === "TIMING") {
|
|
167
|
+
e(`webView.${r.variant}`, r.phase, {
|
|
168
|
+
requestId: r.requestId,
|
|
169
|
+
ms: r.ms
|
|
170
|
+
});
|
|
151
171
|
return;
|
|
152
172
|
}
|
|
153
|
-
|
|
154
|
-
}, [
|
|
155
|
-
return /* @__PURE__ */
|
|
173
|
+
l.emit("FROM_WEBVIEW_WORKER", r);
|
|
174
|
+
}, [a]);
|
|
175
|
+
return /* @__PURE__ */ p(d, {
|
|
156
176
|
pointerEvents: "none",
|
|
157
|
-
style:
|
|
158
|
-
children: /* @__PURE__ */ f
|
|
159
|
-
ref:
|
|
177
|
+
style: _.hiddenHost,
|
|
178
|
+
children: /* @__PURE__ */ p(f, {
|
|
179
|
+
ref: t,
|
|
160
180
|
source: {
|
|
161
|
-
html:
|
|
162
|
-
baseUrl:
|
|
181
|
+
html: g,
|
|
182
|
+
baseUrl: m
|
|
163
183
|
},
|
|
164
184
|
originWhitelist: ["*"],
|
|
165
185
|
javaScriptEnabled: !0,
|
|
166
186
|
domStorageEnabled: !0,
|
|
167
187
|
androidLayerType: "hardware",
|
|
168
|
-
onMessage:
|
|
169
|
-
onLoad: () =>
|
|
188
|
+
onMessage: u,
|
|
189
|
+
onLoad: () => t.current?.injectJavaScript(h)
|
|
170
190
|
})
|
|
171
191
|
});
|
|
172
192
|
};
|
|
173
193
|
//#endregion
|
|
174
|
-
export {
|
|
194
|
+
export { v as default };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`./serialization.utils.cjs`);let
|
|
1
|
+
require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../common/src/functions/utils/hinkalTiming.utils.cjs`),t=require(`./serialization.utils.cjs`);let n=require(`react-native`);var r=class{onmessage=null;onerror=null;requestId=t.nextRequestId();sentAt=0;subscription;constructor(t){this.variant=t,this.subscription=n.DeviceEventEmitter.addListener(`FROM_WEBVIEW_WORKER`,t=>{!t||t.requestId!==this.requestId||(t.type===`RESULT`?(e.logRnDeltaEvent(`rnBridge.${this.variant}`,`round-trip`,{requestId:this.requestId,ms:Date.now()-this.sentAt}),this.onmessage?.({data:t.data})):t.type===`ERROR`&&this.onerror?.(Error(t.error??`WebView worker error`)))})}postMessage(t){this.sentAt=Date.now(),e.logRnDeltaEvent(`rnBridge.${this.variant}`,`postMessage-sent`,{requestId:this.requestId}),n.DeviceEventEmitter.emit(`TO_WEBVIEW_WORKER`,{__requestId:this.requestId,variant:this.variant,message:t})}terminate(){this.subscription?.remove?.(),this.subscription=null}};exports.HinkalRNWorker=r;
|
|
@@ -1,21 +1,26 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { logRnDeltaEvent as e } from "../../common/src/functions/utils/hinkalTiming.utils.mjs";
|
|
2
|
+
import { nextRequestId as t } from "./serialization.utils.mjs";
|
|
3
|
+
import { DeviceEventEmitter as n } from "react-native";
|
|
3
4
|
//#region libs/shared/sdk/src/react-native/bridge/HinkalRNWorker.ts
|
|
4
|
-
var
|
|
5
|
+
var r = class {
|
|
5
6
|
onmessage = null;
|
|
6
7
|
onerror = null;
|
|
7
|
-
requestId =
|
|
8
|
+
requestId = t();
|
|
9
|
+
sentAt = 0;
|
|
8
10
|
subscription;
|
|
9
|
-
constructor(
|
|
10
|
-
this.variant =
|
|
11
|
-
!
|
|
11
|
+
constructor(t) {
|
|
12
|
+
this.variant = t, this.subscription = n.addListener("FROM_WEBVIEW_WORKER", (t) => {
|
|
13
|
+
!t || t.requestId !== this.requestId || (t.type === "RESULT" ? (e(`rnBridge.${this.variant}`, "round-trip", {
|
|
14
|
+
requestId: this.requestId,
|
|
15
|
+
ms: Date.now() - this.sentAt
|
|
16
|
+
}), this.onmessage?.({ data: t.data })) : t.type === "ERROR" && this.onerror?.(Error(t.error ?? "WebView worker error")));
|
|
12
17
|
});
|
|
13
18
|
}
|
|
14
|
-
postMessage(
|
|
15
|
-
|
|
19
|
+
postMessage(t) {
|
|
20
|
+
this.sentAt = Date.now(), e(`rnBridge.${this.variant}`, "postMessage-sent", { requestId: this.requestId }), n.emit("TO_WEBVIEW_WORKER", {
|
|
16
21
|
__requestId: this.requestId,
|
|
17
22
|
variant: this.variant,
|
|
18
|
-
message:
|
|
23
|
+
message: t
|
|
19
24
|
});
|
|
20
25
|
}
|
|
21
26
|
terminate() {
|
|
@@ -23,4 +28,4 @@ var n = class {
|
|
|
23
28
|
}
|
|
24
29
|
};
|
|
25
30
|
//#endregion
|
|
26
|
-
export {
|
|
31
|
+
export { r as HinkalRNWorker };
|