@efffrida/frida-tools 0.0.17 → 0.0.18

package/package.json

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

package/src/FridaScript.ts

@@ -4,6 +4,7 @@
  * @since 1.0.0
  */
 
+import type * as FileSystem from "@effect/platform/FileSystem";
 import type * as Path from "@effect/platform/Path";
 import type * as Context from "effect/Context";
 import type * as Deferred from "effect/Deferred";
@@ -151,3 +152,29 @@ export const layer: {
         options?: LoadOptions | undefined
     ): (entrypoint: URL) => Layer.Layer<FridaScript, FridaSessionError.FridaSessionError, FridaSession.FridaSession>;
 } = internal.layer;
+
+/**
+ * @since 1.0.0
+ * @category Frida
+ */
+export const watch: {
+    <A, E, R>(
+        effect: Effect.Effect<A, E, R>,
+        entrypoint: URL,
+        options?: LoadOptions | undefined
+    ): Effect.Effect<
+        void,
+        E | FridaSessionError.FridaSessionError,
+        FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
+    >;
+    (
+        entrypoint: URL,
+        options?: LoadOptions | undefined
+    ): <A, E, R>(
+        effect: Effect.Effect<A, E, R>
+    ) => Effect.Effect<
+        void,
+        E | FridaSessionError.FridaSessionError,
+        FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
+    >;
+} = internal.watch;

package/src/FridaSessionError.ts

@@ -34,7 +34,18 @@ export const isFridaSessionError = (u: unknown): u is FridaSessionError =>
  */
 export class FridaSessionError extends PlatformError.TypeIdError(FridaSessionErrorTypeId, "FridaSessionError")<{
     cause: unknown;
-    when: "spawn" | "kill" | "attach" | "detach" | "compile" | "load" | "unload" | "resume" | "message" | "rpcCall";
+    when:
+        | "spawn"
+        | "kill"
+        | "attach"
+        | "detach"
+        | "compile"
+        | "watch"
+        | "load"
+        | "unload"
+        | "resume"
+        | "message"
+        | "rpcCall";
 }> {
     override get message() {
         return `A Frida session error occurred on ${this.when}`;

package/src/internal/device.ts

@@ -234,7 +234,7 @@ export const acquireAndroidEmulatorDevice = Effect.fn("acquireAndroidEmulatorDev
                         new FridaDeviceAcquisitionError.FridaDeviceAcquisitionError({
                             attempts: 1,
                             acquisitionMethod: "android-emulator",
-                            cause: new Error(`ADB wait-for-device failed with exit code ${code}`),
+                            cause: `ADB wait-for-device failed with exit code ${code}`,
                         })
                 )
             );
@@ -248,7 +248,7 @@ export const acquireAndroidEmulatorDevice = Effect.fn("acquireAndroidEmulatorDev
                         new FridaDeviceAcquisitionError.FridaDeviceAcquisitionError({
                             attempts: 1,
                             acquisitionMethod: "android-emulator",
-                            cause: new Error(`ADB root failed with exit code ${code}`),
+                            cause: `ADB root failed with exit code ${code}`,
                         })
                 )
             );
@@ -274,7 +274,7 @@ export const acquireAndroidEmulatorDevice = Effect.fn("acquireAndroidEmulatorDev
             new FridaDeviceAcquisitionError.FridaDeviceAcquisitionError({
                 attempts: 1,
                 acquisitionMethod: "android-emulator",
-                cause: new Error("Timeout while acquiring Android emulator device"),
+                cause: "Timeout while acquiring Android emulator device",
             }),
     }),
     Effect.catchIf(

package/src/internal/script.ts

@@ -1,6 +1,7 @@
 import type * as Scope from "effect/Scope";
 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 Context from "effect/Context";
@@ -375,3 +376,65 @@ export const layer = Function.dual<
     (entrypoint: URL, options?: FridaScript.LoadOptions | undefined) =>
         Layer.scoped(Tag, load(entrypoint, options)).pipe(Layer.provide(Path.layer))
 );
+
+/** @internal */
+export const watch = Function.dual<
+    (
+        entrypoint: URL,
+        options?: FridaScript.LoadOptions | undefined
+    ) => <A, E, R>(
+        effect: Effect.Effect<A, E, R>
+    ) => Effect.Effect<
+        void,
+        E | FridaSessionError.FridaSessionError,
+        FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript.FridaScript>
+    >,
+    <A, E, R>(
+        effect: Effect.Effect<A, E, R>,
+        entrypoint: URL,
+        options?: FridaScript.LoadOptions | undefined
+    ) => Effect.Effect<
+        void,
+        E | FridaSessionError.FridaSessionError,
+        FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript.FridaScript>
+    >
+>(
+    (arguments_) => Effect.isEffect(arguments_[0]),
+    <A, E, R>(
+        effect: Effect.Effect<A, E, R>,
+        entrypoint: URL,
+        options?: FridaScript.LoadOptions | undefined
+    ): Effect.Effect<
+        void,
+        E | FridaSessionError.FridaSessionError,
+        FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript.FridaScript>
+    > =>
+        Effect.gen(function* () {
+            const path = yield* Path.Path;
+            const fileSystem = yield* FileSystem.FileSystem;
+
+            const pathString = yield* Effect.mapError(
+                path.fromFileUrl(entrypoint),
+                (cause) =>
+                    new FridaSessionError.FridaSessionError({
+                        when: "watch",
+                        cause,
+                    })
+            );
+
+            const provideFridaScript = Effect.provideServiceEffect(Tag, load(entrypoint, options));
+            const sink = Sink.forEach((_: void) => provideFridaScript(effect).pipe(Effect.scoped));
+            const stream = fileSystem.watch(pathString).pipe(
+                Stream.filter((event) => event._tag === "Update"),
+                Stream.mapError(
+                    (cause) =>
+                        new FridaSessionError.FridaSessionError({
+                            when: "watch",
+                            cause,
+                        })
+                )
+            );
+
+            return yield* Stream.run(stream, sink);
+        }).pipe(Effect.provide(Path.layer))
+);