git.iko.soy/bridge
on master help sign in
add localHosting hook

adds localHosting hook, to check whether or not the ship is self hosted.

commit51e7d9d1a9bf8d4ea438202dcbc2bd95b1fe21ae authorLiam Fitzgerald <liam@urizen.co> dateTue 7 Apr 2020, 10:17 (7 years ago) parent21aadd2
2 files changed+86−14
compare with master
unifiedsplit
src/lib/useLocaHosting.js+51 src/views/UrbitOS/Home.js+35−14
src/lib/useLocaHosting.jsnew file+51
@@ -0,0 +1,51 @@
1+import { useState, useEffect, useMemo } from 'react';
2+import { Just } from 'folktale/maybe';
3+import * as ob from 'urbit-ob';
4+
5+import { usePointCursor } from 'store/pointCursor';
6+
7+const DOMAIN = 'arvo.network';
8+
9+const STATE = {
10+ UNKNOWN: 'UNKNOWN',
11+ MISSING: 'MISSING',
12+ RUNNING: 'RUNNING',
13+};
14+
15+export default function useLocalHosting() {
16+ const [status, setStatus] = useState(STATE.UNKNOWN);
17+
18+ const { pointCursor } = usePointCursor();
19+
20+ useEffect(() => {
21+ const updateStatus = async point => {
22+ const patp = ob.patp(point).slice(1);
23+ try {
24+ const { who } = await fetch(`https://${patp}.${DOMAIN}/who.json`).then(
25+ r => r.json()
26+ );
27+ if (who === patp) {
28+ setStatus(STATE.RUNNING);
29+ } else {
30+ setStatus(STATE.MISSING);
31+ }
32+ } catch (e) {
33+ setStatus(STATE.MISSING);
34+ }
35+ };
36+ if (Just.hasInstance(pointCursor)) {
37+ updateStatus(pointCursor.value);
38+ }
39+ }, [pointCursor]);
40+
41+ const url = useMemo(
42+ () =>
43+ pointCursor.value &&
44+ `https://${ob.patp(pointCursor.value).slice(1)}.${DOMAIN}`,
45+ [pointCursor]
46+ );
47+
48+ const running = useMemo(() => status === STATE.RUNNING, [status]);
49+
50+ return { running, url };
51+}
src/views/UrbitOS/Home.js+35−14
@@ -1,4 +1,4 @@
1−import React, { useCallback, useState, useEffect } from 'react';
1+import React, { useCallback, useState, useEffect, useMemo } from 'react';
22import cn from 'classnames';
33import { Grid, Button, SelectInput, Flex } from 'indigo-react';
44import * as ob from 'urbit-ob';
@@ -22,6 +22,7 @@ import { useLocalRouter } from 'lib/LocalRouter';
2222import { useHosting } from 'store/hosting';
2323import DownloadKeyfileButton from 'components/DownloadKeyfileButton';
2424import useLifecycle from 'lib/useLifecycle';
25+import useLocalHosting from 'lib/useLocaHosting';
2526
2627export default function UrbitOSHome({ manualNetworkSeed }) {
2728 const { pointCursor } = usePointCursor();
@@ -104,6 +105,13 @@ function Hosting({ manualNetworkSeed }) {
104105 disabled,
105106 } = ship;
106107
108+ const { running: localRunning, url: localUrl } = useLocalHosting();
109+
110+ let running = useMemo(() => localRunning || ship.running, [
111+ ship,
112+ localRunning,
113+ ]);
114+
107115 useLifecycle(() => {
108116 syncStatus();
109117 });
@@ -114,6 +122,19 @@ function Hosting({ manualNetworkSeed }) {
114122 const options = [{ text: 'Tlon', value: 'tlon' }];
115123
116124 const renderMain = useCallback(() => {
125+ if (localRunning) {
126+ return (
127+ <Grid.Item
128+ full
129+ as={LoginButton}
130+ solid
131+ success
132+ url={localUrl}
133+ code={code}>
134+ Open OS
135+ </Grid.Item>
136+ );
137+ }
117138 if (ship.running) {
118139 return (
119140 <>
@@ -158,6 +179,7 @@ function Hosting({ manualNetworkSeed }) {
158179 );
159180 }
160181 }, [
182+ localRunning,
161183 ship.missing,
162184 ship.running,
163185 ship.pending,
@@ -202,11 +224,8 @@ function Hosting({ manualNetworkSeed }) {
202224 <Grid.Item full className="f5" as={Flex}>
203225 <Flex.Item>Urbit OS </Flex.Item>
204226 <Flex.Item
205− className={cn(
206− { green3: ship.running, gray4: !ship.running },
207− 'ml3'
208− )}>
209− {ship.running ? 'Connected' : 'Disconnected'}
227+ className={cn({ green3: running, gray4: !running }, 'ml3')}>
228+ {running ? 'Connected' : 'Disconnected'}
210229 </Flex.Item>
211230 </Grid.Item>
212231 <BridgeForm initialValues={{ provider: 'tlon' }}>
@@ -214,14 +233,16 @@ function Hosting({ manualNetworkSeed }) {
214233 <>
215234 {renderDetails()}
216235 {renderMain()}
217− <Grid.Item
218− full
219− as={SelectInput}
220− name="provider"
221− label="Host Provider"
222− options={options}
223− disabled
224− />
236+ {!localRunning && (
237+ <Grid.Item
238+ full
239+ as={SelectInput}
240+ name="provider"
241+ label="Host Provider"
242+ options={options}
243+ disabled
244+ />
245+ )}
225246 </>
226247 )}
227248 </BridgeForm>