apps 0.0.1-beta.23 → 0.0.1-beta.24

package/js/client.js

@@ -46,6 +46,7 @@ import {
   Logger_exports,
   ManagedRuntime_exports,
   Option_exports,
+  Queue_exports,
   Schedule_exports,
   Schema_exports,
   Semaphore_exports,
@@ -793,6 +794,33 @@ var makeOptimisticClient = (transport) => {
 };
 
 // src/implementation/ui-client.ts
+var resubscribeDelay = Schedule_exports.min([
+  Schedule_exports.exponential("1 second"),
+  Schedule_exports.spaced("1 minute")
+]).pipe(Schedule_exports.jittered);
+var appFailure = (error) => Schema_exports.is(UiFailed)(error) && error.reason === "operation_failed";
+var resubscribes = (error) => HttpClientError_exports.isHttpClientError(error) || Cause_exports.isTimeoutError(error) || Schema_exports.is(UiFailed)(error) && error.reason !== "account_required";
+var Retrying = class {
+  constructor(error, previous) {
+    this.error = error;
+    this.previous = previous;
+  }
+  error;
+  previous;
+};
+var visibleResult = (result) => {
+  const current = AsyncResult_exports.value(result);
+  if (Option_exports.isNone(current) || !(current.value instanceof Retrying)) {
+    return result;
+  }
+  const previous = Option_exports.map(
+    Option_exports.fromUndefinedOr(current.value.previous),
+    AsyncResult_exports.success
+  );
+  return AsyncResult_exports.isSuccess(result) ? AsyncResult_exports.failureWithPrevious(Cause_exports.fail(current.value.error), { previous, waiting: true }) : AsyncResult_exports.failureWithPrevious(AsyncResult_exports.isFailure(result) ? result.cause : Cause_exports.empty, {
+    previous
+  });
+};
 var createAppClient = () => {
   const { runtime, atoms } = makeBrowserTelemetry(
     browserSettings("/_executor/api/telemetry", "executor-app-web")
@@ -847,7 +875,8 @@ var createAppClient = () => {
     Stream_exports.suspend(() => {
       let previous;
       let attempts = 0;
-      return Stream_exports.unwrap(
+      let latest;
+      const subscription = Stream_exports.unwrap(
         Effect_exports.gen(function* () {
           const attempt = attempts++;
           const first = yield* pendingSpan("ui.app.first_result", {
@@ -895,53 +924,55 @@ var createAppClient = () => {
             Stream_exports.timeout("45 seconds"),
             Stream_exports.concat(Stream_exports.fail(new UiFailed({ reason: "unavailable" }))),
             Stream_exports.filter((frame) => frame.type !== "heartbeat"),
-            Stream_exports.mapEffect((frame) => {
-              if (frame.type === "failure") return Effect_exports.fail(frame.error);
-              const server = externalTrace(frame.trace);
-              return Effect_exports.gen(function* () {
-                const value = yield* Schema_exports.decodeUnknownEffect(decoderOf(output))(
-                  frame.value
-                ).pipe(Effect_exports.mapError(() => new UiFailed({ reason: "operation_failed" })));
-                const received = yield* Effect_exports.currentSpan;
-                const receivedAt = clock.currentTimeMillisUnsafe();
-                const currentRevision = revision++;
-                yield* Effect_exports.annotateCurrentSpan({
-                  "executor.operation.name": name,
-                  "executor.snapshot.revision": currentRevision,
-                  "browser.query.elapsed_ms": receivedAt - started,
-                  "executor.trace.context_valid": Option_exports.isSome(server)
-                });
-                yield* first.finish(Exit_exports.void);
-                let committed = false;
-                return {
-                  value,
-                  commit: () => {
-                    if (committed) return;
-                    committed = true;
-                    const committedAt = clock.currentTimeMillisUnsafe();
-                    runtime.runFork(
-                      Effect_exports.void.pipe(
-                        Effect_exports.withSpan("ui.app.result.commit", {
-                          parent: received,
-                          attributes: {
-                            "executor.operation.name": name,
-                            "executor.snapshot.revision": currentRevision,
-                            "browser.query.elapsed_ms": committedAt - started,
-                            "browser.query.receive_to_commit_ms": committedAt - receivedAt,
-                            "browser.page.hidden": document.visibilityState === "hidden"
-                          }
-                        })
-                      )
-                    );
-                  }
-                };
-              }).pipe(
-                Effect_exports.withSpan("ui.app.result.receive", {
-                  parent: Option_exports.isSome(server) ? server.value : first.span,
-                  kind: "consumer"
-                })
-              );
-            }),
+            Stream_exports.mapEffect(
+              (frame) => {
+                if (frame.type === "failure") return Effect_exports.fail(frame.error);
+                const server = externalTrace(frame.trace);
+                return Effect_exports.gen(function* () {
+                  const value = yield* Schema_exports.decodeUnknownEffect(decoderOf(output))(
+                    frame.value
+                  ).pipe(Effect_exports.mapError(() => new AppQueryFailed()));
+                  const received = yield* Effect_exports.currentSpan;
+                  const receivedAt = clock.currentTimeMillisUnsafe();
+                  const currentRevision = revision++;
+                  yield* Effect_exports.annotateCurrentSpan({
+                    "executor.operation.name": name,
+                    "executor.snapshot.revision": currentRevision,
+                    "browser.query.elapsed_ms": receivedAt - started,
+                    "executor.trace.context_valid": Option_exports.isSome(server)
+                  });
+                  yield* first.finish(Exit_exports.void);
+                  let committed = false;
+                  return {
+                    value,
+                    commit: () => {
+                      if (committed) return;
+                      committed = true;
+                      const committedAt = clock.currentTimeMillisUnsafe();
+                      runtime.runFork(
+                        Effect_exports.void.pipe(
+                          Effect_exports.withSpan("ui.app.result.commit", {
+                            parent: received,
+                            attributes: {
+                              "executor.operation.name": name,
+                              "executor.snapshot.revision": currentRevision,
+                              "browser.query.elapsed_ms": committedAt - started,
+                              "browser.query.receive_to_commit_ms": committedAt - receivedAt,
+                              "browser.page.hidden": document.visibilityState === "hidden"
+                            }
+                          })
+                        )
+                      );
+                    }
+                  };
+                }).pipe(
+                  Effect_exports.withSpan("ui.app.result.receive", {
+                    parent: Option_exports.isSome(server) ? server.value : first.span,
+                    kind: "consumer"
+                  })
+                );
+              }
+            ),
             Stream_exports.onExit(finish),
             Stream_exports.provideService(Tracer_exports.ParentSpan, first.span)
           );
@@ -952,16 +983,35 @@ var createAppClient = () => {
         Stream_exports.catch(
           (error) => Schema_exports.is(UiDeploymentChanged)(error) ? Stream_exports.unwrap(deploymentChanged.pipe(Effect_exports.as(Stream_exports.never))) : Stream_exports.fail(error)
         ),
-        Stream_exports.retry(
-          Schedule_exports.spaced("1 second").pipe(
-            Schedule_exports.while(
-              ({ input: input2 }) => HttpClientError_exports.isHttpClientError(input2) || Cause_exports.isTimeoutError(input2) || Schema_exports.is(UiFailed)(input2)
-            )
-          )
+        Stream_exports.tap(
+          (value) => Effect_exports.sync(() => {
+            latest = value;
+          })
         )
       );
+      return Stream_exports.unwrap(
+        Effect_exports.gen(function* () {
+          const retrying = yield* Queue_exports.unbounded();
+          return Stream_exports.merge(
+            subscription.pipe(
+              Stream_exports.retry(
+                resubscribeDelay.pipe(
+                  Schedule_exports.while(
+                    ({ input: input2 }) => !resubscribes(input2) ? false : appFailure(input2) ? Queue_exports.offer(retrying, new Retrying(input2, latest)).pipe(
+                      Effect_exports.as(true)
+                    ) : true
+                  )
+                )
+              )
+            ),
+            // Shown outside the retried stream, so they do not reset its delay.
+            Stream_exports.fromQueue(retrying),
+            { haltStrategy: "left" }
+          );
+        })
+      );
     })
-  ).pipe(Atom_exports.map(queryResult));
+  ).pipe(Atom_exports.map((result) => queryResult(visibleResult(result))));
   const optimistic = makeOptimisticClient({
     source,
     read: (name, input, output) => request("query", name, input, output),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps",
-  "version": "0.0.1-beta.23",
+  "version": "0.0.1-beta.24",
   "description": "TypeScript apps with typed tools, accounts, storage, and UI.",
   "type": "module",
   "sideEffects": false,