Skip to content

Commit 9a580a1

Browse files
AndrejsAndrejs
authored andcommitted
Merge branch 'master' of https://github.com/cybercongress/cyb-ts into feat/ml-experementa
2 parents fa1d420 + dbbb2c6 commit 9a580a1

File tree

2 files changed

+30
-23
lines changed

2 files changed

+30
-23
lines changed

src/components/loader/loader.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,18 @@ const Bootloader = () => {
211211
function bootstrap() {
212212
if ('serviceWorker' in navigator) {
213213
console.log('Going to install service worker');
214-
window.addEventListener('load', () => {
215-
console.log('Starting to load service worker');
216-
navigator.serviceWorker
217-
.register('/service-worker.js')
218-
.then((registration) => {
219-
console.log('service worker registered: ', registration);
220-
})
221-
.catch((registrationError) => {
222-
console.log('service worker registration failed: ', registrationError);
223-
});
224-
});
214+
// TODO: tmp disabled
215+
// window.addEventListener('load', () => {
216+
// console.log('Starting to load service worker');
217+
// navigator.serviceWorker
218+
// .register('/service-worker.js')
219+
// .then((registration) => {
220+
// console.log('service worker registered: ', registration);
221+
// })
222+
// .catch((registrationError) => {
223+
// console.log('service worker registration failed: ', registrationError);
224+
// });
225+
// });
225226
} else {
226227
console.log('No service worker is available');
227228
}
@@ -246,8 +247,9 @@ function bootstrap() {
246247

247248
progressData.innerHTML = `Loading: <span>${Math.round(
248249
progress * 100
249-
)}%</span>. <br/> Network speed: <span>${Math.round(e.networkSpeed * 100) / 100
250-
} kbps</span>`;
250+
)}%</span>. <br/> Network speed: <span>${
251+
Math.round(e.networkSpeed * 100) / 100
252+
} kbps</span>`;
251253

252254
// console.log(e.loaded, e.loaded / e.totalSize); // @TODO
253255
})

src/contexts/backend/backend.tsx

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Remote, proxy } from 'comlink';
12
import React, {
23
useCallback,
34
useContext,
@@ -6,36 +7,34 @@ import React, {
67
useState,
78
} from 'react';
89
import { useAppDispatch, useAppSelector } from 'src/redux/hooks';
9-
import { proxy, Remote } from 'comlink';
10+
import RxBroadcastChannelListener from 'src/services/backend/channels/RxBroadcastChannelListener';
1011
import { backgroundWorkerInstance } from 'src/services/backend/workers/background/service';
1112
import { cozoDbWorkerInstance } from 'src/services/backend/workers/db/service';
12-
import RxBroadcastChannelListener from 'src/services/backend/channels/RxBroadcastChannelListener';
1313

14-
import { CybIpfsNode } from 'src/services/ipfs/types';
15-
import { getIpfsOpts } from 'src/services/ipfs/config';
1614
import { selectCurrentAddress } from 'src/redux/features/pocket';
1715
import DbApiWrapper from 'src/services/backend/services/DbApi/DbApi';
18-
import { CozoDbWorker } from 'src/services/backend/workers/db/worker';
1916
import { BackgroundWorker } from 'src/services/backend/workers/background/worker';
17+
import { CozoDbWorker } from 'src/services/backend/workers/db/worker';
18+
import { getIpfsOpts } from 'src/services/ipfs/config';
19+
import { CybIpfsNode } from 'src/services/ipfs/types';
2020

21-
import { SyncEntryName } from 'src/services/backend/types/services';
22-
import { DB_NAME } from 'src/services/CozoDb/cozoDb';
2321
import { RESET_SYNC_STATE_ACTION_NAME } from 'src/redux/reducers/backend';
22+
import { DB_NAME } from 'src/services/CozoDb/cozoDb';
2423
import BroadcastChannelSender from 'src/services/backend/channels/BroadcastChannelSender';
24+
import { SyncEntryName } from 'src/services/backend/types/services';
2525
// import BroadcastChannelListener from 'src/services/backend/channels/BroadcastChannelListener';
2626

2727
import { selectCurrentPassport } from 'src/features/passport/passports.redux';
2828
import {
2929
selectRuneEntypoints,
30-
setContext,
3130
setEntrypoint,
3231
} from 'src/redux/reducers/scripting';
3332
import { RuneEngine } from 'src/services/scripting/engine';
3433
import runeDeps from 'src/services/scripting/runeDeps';
3534

36-
import { SenseApi, createSenseApi } from './services/senseApi';
37-
import { useSigningClient } from '../signerClient';
3835
import { UserContext } from 'src/services/scripting/types';
36+
import { useSigningClient } from '../signerClient';
37+
import { SenseApi, createSenseApi } from './services/senseApi';
3938

4039
const setupStoragePersistence = async () => {
4140
let isPersistedStorage = await navigator.storage.persisted();
@@ -312,6 +311,11 @@ function BackendProvider({ children }: { children: React.ReactNode }) {
312311
[isMlInitialized]
313312
);
314313

314+
const defferedDbApi = useMemo(
315+
() => (isDbInitialized ? backgroundWorkerInstance.defferedDbApi : null),
316+
[isDbInitialized]
317+
);
318+
315319
const valueMemo = useMemo(
316320
() =>
317321
({
@@ -320,6 +324,7 @@ function BackendProvider({ children }: { children: React.ReactNode }) {
320324
ipfsApi,
321325
mlApi,
322326
rune,
327+
defferedDbApi,
323328
ipfsNode,
324329
restartSync: (name: SyncEntryName) =>
325330
backgroundWorkerInstance.restartSync(name),

0 commit comments

Comments
 (0)