improve watch behavior

Author: leonitousconforti

docs/frida-tools/FridaScript.ts.md

@@ -98,7 +98,7 @@ declare const watch: {
     options?: LoadOptions | undefined
   ): Effect.Effect<
     void,
-    E | FridaSessionError.FridaSessionError,
+    FridaSessionError.FridaSessionError,
     FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
   >
   (
@@ -108,7 +108,7 @@ declare const watch: {
     effect: Effect.Effect<A, E, R>
   ) => Effect.Effect<
     void,
-    E | FridaSessionError.FridaSessionError,
+    FridaSessionError.FridaSessionError,
     FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
   >
 }

packages/frida-tools/docs/modules/FridaScript.ts.md

@@ -98,7 +98,7 @@ declare const watch: {
     options?: LoadOptions | undefined
   ): Effect.Effect<
     void,
-    E | FridaSessionError.FridaSessionError,
+    FridaSessionError.FridaSessionError,
     FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
   >
   (
@@ -108,7 +108,7 @@ declare const watch: {
     effect: Effect.Effect<A, E, R>
   ) => Effect.Effect<
     void,
-    E | FridaSessionError.FridaSessionError,
+    FridaSessionError.FridaSessionError,
     FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
   >
 }

packages/frida-tools/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@efffrida/frida-tools",
-    "version": "0.0.19",
+    "version": "0.0.20",
     "description": "Frida with effect-ts",
     "keywords": [
         "frida.re",

packages/frida-tools/src/FridaScript.ts

@@ -164,7 +164,7 @@ export const watch: {
         options?: LoadOptions | undefined
     ): Effect.Effect<
         void,
-        E | FridaSessionError.FridaSessionError,
+        FridaSessionError.FridaSessionError,
         FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
     >;
     (
@@ -174,7 +174,7 @@ export const watch: {
         effect: Effect.Effect<A, E, R>
     ) => Effect.Effect<
         void,
-        E | FridaSessionError.FridaSessionError,
+        FridaSessionError.FridaSessionError,
         FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
     >;
 } = internal.watch;

packages/frida-tools/src/internal/script.ts

@@ -4,6 +4,7 @@ import type * as FridaScript from "../FridaScript.ts";
 import * as FileSystem from "@effect/platform/FileSystem";
 import * as Path from "@effect/platform/Path";
 import * as Cause from "effect/Cause";
+import * as Chunk from "effect/Chunk";
 import * as Context from "effect/Context";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
@@ -386,7 +387,7 @@ export const watch = Function.dual<
         effect: Effect.Effect<A, E, R>
     ) => Effect.Effect<
         void,
-        E | FridaSessionError.FridaSessionError,
+        FridaSessionError.FridaSessionError,
         FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript.FridaScript>
     >,
     <A, E, R>(
@@ -395,7 +396,7 @@ export const watch = Function.dual<
         options?: FridaScript.LoadOptions | undefined
     ) => Effect.Effect<
         void,
-        E | FridaSessionError.FridaSessionError,
+        FridaSessionError.FridaSessionError,
         FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript.FridaScript>
     >
 >(
@@ -406,7 +407,7 @@ export const watch = Function.dual<
         options?: FridaScript.LoadOptions | undefined
     ): Effect.Effect<
         void,
-        E | FridaSessionError.FridaSessionError,
+        FridaSessionError.FridaSessionError,
         FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript.FridaScript>
     > =>
         Effect.gen(function* () {
@@ -422,10 +423,21 @@ export const watch = Function.dual<
                     })
             );
 
-            const provideFridaScript = Effect.provideServiceEffect(Tag, load(entrypoint, options));
-            const sink = Sink.forEach((_: void) => provideFridaScript(effect).pipe(Effect.scoped));
+            const sink = Sink.forEach((event: FileSystem.WatchEvent.Update) =>
+                Function.pipe(
+                    Effect.logDebug(`reloading ${event.path}`),
+                    Effect.andThen(effect),
+                    Effect.andThen(Effect.logDebug(`script completed`)),
+                    Effect.provideServiceEffect(Tag, load(entrypoint, options)),
+                    Effect.scoped,
+                    Effect.catchAll(Effect.logError),
+                    Effect.catchAllDefect(Effect.logError)
+                )
+            );
+
             const stream = fileSystem.watch(pathString).pipe(
                 Stream.filter((event) => event._tag === "Update"),
+                Stream.prepend(Chunk.of(FileSystem.WatchEventUpdate({ path: pathString }))),
                 Stream.mapError(
                     (cause) =>
                         new FridaSessionError.FridaSessionError({

packages/rpc/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@efffrida/rpc",
-    "version": "0.0.19",
+    "version": "0.0.20",
     "description": "effect rpc-frida",
     "keywords": [
         "frida.re",

packages/vitest-pool/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@efffrida/vitest-pool",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "effect frida vitest-pool",
     "keywords": [
         "frida.re",