@flux-control/effect-modbus-rs 0.7.0 → 0.8.0

package/dist/index.js

@@ -1263,10 +1263,9 @@ var createMockTransport = (devices) => {
       setRequestTimeout: (_timeoutMs) => ensureOpen,
       clearRequestTimeout: () => ensureOpen,
       reconnect: () => Effect7.andThen(reconnectOnce, SubscriptionRef3.set(connectionState, ConnectionState.Connected())),
-      close: () => Effect7.gen(function* () {
+      close: (scope) => Effect7.gen(function* () {
         if (closed)
           return;
-        const scope = yield* Effect7.scope;
         yield* Scope2.close(scope, Exit3.void).pipe(Effect7.onExit(() => closeTransport));
       }),
       hasPendingRequests: () => false
@@ -1466,10 +1465,9 @@ function createTransportScoped(transportKey, openMethod, serviceName, config) {
           return yield* transportClosed();
         yield* SubscriptionRef4.set(connectionState, ConnectionState.Connected());
       }),
-      close: Effect8.fnUntraced(function* () {
+      close: Effect8.fnUntraced(function* (scope) {
         if (closed)
           return;
-        const scope = yield* Effect8.scope;
         yield* Scope3.close(scope, Exit4.void).pipe(Effect8.onExit(() => closeTransport));
       }),
       withBatchingClient: batching.withBatchingClient,

package/dist/src/AsciiTransportService.d.ts

@@ -48,7 +48,7 @@ export declare class AsciiTransportService extends AsciiTransportService_base {
         setRequestTimeout: (timeoutMs: number) => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         clearRequestTimeout: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         reconnect: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusError, never>;
-        close: () => import("effect/Effect").Effect<void, import("./errors").ModbusError, import("effect/Scope").Scope>;
+        close: (scope: import("effect/Scope").Closeable) => import("effect/Effect").Effect<void, import("./errors").ModbusError, never>;
         withBatchingClient: (unitId: number, options?: import("./batching-client").BatchingClientOptions & {
             readonly retry?: import("./retry").ModbusRetryPolicy;
         }) => import("effect/Effect").Effect<import("./batching-client").BatchingModbusClient, import("./errors").ModbusError | import("./errors").ModbusUnitAlreadyDeclaredError>;

package/dist/src/RtuTransportService.d.ts

@@ -48,7 +48,7 @@ export declare class RtuTransportService extends RtuTransportService_base {
         setRequestTimeout: (timeoutMs: number) => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         clearRequestTimeout: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         reconnect: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusError, never>;
-        close: () => import("effect/Effect").Effect<void, import("./errors").ModbusError, import("effect/Scope").Scope>;
+        close: (scope: import("effect/Scope").Closeable) => import("effect/Effect").Effect<void, import("./errors").ModbusError, never>;
         withBatchingClient: (unitId: number, options?: import("./batching-client").BatchingClientOptions & {
             readonly retry?: import("./retry").ModbusRetryPolicy;
         }) => import("effect/Effect").Effect<import("./batching-client").BatchingModbusClient, import("./errors").ModbusError | import("./errors").ModbusUnitAlreadyDeclaredError>;

package/dist/src/TcpTransportService.d.ts

@@ -48,7 +48,7 @@ export declare class TcpTransportService extends TcpTransportService_base {
         setRequestTimeout: (timeoutMs: number) => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         clearRequestTimeout: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         reconnect: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusError, never>;
-        close: () => import("effect/Effect").Effect<void, import("./errors").ModbusError, import("effect/Scope").Scope>;
+        close: (scope: import("effect/Scope").Closeable) => import("effect/Effect").Effect<void, import("./errors").ModbusError, never>;
         withBatchingClient: (unitId: number, options?: import("./batching-client").BatchingClientOptions & {
             readonly retry?: import("./retry").ModbusRetryPolicy;
         }) => import("effect/Effect").Effect<import("./batching-client").BatchingModbusClient, import("./errors").ModbusError | import("./errors").ModbusUnitAlreadyDeclaredError>;

package/dist/src/WasmAsciiTransportService.d.ts

@@ -54,7 +54,7 @@ export declare class WasmAsciiTransportService extends WasmAsciiTransportService
         setRequestTimeout: (timeoutMs: number) => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         clearRequestTimeout: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         reconnect: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusError, never>;
-        close: () => import("effect/Effect").Effect<void, import("./errors").ModbusError, import("effect/Scope").Scope>;
+        close: (scope: import("effect/Scope").Closeable) => import("effect/Effect").Effect<void, import("./errors").ModbusError, never>;
         withBatchingClient: (unitId: number, options?: import("./batching-client").BatchingClientOptions & {
             readonly retry?: import("./retry").ModbusRetryPolicy;
         }) => import("effect/Effect").Effect<import("./batching-client").BatchingModbusClient, import("./errors").ModbusError | import("./errors").ModbusUnitAlreadyDeclaredError>;

package/dist/src/WasmRtuTransportService.d.ts

@@ -54,7 +54,7 @@ export declare class WasmRtuTransportService extends WasmRtuTransportService_bas
         setRequestTimeout: (timeoutMs: number) => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         clearRequestTimeout: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         reconnect: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusError, never>;
-        close: () => import("effect/Effect").Effect<void, import("./errors").ModbusError, import("effect/Scope").Scope>;
+        close: (scope: import("effect/Scope").Closeable) => import("effect/Effect").Effect<void, import("./errors").ModbusError, never>;
         withBatchingClient: (unitId: number, options?: import("./batching-client").BatchingClientOptions & {
             readonly retry?: import("./retry").ModbusRetryPolicy;
         }) => import("effect/Effect").Effect<import("./batching-client").BatchingModbusClient, import("./errors").ModbusError | import("./errors").ModbusUnitAlreadyDeclaredError>;

package/dist/src/WasmWsTransportService.d.ts

@@ -41,7 +41,7 @@ export declare class WasmWsTransportService extends WasmWsTransportService_base
         setRequestTimeout: (timeoutMs: number) => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         clearRequestTimeout: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusNotConnectedError, never>;
         reconnect: () => import("effect/Effect").Effect<undefined, import("./errors").ModbusError, never>;
-        close: () => import("effect/Effect").Effect<void, import("./errors").ModbusError, import("effect/Scope").Scope>;
+        close: (scope: import("effect/Scope").Closeable) => import("effect/Effect").Effect<void, import("./errors").ModbusError, never>;
         withBatchingClient: (unitId: number, options?: import("./batching-client").BatchingClientOptions & {
             readonly retry?: import("./retry").ModbusRetryPolicy;
         }) => import("effect/Effect").Effect<import("./batching-client").BatchingModbusClient, import("./errors").ModbusError | import("./errors").ModbusUnitAlreadyDeclaredError>;

package/dist/src/mocks.d.ts

@@ -159,6 +159,6 @@ export declare const createMockTransport: (devices: SlaveDeviceDefinitions) => (
     setRequestTimeout: (_timeoutMs: number) => Effect.Effect<void, ModbusNotConnectedError, never>;
     clearRequestTimeout: () => Effect.Effect<void, ModbusNotConnectedError, never>;
     reconnect: () => Effect.Effect<void, ModbusError, never>;
-    close: () => Effect.Effect<void, never, Scope.Scope>;
+    close: (scope: Scope.Closeable) => Effect.Effect<void, never, never>;
     hasPendingRequests: () => false;
 }, never, Scope.Scope>;

package/dist/src/shared-transport.d.ts

@@ -132,8 +132,13 @@ export interface TransportServiceApi {
      * while the reconnect was running.
      */
     reconnect(): Effect.Effect<void, ModbusError>;
-    /** Closes the transport and its scope immediately. */
-    close(): Effect.Effect<void, ModbusError, Scope.Scope>;
+    /**
+     * Closes `scope`, then closes the transport.
+     *
+     * Pass the scope that holds the work to finish first, such as
+     * `onShutdown` writes. The transport closes even if a finalizer fails.
+     */
+    close(scope: Scope.Closeable): Effect.Effect<void, ModbusError>;
     /**
      * Declares the {@link BatchingModbusClient} for a unit.
      *
@@ -236,7 +241,7 @@ export declare function createTransportScoped<TOptions, TClient extends AnyModbu
     setRequestTimeout: (timeoutMs: number) => Effect.Effect<undefined, ModbusNotConnectedError, never>;
     clearRequestTimeout: () => Effect.Effect<undefined, ModbusNotConnectedError, never>;
     reconnect: () => Effect.Effect<undefined, ModbusError, never>;
-    close: () => Effect.Effect<void, ModbusError, Scope.Scope>;
+    close: (scope: Scope.Closeable) => Effect.Effect<void, ModbusError, never>;
     withBatchingClient: (unitId: number, options?: BatchingClientOptions & {
         readonly retry?: ModbusRetryPolicy;
     }) => Effect.Effect<BatchingModbusClient, ModbusError | ModbusUnitAlreadyDeclaredError>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flux-control/effect-modbus-rs",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Type-safe Modbus communication via Effect-TS, wrapping the modbus-rs npm bindings.",
   "license": "GPL-3.0",
   "repository": {
@@ -44,10 +44,10 @@
   "devDependencies": {
     "@changesets/cli": "^2.31.1",
     "@effect/language-service": "0.87.2",
-    "@effect/platform-bun": "^4.0.0-rc.109",
+    "@effect/platform-bun": "^4.0.0-rc.118",
     "@oxlint/plugins": "1.76.0",
     "@types/bun": "latest",
-    "effect": "4.0.0-rc.109",
+    "effect": "4.0.0-rc.118",
     "fallow": "^2.104.0",
     "husky": "^9.1.7",
     "oxfmt": "^0.71.0",
@@ -55,6 +55,6 @@
     "typescript": "^7.0.2"
   },
   "peerDependencies": {
-    "effect": "^4.0.0-rc.109"
+    "effect": "^4.0.0-rc.118"
   }
 }