@trevrpc/effect 1.7.0 → 1.8.0

package/README.md

@@ -3,8 +3,8 @@
 [Effect](https://effect.website) adapter for the TrevRPC browser client, [`@trevrpc/trevrpc-js`](https://www.npmjs.com/package/@trevrpc/trevrpc-js): it makes clients whose calls are effects and streams.
 
 > **Compatibility:** every TrevRPC package shares one version, and packages of the same version are compatible
-> with each other: `trevrpc-rust` 1.7.0 works with `trevrpc-go` 1.7.0, `trevrpc-js` 1.7.0, and `trevrpc-kotlin`
-> 1.7.0. Compatibility across different versions isn't guaranteed yet; that's a milestone for 2.0.
+> with each other: `trevrpc-rust` 1.8.0 works with `trevrpc-go` 1.8.0, `trevrpc-js` 1.8.0, and `trevrpc-kotlin`
+> 1.8.0. Compatibility across different versions isn't guaranteed yet; that's a milestone for 2.0.
 
 ```sh
 npm install @trevrpc/effect @trevrpc/trevrpc-js @bufbuild/protobuf effect
@@ -44,7 +44,7 @@ const replies = greeter.chat(
 `options` are the usual [call options](https://trev.zip/llc/TrevRPC/wiki/JavaScript-Guide#call-options).
 
 - **Cancellation.** Interrupting an effect or stream cancels its call, which the server sees as `CANCELLED`; so does taking part of a response stream (`Stream.take`) or a failure elsewhere in the program. A `signal` in the call options also cancels the call.
-- **Request streams.** Client-streaming and bidirectional calls pull their requests from the stream as the transport accepts them, so a request stream is only consumed as fast as the server reads it. When the server ends the call first, the rest of the stream is not pulled, and the server's outcome is the result: its response or response stream if it succeeded, or its `TrevRpcError`. A request stream that fails cancels the call, and the call fails with the request stream's error.
+- **Request streams.** Client-streaming and bidirectional calls pull their requests from the stream as the transport accepts them, so a request stream is only consumed as fast as the server reads it. When the server ends the call first, the rest of the stream is not pulled, and the server's outcome is the result: its response or response stream if it succeeded, or its `TrevRpcError`. A request stream that fails cancels the call, and the call fails with the request stream's error. So does a request that does not encode or that the client's [validator](https://trev.zip/llc/TrevRPC/wiki/JavaScript-Guide#request-validation) rejects: the call fails with its `TrevRpcError`.
 - **Errors.** Calls fail with the `TrevRpcError` of the [client](https://trev.zip/llc/TrevRPC/wiki/JavaScript-Guide#errors-cancellation-and-streams), whose `_tag` is `"TrevRpcError"`, so `Effect.catchTag("TrevRpcError", ...)` handles it. Anything else a call rejects with becomes a `TrevRpcError` with `Code.Unknown` and the original as `cause`, as `toTrevRpcError(error)` does.
 - **Rendering.** Response streams deliver buffered messages without returning to the event loop, as the client does; see [Rendering long streams](https://trev.zip/llc/TrevRPC/wiki/JavaScript-Guide#rendering-long-streams) before rendering a long stream message by message.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trevrpc/effect",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Effect adapter for TrevRPC browser clients",
   "homepage": "https://trev.zip/llc/TrevRPC",
   "bugs": {
@@ -42,12 +42,12 @@
     "@bufbuild/protobuf": "^2.17.0",
     "@bufbuild/protoc-gen-es": "^2.17.0",
     "@trevrpc/trevrpc-js": "file:..",
-    "effect": "^4.1.2",
+    "effect": "^4.1.3",
     "typescript": "^7.0.2"
   },
   "peerDependencies": {
     "@bufbuild/protobuf": "^2.17.0",
-    "@trevrpc/trevrpc-js": "^1.7.0",
+    "@trevrpc/trevrpc-js": "^1.8.0",
     "effect": "^4.1.2"
   },
   "engines": {

package/src/index.js

@@ -118,12 +118,29 @@ function withSignal(options, signal) {
 
 /**
  * Sends each request of `requests`, waiting for the transport to accept it. Stops without an error
- * at the first rejected send, which means the call has ended; the call reports its outcome. A
- * failing request stream fails with its error, and the caller's scope then cancels the call.
+ * at the first send rejected because the call ended; the call reports its outcome. A send rejected
+ * while the call goes on, for a request that does not encode or that the client's validator
+ * rejects, fails with its error, as a failing request stream does with its own; the caller's scope
+ * then cancels the call.
  */
 function upload(stream, requests) {
+  // The call settles its status as it ends, before the sends that its end rejects fail.
+  let ended = false;
+  const end = () => {
+    ended = true;
+  };
+  stream.status.then(end, end);
   return Stream.runForEachWhile(requests, (request) =>
-    Effect.promise(() => stream.send(request).then(accepted, rejected)),
+    Effect.tryPromise({
+      try: () =>
+        stream.send(request).then(accepted, (error) => {
+          if (ended) {
+            return false;
+          }
+          throw error;
+        }),
+      catch: toTrevRpcError,
+    }),
   );
 }
 
@@ -133,5 +150,4 @@ function settled(promise) {
 }
 
 const accepted = () => true;
-const rejected = () => false;
 const ignore = () => {};