@peerbit/react 0.0.20 → 0.0.21
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/useProgram.js +25 -15
- package/lib/esm/useProgram.js.map +1 -1
- package/package.json +2 -2
- package/src/useProgram.tsx +38 -23
package/lib/esm/useProgram.js
CHANGED
|
@@ -25,25 +25,33 @@ export const useProgram = (addressOrOpen, options) => {
|
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
27
|
setLoading(true);
|
|
28
|
-
let changeListener;
|
|
28
|
+
let changeListener = undefined;
|
|
29
29
|
closingRef.current.then(() => {
|
|
30
30
|
programLoadingRef.current = peer
|
|
31
31
|
?.open(addressOrOpen, { ...options, existing: "reuse" })
|
|
32
32
|
.then((p) => {
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
// if program has topics do change listening on peers
|
|
34
|
+
if ([p, ...p.allPrograms].filter((x) => x.closed === false &&
|
|
35
|
+
x.getTopics &&
|
|
36
|
+
x.getTopics?.().length > 0).length === 0) {
|
|
37
|
+
setPeers([peer.identity.publicKey]);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
changeListener = () => {
|
|
41
|
+
p.getReady().then((set) => {
|
|
42
|
+
setPeers([...set.values()]);
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
p.events.addEventListener("join", changeListener);
|
|
46
|
+
p.events.addEventListener("leave", changeListener);
|
|
47
|
+
p.getReady()
|
|
48
|
+
.then((set) => {
|
|
35
49
|
setPeers([...set.values()]);
|
|
50
|
+
})
|
|
51
|
+
.catch((e) => {
|
|
52
|
+
console.log("Error getReady()", e);
|
|
36
53
|
});
|
|
37
|
-
}
|
|
38
|
-
p.events.addEventListener("join", changeListener);
|
|
39
|
-
p.events.addEventListener("leave", changeListener);
|
|
40
|
-
p.getReady()
|
|
41
|
-
.then((set) => {
|
|
42
|
-
setPeers([...set.values()]);
|
|
43
|
-
})
|
|
44
|
-
.catch((e) => {
|
|
45
|
-
console.log("Error getReady()", e);
|
|
46
|
-
});
|
|
54
|
+
}
|
|
47
55
|
setProgram(p);
|
|
48
56
|
forceUpdate();
|
|
49
57
|
if (options?.id) {
|
|
@@ -67,8 +75,10 @@ export const useProgram = (addressOrOpen, options) => {
|
|
|
67
75
|
closingRef.current =
|
|
68
76
|
programLoadingRef.current.then((p) => {
|
|
69
77
|
const unsubscribe = () => {
|
|
70
|
-
|
|
71
|
-
|
|
78
|
+
changeListener &&
|
|
79
|
+
p.events.removeEventListener("join", changeListener);
|
|
80
|
+
changeListener &&
|
|
81
|
+
p.events.removeEventListener("leave", changeListener);
|
|
72
82
|
};
|
|
73
83
|
if (options?.keepOpenOnUnmount) {
|
|
74
84
|
unsubscribe();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useProgram.js","sourceRoot":"","sources":["../../src/useProgram.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChE,MAAM,gBAAgB,GAAG,CACrB,CAAK,EACP,EAAE;IACA,IAAI,CAAC;QACD,OAAO,CAAC,EAAE,OAAO,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,CAAC,CAAC,CAAC;IACf,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,UAAU,GAAG,CAItB,aAA0B,EAC1B,OAAuE,EACzE,EAAE;IACA,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAC3B,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAiB,CAAC;IACtD,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAqB,OAAO,EAAE,EAAE,CAAC,CAAC;IAC9D,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,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAkB,EAAE,CAAC,CAAC;IAExD,IAAI,UAAU,GAAG,MAAM,CAAe,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACzD;;UAEM;IACN,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,
|
|
1
|
+
{"version":3,"file":"useProgram.js","sourceRoot":"","sources":["../../src/useProgram.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@peerbit/react",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.21",
|
|
4
4
|
"homepage": "https://dao-xyz.github.io/peerbit-examples",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"module": "lib/esm/index.js",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"last 1 safari version"
|
|
71
71
|
]
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "6e2a023d63cd34b6058da13820562d64b8101253"
|
|
74
74
|
}
|
package/src/useProgram.tsx
CHANGED
|
@@ -38,26 +38,39 @@ export const useProgram = <
|
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
40
|
setLoading(true);
|
|
41
|
-
let changeListener: () => void;
|
|
41
|
+
let changeListener: (() => void) | undefined = undefined;
|
|
42
42
|
|
|
43
43
|
closingRef.current.then(() => {
|
|
44
44
|
programLoadingRef.current = peer
|
|
45
45
|
?.open(addressOrOpen, { ...options, existing: "reuse" })
|
|
46
46
|
.then((p) => {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
47
|
+
// if program has topics do change listening on peers
|
|
48
|
+
if (
|
|
49
|
+
[p, ...p.allPrograms].filter(
|
|
50
|
+
(x) =>
|
|
51
|
+
x.closed === false &&
|
|
52
|
+
x.getTopics &&
|
|
53
|
+
x.getTopics?.().length > 0
|
|
54
|
+
).length === 0
|
|
55
|
+
) {
|
|
56
|
+
setPeers([peer.identity.publicKey]);
|
|
57
|
+
} else {
|
|
58
|
+
changeListener = () => {
|
|
59
|
+
p.getReady().then((set) => {
|
|
60
|
+
setPeers([...set.values()]);
|
|
61
|
+
});
|
|
62
|
+
};
|
|
63
|
+
p.events.addEventListener("join", changeListener);
|
|
64
|
+
p.events.addEventListener("leave", changeListener);
|
|
65
|
+
p.getReady()
|
|
66
|
+
.then((set) => {
|
|
67
|
+
setPeers([...set.values()]);
|
|
68
|
+
})
|
|
69
|
+
.catch((e) => {
|
|
70
|
+
console.log("Error getReady()", e);
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
|
|
61
74
|
setProgram(p);
|
|
62
75
|
forceUpdate();
|
|
63
76
|
if (options?.id) {
|
|
@@ -83,14 +96,16 @@ export const useProgram = <
|
|
|
83
96
|
closingRef.current =
|
|
84
97
|
programLoadingRef.current.then((p) => {
|
|
85
98
|
const unsubscribe = () => {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
99
|
+
changeListener &&
|
|
100
|
+
p.events.removeEventListener(
|
|
101
|
+
"join",
|
|
102
|
+
changeListener
|
|
103
|
+
);
|
|
104
|
+
changeListener &&
|
|
105
|
+
p.events.removeEventListener(
|
|
106
|
+
"leave",
|
|
107
|
+
changeListener
|
|
108
|
+
);
|
|
94
109
|
};
|
|
95
110
|
if (options?.keepOpenOnUnmount) {
|
|
96
111
|
unsubscribe();
|