@efffrida/rpc 0.0.27 → 0.0.29

package/dist/node/FridaRpcClient.js

@@ -4,80 +4,101 @@
  *
  * @since 1.0.0
  */
-import * as RpcClient from "@effect/rpc/RpcClient";
-import * as RpcSerialization from "@effect/rpc/RpcSerialization";
-import * as FridaScript from "@efffrida/frida-tools/FridaScript";
+import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as ParseResult from "effect/ParseResult";
-import * as Predicate from "effect/Predicate";
+import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
-import * as constants from "../shared/constants.js";
+import * as RpcClient from "effect/unstable/rpc/RpcClient";
+import * as RpcClientError from "effect/unstable/rpc/RpcClientError";
+import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization";
+import * as FridaScript from "@efffrida/frida-tools/FridaScript";
+import * as constants from "../shared/Constants.js";
 /**
  * @since 1.0.0
  * @category Protocol
  */
-export const makeProtocolFrida = options => RpcClient.Protocol.make(Effect.fnUntraced(function* (writeResponse) {
+export const makeProtocolFrida = options => RpcClient.Protocol.make(Effect.fnUntraced(function* (writeResponse, clientIds) {
   const script = yield* FridaScript.FridaScript;
   const serialization = yield* RpcSerialization.RpcSerialization;
-  const parser = serialization.unsafeMake();
   const mainExportName = options?.exportName ?? constants.defaultServerMainExportName;
-  const makeExportName = options?.generateExportName ?? constants.generateServerExportNameForClient;
-  /**
-   * Obtain a client id from the frida script export, this will allow
-   * us to filter future messages for ours since the script channels
-   * are shared.
-   */
-  const clientId = yield* Effect.catchIf(script.callExport(mainExportName, Schema.Number)(), ParseResult.isParseError, () => Effect.dieMessage("Failed to obtain client ID from Frida script export"));
-  const isClientId = Predicate.compose(Predicate.isNumber, id => id === clientId);
-  const receivingPredicate = Predicate.compose(Predicate.isUnknown, Predicate.struct({
-    clientId: isClientId
-  }));
-  /**
-   * Start listening for responses to our requests, decode them, and
-   * send the responses back to the implementation.
-   */
-  yield* script.stream.pipe(Stream.filterMap(unfiltered => {
-    if (receivingPredicate(unfiltered.message)) return unfiltered.data;else return Option.none();
-  }), Stream.runForEach(filtered => {
+  const informServerToSetupExport = script.callExport(mainExportName, Schema.String);
+  const clientExportName = yield* Effect.orDie(informServerToSetupExport());
+  const parser = serialization.makeUnsafe();
+  const requestClientMap = new Map();
+  let currentError = undefined;
+  const broadcast = response => Effect.forEach(clientIds, clientId => writeResponse(clientId, response));
+  yield* Stream.runForEach(script.stream, message => {
+    if (Option.isNone(message.data)) {
+      return Effect.void;
+    }
     try {
-      const responses = parser.decode(filtered);
+      const responses = parser.decode(message.data.value);
       if (responses.length === 0) return Effect.void;
       let i = 0;
       return Effect.whileLoop({
+        step: Function.constVoid,
         while: () => i < responses.length,
-        body: () => writeResponse(responses[i++]),
-        step: Function.constVoid
+        body: () => {
+          const response = responses[i++];
+          if ("requestId" in response) {
+            const clientId = requestClientMap.get(response.requestId);
+            if (response._tag === "Exit") requestClientMap.delete(response.requestId);
+            return writeResponse(clientId, response);
+          } else return broadcast(response);
+        }
       });
     } catch (defect) {
-      return writeResponse({
-        _tag: "Defect",
-        defect
+      return broadcast({
+        _tag: "ClientProtocolError",
+        error: new RpcClientError.RpcClientError({
+          reason: new RpcClientError.RpcClientDefect({
+            message: "Error decoding message",
+            cause: defect
+          })
+        })
       });
     }
-  }), Effect.interruptible, Effect.forkScoped);
-  /**
-   * Sending messages is as simple as encoding them, then posting them
-   * to the frida side tagged with our client id so it knows where to
-   * send them back to.
-   */
-  const send = Effect.fnUntraced(function* (message) {
-    const encoded = parser.encode(message);
-    if (Predicate.isUndefined(encoded)) return;
-    yield* script.callExport(makeExportName(clientId), Schema.Void)(encoded).pipe(Effect.orDie);
-  });
+  }).pipe(Effect.tapCause(cause => {
+    const error = Cause.findError(cause);
+    const hasError = Result.isSuccess(error);
+    const defect = hasError ? new RpcClientError.RpcClientDefect({
+      message: error.success.message,
+      cause: error.success.cause
+    }) : new RpcClientError.RpcClientDefect({
+      message: "Unknown error in Frida RPC client stream",
+      cause: Cause.squash(cause)
+    });
+    currentError = new RpcClientError.RpcClientError({
+      reason: defect
+    });
+    return broadcast({
+      _tag: "ClientProtocolError",
+      error: currentError
+    });
+  }), Effect.forkScoped);
   return {
-    send,
     supportsAck: true,
-    supportsTransferables: false
+    supportsTransferables: false,
+    send(clientId, request) {
+      if (currentError) {
+        return Effect.fail(currentError);
+      }
+      if (request._tag === "Request") {
+        requestClientMap.set(request.id, clientId);
+      }
+      const encoded = parser.encode(request);
+      if (encoded === undefined) return Effect.void;
+      return Effect.orDie(script.callExport(clientExportName)(encoded));
+    }
   };
 }));
 /**
  * @since 1.0.0
  * @category Layers
  */
-export const layerProtocolFrida = options => Layer.scoped(RpcClient.Protocol, makeProtocolFrida(options));
+export const layerProtocolFrida = options => Layer.effect(RpcClient.Protocol, makeProtocolFrida(options));
 //# sourceMappingURL=FridaRpcClient.js.map

package/dist/node/FridaRpcClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"FridaRpcClient.js","names":["RpcClient","RpcSerialization","FridaScript","Effect","Function","Layer","Option","ParseResult","Predicate","Schema","Stream","constants","makeProtocolFrida","options","Protocol","make","fnUntraced","writeResponse","script","serialization","parser","unsafeMake","mainExportName","exportName","defaultServerMainExportName","makeExportName","generateExportName","generateServerExportNameForClient","clientId","catchIf","callExport","Number","isParseError","dieMessage","isClientId","compose","isNumber","id","receivingPredicate","isUnknown","struct","stream","pipe","filterMap","unfiltered","message","data","none","runForEach","filtered","responses","decode","length","void","i","whileLoop","while","body","step","constVoid","defect","_tag","interruptible","forkScoped","send","encoded","encode","isUndefined","Void","orDie","supportsAck","supportsTransferables","layerProtocolFrida","scoped"],"sources":["../../src/node/FridaRpcClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FridaRpcClient.js","names":["Cause","Effect","Function","Layer","Option","Result","Schema","Stream","RpcClient","RpcClientError","RpcSerialization","FridaScript","constants","makeProtocolFrida","options","Protocol","make","fnUntraced","writeResponse","clientIds","script","serialization","mainExportName","exportName","defaultServerMainExportName","informServerToSetupExport","callExport","String","clientExportName","orDie","parser","makeUnsafe","requestClientMap","Map","currentError","undefined","broadcast","response","forEach","clientId","runForEach","stream","message","isNone","data","void","responses","decode","value","length","i","whileLoop","step","constVoid","while","body","get","requestId","_tag","delete","defect","error","reason","RpcClientDefect","cause","pipe","tapCause","findError","hasError","isSuccess","success","squash","forkScoped","supportsAck","supportsTransferables","send","request","fail","set","id","encoded","encode","layerProtocolFrida","effect"],"sources":["../../src/node/FridaRpcClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/node/FridaRpcServer.d.ts

@@ -5,12 +5,19 @@
  * @since 1.0.0
  */
 import type * as Scope from "effect/Scope";
-import * as RpcSerialization from "@effect/rpc/RpcSerialization";
-import * as FridaScript from "@efffrida/frida-tools/FridaScript";
 import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization";
+import * as RpcServer from "effect/unstable/rpc/RpcServer";
+import * as FridaScript from "@efffrida/frida-tools/FridaScript";
 /**
  * @since 1.0.0
  * @category Protocol
  */
-export declare const makeProtocolFrida: () => Effect.Effect<unknown, never, FridaScript.FridaScript | RpcSerialization.RpcSerialization | Scope.Scope>;
+export declare const makeProtocolFrida: () => Effect.Effect<RpcServer.Protocol["Service"], never, FridaScript.FridaScript | RpcSerialization.RpcSerialization | Scope.Scope>;
+/**
+ * @since 1.0.0
+ * @category Layer
+ */
+export declare const layerProtocolFrida: Layer.Layer<RpcServer.Protocol, never, FridaScript.FridaScript | RpcSerialization.RpcSerialization>;
 //# sourceMappingURL=FridaRpcServer.d.ts.map

package/dist/node/FridaRpcServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FridaRpcServer.d.ts","sourceRoot":"","sources":["../../src/node/FridaRpcServer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAG3C,OAAO,KAAK,gBAAgB,MAAM,8BAA8B,CAAC;AAEjE,OAAO,KAAK,WAAW,MAAM,mCAAmC,CAAC;AAEjE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAaxC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,CAC9C,OAAO,EACP,KAAK,EACL,WAAW,CAAC,WAAW,GAAG,gBAAgB,CAAC,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAmGvE,CAAC"}
+{"version":3,"file":"FridaRpcServer.d.ts","sourceRoot":"","sources":["../../src/node/FridaRpcServer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAE3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAOtC,OAAO,KAAK,gBAAgB,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,WAAW,MAAM,mCAAmC,CAAC;AAIjE;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,CAC9C,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC7B,KAAK,EACL,WAAW,CAAC,WAAW,GAAG,gBAAgB,CAAC,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAuGvE,CAAC;AAEP;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,KAAK,CACxC,SAAS,CAAC,QAAQ,EAClB,KAAK,EACL,WAAW,CAAC,WAAW,GAAG,gBAAgB,CAAC,gBAAgB,CACN,CAAC"}

package/dist/node/FridaRpcServer.js

@@ -4,102 +4,96 @@
  *
  * @since 1.0.0
  */
-import * as RpcMessage from "@effect/rpc/RpcMessage";
-import * as RpcSerialization from "@effect/rpc/RpcSerialization";
-import * as RpcServer from "@effect/rpc/RpcServer";
-import * as FridaScript from "@efffrida/frida-tools/FridaScript";
-import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
-import * as Mailbox from "effect/Mailbox";
+import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
-import * as Schema from "effect/Schema";
+import * as Queue from "effect/Queue";
 import * as Stream from "effect/Stream";
 import * as String from "effect/String";
-import * as Tuple from "effect/Tuple";
-import * as constants from "../shared/constants.js";
-import * as predicates from "../shared/predicates.js";
+import * as RpcMessage from "effect/unstable/rpc/RpcMessage";
+import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization";
+import * as RpcServer from "effect/unstable/rpc/RpcServer";
+import * as FridaScript from "@efffrida/frida-tools/FridaScript";
+import * as constants from "../shared/Constants.js";
 /**
  * @since 1.0.0
  * @category Protocol
  */
 export const makeProtocolFrida = () => Effect.gen(function* () {
-  const encoder = new TextEncoder();
-  const script = yield* FridaScript.FridaScript;
   const serialization = yield* RpcSerialization.RpcSerialization;
+  const script = yield* FridaScript.FridaScript;
+  const disconnects = yield* Queue.unbounded();
+  const parser = serialization.makeUnsafe();
+  const encoder = new TextEncoder();
   let clientId = 0;
   const clientIds = new Set();
-  const parser = serialization.unsafeMake();
-  const disconnects = yield* Mailbox.make();
+  const clientIdsByExports = new Map();
+  const clients = new Map();
+  const stripPrefix = String.replace(constants.nodeRpcClientConnectionRequestMessagePrefix, "");
+  const newClientPredicate = Predicate.compose(Predicate.isString, String.startsWith(constants.nodeRpcClientConnectionRequestMessagePrefix));
+  const clientMessagePredicate = Predicate.compose(Predicate.isString, message => clientIdsByExports.has(message));
   let writeRequest;
-  // Listen for new clients
-  yield* script.stream.pipe(Stream.filterMap(({
-    message
-  }) => {
-    if (predicates.newClientPredicate(message)) {
-      const stripPrefix = String.replace(constants.nodeRpcClientConnectionRequestMessagePrefix, "");
-      return Option.some(stripPrefix(message));
-    } else {
-      return Option.none();
-    }
-  }), Stream.runForEach(exportName => {
-    const id = clientId++;
+  const makeRawWriter = exportName => data => {
+    const transformed = typeof data === "string" ? encoder.encode(data) : data;
+    return script.callExport(exportName)(transformed).pipe(Effect.orDie);
+  };
+  const onClientConnect = message => {
+    const writeRaw = makeRawWriter(stripPrefix(message));
+    const write = response => {
+      try {
+        const encoded = parser.encode(response);
+        if (encoded === undefined) return Effect.void;
+        return writeRaw(encoded);
+      } catch (cause) {
+        const encoded = parser.encode(RpcMessage.ResponseDefectEncoded(cause));
+        return writeRaw(encoded);
+      }
+    };
+    const id = ++clientId;
+    clientIdsByExports.set(stripPrefix(message), id);
+    clients.set(id, {
+      write
+    });
     clientIds.add(id);
-    return script.callExport(exportName, Schema.Void)(clientId++);
-  }), Stream.tapError(Console.error), Stream.runDrain, Effect.forkScoped);
-  // Listen for messages from connected clients
-  yield* script.stream.pipe(Stream.filterMap(({
-    data: maybeData,
-    message
-  }) => {
-    if (predicates.isTaggedForAnyClient(message)) {
-      return Option.map(maybeData, data => Tuple.make(message.clientId, data));
-    } else {
-      return Option.none();
-    }
-  }), Stream.runForEach(([clientId, data]) => {
+    return Effect.void;
+  };
+  const onMessage = (exportName, data) => {
     try {
+      const id = clientIdsByExports.get(exportName);
       const decoded = parser.decode(data);
       if (decoded.length === 0) return Effect.void;
       let i = 0;
       return Effect.whileLoop({
         while: () => i < decoded.length,
+        step: Function.constVoid,
         body() {
           const message = decoded[i++];
-          return writeRequest(clientId, message);
-        },
-        step: Function.constVoid
+          return writeRequest(id, message);
+        }
       });
     } catch (cause) {
-      return Effect.sync(() => {
-        const encoded = parser.encode(RpcMessage.ResponseDefectEncoded(cause));
-        const transformed = typeof encoded === "string" ? encoder.encode(encoded) : encoded;
-        script.script.post({
-          clientId
-        }, Buffer.from(transformed));
-      });
+      const writeRaw = makeRawWriter(exportName);
+      return writeRaw(parser.encode(RpcMessage.ResponseDefectEncoded(cause)));
     }
-  }), Stream.tapError(Console.error), Stream.runDrain, Effect.forkScoped);
+  };
+  yield* Stream.runForEach(script.stream, ({
+    message,
+    data
+  }) => {
+    if (newClientPredicate(message)) return onClientConnect(message);
+    if (clientMessagePredicate(message) && Option.isSome(data)) return onMessage(message, data.value);
+    return Effect.void;
+  }).pipe(Effect.forkScoped);
   return yield* RpcServer.Protocol.make(_writeRequest => {
     writeRequest = _writeRequest;
     return Effect.succeed({
       disconnects,
       send: (clientId, response) => {
-        const writeRaw = data => {
-          const transformed = typeof data === "string" ? encoder.encode(data) : data;
-          script.script.post({
-            clientId
-          }, Buffer.from(transformed));
-          return Effect.void;
-        };
-        try {
-          const encoded = parser.encode(response);
-          if (Predicate.isNotUndefined(encoded)) return writeRaw(encoded);else return Effect.void;
-        } catch (cause) {
-          const encoded = parser.encode(RpcMessage.ResponseDefectEncoded(cause));
-          return writeRaw(encoded);
-        }
+        const client = clients.get(clientId);
+        if (!client) return Effect.void;
+        return Effect.sync(() => client.write(response));
       },
       end(_clientId) {
         return Effect.void;
@@ -112,4 +106,9 @@ export const makeProtocolFrida = () => Effect.gen(function* () {
     });
   });
 });
+/**
+ * @since 1.0.0
+ * @category Layer
+ */
+export const layerProtocolFrida = /*#__PURE__*/Layer.effect(RpcServer.Protocol, /*#__PURE__*/makeProtocolFrida());
 //# sourceMappingURL=FridaRpcServer.js.map

package/dist/node/FridaRpcServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"FridaRpcServer.js","names":["RpcMessage","RpcSerialization","RpcServer","FridaScript","Console","Effect","Function","Mailbox","Option","Predicate","Schema","Stream","String","Tuple","constants","predicates","makeProtocolFrida","gen","encoder","TextEncoder","script","serialization","clientId","clientIds","Set","parser","unsafeMake","disconnects","make","writeRequest","stream","pipe","filterMap","message","newClientPredicate","stripPrefix","replace","nodeRpcClientConnectionRequestMessagePrefix","some","none","runForEach","exportName","id","add","callExport","Void","tapError","error","runDrain","forkScoped","data","maybeData","isTaggedForAnyClient","map","decoded","decode","length","void","i","whileLoop","while","body","step","constVoid","cause","sync","encoded","encode","ResponseDefectEncoded","transformed","post","Buffer","from","Protocol","_writeRequest","succeed","send","response","writeRaw","isNotUndefined","end","_clientId","initialMessage","succeedNone","supportsAck","supportsTransferables","supportsSpanPropagation"],"sources":["../../src/node/FridaRpcServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FridaRpcServer.js","names":["Effect","Function","Layer","Option","Predicate","Queue","Stream","String","RpcMessage","RpcSerialization","RpcServer","FridaScript","constants","makeProtocolFrida","gen","serialization","script","disconnects","unbounded","parser","makeUnsafe","encoder","TextEncoder","clientId","clientIds","Set","clientIdsByExports","Map","clients","stripPrefix","replace","nodeRpcClientConnectionRequestMessagePrefix","newClientPredicate","compose","isString","startsWith","clientMessagePredicate","message","has","writeRequest","makeRawWriter","exportName","data","transformed","encode","callExport","pipe","orDie","onClientConnect","writeRaw","write","response","encoded","undefined","void","cause","ResponseDefectEncoded","id","set","add","onMessage","get","decoded","decode","length","i","whileLoop","while","step","constVoid","body","runForEach","stream","isSome","value","forkScoped","Protocol","make","_writeRequest","succeed","send","client","sync","end","_clientId","initialMessage","succeedNone","supportsAck","supportsTransferables","supportsSpanPropagation","layerProtocolFrida","effect"],"sources":["../../src/node/FridaRpcServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/shared/{constants.d.ts → Constants.d.ts}

@@ -1,6 +1,10 @@
+/**
+ * Constants for working with RPC servers and clients.
+ *
+ * @since 1.0.0
+ */
 export declare const defaultServerMainExportName = "rpc";
 export declare const generateServerExportNameForClient: (clientId: number) => string;
-export declare const generateClientCallbackExportNameForServer: () => string;
-export declare const nodeRpcClientConnectionRequestMessagePrefix = "client id request message";
+export declare const nodeRpcClientConnectionRequestMessagePrefix = "@efffrida/rpc/NodeRpcClientConnectionRequest/";
 export declare const nodeRpcClientMakeConnectionRequestForServer: (exportName: string) => string;
-//# sourceMappingURL=constants.d.ts.map
+//# sourceMappingURL=Constants.d.ts.map

package/dist/shared/Constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Constants.d.ts","sourceRoot":"","sources":["../../src/shared/Constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,2BAA2B,QAAQ,CAAC;AACjD,eAAO,MAAM,iCAAiC,GAAI,UAAU,MAAM,KAAG,MACN,CAAC;AAEhE,eAAO,MAAM,2CAA2C,kDAAkD,CAAC;AAC3G,eAAO,MAAM,2CAA2C,GAAI,YAAY,MAAM,WACb,CAAC"}

package/dist/shared/Constants.js

@@ -0,0 +1,10 @@
+/**
+ * Constants for working with RPC servers and clients.
+ *
+ * @since 1.0.0
+ */
+export const defaultServerMainExportName = "rpc";
+export const generateServerExportNameForClient = clientId => `@efffrida/rpc/FridaServerRpcListenerForClient/${clientId}`;
+export const nodeRpcClientConnectionRequestMessagePrefix = "@efffrida/rpc/NodeRpcClientConnectionRequest/";
+export const nodeRpcClientMakeConnectionRequestForServer = exportName => `${nodeRpcClientConnectionRequestMessagePrefix}${exportName}`;
+//# sourceMappingURL=Constants.js.map

package/dist/shared/Constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Constants.js","names":["defaultServerMainExportName","generateServerExportNameForClient","clientId","nodeRpcClientConnectionRequestMessagePrefix","nodeRpcClientMakeConnectionRequestForServer","exportName"],"sources":["../../src/shared/Constants.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;AAMA,OAAO,MAAMA,2BAA2B,GAAG,KAAK;AAChD,OAAO,MAAMC,iCAAiC,GAAIC,QAAgB,IAC9D,iDAAiDA,QAAQ,EAAE;AAE/D,OAAO,MAAMC,2CAA2C,GAAG,+CAA+C;AAC1G,OAAO,MAAMC,2CAA2C,GAAIC,UAAkB,IAC1E,GAAGF,2CAA2C,GAAGE,UAAU,EAAE","ignoreList":[]}

package/dist/shared/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @since 1.0.0
+ */
+/**
+ * Constants for working with RPC servers and clients.
+ *
+ * @since 1.0.0
+ */
+export * as Constants from "./Constants.ts";
+//# sourceMappingURL=index.d.ts.map

package/dist/shared/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;GAIG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA"}

package/dist/shared/index.js

@@ -0,0 +1,10 @@
+/**
+ * @since 1.0.0
+ */
+/**
+ * Constants for working with RPC servers and clients.
+ *
+ * @since 1.0.0
+ */
+export * as Constants from "./Constants.js";
+//# sourceMappingURL=index.js.map

package/dist/shared/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["Constants"],"sources":["../../src/shared/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;;;;;AAKA,OAAO,KAAKA,SAAS,MAAM,gBAAgB","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@efffrida/rpc",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "effect rpc-frida",
   "keywords": [
     "effect-ts",
@@ -38,30 +38,22 @@
     "provenance": true
   },
   "dependencies": {
-    "@efffrida/frida-tools": "^0.0.27",
-    "@efffrida/platform": "0.0.19",
-    "@efffrida/polyfills": "0.0.6"
+    "@efffrida/frida-tools": "^0.0.29",
+    "@efffrida/platform": "0.0.21",
+    "@efffrida/polyfills": "0.0.8"
   },
   "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",
-    "frida": "17.9.8",
-    "vitest": "4.1.6",
-    "@efffrida/vitest-pool": "0.0.12"
+    "@types/node": "25.9.0",
+    "effect": "4.0.0-beta.69",
+    "frida": "17.9.10",
+    "ioredis": "5.10.1",
+    "vitest": "4.1.6"
   },
   "peerDependencies": {
-    "@effect/platform": "0.96.1",
-    "@effect/rpc": "0.75.1",
-    "effect": "3.21.2"
+    "effect": "4.0.0-beta.69"
   },
   "tags": [
     "frida.re",