hs-playlib 0.2.0 → 0.4.0

package/dist/src/payments/uniffi_client.js

@@ -18,6 +18,8 @@ const koffi_1 = __importDefault(require("koffi"));
 const path_1 = __importDefault(require("path"));
 // @ts-ignore - generated CommonJS module
 const _generated_flows_js_1 = require("./_generated_flows.js");
+// @ts-ignore - generated protobuf types
+const proto_js_1 = require("./generated/proto.js");
 const _dirname = __dirname;
 const FLOW_NAMES = Object.keys(_generated_flows_js_1.FLOWS);
 const SINGLE_FLOW_NAMES = Object.keys((_generated_flows_js_1.SINGLE_FLOWS || {}));
@@ -58,11 +60,8 @@ function makeCallStatus() {
 function checkCallStatus(ffi, status) {
     if (status.code === 0)
         return;
-    if (status.code === 1) {
-        const errMsg = liftError(status.error_buf);
-        freeRustBuffer(ffi, status.error_buf);
-        throw new Error(errMsg);
-    }
+    // Only Rust panics should reach here now (status.code === 2)
+    // Normal errors are encoded as protobuf RequestError/ResponseError in returned bytes
     if (status.error_buf.len > 0n) {
         const msg = liftString(status.error_buf);
         freeRustBuffer(ffi, status.error_buf);
@@ -70,28 +69,6 @@ function checkCallStatus(ffi, status) {
     }
     throw new Error("Unknown Rust panic");
 }
-function liftError(buf) {
-    if (!buf.data || buf.len === 0n)
-        return "Unknown error";
-    const raw = Buffer.from(koffi_1.default.decode(buf.data, "uint8", Number(buf.len)));
-    let offset = 0;
-    // UniFFI Error layout: [i32 variant] + [i32 len] + [bytes]
-    const variant = raw.readInt32BE(offset);
-    offset += 4;
-    const variantNames = {
-        1: "DecodeError",
-        2: "MissingMetadata",
-        3: "MetadataParseError",
-        4: "HandlerError",
-        5: "NoConnectorRequest",
-    };
-    if (variant === 5)
-        return "NoConnectorRequest";
-    const strLen = raw.readInt32BE(offset);
-    offset += 4;
-    const msg = raw.subarray(offset, offset + strLen).toString("utf-8");
-    return `${variantNames[variant] || "UniffiError"}: ${msg}`;
-}
 /**
  * UniFFI Strings are serialized as raw UTF8 bytes when top-level in RustBuffer.
  */
@@ -154,7 +131,21 @@ class UniffiClient {
         const result = fn(rbReq, rbOpts, status);
         try {
             checkCallStatus(this._ffi, status);
-            return liftBytes(result);
+            const bytes = liftBytes(result);
+            try {
+                const reqErr = proto_js_1.types.RequestError.decode(bytes);
+                if (reqErr.errorMessage) {
+                    const err = new Error(reqErr.errorMessage);
+                    err.ffiError = reqErr;
+                    throw err;
+                }
+            }
+            catch (e) {
+                if (e.ffiError)
+                    throw e;
+                // decode failed — not an error proto, return bytes as-is
+            }
+            return bytes;
         }
         finally {
             freeRustBuffer(this._ffi, result);
@@ -176,7 +167,21 @@ class UniffiClient {
         const result = fn(rbRes, rbReq, rbOpts, status);
         try {
             checkCallStatus(this._ffi, status);
-            return liftBytes(result);
+            const bytes = liftBytes(result);
+            try {
+                const resErr = proto_js_1.types.ResponseError.decode(bytes);
+                if (resErr.errorMessage) {
+                    const err = new Error(resErr.errorMessage);
+                    err.ffiError = resErr;
+                    throw err;
+                }
+            }
+            catch (e) {
+                if (e.ffiError)
+                    throw e;
+                // decode failed — not an error proto, return bytes as-is
+            }
+            return bytes;
         }
         finally {
             freeRustBuffer(this._ffi, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hs-playlib",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Hyperswitch Payments SDK — Node.js client for connector integrations via UniFFI FFI",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",