@peerbit/react 0.0.9 → 0.0.10
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/lib/esm/__tests__/lockstorage.test.js +39 -35
- package/lib/esm/__tests__/lockstorage.test.js.map +1 -1
- package/lib/esm/__tests__/utils.test.js +21 -17
- package/lib/esm/__tests__/utils.test.js.map +1 -1
- package/lib/esm/index.d.ts +1 -0
- package/lib/esm/index.js +1 -0
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/lockstorage.d.ts +2 -2
- package/lib/esm/lockstorage.js.map +1 -1
- package/lib/esm/useLocal.d.ts +2 -0
- package/lib/esm/useLocal.js +21 -0
- package/lib/esm/useLocal.js.map +1 -0
- package/lib/esm/usePeer.js +24 -22
- package/lib/esm/usePeer.js.map +1 -1
- package/lib/esm/useProgram.d.ts +1 -1
- package/lib/esm/useProgram.js +11 -9
- package/lib/esm/useProgram.js.map +1 -1
- package/lib/esm/utils.d.ts +6 -2
- package/lib/esm/utils.js +16 -4
- package/lib/esm/utils.js.map +1 -1
- package/package.json +10 -9
- package/src/__tests__/lockstorage.test.ts +47 -38
- package/src/__tests__/utils.test.ts +23 -17
- package/src/index.ts +1 -0
- package/src/lockstorage.ts +1 -1
- package/src/useLocal.tsx +27 -0
- package/src/usePeer.tsx +31 -21
- package/src/useProgram.tsx +20 -11
- package/src/utils.ts +31 -4
|
@@ -17,13 +17,19 @@ THIS SOFTWARE.
|
|
|
17
17
|
import { FastMutex } from "../lockstorage.js";
|
|
18
18
|
import sinon from "sinon";
|
|
19
19
|
import nodelocalstorage from "node-localstorage";
|
|
20
|
-
import {
|
|
20
|
+
import { expect } from "chai";
|
|
21
21
|
import { delay } from "@peerbit/time";
|
|
22
|
-
var LocalStorage = nodelocalstorage.LocalStorage;
|
|
23
|
-
var localStorage = new LocalStorage("./tmp/FastMutex");
|
|
24
|
-
globalThis.localStorage = localStorage;
|
|
25
22
|
describe("FastMutex", () => {
|
|
26
23
|
let sandbox;
|
|
24
|
+
before(() => {
|
|
25
|
+
var LocalStorage = nodelocalstorage.LocalStorage;
|
|
26
|
+
var localStorage = new LocalStorage("./tmp/FastMutex");
|
|
27
|
+
localStorage.clear();
|
|
28
|
+
globalThis.localStorage = localStorage;
|
|
29
|
+
});
|
|
30
|
+
after(() => {
|
|
31
|
+
globalThis.localStorage.clear();
|
|
32
|
+
});
|
|
27
33
|
beforeEach(() => {
|
|
28
34
|
sandbox = sinon.createSandbox();
|
|
29
35
|
localStorage.clear();
|
|
@@ -31,13 +37,13 @@ describe("FastMutex", () => {
|
|
|
31
37
|
afterEach(() => {
|
|
32
38
|
sandbox.restore();
|
|
33
39
|
localStorage.clear();
|
|
34
|
-
expect(localStorage.length).
|
|
40
|
+
expect(localStorage.length).to.eq(0);
|
|
35
41
|
});
|
|
36
42
|
it("should immediately establish a lock when there is no contention", async () => {
|
|
37
43
|
const fm1 = new FastMutex({ localStorage: localStorage });
|
|
38
|
-
expect(fm1.isLocked("clientId")).
|
|
44
|
+
expect(fm1.isLocked("clientId")).to.be.false;
|
|
39
45
|
const stats = await fm1.lock("clientId");
|
|
40
|
-
expect(fm1.isLocked("clientId")).
|
|
46
|
+
expect(fm1.isLocked("clientId")).to.be.true;
|
|
41
47
|
});
|
|
42
48
|
it("When another client has a lock (Y is not 0), it should restart to acquire a lock at a later time", function () {
|
|
43
49
|
const fm1 = new FastMutex({
|
|
@@ -51,7 +57,7 @@ describe("FastMutex", () => {
|
|
|
51
57
|
localStorage.removeItem(`yPrefix_${key}`);
|
|
52
58
|
}, 20);
|
|
53
59
|
return fm1.lock(key).then(() => {
|
|
54
|
-
expect(fm1.getLockedInfo(key)).
|
|
60
|
+
expect(fm1.getLockedInfo(key)).to.exist;
|
|
55
61
|
});
|
|
56
62
|
});
|
|
57
63
|
it("when contending for a lock and ultimately losing, it should restart", () => {
|
|
@@ -69,9 +75,9 @@ describe("FastMutex", () => {
|
|
|
69
75
|
stub.onCall(3).returns(null);
|
|
70
76
|
stub.onCall(4).returns("uniqueId");
|
|
71
77
|
return fm.lock(key).then((stats) => {
|
|
72
|
-
expect(stats.restartCount).
|
|
73
|
-
expect(stats.locksLost).
|
|
74
|
-
expect(stats.contentionCount).
|
|
78
|
+
expect(stats.restartCount).to.eq(1);
|
|
79
|
+
expect(stats.locksLost).to.eq(1);
|
|
80
|
+
expect(stats.contentionCount).to.eq(1);
|
|
75
81
|
});
|
|
76
82
|
});
|
|
77
83
|
it("When contending for a lock and ultimately winning, it should not restart", () => {
|
|
@@ -87,10 +93,10 @@ describe("FastMutex", () => {
|
|
|
87
93
|
stub.onCall(2).returns("uniqueId");
|
|
88
94
|
const spy = sandbox.spy(fm, "lock");
|
|
89
95
|
return fm.lock(key).then((stats) => {
|
|
90
|
-
expect(stats.restartCount).
|
|
91
|
-
expect(stats.locksLost).
|
|
92
|
-
expect(stats.contentionCount).
|
|
93
|
-
expect(spy.callCount).
|
|
96
|
+
expect(stats.restartCount).to.eq(0);
|
|
97
|
+
expect(stats.locksLost).to.eq(0);
|
|
98
|
+
expect(stats.contentionCount).to.eq(1);
|
|
99
|
+
expect(spy.callCount).to.eq(1);
|
|
94
100
|
});
|
|
95
101
|
});
|
|
96
102
|
// This is just to ensure that the internals of FastMutex have prefixes on the
|
|
@@ -107,18 +113,18 @@ describe("FastMutex", () => {
|
|
|
107
113
|
/* eslint-disable jest/valid-expect-in-promise */
|
|
108
114
|
const lock1Promise = fm1.lock("lock1").then((stats) => {
|
|
109
115
|
lock1Acquired = true;
|
|
110
|
-
expect(localStorage.getItem(yPrefix + "lock1")).
|
|
116
|
+
expect(localStorage.getItem(yPrefix + "lock1")).to.exist;
|
|
111
117
|
return stats;
|
|
112
118
|
});
|
|
113
119
|
/* eslint-disable jest/valid-expect-in-promise */
|
|
114
120
|
const lock2Promise = fm2.lock("lock2").then((stats) => {
|
|
115
121
|
lock2Acquired = true;
|
|
116
|
-
expect(localStorage.getItem(yPrefix + "lock2")).
|
|
122
|
+
expect(localStorage.getItem(yPrefix + "lock2")).to.exist;
|
|
117
123
|
return stats;
|
|
118
124
|
});
|
|
119
125
|
await Promise.all([lock1Promise, lock2Promise]).then(() => {
|
|
120
|
-
expect(lock1Acquired).
|
|
121
|
-
expect(lock2Acquired).
|
|
126
|
+
expect(lock1Acquired).to.be.true;
|
|
127
|
+
expect(lock2Acquired).to.be.true;
|
|
122
128
|
});
|
|
123
129
|
});
|
|
124
130
|
it("release() should remove the y lock in localStorage", () => {
|
|
@@ -131,11 +137,11 @@ describe("FastMutex", () => {
|
|
|
131
137
|
return fm1
|
|
132
138
|
.lock(key)
|
|
133
139
|
.then(() => {
|
|
134
|
-
expect(fm1.getItem("yLock" + key)).
|
|
140
|
+
expect(fm1.getItem("yLock" + key)).to.eq("releaseTestId");
|
|
135
141
|
return fm1.release(key);
|
|
136
142
|
})
|
|
137
143
|
.then(() => {
|
|
138
|
-
expect(fm1.getItem("yLock" + key)).
|
|
144
|
+
expect(fm1.getItem("yLock" + key)).to.be.undefined;
|
|
139
145
|
});
|
|
140
146
|
});
|
|
141
147
|
// this is essentially just a better way to test that two locks cannot get
|
|
@@ -151,7 +157,7 @@ describe("FastMutex", () => {
|
|
|
151
157
|
.then(() => {
|
|
152
158
|
// before the lock is released, try to establish another lock:
|
|
153
159
|
var lock2Promise = fm2.lock("clientId");
|
|
154
|
-
expect(fm1LockReleased).
|
|
160
|
+
expect(fm1LockReleased).to.be.false;
|
|
155
161
|
// in a few milliseconds, release the lock
|
|
156
162
|
setTimeout(() => {
|
|
157
163
|
fm1.release("clientId");
|
|
@@ -161,21 +167,19 @@ describe("FastMutex", () => {
|
|
|
161
167
|
})
|
|
162
168
|
.then((lock2) => {
|
|
163
169
|
// this will only execute once the other lock was released
|
|
164
|
-
expect(fm1LockReleased).
|
|
170
|
+
expect(fm1LockReleased).to.be.true;
|
|
165
171
|
});
|
|
166
172
|
});
|
|
167
|
-
it("should throw if lock is never acquired after set time period",
|
|
168
|
-
jest.setTimeout(1000);
|
|
169
|
-
// this.slow(500);
|
|
173
|
+
it("should throw if lock is never acquired after set time period", () => {
|
|
170
174
|
const fm1 = new FastMutex({ localStorage: localStorage, timeout: 50 });
|
|
171
175
|
const fm2 = new FastMutex({ localStorage: localStorage, timeout: 50 });
|
|
172
176
|
const p = fm1.lock("timeoutTest").then(() => {
|
|
173
177
|
// fm2 will never get a lock as we're not releasing fm1's lock:
|
|
174
178
|
return fm2.lock("timeoutTest");
|
|
175
179
|
});
|
|
176
|
-
|
|
180
|
+
expect(p).eventually.to.throw();
|
|
177
181
|
});
|
|
178
|
-
it("should ignore expired locks", () => {
|
|
182
|
+
it("should ignore expired locks", async () => {
|
|
179
183
|
const fm1 = new FastMutex({
|
|
180
184
|
localStorage: localStorage,
|
|
181
185
|
timeout: 5000,
|
|
@@ -187,8 +191,8 @@ describe("FastMutex", () => {
|
|
|
187
191
|
value: "oldclient",
|
|
188
192
|
};
|
|
189
193
|
localStorage.setItem("yLocktimeoutTest", JSON.stringify(expiredRecord));
|
|
190
|
-
expect(JSON.parse(localStorage.getItem("yLocktimeoutTest")).value).
|
|
191
|
-
|
|
194
|
+
expect(JSON.parse(localStorage.getItem("yLocktimeoutTest")).value).to.eq("oldclient");
|
|
195
|
+
await fm1.lock("timeoutTest"); // should not throw
|
|
192
196
|
});
|
|
193
197
|
it("should reset the client stats after lock is released", async () => {
|
|
194
198
|
// without resetting the stats, the acquireStart will always be set, and
|
|
@@ -197,18 +201,18 @@ describe("FastMutex", () => {
|
|
|
197
201
|
let keepLock = true;
|
|
198
202
|
let keepLockFn = () => keepLock;
|
|
199
203
|
await fm1.lock("resetStats", keepLockFn);
|
|
200
|
-
expect(fm1.isLocked("resetStats")).
|
|
204
|
+
expect(fm1.isLocked("resetStats")).to.be.true;
|
|
201
205
|
keepLock = false;
|
|
202
206
|
await delay(100); // await timeout
|
|
203
|
-
expect(fm1.isLocked("resetStats")).
|
|
207
|
+
expect(fm1.isLocked("resetStats")).to.be.false;
|
|
204
208
|
const p = fm1.lock("resetStats").then(() => fm1.release("resetStats"));
|
|
205
|
-
await
|
|
209
|
+
await p; // should not throw
|
|
206
210
|
});
|
|
207
211
|
it("can keep lock with callback function", async () => {
|
|
208
212
|
const fm1 = new FastMutex({ localStorage: localStorage, timeout: 50 });
|
|
209
213
|
await fm1.lock("x");
|
|
210
214
|
await fm1.release("x");
|
|
211
|
-
expect(fm1.isLocked("x")).
|
|
215
|
+
expect(fm1.isLocked("x")).to.be.false;
|
|
212
216
|
await fm1.lock("x").then(() => fm1.release("x"));
|
|
213
217
|
});
|
|
214
218
|
it("should reset the client stats if the lock has expired", async () => {
|
|
@@ -219,7 +223,7 @@ describe("FastMutex", () => {
|
|
|
219
223
|
await fm1.lock("resetStats");
|
|
220
224
|
// try to acquire a lock after `timeout`:
|
|
221
225
|
await delay(50);
|
|
222
|
-
await
|
|
226
|
+
await fm1.lock("resetStats"); // should not throw
|
|
223
227
|
});
|
|
224
228
|
});
|
|
225
229
|
//# sourceMappingURL=lockstorage.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockstorage.test.js","sourceRoot":"","sources":["../../../src/__tests__/lockstorage.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;EAeE;AAEF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"lockstorage.test.js","sourceRoot":"","sources":["../../../src/__tests__/lockstorage.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,16 @@ import { FastMutex } from "../lockstorage";
|
|
|
4
4
|
import { delay } from "@peerbit/time";
|
|
5
5
|
import { default as sodium } from "libsodium-wrappers";
|
|
6
6
|
import { v4 as uuid } from "uuid";
|
|
7
|
-
|
|
8
|
-
var localStorage = new LocalStorage("./tmp/getKeypair");
|
|
9
|
-
globalThis.localStorage = localStorage;
|
|
7
|
+
import { expect } from "chai";
|
|
10
8
|
describe("getKeypair", () => {
|
|
11
|
-
|
|
9
|
+
before(async () => {
|
|
12
10
|
await sodium.ready;
|
|
11
|
+
var LocalStorage = nodelocalstorage.LocalStorage;
|
|
12
|
+
var localStorage = new LocalStorage("./tmp/getKeypair");
|
|
13
|
+
globalThis.localStorage = localStorage;
|
|
14
|
+
});
|
|
15
|
+
after(() => {
|
|
16
|
+
globalThis.localStorage.clear();
|
|
13
17
|
});
|
|
14
18
|
it("can aquire multiple keypairs", async () => {
|
|
15
19
|
let timeout = 1000;
|
|
@@ -19,15 +23,15 @@ describe("getKeypair", () => {
|
|
|
19
23
|
let id = uuid();
|
|
20
24
|
const { key: keypair, path: path1 } = await getFreeKeypair(id, mutex, lockCondition);
|
|
21
25
|
const { key: keypair2, path: path2 } = await getFreeKeypair(id, mutex);
|
|
22
|
-
expect(keypair.equals(keypair2)).
|
|
23
|
-
expect(path1).not.
|
|
26
|
+
expect(keypair.equals(keypair2)).to.be.false;
|
|
27
|
+
expect(path1).not.to.eq(path2);
|
|
24
28
|
lock = false;
|
|
25
29
|
await delay(timeout);
|
|
26
30
|
const { path: path3, key: keypair3 } = await getFreeKeypair(id, mutex);
|
|
27
|
-
expect(path3).
|
|
28
|
-
expect(keypair3.equals(keypair)).
|
|
31
|
+
expect(path3).to.eq(path1);
|
|
32
|
+
expect(keypair3.equals(keypair)).to.be.true;
|
|
29
33
|
const allKeypair = await getAllKeyPairs(id);
|
|
30
|
-
expect(allKeypair.map((x) => x.publicKey.hashcode())).
|
|
34
|
+
expect(allKeypair.map((x) => x.publicKey.hashcode())).to.deep.eq([
|
|
31
35
|
keypair3.publicKey.hashcode(),
|
|
32
36
|
keypair2.publicKey.hashcode(),
|
|
33
37
|
]);
|
|
@@ -38,12 +42,12 @@ describe("getKeypair", () => {
|
|
|
38
42
|
let lock = true;
|
|
39
43
|
const lockCondition = () => lock;
|
|
40
44
|
let id = uuid();
|
|
41
|
-
const { key: keypair, path: path1 } = await getFreeKeypair(id, mutex, lockCondition, true);
|
|
42
|
-
const { key: keypair2, path: path2 } = await getFreeKeypair(id, mutex, undefined, true);
|
|
43
|
-
expect(keypair.equals(keypair2)).
|
|
44
|
-
expect(path1).
|
|
45
|
+
const { key: keypair, path: path1 } = await getFreeKeypair(id, mutex, lockCondition, { releaseLockIfSameId: true });
|
|
46
|
+
const { key: keypair2, path: path2 } = await getFreeKeypair(id, mutex, undefined, { releaseLockIfSameId: true });
|
|
47
|
+
expect(keypair.equals(keypair2)).to.be.true;
|
|
48
|
+
expect(path1).to.eq(path2);
|
|
45
49
|
const allKeypair = await getAllKeyPairs(id);
|
|
46
|
-
expect(allKeypair).
|
|
50
|
+
expect(allKeypair).to.have.length(1);
|
|
47
51
|
});
|
|
48
52
|
it("releases manually", async () => {
|
|
49
53
|
let timeout = 1000;
|
|
@@ -51,11 +55,11 @@ describe("getKeypair", () => {
|
|
|
51
55
|
const id = uuid();
|
|
52
56
|
const { key: keypair, path: path1 } = await getFreeKeypair(id, mutex);
|
|
53
57
|
const { key: keypair2, path: path2 } = await getFreeKeypair(id, mutex);
|
|
54
|
-
expect(path1).not.
|
|
58
|
+
expect(path1).not.to.eq(path2);
|
|
55
59
|
releaseKey(path1, mutex);
|
|
56
|
-
expect(mutex.getLockedInfo(path1)).
|
|
60
|
+
expect(mutex.getLockedInfo(path1)).to.be.undefined;
|
|
57
61
|
const { key: keypair3, path: path3 } = await getFreeKeypair(id, mutex);
|
|
58
|
-
expect(path1).
|
|
62
|
+
expect(path1).to.eq(path3); // we can now acquire key at path1 again, since we released it
|
|
59
63
|
});
|
|
60
64
|
});
|
|
61
65
|
//# sourceMappingURL=utils.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAClC,IAAI,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils.test.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/index.d.ts
CHANGED
package/lib/esm/index.js
CHANGED
package/lib/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAClE,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAClE,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
|
package/lib/esm/lockstorage.d.ts
CHANGED
|
@@ -6,11 +6,11 @@ export declare class FastMutex {
|
|
|
6
6
|
localStorage: any;
|
|
7
7
|
intervals: Map<string, any>;
|
|
8
8
|
constructor({ clientId, xPrefix, yPrefix, timeout, localStorage, }?: {
|
|
9
|
-
clientId?:
|
|
9
|
+
clientId?: string | undefined;
|
|
10
10
|
xPrefix?: string | undefined;
|
|
11
11
|
yPrefix?: string | undefined;
|
|
12
12
|
timeout?: number | undefined;
|
|
13
|
-
localStorage?:
|
|
13
|
+
localStorage?: any;
|
|
14
14
|
});
|
|
15
15
|
lock(key: string, keepLocked?: () => boolean): Promise<{
|
|
16
16
|
restartCount: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockstorage.js","sourceRoot":"","sources":["../../src/lockstorage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;EAeE;AAEF,OAAO,OAAO,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAClC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEnC,MAAM,OAAO,SAAS;IAClB,QAAQ,CAAS;IACjB,OAAO,CAAS;IAChB,OAAO,CAAS;IAChB,OAAO,CAAS;IAChB,YAAY,CAAM;IAClB,SAAS,CAAmB;IAE5B,YAAY,EACR,QAAQ,GAAG,IAAI,EAAE,EACjB,OAAO,GAAG,gBAAgB,EAC1B,OAAO,GAAG,gBAAgB,EAC1B,OAAO,GAAG,IAAI,EACd,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"lockstorage.js","sourceRoot":"","sources":["../../src/lockstorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { SearchRequest } from "@peerbit/document";
|
|
2
|
+
import { useEffect, useState } from "react";
|
|
3
|
+
export const useLocal = (db) => {
|
|
4
|
+
const [all, setAll] = useState([]);
|
|
5
|
+
useEffect(() => {
|
|
6
|
+
if (!db || db.closed) {
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
const changeListener = async () => {
|
|
10
|
+
setAll(await db.index.search(new SearchRequest(), {
|
|
11
|
+
local: true,
|
|
12
|
+
remote: false,
|
|
13
|
+
}));
|
|
14
|
+
};
|
|
15
|
+
changeListener();
|
|
16
|
+
db.events.addEventListener("change", changeListener);
|
|
17
|
+
return () => db.events.addEventListener("change", changeListener);
|
|
18
|
+
}, [db?.address, db?.closed]);
|
|
19
|
+
return all;
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=useLocal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useLocal.js","sourceRoot":"","sources":["../../src/useLocal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CACpB,EAAsB,EACxB,EAAE;IACA,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAM,EAAE,CAAC,CAAC;IACxC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO;QACX,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;YAC9B,MAAM,CACF,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,aAAa,EAAE,EAAE;gBACvC,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,KAAK;aAChB,CAAC,CACL,CAAC;QACN,CAAC,CAAC;QAEF,cAAc,EAAE,CAAC;QACjB,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAErD,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACtE,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC;AACf,CAAC,CAAC"}
|
package/lib/esm/usePeer.js
CHANGED
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import React, { useContext } from "react";
|
|
3
3
|
import { Peerbit } from "peerbit";
|
|
4
|
-
import { webSockets } from "@libp2p/websockets";
|
|
5
4
|
import { DirectSub } from "@peerbit/pubsub";
|
|
6
5
|
import { yamux } from "@chainsafe/libp2p-yamux";
|
|
7
|
-
import { getFreeKeypair, getTabId, inIframe } from "./utils.js";
|
|
8
|
-
import { noise } from "@
|
|
6
|
+
import { getFreeKeypair, getTabId, inIframe, cookiesWhereClearedJustNow, } from "./utils.js";
|
|
7
|
+
import { noise } from "@chainsafe/libp2p-noise";
|
|
9
8
|
import { v4 as uuid } from "uuid";
|
|
10
9
|
import { FastMutex } from "./lockstorage.js";
|
|
11
10
|
import sodium from "libsodium-wrappers";
|
|
12
|
-
import * as filters from "@libp2p/websockets/filters";
|
|
13
11
|
import { useMount } from "./useMount.js";
|
|
14
12
|
import { createClient, createHost } from "@peerbit/proxy-window";
|
|
15
|
-
import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
|
|
16
|
-
import { webRTC } from "@libp2p/webrtc";
|
|
17
13
|
import { identify } from "@libp2p/identify";
|
|
14
|
+
import { webSockets } from "@libp2p/websockets";
|
|
15
|
+
import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
|
|
16
|
+
import * as filters from "@libp2p/websockets/filters";
|
|
18
17
|
import { detectIncognito } from "detectincognitojs";
|
|
19
18
|
if (!window.name) {
|
|
20
19
|
window.name = uuid();
|
|
@@ -56,13 +55,16 @@ export const PeerProvider = (options) => {
|
|
|
56
55
|
: options.top
|
|
57
56
|
: options;
|
|
58
57
|
if (nodeOptions.type !== "proxy") {
|
|
58
|
+
const releaseFirstLock = cookiesWhereClearedJustNow();
|
|
59
59
|
const nodeId = nodeOptions.keypair ||
|
|
60
60
|
(await getFreeKeypair("", new FastMutex({
|
|
61
61
|
clientId: getTabId(),
|
|
62
62
|
timeout: 1000,
|
|
63
|
-
}), undefined,
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
}), undefined, {
|
|
64
|
+
releaseFirstLock, // when clearing cookies sometimes the localStorage is not cleared immediately so we need to release the lock forcefully. TODO investigate why this is happening
|
|
65
|
+
releaseLockIfSameId: true, // reuse keypairs from same tab, (force release)
|
|
66
|
+
})).key;
|
|
67
|
+
const peerId = nodeId.toPeerId();
|
|
66
68
|
let directory = undefined;
|
|
67
69
|
if (!nodeOptions.inMemory &&
|
|
68
70
|
!(await detectIncognito()).isPrivate) {
|
|
@@ -86,13 +88,15 @@ export const PeerProvider = (options) => {
|
|
|
86
88
|
newPeer = await Peerbit.create({
|
|
87
89
|
libp2p: {
|
|
88
90
|
addresses: {
|
|
89
|
-
listen: [
|
|
91
|
+
listen: [
|
|
92
|
+
"/p2p-circuit",
|
|
93
|
+
/* "/webrtc" */
|
|
94
|
+
], // TMP disable because flaky behaviour with libp2p 1.8.1
|
|
90
95
|
},
|
|
91
|
-
|
|
96
|
+
connectionEncrypters: [noise()],
|
|
92
97
|
peerId, //, having the same peer accross broswers does not work, only one tab will be recognized by other peers
|
|
93
98
|
connectionManager: {
|
|
94
99
|
maxConnections: 100,
|
|
95
|
-
minConnections: 1,
|
|
96
100
|
},
|
|
97
101
|
streamMuxers: [yamux()],
|
|
98
102
|
...(nodeOptions.network === "local"
|
|
@@ -111,19 +115,15 @@ export const PeerProvider = (options) => {
|
|
|
111
115
|
webSockets({
|
|
112
116
|
filter: filters.all,
|
|
113
117
|
}),
|
|
114
|
-
circuitRelayTransport(
|
|
115
|
-
|
|
116
|
-
}),
|
|
117
|
-
webRTC(),
|
|
118
|
+
circuitRelayTransport(),
|
|
119
|
+
/* webRTC(), */ // TMP disable because flaky behaviour with libp2p 1.8.1
|
|
118
120
|
],
|
|
119
121
|
}
|
|
120
122
|
: {
|
|
121
123
|
transports: [
|
|
122
124
|
webSockets({ filter: filters.wss }),
|
|
123
|
-
circuitRelayTransport(
|
|
124
|
-
|
|
125
|
-
}),
|
|
126
|
-
webRTC(),
|
|
125
|
+
circuitRelayTransport(),
|
|
126
|
+
/* webRTC(), */ // TMP disable because flaky behaviour with libp2p 1.8.1
|
|
127
127
|
],
|
|
128
128
|
}),
|
|
129
129
|
services: {
|
|
@@ -138,8 +138,10 @@ export const PeerProvider = (options) => {
|
|
|
138
138
|
},
|
|
139
139
|
directory,
|
|
140
140
|
});
|
|
141
|
-
console.log("
|
|
142
|
-
|
|
141
|
+
console.log("Client created", {
|
|
142
|
+
directory,
|
|
143
|
+
peerHash: newPeer?.identity.publicKey.hashcode(),
|
|
144
|
+
});
|
|
143
145
|
setConnectionState("connecting");
|
|
144
146
|
// Resolve bootstrap nodes async (we want to return before this is done)
|
|
145
147
|
const connectFn = async () => {
|
package/lib/esm/usePeer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePeer.js","sourceRoot":"","sources":["../../src/usePeer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"usePeer.js","sourceRoot":"","sources":["../../src/usePeer.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EACH,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,0BAA0B,GAC7B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAepD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACf,MAAM,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAe,EAAS,CAAC,CAAC;AACxE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AA2BrD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAoB,EAAE,EAAE;IACjD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAClC,SAAS,CACZ,CAAC;IACF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CACxC,SAAS,CACZ,CAAC;IAEF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAC5C,SAAS,CACZ,CAAC;IAEF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,IAAI,CAAC,CAAC;IAC5D,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GACvC,KAAK,CAAC,QAAQ,CAAmB,cAAc,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CACtB,GAAG,EAAE,CAAC,CAAC;QACH,IAAI;QACJ,OAAO;QACP,OAAO;QACP,eAAe;QACf,MAAM,EAAE,eAAe;QACvB,SAAS,EAAE,SAAS;KACvB,CAAC,EACF;QACI,OAAO;QACP,CAAC,CAAC,OAAO;QACT,eAAe;QACf,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE;QACrC,SAAS;KACZ,CACJ,CAAC;IAEF,QAAQ,CAAC,GAAG,EAAE;QACV,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,KAAK,IAAI,EAAE;YAClB,MAAM,MAAM,CAAC,KAAK,CAAC;YACnB,IAAI,IAAI,EAAE,CAAC;gBACP,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,OAAO,CAAC,SAAS,CAAC,CAAC;YACvB,CAAC;YAED,IAAI,OAAsB,CAAC;YAC3B,MAAM,WAAW,GAAI,OAA+B,CAAC,GAAG;gBACpD,CAAC,CAAC,QAAQ,EAAE;oBACR,CAAC,CAAE,OAA+B,CAAC,MAAM;oBACzC,CAAC,CAAE,OAA+B,CAAC,GAAG;gBAC1C,CAAC,CAAE,OAAsB,CAAC;YAE9B,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC/B,MAAM,gBAAgB,GAAG,0BAA0B,EAAE,CAAC;gBACtD,MAAM,MAAM,GACR,WAAW,CAAC,OAAO;oBACnB,CACI,MAAM,cAAc,CAChB,EAAE,EACF,IAAI,SAAS,CAAC;wBACV,QAAQ,EAAE,QAAQ,EAAE;wBACpB,OAAO,EAAE,IAAI;qBAChB,CAAC,EACF,SAAS,EACT;wBACI,gBAAgB,EAAE,gKAAgK;wBAClL,mBAAmB,EAAE,IAAI,EAAE,gDAAgD;qBAC9E,CACJ,CACJ,CAAC,GAAG,CAAC;gBACV,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAEjC,IAAI,SAAS,GAAuB,SAAS,CAAC;gBAC9C,IACI,CAAE,WAA0B,CAAC,QAAQ;oBACrC,CAAC,CAAC,MAAM,eAAe,EAAE,CAAC,CAAC,SAAS,EACtC,CAAC;oBACC,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpD,YAAY,CAAC,SAAS,CAAC,CAAC;oBACxB,IAAI,CAAC,SAAS,EAAE,CAAC;wBACb,YAAY,CAAC,KAAK,CAAC,CAAC;wBACpB,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;4BACnB,OAAO,CAAC,KAAK,CACT,gLAAgL,CACnL,CAAC;wBACN,CAAC;6BAAM,CAAC;4BACJ,OAAO,CAAC,KAAK,CACT,8DAA8D,CACjE,CAAC;wBACN,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACJ,SAAS,GAAG,UAAU,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC;oBAC/C,CAAC;gBACL,CAAC;gBAED,0EAA0E;gBAC1E,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC7B,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;oBAC3B,MAAM,EAAE;wBACJ,SAAS,EAAE;4BACP,MAAM,EAAE;gCACJ,cAAc;gCACd,eAAe;6BAClB,EAAE,wDAAwD;yBAC9D;wBACD,oBAAoB,EAAE,CAAC,KAAK,EAAE,CAAC;wBAC/B,MAAM,EAAE,uGAAuG;wBAC/G,iBAAiB,EAAE;4BACf,cAAc,EAAE,GAAG;yBACtB;wBAED,YAAY,EAAE,CAAC,KAAK,EAAE,CAAC;wBACvB,GAAG,CAAC,WAAW,CAAC,OAAO,KAAK,OAAO;4BAC/B,CAAC,CAAC;gCACI,eAAe,EAAE;oCACb,iBAAiB,EAAE,GAAG,EAAE;wCACpB,2EAA2E;wCAC3E,0EAA0E;wCAC1E,2EAA2E;wCAC3E,yBAAyB;wCACzB,OAAO,KAAK,CAAC;oCACjB,CAAC;iCACJ;gCACD,UAAU,EAAE;oCACR,mFAAmF;oCACnF,UAAU,CAAC;wCACP,MAAM,EAAE,OAAO,CAAC,GAAG;qCACtB,CAAC;oCACF,qBAAqB,EAAE;oCACvB,kBAAkB,CAAC,wDAAwD;iCAC9E;6BACJ;4BACH,CAAC,CAAC;gCACI,UAAU,EAAE;oCACR,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;oCACnC,qBAAqB,EAAE;oCACvB,iBAAiB,CAAC,wDAAwD;iCAC7E;6BACJ,CAAC;wBAER,QAAQ,EAAE;4BACN,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CACV,IAAI,SAAS,CAAC,CAAC,EAAE;gCACb,eAAe,EAAE,IAAI;gCACrB;;yCAES;6BACZ,CAAC;4BACN,QAAQ,EAAE,QAAQ,EAAE;yBACvB;qBACJ;oBACD,SAAS;iBACZ,CAAC,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;oBAC1B,SAAS;oBACT,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE;iBACnD,CAAC,CAAC;gBAEH,kBAAkB,CAAC,YAAY,CAAC,CAAC;gBAEjC,wEAAwE;gBACxE,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;oBACzB,IAAI,CAAC;wBACD,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;4BAClC,MAAM,OAAO,CAAC,IAAI,CACd,iCAAiC;gCAC7B,CAAC,MAAM,CACH,MAAM,KAAK,CACP,+BAA+B,CAClC,CACJ,CAAC,IAAI,EAAE,CAAC,CAChB,CAAC;wBACN,CAAC;6BAAM,CAAC;4BACJ,+DAA+D;4BAC/D,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;gCACxB,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;oCACvC,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCAC7B,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACJ,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;4BACnC,CAAC;wBACL,CAAC;wBACD,kBAAkB,CAAC,WAAW,CAAC,CAAC;oBACpC,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAChB,OAAO,CAAC,KAAK,CACT,qCAAqC,GAAG,GAAG,EAAE,OAAO,CACvD,CAAC;wBACF,kBAAkB,CAAC,QAAQ,CAAC,CAAC;oBACjC,CAAC;oBAED,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;wBACnB,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;oBACxC,CAAC;gBACL,CAAC,CAAC;gBAEF,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;gBAClC,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;oBACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAClC,CAAC,CAAC,CAAC;gBACH,oFAAoF;gBAEpF,IAAI,WAAW,CAAC,iBAAiB,KAAK,KAAK,EAAE,CAAC;oBAC1C,MAAM,OAAO,CAAC;gBAClB,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC3D,CAAC;YAED,OAAO,CAAC,OAAO,CAAC,CAAC;YACjB,UAAU,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC;QACF,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,OAAO,CACH,KAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,YAC5B,OAAO,CAAC,QAAQ,GACE,CAC1B,CAAC;AACN,CAAC,CAAC"}
|
package/lib/esm/useProgram.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Program, OpenOptions, ProgramEvents } from "@peerbit/program";
|
|
2
2
|
type ExtractArgs<T> = T extends Program<infer Args> ? Args : never;
|
|
3
3
|
type ExtractEvents<T> = T extends Program<any, infer Events> ? Events : never;
|
|
4
|
-
export declare const useProgram: <P extends Program<ExtractArgs<P>, ExtractEvents<P>> & Program<any, ProgramEvents>>(addressOrOpen?:
|
|
4
|
+
export declare const useProgram: <P extends Program<ExtractArgs<P>, ExtractEvents<P>> & Program<any, ProgramEvents>>(addressOrOpen?: P | string, options?: OpenOptions<P>) => {
|
|
5
5
|
program: P | undefined;
|
|
6
6
|
session: any;
|
|
7
7
|
loading: boolean;
|
package/lib/esm/useProgram.js
CHANGED
|
@@ -48,15 +48,17 @@ export const useProgram = (addressOrOpen, options) => {
|
|
|
48
48
|
return () => {
|
|
49
49
|
let startRef = programLoadingRef.current;
|
|
50
50
|
// TODO don't close on reopen the same db?
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
p.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
51
|
+
if (programLoadingRef.current) {
|
|
52
|
+
closingRef.current =
|
|
53
|
+
programLoadingRef.current.then((p) => p.close().then(() => {
|
|
54
|
+
p.events.removeEventListener("join", changeListener);
|
|
55
|
+
p.events.removeEventListener("leave", changeListener);
|
|
56
|
+
if (programLoadingRef.current === startRef) {
|
|
57
|
+
setProgram(undefined);
|
|
58
|
+
programLoadingRef.current = undefined;
|
|
59
|
+
}
|
|
60
|
+
})) || Promise.resolve();
|
|
61
|
+
}
|
|
60
62
|
};
|
|
61
63
|
}, [
|
|
62
64
|
peer?.identity.publicKey.hashcode(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useProgram.js","sourceRoot":"","sources":["../../src/useProgram.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChE,MAAM,kBAAkB,GAAG,CAKvB,CAAK,EACP,EAAE;IACA,IAAI,CAAC;QACD,OAAO,CAAC,EAAE,OAAO,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,UAAU,GAAG,CAItB,aAA0B,EAC1B,OAAwB,EAC1B,EAAE;IACA,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAC3B,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAiB,CAAC;IACtD,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,IAAI,iBAAiB,GAAG,MAAM,EAAc,CAAC;IAC7C,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IAC1D,IAAI,UAAU,GAAG,MAAM,CAAe,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAEzD,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1B,OAAO;QACX,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,cAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"useProgram.js","sourceRoot":"","sources":["../../src/useProgram.tsx"],"names":[],"mappings":"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"}
|