@efffrida/frida-tools 0.0.27 → 0.0.29

package/dist/internal/session.js

@@ -1,7 +1,9 @@
 import * as Context from "effect/Context";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Match from "effect/Match";
+import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
 import * as Frida from "frida";
 import * as FridaDevice from "../FridaDevice.js";
@@ -9,23 +11,47 @@ import * as FridaSessionError from "../FridaSessionError.js";
 /** @internal */
 export const FridaSessionTypeId = /*#__PURE__*/Symbol.for("@efffrida/frida-tools/FridaSession");
 /** @internal */
-export const Tag = /*#__PURE__*/Context.GenericTag("@efffrida/frida-tools/FridaSession");
+export const Tag = /*#__PURE__*/Context.Service("@efffrida/frida-tools/FridaSession");
 /** @internal */
 export const isFridaSession = u => Predicate.hasProperty(u, FridaSessionTypeId);
 /** @internal */
+export const resume = session => Effect.tryPromise({
+  try: signal => {
+    const cancellable = new Frida.Cancellable();
+    signal.onabort = () => cancellable.cancel();
+    return session.resume(cancellable);
+  },
+  catch: cause => new FridaSessionError.FridaSessionError({
+    when: "resume",
+    cause
+  })
+});
+/** @internal */
+export const detach = session => Effect.tryPromise({
+  try: signal => {
+    const cancellable = new Frida.Cancellable();
+    signal.onabort = () => cancellable.cancel();
+    return session.detach(cancellable);
+  },
+  catch: cause => new FridaSessionError.FridaSessionError({
+    when: "detach",
+    cause
+  })
+});
+/** @internal */
 export const frontmost = options => Effect.flatMap(FridaDevice.FridaDevice, ({
   device
 }) => Effect.tryPromise(signal => {
   const cancellable = new Frida.Cancellable();
   signal.onabort = () => cancellable.cancel();
   return device.getFrontmostApplication(options, cancellable);
-})).pipe(Effect.flatMap(Effect.fromNullable), Effect.mapError(cause => new FridaSessionError.FridaSessionError({
+})).pipe(Effect.flatMap(Effect.fromNullishOr), Effect.mapError(cause => new FridaSessionError.FridaSessionError({
   when: "attach",
   cause
 })));
 /** @internal */
 export const spawn = (program, options) => {
-  const spawnEffect = Effect.flatMap(FridaDevice.FridaDevice, ({
+  const acquire = Effect.flatMap(FridaDevice.FridaDevice, ({
     device
   }) => Effect.tryPromise({
     try: signal => {
@@ -38,19 +64,6 @@ export const spawn = (program, options) => {
       cause
     })
   }));
-  const resumeEffect = pid => Effect.flatMap(FridaDevice.FridaDevice, ({
-    device
-  }) => Effect.tryPromise({
-    try: signal => {
-      const cancellable = new Frida.Cancellable();
-      signal.onabort = () => cancellable.cancel();
-      return device.resume(pid, cancellable);
-    },
-    catch: cause => new FridaSessionError.FridaSessionError({
-      when: "resume",
-      cause
-    })
-  }));
   const release = pid => Effect.flatMap(FridaDevice.FridaDevice, ({
     device
   }) => Effect.promise(signal => {
@@ -58,12 +71,24 @@ export const spawn = (program, options) => {
     signal.onabort = () => cancellable.cancel();
     return device.kill(pid, cancellable);
   }));
-  const acquire = Effect.tap(spawnEffect, resumeEffect);
   const resource = Effect.acquireRelease(acquire, release);
   return resource;
 };
 /** @internal */
 export const attach = (target, options) => {
+  const detached = Deferred.makeUnsafe();
+  const onDetached = (reason, crash) => {
+    Deferred.doneUnsafe(detached, Effect.succeed({
+      reason,
+      crash: Option.fromNullOr(crash).pipe(Option.map(c => ({
+        pid: c.pid,
+        processName: c.processName,
+        summary: c.summary,
+        report: c.report,
+        parameters: c.parameters
+      })))
+    }));
+  };
   const acquire = Effect.flatMap(FridaDevice.FridaDevice, ({
     device
   }) => Effect.tryPromise({
@@ -80,45 +105,64 @@ export const attach = (target, options) => {
   const release = session => Effect.promise(signal => {
     const cancellable = new Frida.Cancellable();
     signal.onabort = () => cancellable.cancel();
+    session.detached.disconnect(onDetached);
     return session.detach(cancellable);
   });
   const resource = Effect.acquireRelease(acquire, release);
-  return Effect.map(resource, session => ({
-    session,
-    resume: Effect.tryPromise(signal => {
-      const cancellable = new Frida.Cancellable();
-      signal.onabort = () => cancellable.cancel();
-      return session.resume(cancellable);
-    }),
-    enableChildGating: Effect.tryPromise(signal => {
-      const cancellable = new Frida.Cancellable();
-      signal.onabort = () => cancellable.cancel();
-      return session.enableChildGating(cancellable);
-    }),
-    disableChildGating: Effect.tryPromise(signal => {
-      const cancellable = new Frida.Cancellable();
-      signal.onabort = () => cancellable.cancel();
-      return session.disableChildGating(cancellable);
-    }),
-    setupPeerConnection: opts => Effect.tryPromise(signal => {
-      const cancellable = new Frida.Cancellable();
-      signal.onabort = () => cancellable.cancel();
-      return session.setupPeerConnection(opts, cancellable);
-    }),
-    joinPortal: (address, opts) => Effect.tryPromise(signal => {
-      const cancellable = new Frida.Cancellable();
-      signal.onabort = () => cancellable.cancel();
-      return session.joinPortal(address, opts, cancellable);
-    }),
-    [FridaSessionTypeId]: FridaSessionTypeId
-  }));
+  return Effect.map(resource, session => {
+    session.detached.connect(onDetached);
+    return {
+      session,
+      pid: session.pid,
+      detached: detached,
+      resume: resume(session),
+      detach: detach(session),
+      enableChildGating: Effect.tryPromise(signal => {
+        const cancellable = new Frida.Cancellable();
+        signal.onabort = () => cancellable.cancel();
+        return session.enableChildGating(cancellable);
+      }),
+      disableChildGating: Effect.tryPromise(signal => {
+        const cancellable = new Frida.Cancellable();
+        signal.onabort = () => cancellable.cancel();
+        return session.disableChildGating(cancellable);
+      }),
+      setupPeerConnection: opts => Effect.tryPromise(signal => {
+        const cancellable = new Frida.Cancellable();
+        signal.onabort = () => cancellable.cancel();
+        return session.setupPeerConnection(opts, cancellable);
+      }),
+      joinPortal: (address, opts) => Effect.tryPromise(signal => {
+        const cancellable = new Frida.Cancellable();
+        signal.onabort = () => cancellable.cancel();
+        return session.joinPortal(address, opts, cancellable);
+      }),
+      [FridaSessionTypeId]: FridaSessionTypeId
+    };
+  });
 };
 /** @internal */
-export const layer = (target, options) => Layer.scoped(Tag, Effect.gen(function* () {
+export const layer = (target, options) => Layer.effect(Tag, Effect.gen(function* () {
+  const {
+    device
+  } = yield* FridaDevice.FridaDevice;
   const pid = yield* Match.value(target).pipe(Match.when(Match.number, proc => Effect.succeed(proc)), Match.when(Match.string, proc => spawn(proc)), Match.orElse(proc => spawn(proc)));
   const session = yield* attach(pid, options);
+  if (typeof target !== "number") {
+    yield* Effect.tryPromise({
+      try: signal => {
+        const cancellable = new Frida.Cancellable();
+        signal.onabort = () => cancellable.cancel();
+        return device.resume(session.pid, cancellable);
+      },
+      catch: cause => new FridaSessionError.FridaSessionError({
+        when: "resume",
+        cause
+      })
+    });
+  }
   return session;
 }));
 /** @internal */
-export const layerFrontmost = options => Layer.unwrapEffect(Effect.map(frontmost(options), app => layer(app.pid)));
+export const layerFrontmost = options => Layer.unwrap(Effect.map(frontmost(options), app => layer(app.pid)));
 //# sourceMappingURL=session.js.map

package/dist/internal/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":["Context","Effect","Layer","Match","Predicate","Frida","FridaDevice","FridaSessionError","FridaSessionTypeId","Symbol","for","Tag","GenericTag","isFridaSession","u","hasProperty","frontmost","options","flatMap","device","tryPromise","signal","cancellable","Cancellable","onabort","cancel","getFrontmostApplication","pipe","fromNullable","mapError","cause","when","spawn","program","spawnEffect","try","catch","resumeEffect","pid","resume","release","promise","kill","acquire","tap","resource","acquireRelease","attach","target","session","detach","map","enableChildGating","disableChildGating","setupPeerConnection","opts","joinPortal","address","layer","scoped","gen","value","number","proc","succeed","string","orElse","layerFrontmost","unwrapEffect","app"],"sources":["../../src/internal/session.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"session.js","names":["Context","Deferred","Effect","Layer","Match","Option","Predicate","Frida","FridaDevice","FridaSessionError","FridaSessionTypeId","Symbol","for","Tag","Service","isFridaSession","u","hasProperty","resume","session","tryPromise","try","signal","cancellable","Cancellable","onabort","cancel","catch","cause","when","detach","frontmost","options","flatMap","device","getFrontmostApplication","pipe","fromNullishOr","mapError","spawn","program","acquire","release","pid","promise","kill","resource","acquireRelease","attach","target","detached","makeUnsafe","onDetached","reason","crash","doneUnsafe","succeed","fromNullOr","map","c","processName","summary","report","parameters","disconnect","connect","enableChildGating","disableChildGating","setupPeerConnection","opts","joinPortal","address","layer","effect","gen","value","number","proc","string","orElse","layerFrontmost","unwrap","app"],"sources":["../../src/internal/session.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@efffrida/frida-tools",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Frida with effect-ts",
   "keywords": [
     "effect-ts",
@@ -35,26 +35,19 @@
     "provenance": true
   },
   "dependencies": {
-    "frida": "17.9.8"
+    "frida": "17.9.10"
   },
   "devDependencies": {
-    "@effect/cluster": "0.58.2",
-    "@effect/experimental": "0.60.0",
-    "@effect/platform": "0.96.1",
-    "@effect/platform-node": "0.106.0",
-    "@effect/rpc": "0.75.1",
-    "@effect/sql": "0.51.1",
-    "@effect/vitest": "0.29.0",
-    "@effect/workflow": "0.18.1",
+    "@effect/platform-node": "4.0.0-beta.69",
+    "@effect/vitest": "4.0.0-beta.69",
     "@types/frida-gum": "19.1.0",
-    "@types/node": "25.7.0",
-    "effect": "3.21.2",
-    "vitest": "4.1.6",
-    "@efffrida/polyfills": "0.0.6"
+    "@types/node": "25.9.0",
+    "effect": "4.0.0-beta.69",
+    "ioredis": "5.10.1",
+    "vitest": "4.1.6"
   },
   "peerDependencies": {
-    "@effect/platform": "0.96.1",
-    "effect": "3.21.2"
+    "effect": "4.0.0-beta.69"
   },
   "tags": [
     "frida.re",

package/src/FridaDevice.ts

@@ -4,15 +4,16 @@
  * @since 1.0.0
  */
 
-import type * as CommandExecutor from "@effect/platform/CommandExecutor";
-import type * as ConfigError from "effect/ConfigError";
+import type * as Config from "effect/Config";
 import type * as Context from "effect/Context";
 import type * as Effect from "effect/Effect";
 import type * as Layer from "effect/Layer";
+import type * as Path from "effect/Path";
 import type * as Scope from "effect/Scope";
-import type * as Frida from "frida";
+import type * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 
 import type * as FridaDeviceAcquisitionError from "./FridaDeviceAcquisitionError.ts";
+import type * as Frida from "frida";
 
 import * as internal from "./internal/device.ts";
 
@@ -42,7 +43,7 @@ export interface FridaDevice {
  * @since 1.0.0
  * @category Tags
  */
-export const FridaDevice: Context.Tag<FridaDevice, FridaDevice> = internal.Tag;
+export const FridaDevice: Context.Service<FridaDevice, FridaDevice> = internal.Tag;
 
 /**
  * @since 1.0.0
@@ -97,7 +98,7 @@ export const acquireAndroidEmulatorDevice: (
 ) => Effect.Effect<
     FridaDevice,
     FridaDeviceAcquisitionError.FridaDeviceAcquisitionError,
-    CommandExecutor.CommandExecutor | Scope.Scope
+    ChildProcessSpawner.ChildProcessSpawner | Scope.Scope
 > = internal.acquireAndroidEmulatorDevice;
 
 /**
@@ -115,8 +116,8 @@ export const acquireAndroidEmulatorDeviceConfig: (
         | undefined
 ) => Effect.Effect<
     FridaDevice,
-    ConfigError.ConfigError | FridaDeviceAcquisitionError.FridaDeviceAcquisitionError,
-    CommandExecutor.CommandExecutor | Scope.Scope
+    Config.ConfigError | FridaDeviceAcquisitionError.FridaDeviceAcquisitionError,
+    ChildProcessSpawner.ChildProcessSpawner | Path.Path | Scope.Scope
 > = internal.acquireAndroidEmulatorDeviceConfig;
 
 /**
@@ -165,7 +166,7 @@ export const layerAndroidEmulatorDevice: (
 ) => Layer.Layer<
     FridaDevice,
     FridaDeviceAcquisitionError.FridaDeviceAcquisitionError,
-    CommandExecutor.CommandExecutor
+    ChildProcessSpawner.ChildProcessSpawner
 > = internal.layerAndroidEmulatorDevice;
 
 /**
@@ -183,6 +184,6 @@ export const layerAndroidEmulatorDeviceConfig: (
         | undefined
 ) => Layer.Layer<
     FridaDevice,
-    ConfigError.ConfigError | FridaDeviceAcquisitionError.FridaDeviceAcquisitionError,
-    CommandExecutor.CommandExecutor
+    Config.ConfigError | FridaDeviceAcquisitionError.FridaDeviceAcquisitionError,
+    ChildProcessSpawner.ChildProcessSpawner | Path.Path
 > = internal.layerAndroidEmulatorDeviceConfig;

package/src/FridaDeviceAcquisitionError.ts

@@ -4,41 +4,16 @@
  * @since 1.0.0
  */
 
-import * as PlatformError from "@effect/platform/Error";
-import * as Predicate from "effect/Predicate";
+import * as Data from "effect/Data";
 
 /**
  * @since 1.0.0
  * @category Errors
  */
-export const FridaDeviceAcquisitionErrorTypeId: unique symbol = Symbol.for(
-    "@efffrida/FridaError/FridaDeviceAcquisitionError"
-) as FridaDeviceAcquisitionErrorTypeId;
-
-/**
- * @since 1.0.0
- * @category Errors
- */
-export type FridaDeviceAcquisitionErrorTypeId = typeof FridaDeviceAcquisitionErrorTypeId;
-
-/**
- * @since 1.0.0
- * @category Errors
- */
-export const isFridaDeviceAcquisitionError = (u: unknown): u is FridaDeviceAcquisitionError =>
-    Predicate.hasProperty(u, FridaDeviceAcquisitionErrorTypeId);
-
-/**
- * @since 1.0.0
- * @category Errors
- */
-export class FridaDeviceAcquisitionError extends PlatformError.TypeIdError(
-    FridaDeviceAcquisitionErrorTypeId,
-    "FridaDeviceAcquisitionError"
-)<{
-    cause: unknown;
-    attempts: number;
+export class FridaDeviceAcquisitionError extends Data.TaggedError("FridaDeviceAcquisitionError")<{
     acquisitionMethod: "usb" | "remote" | "local" | "android-emulator";
+    attempts: number;
+    cause: unknown;
 }> {
     public override get message(): string {
         return `Failed to acquire ${this.acquisitionMethod} Frida device after ${this.attempts} attempt(s)`;

package/src/FridaScript.ts

@@ -4,32 +4,32 @@
  * @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";
 import type * as Duration from "effect/Duration";
 import type * as Effect from "effect/Effect";
 import type * as Exit from "effect/Exit";
+import type * as FileSystem from "effect/FileSystem";
 import type * as Layer from "effect/Layer";
 import type * as Option from "effect/Option";
-import type * as ParseResult from "effect/ParseResult";
+import type * as Path from "effect/Path";
 import type * as Schema from "effect/Schema";
 import type * as Scope from "effect/Scope";
 import type * as Sink from "effect/Sink";
 import type * as Stream from "effect/Stream";
-import type * as Frida from "frida";
 
 import type * as FridaSession from "./FridaSession.ts";
 import type * as FridaSessionError from "./FridaSessionError.ts";
+import type * as Frida from "frida";
 
-import * as internal from "./internal/script.ts";
+import * as internalCompiler from "./internal/compiler.ts";
+import * as internalScript from "./internal/script.ts";
 
 /**
  * @since 1.0.0
  * @category Type ids
  */
-export const FridaScriptTypeId: unique symbol = internal.FridaScriptTypeId;
+export const FridaScriptTypeId: unique symbol = internalScript.FridaScriptTypeId;
 
 /**
  * @since 1.0.0
@@ -58,23 +58,23 @@ export interface FridaScript {
         FridaSessionError.FridaSessionError,
         never
     >;
-    readonly callExport: <A, I, R>(
+    readonly callExport: <A = unknown, R = never>(
         exportName: string,
-        schema: Schema.Schema<A, I, R>
-    ) => (...args: Array<any>) => Effect.Effect<A, FridaSessionError.FridaSessionError | ParseResult.ParseError, R>;
+        schema?: Schema.Decoder<A, R> | undefined
+    ) => (...args: Array<any>) => Effect.Effect<A, FridaSessionError.FridaSessionError | Schema.SchemaError, R>;
 }
 
 /**
  * @since 1.0.0
  * @category Tags
  */
-export const FridaScript: Context.Tag<FridaScript, FridaScript> = internal.Tag;
+export const FridaScript: Context.Service<FridaScript, FridaScript> = internalScript.Tag;
 
 /**
  * @since 1.0.0
  * @category Predicates
  */
-export const isFridaScript: (u: unknown) => u is FridaScript = internal.isFridaScript;
+export const isFridaScript: (u: unknown) => u is FridaScript = internalScript.isFridaScript;
 
 /**
  * @since 1.0.0
@@ -82,23 +82,22 @@ export const isFridaScript: (u: unknown) => u is FridaScript = internal.isFridaS
  */
 export interface LoadOptions extends Frida.ScriptOptions, Frida.CompilerOptions {
     readonly messageMailboxCapacity?:
-        | number
         | {
-              readonly capacity?: number;
-              readonly strategy?: "suspend" | "dropping" | "sliding";
+              readonly capacity?: number | undefined;
+              readonly strategy?: "suspend" | "dropping" | "sliding" | undefined;
           }
         | undefined;
     readonly streamShareOptions?:
         | {
               readonly capacity: "unbounded";
               readonly replay?: number | undefined;
-              readonly idleTimeToLive?: Duration.DurationInput | undefined;
+              readonly idleTimeToLive?: Duration.Input | undefined;
           }
         | {
               readonly capacity: number;
               readonly strategy?: "sliding" | "dropping" | "suspend" | undefined;
               readonly replay?: number | undefined;
-              readonly idleTimeToLive?: Duration.DurationInput | undefined;
+              readonly idleTimeToLive?: Duration.Input | undefined;
           }
         | undefined;
 }
@@ -111,11 +110,11 @@ export const compile: {
     (
         entrypoint: string,
         options?: Frida.CompilerOptions | undefined
-    ): Effect.Effect<string, FridaSessionError.FridaSessionError, Scope.Scope>;
+    ): Effect.Effect<string, FridaSessionError.FridaSessionError>;
     (
         options?: Frida.CompilerOptions | undefined
-    ): (entrypoint: string) => Effect.Effect<string, FridaSessionError.FridaSessionError, Scope.Scope>;
-} = internal.compile;
+    ): (entrypoint: string) => Effect.Effect<string, FridaSessionError.FridaSessionError>;
+} = internalCompiler.compile;
 
 /**
  * @since 1.0.0
@@ -139,7 +138,7 @@ export const load: {
         FridaSessionError.FridaSessionError,
         Path.Path | FridaSession.FridaSession | Scope.Scope
     >;
-} = internal.load;
+} = internalScript.load;
 
 /**
  * @since 1.0.0
@@ -153,7 +152,7 @@ export const layer: {
     (
         options?: LoadOptions | undefined
     ): (entrypoint: URL) => Layer.Layer<FridaScript, FridaSessionError.FridaSessionError, FridaSession.FridaSession>;
-} = internal.layer;
+} = internalScript.layer;
 
 /**
  * @since 1.0.0
@@ -179,7 +178,7 @@ export const watch: {
         FridaSessionError.FridaSessionError,
         FileSystem.FileSystem | FridaSession.FridaSession | Exclude<R, FridaScript>
     >;
-} = internal.watch;
+} = internalScript.watch;
 
 /**
  * Successes will be logged with info, failures with warning, defects with
@@ -190,4 +189,4 @@ export const watch: {
  */
 export const logWatchErrors: <A, E1, E2, R>(
     watchStream: Stream.Stream<Exit.Exit<A, E1>, E2, R>
-) => Stream.Stream<Exit.Exit<A, E1>, E2, R> = internal.logWatchErrors;
+) => Stream.Stream<Exit.Exit<A, E1>, E2, R> = internalScript.logWatchErrors;

package/src/FridaSession.ts

@@ -6,13 +6,15 @@
 
 import type * as Cause from "effect/Cause";
 import type * as Context from "effect/Context";
+import type * as Deferred from "effect/Deferred";
 import type * as Effect from "effect/Effect";
 import type * as Layer from "effect/Layer";
+import type * as Option from "effect/Option";
 import type * as Scope from "effect/Scope";
-import type * as Frida from "frida";
 
 import type * as FridaDevice from "./FridaDevice.ts";
 import type * as FridaSessionError from "./FridaSessionError.ts";
+import type * as Frida from "frida";
 
 import * as internal from "./internal/session.ts";
 
@@ -33,23 +35,39 @@ export type FridaSessionTypeId = typeof FridaSessionTypeId;
  * @category Models
  */
 export interface FridaSession {
+    readonly pid: number;
     readonly session: Frida.Session;
+
     readonly [FridaSessionTypeId]: typeof FridaSessionTypeId;
-    readonly resume: Effect.Effect<void, Cause.UnknownException>;
-    readonly enableChildGating: Effect.Effect<void, Cause.UnknownException>;
-    readonly disableChildGating: Effect.Effect<void, Cause.UnknownException>;
-    setupPeerConnection(options?: Frida.PeerOptions | undefined): Effect.Effect<void, Cause.UnknownException>;
+    readonly detached: Deferred.Deferred<
+        {
+            reason: Frida.SessionDetachReason;
+            crash: Option.Option<{
+                pid: number;
+                processName: string;
+                summary: string;
+                report: string;
+                parameters: unknown;
+            }>;
+        },
+        FridaSessionError.FridaSessionError
+    >;
+    readonly resume: Effect.Effect<void, FridaSessionError.FridaSessionError, never>;
+    readonly detach: Effect.Effect<void, FridaSessionError.FridaSessionError, never>;
+    readonly enableChildGating: Effect.Effect<void, Cause.UnknownError, never>;
+    readonly disableChildGating: Effect.Effect<void, Cause.UnknownError, never>;
+    setupPeerConnection(options?: Frida.PeerOptions | undefined): Effect.Effect<void, Cause.UnknownError, never>;
     joinPortal(
         address: string,
         options?: Frida.PortalOptions | undefined
-    ): Effect.Effect<Frida.PortalMembership, Cause.UnknownException>;
+    ): Effect.Effect<Frida.PortalMembership, Cause.UnknownError, never>;
 }
 
 /**
  * @since 1.0.0
  * @category Tags
  */
-export const FridaSession: Context.Tag<FridaSession, FridaSession> = internal.Tag;
+export const FridaSession: Context.Service<FridaSession, FridaSession> = internal.Tag;
 
 /**
  * @since 1.0.0

package/src/FridaSessionError.ts

@@ -4,35 +4,13 @@
  * @since 1.0.0
  */
 
-import * as PlatformError from "@effect/platform/Error";
-import * as Predicate from "effect/Predicate";
+import * as Data from "effect/Data";
 
 /**
  * @since 1.0.0
  * @category Errors
  */
-export const FridaSessionErrorTypeId: unique symbol = Symbol.for(
-    "@efffrida/FridaError/FridaSessionError"
-) as FridaSessionErrorTypeId;
-
-/**
- * @since 1.0.0
- * @category Errors
- */
-export type FridaSessionErrorTypeId = typeof FridaSessionErrorTypeId;
-
-/**
- * @since 1.0.0
- * @category Errors
- */
-export const isFridaSessionError = (u: unknown): u is FridaSessionError =>
-    Predicate.hasProperty(u, FridaSessionErrorTypeId);
-
-/**
- * @since 1.0.0
- * @category Errors
- */
-export class FridaSessionError extends PlatformError.TypeIdError(FridaSessionErrorTypeId, "FridaSessionError")<{
+export class FridaSessionError extends Data.TaggedError("FridaSessionError")<{
     cause: unknown;
     when:
         | "spawn"