improve

paritytech · May 2, 2024 · 49c5ef5 · 49c5ef5
1 parent 93885c7
commit 49c5ef5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/projects/extension/src/background/smoldot2.ts b/projects/extension/src/background/smoldot2.ts
@@ -25,7 +25,10 @@ import {
   JsonRpcConnection,
   JsonRpcProvider,
 } from "@polkadot-api/json-rpc-provider"
-import { getSyncProvider } from "@polkadot-api/json-rpc-provider-proxy"
+import {
+  AsyncJsonRpcProvider,
+  getSyncProvider,
+} from "@polkadot-api/json-rpc-provider-proxy"
 
 const chainSpecSchema = z.object({
   name: z.string(),
@@ -61,7 +64,8 @@ export const start = (
       _(
         Effect.sync(() => startSmoldotClient(options)),
         Effect.andThen((client) => Deferred.succeed(deferred, client)),
-        Effect.tap(() => Console.log("success")),
+        Effect.tap(() => Effect.log("smoldot created successfully")),
+        Effect.withSpan("smoldot/create"),
       ),
     )
 
@@ -124,10 +128,15 @@ export const start = (
           }),
         )
 
-        const provider: JsonRpcProvider = getSyncProvider(
-          async () => (onMessage, onError) => {
-            runPromise(Deferred.succeed(deferredOnMessage, onMessage))
-            runPromise(Deferred.succeed(deferredOnError, onError))
+        const provider: JsonRpcProvider = getSyncProvider(async () => {
+          let p1 = Promise.withResolvers<boolean>()
+          let p2 = Promise.withResolvers<boolean>()
+
+          const asyncProvider: AsyncJsonRpcProvider = (onMessage, onError) => {
+            p1.resolve(
+              runPromise(Deferred.succeed(deferredOnMessage, onMessage)),
+            )
+            p2.resolve(runPromise(Deferred.succeed(deferredOnError, onError)))
 
             const send: JsonRpcConnection["send"] = (message) => {
               chain.sendJsonRpc(message)
@@ -142,8 +151,13 @@ export const start = (
               send,
               disconnect,
             }
-          },
-        )
+          }
+
+          await p1.promise
+          await p2.promise
+
+          return asyncProvider
+        })
 
         const substrateClient = yield* Effect.sync(() =>
           createSubstrateClient(provider),

diff --git a/projects/extension/tsconfig.json b/projects/extension/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ESNext",
     "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": ["ESNext", "DOM", "DOM.Iterable"],
     "module": "ESNext",
     "skipLibCheck": true,