Skip to content

Commit 2852656

Browse files
ben221199ben221199
committed
Make RPC constants
1 parent d010182 commit 2852656

9 files changed

Lines changed: 75 additions & 62 deletions

File tree

‎src/ClaimPage.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@ function ClaimPage(): JSX.Element {
1212
const params: Params<string> = useParams();
1313
const claim: string = params["*"];
1414

15-
const [claimResolveData, setClaimResolveData] = useState(null);
15+
const [claimResolveData, setClaimResolveData] = useState<object>(null);
1616

1717
useEffect((): void => {
1818
LBRY.rpc(
1919
daemonRPC,
20-
"resolve",
20+
LBRY.RESOLVE,
2121
{ urls: [claim] },
2222
null,
23-
import.meta.env.VITE_DAEMON_PROXY === "true",
24-
).then(async (json: object) => {
25-
//await new Promise(r => setTimeout(r, 10000));
26-
23+
LBRY.isUsingProxy(),
24+
).then((json: object): void => {
2725
setClaimResolveData(json.result[claim] ?? null);
2826
});
2927
}, [claim, daemonRPC]);

‎src/Home.tsx‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,29 @@ function Home(): JSX.Element {
1313
const [row3, setRow3] = useState<object[]>([]);
1414

1515
useEffect((): void => {
16+
const searchOptions: object = {
17+
page_size: 4,
18+
claim_type: ["stream", "repost", "channel"],
19+
no_totals: true,
20+
any_tags: [],
21+
not_tags: NOT_TAGS,
22+
channel_ids: [
23+
"80d2590ad04e36fb1d077a9b9e3a8bba76defdf8",
24+
"b58dfaeab6c70754d792cdd9b56ff59b90aea334",
25+
],
26+
not_channel_ids: [],
27+
order_by: ["release_time"],
28+
has_source: true,
29+
release_time: ">1731193200",
30+
include_purchase_receipt: true,
31+
};
32+
1633
LBRY.rpc(
1734
daemonRPC,
18-
"claim_search",
19-
{
20-
page_size: 4,
21-
claim_type: ["stream", "repost", "channel"],
22-
no_totals: true,
23-
any_tags: [],
24-
not_tags: NOT_TAGS,
25-
channel_ids: [
26-
"80d2590ad04e36fb1d077a9b9e3a8bba76defdf8",
27-
"b58dfaeab6c70754d792cdd9b56ff59b90aea334",
28-
],
29-
not_channel_ids: [],
30-
order_by: ["release_time"],
31-
has_source: true,
32-
release_time: ">1731193200",
33-
include_purchase_receipt: true,
34-
},
35+
LBRY.CLAIM_SEARCH,
36+
searchOptions,
3537
null,
36-
import.meta.env.VITE_DAEMON_PROXY === "true",
38+
LBRY.isUsingProxy(),
3739
).then((json: object): void => {
3840
setRow1(json.result.items);
3941
});
@@ -42,7 +44,7 @@ function Home(): JSX.Element {
4244
useEffect((): void => {
4345
LBRY.rpc(
4446
daemonRPC,
45-
"claim_search",
47+
LBRY.CLAIM_SEARCH,
4648
{
4749
page_size: 4,
4850
claim_type: ["stream"],
@@ -58,7 +60,7 @@ function Home(): JSX.Element {
5860
include_purchase_receipt: true,
5961
},
6062
null,
61-
import.meta.env.VITE_DAEMON_PROXY === "true",
63+
LBRY.isUsingProxy(),
6264
).then((json: object): void => {
6365
setRow2(json.result.items);
6466
});
@@ -67,7 +69,7 @@ function Home(): JSX.Element {
6769
useEffect((): void => {
6870
LBRY.rpc(
6971
daemonRPC,
70-
"claim_search",
72+
LBRY.CLAIM_SEARCH,
7173
{
7274
page_size: 4,
7375
claim_type: ["stream", "repost", "channel"],
@@ -81,7 +83,7 @@ function Home(): JSX.Element {
8183
include_purchase_receipt: true,
8284
},
8385
null,
84-
import.meta.env.VITE_DAEMON_PROXY === "true",
86+
LBRY.isUsingProxy(),
8587
).then((json: object): void => {
8688
setRow3(json.result.items);
8789
});

‎src/LBRY.tsx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
const VERSION_2_0: string = "2.0";
22

3+
const CLAIM_SEARCH: string = "claim_search";
4+
const GET: string = "get";
5+
const RESOLVE: string = "resolve";
6+
const SETTINGS_GET: string = "settings_get";
7+
const TXO_LIST: string = "txo_list";
8+
const WALLET_BALANCE: string = "wallet_balance";
9+
310
function generateID(): number {
411
return Math.ceil(Math.random() * 65536) + 1;
512
}
613

14+
function isUsingProxy(): boolean {
15+
return import.meta.env.VITE_DAEMON_PROXY === "true";
16+
}
17+
718
async function rpcDirect(
819
input: string | URL | Request,
920
method: string,
@@ -65,5 +76,12 @@ async function rpc(
6576
}
6677

6778
export default {
79+
CLAIM_SEARCH,
80+
GET,
81+
RESOLVE,
82+
SETTINGS_GET,
83+
TXO_LIST,
84+
WALLET_BALANCE,
85+
isUsingProxy,
6886
rpc,
6987
};

‎src/SearchPage.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ function SearchPage(): JSX.Element {
1111

1212
const query: string | null = new URLSearchParams(location.search).get("q");
1313

14-
const [resolveItem, setResolveItem] = useState(null);
14+
const [resolveItem, setResolveItem] = useState<object>(null);
1515
const [channelSearchItems, setChannelSearchItems] = useState<object[]>([]);
1616

1717
useEffect((): void => {
1818
LBRY.rpc(
1919
daemonRPC,
20-
"resolve",
20+
LBRY.RESOLVE,
2121
{
2222
urls: ["lbry://" + query, "lbry://@" + query],
2323
include_purchase_receipt: true,
2424
},
2525
null,
26-
import.meta.env.VITE_DAEMON_PROXY === "true",
26+
LBRY.isUsingProxy(),
2727
).then((json: object): void => {
2828
if (
2929
json.result["lbry://" + query] &&
@@ -45,7 +45,7 @@ function SearchPage(): JSX.Element {
4545
useEffect((): void => {
4646
LBRY.rpc(
4747
daemonRPC,
48-
"claim_search",
48+
LBRY.CLAIM_SEARCH,
4949
{
5050
page_size: 20,
5151
claim_type: ["channel", "stream"],
@@ -54,7 +54,7 @@ function SearchPage(): JSX.Element {
5454
text: query,
5555
},
5656
null,
57-
import.meta.env.VITE_DAEMON_PROXY === "true",
57+
LBRY.isUsingProxy(),
5858
).then((json: object): void => {
5959
setChannelSearchItems(json.result.items);
6060
});

‎src/SettingsPage.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ import LBRY from "~/LBRY";
55
function SettingsPage() {
66
const daemonRPC: string = useDaemonRPC();
77

8-
const [settings, setSettings]: [object, (value: object) => object] =
9-
useState();
8+
const [settings, setSettings] = useState<object>();
109

1110
useEffect((): void => {
1211
LBRY.rpc(
1312
daemonRPC,
14-
"settings_get",
13+
LBRY.SETTINGS_GET,
1514
null,
1615
null,
17-
import.meta.env.VITE_DAEMON_PROXY === "true",
16+
LBRY.isUsingProxy(),
1817
).then((json: object): void => {
1918
setSettings(json.result || json.error?.message || "Unknown error");
2019
});

‎src/WalletPage.tsx‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import LBRY from "~/LBRY";
66
function WalletPage() {
77
const daemonRPC: string = useDaemonRPC();
88

9-
const [wallet, setWallet] = useState(null);
9+
const [wallet, setWallet] = useState<object[unknown]>(null);
1010
const [transactions, setTransactions] = useState<object[]>([]);
1111

1212
useEffect((): void => {
1313
LBRY.rpc(
1414
daemonRPC,
15-
"wallet_balance",
15+
LBRY.WALLET_BALANCE,
1616
null,
1717
null,
18-
import.meta.env.VITE_DAEMON_PROXY === "true",
18+
LBRY.isUsingProxy(),
1919
).then((json: object): void => {
2020
if (json.error) {
2121
return;
@@ -25,18 +25,14 @@ function WalletPage() {
2525
}, [daemonRPC]);
2626

2727
useEffect((): void => {
28-
LBRY.rpc(
29-
daemonRPC,
30-
"txo_list",
31-
null,
32-
null,
33-
import.meta.env.VITE_DAEMON_PROXY === "true",
34-
).then((json: object): void => {
35-
if (json.error) {
36-
return;
37-
}
38-
setTransactions(json.result?.items || []);
39-
});
28+
LBRY.rpc(daemonRPC, LBRY.TXO_LIST, null, null, LBRY.isUsingProxy()).then(
29+
(json: object): void => {
30+
if (json.error) {
31+
return;
32+
}
33+
setTransactions(json.result?.items || []);
34+
},
35+
);
4036
}, [daemonRPC]);
4137

4238
return (

‎src/components/ChannelClaim.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function ChannelClaim({ data }: Props & { data: Channel }): JSX.Element {
1717
useEffect((): void => {
1818
LBRY.rpc(
1919
daemonRPC,
20-
"claim_search",
20+
LBRY.CLAIM_SEARCH,
2121
{
2222
page_size: 20,
2323
page: 1,
@@ -32,7 +32,7 @@ function ChannelClaim({ data }: Props & { data: Channel }): JSX.Element {
3232
include_purchase_receipt: true,
3333
},
3434
null,
35-
import.meta.env.VITE_DAEMON_PROXY === "true",
35+
LBRY.isUsingProxy(),
3636
).then((json: object): void => {
3737
setContent(json.result.items);
3838
});
@@ -41,7 +41,7 @@ function ChannelClaim({ data }: Props & { data: Channel }): JSX.Element {
4141
useEffect((): void => {
4242
LBRY.rpc(
4343
daemonRPC,
44-
"claim_search",
44+
LBRY.CLAIM_SEARCH,
4545
{
4646
page_size: 20,
4747
page: 1,
@@ -56,7 +56,7 @@ function ChannelClaim({ data }: Props & { data: Channel }): JSX.Element {
5656
include_purchase_receipt: true,
5757
},
5858
null,
59-
import.meta.env.VITE_DAEMON_PROXY === "true",
59+
LBRY.isUsingProxy(),
6060
).then((json: object): void => {
6161
setPlaylists(json.result.items);
6262
});

‎src/components/CollectionClaim.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function CollectionClaim({ data }: Props & { data: Collection }): JSX.Element {
1212
useEffect((): void => {
1313
LBRY.rpc(
1414
daemonRPC,
15-
"resolve",
15+
LBRY.RESOLVE,
1616
{
1717
urls: data.value.claims.map(
1818
(claim: string): string =>
@@ -21,7 +21,7 @@ function CollectionClaim({ data }: Props & { data: Collection }): JSX.Element {
2121
include_purchase_receipt: true,
2222
},
2323
null,
24-
import.meta.env.VITE_DAEMON_PROXY === "true",
24+
LBRY.isUsingProxy(),
2525
).then((json: object[unknown]): void => {
2626
setItems(Object.values(json.result));
2727
});

‎src/components/StreamClaim.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ function downloadMarkdownFile(claimGetData, setMarkdown): void {
1818
function StreamClaim({ data }: Props & { data: Stream }): JSX.Element {
1919
const daemonRPC: string = useDaemonRPC();
2020

21-
const [claimGetData, setClaimGetData] = useState(null);
21+
const [claimGetData, setClaimGetData] = useState<object[unknown]>(null);
2222
const [markdown, setMarkdown] = useState<string>("");
2323

2424
useEffect((): void => {
2525
LBRY.rpc(
2626
daemonRPC,
27-
"get",
27+
LBRY.GET,
2828
{ uri: data.canonical_url },
2929
null,
30-
import.meta.env.VITE_DAEMON_PROXY === "true",
30+
LBRY.isUsingProxy(),
3131
).then((json: object): void => {
3232
setClaimGetData(json.result);
3333
});
3434
}, [data, daemonRPC]);
3535

3636
//
3737
const [recommendedIsChannelItems, setRecommendedIsChannelItems] =
38-
useState(false);
38+
useState<boolean>(false);
3939

4040
// return (
4141
// <div style={{ display: "flex" }}>

0 commit comments

Comments
 (0)