@nile-squad/nylonpay-ts 1.0.6 → 1.0.8

package/dist/index.js

@@ -2,7 +2,7 @@ import { createHash, createHmac, timingSafeEqual, randomBytes } from 'crypto';
 import { Ok, Err, safeTry } from 'slang-ts';
 import { type, platform, arch, release, hostname } from 'os';
 
-// src/sdk.ts
+// src/create-nylon-pay.ts
 
 // src/pubsub.ts
 function createEmitter() {
@@ -61,9 +61,7 @@ var DEFAULT_MAX_RETRIES = 3;
 var DEFAULT_MAX_POLL_INTERVAL_MS = 2e3;
 var DEFAULT_MAX_POLL_DURATION_MS = 3e5;
 var DEFAULT_MAX_POLL_ATTEMPTS = 150;
-var DEFAULT_STREAMING = true;
-var STREAM_PATH = "/sse/transaction";
-var MAX_STREAM_RECONNECTS = 2;
+var POLL_JITTER_MS = 250;
 var SDK_SERVICE = "sdk";
 var SDK_ACTIONS = {
   collectPayment: "sdk-collect-payment",
@@ -91,13 +89,22 @@ function generateFingerprint() {
 function generateNonce(length = 16) {
   return randomBytes(length).toString("hex");
 }
+function compareByCodePoint(first, second) {
+  if (first < second) {
+    return -1;
+  }
+  if (first > second) {
+    return 1;
+  }
+  return 0;
+}
 function sortValue(value) {
   if (Array.isArray(value)) {
     return value.map((entry) => sortValue(entry));
   }
   if (value && typeof value === "object") {
     const sortedEntries = Object.entries(value).sort(
-      ([firstKey], [secondKey]) => firstKey.localeCompare(secondKey)
+      ([firstKey], [secondKey]) => compareByCodePoint(firstKey, secondKey)
     );
     return Object.fromEntries(
       sortedEntries.map(([entryKey, entryValue]) => [
@@ -121,42 +128,6 @@ function createSignature(input) {
 function createTimestamp() {
   return Date.now().toString();
 }
-
-// src/sse-parse.ts
-function parseBlock(block) {
-  let event = "message";
-  const dataLines = [];
-  for (const rawLine of block.split("\n")) {
-    const line = rawLine.replace(/\r$/, "");
-    if (line.startsWith(":")) {
-      continue;
-    }
-    if (line.startsWith("event:")) {
-      event = line.slice("event:".length).trim();
-    } else if (line.startsWith("data:")) {
-      dataLines.push(line.slice("data:".length).trim());
-    }
-  }
-  if (dataLines.length === 0) {
-    return null;
-  }
-  return { event, data: dataLines.join("\n") };
-}
-function parseSseBuffer(buffer) {
-  const messages = [];
-  let rest = buffer;
-  let separator = rest.indexOf("\n\n");
-  while (separator !== -1) {
-    const block = rest.slice(0, separator);
-    rest = rest.slice(separator + 2);
-    const message = parseBlock(block);
-    if (message) {
-      messages.push(message);
-    }
-    separator = rest.indexOf("\n\n");
-  }
-  return { messages, rest };
-}
 function verifyResponseSignature(data, signature, secret) {
   const expectedSignature = createHmac("sha256", secret).update(createCanonicalPayload(data)).digest("hex");
   const providedBuffer = Buffer.from(signature, "hex");
@@ -169,13 +140,6 @@ function verifyResponseSignature(data, signature, secret) {
 
 // src/transport.ts
 var CACHED_FINGERPRINT = generateFingerprint();
-function streamUrl(baseUrl) {
-  try {
-    return new URL(baseUrl).origin + STREAM_PATH;
-  } catch {
-    return baseUrl.replace(/\/api\/services\/?$/u, "") + STREAM_PATH;
-  }
-}
 var KNOWN_CATEGORIES = /* @__PURE__ */ new Set([
   "auth",
   "validation",
@@ -341,22 +305,30 @@ function createTransport({
         const { status, message, data } = responseBody;
         if (status === true) {
           const { data: strippedData, responseSignature } = stripResponseSignature(data);
-          if (responseSignature) {
-            const isValid = verifyResponseSignature(
-              strippedData,
-              responseSignature,
-              apiSecret
+          if (!responseSignature) {
+            cleanup();
+            return Err(
+              JSON.stringify({
+                category: "internal",
+                message: "Response signature missing",
+                retryable: false
+              })
+            );
+          }
+          const isValid = verifyResponseSignature(
+            strippedData,
+            responseSignature,
+            apiSecret
+          );
+          if (!isValid) {
+            cleanup();
+            return Err(
+              JSON.stringify({
+                category: "internal",
+                message: "Response signature verification failed",
+                retryable: false
+              })
             );
-            if (!isValid) {
-              cleanup();
-              return Err(
-                JSON.stringify({
-                  category: "internal",
-                  message: "Response signature verification failed",
-                  retryable: false
-                })
-              );
-            }
           }
           cleanup();
           return Ok(strippedData);
@@ -381,91 +353,7 @@ function createTransport({
     }
     return attempt(0);
   }
-  function openStream(input) {
-    const controller = new AbortController();
-    let closed = false;
-    const close = () => {
-      if (closed) {
-        return;
-      }
-      closed = true;
-      controller.abort();
-    };
-    const payload = {
-      reference: input.reference,
-      _fingerprint: CACHED_FINGERPRINT
-    };
-    const headers = buildAuthHeaders({ apiKey, apiSecret, payload });
-    const url = streamUrl(baseUrl);
-    const run = async () => {
-      const fetchResult = await safeTry(
-        () => fetchImpl(url, {
-          method: "POST",
-          headers,
-          body: JSON.stringify(payload),
-          signal: controller.signal
-        })
-      );
-      if (fetchResult.isErr) {
-        if (!closed) {
-          input.onError(fetchResult.error);
-        }
-        return;
-      }
-      const response = fetchResult.value;
-      if (!response.ok || !response.body) {
-        const textResult = await safeTry(() => response.text());
-        const message = textResult.isOk ? textResult.value : `HTTP ${response.status}`;
-        if (!closed) {
-          input.onError(message || `HTTP ${response.status}`);
-        }
-        return;
-      }
-      const reader = response.body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = "";
-      while (!closed) {
-        const chunkResult = await safeTry(() => reader.read());
-        if (chunkResult.isErr) {
-          if (!closed) {
-            input.onError(chunkResult.error);
-          }
-          return;
-        }
-        const chunk = chunkResult.value;
-        if (chunk.done) {
-          break;
-        }
-        buffer += decoder.decode(chunk.value, { stream: true });
-        const { messages, rest } = parseSseBuffer(buffer);
-        buffer = rest;
-        for (const message of messages) {
-          if (message.event === "status") {
-            const statusResult = await safeTry(
-              () => JSON.parse(message.data)
-            );
-            if (statusResult.isOk) {
-              input.onStatus(statusResult.value);
-            }
-          } else if (message.event === "error") {
-            const errDataResult = await safeTry(
-              () => JSON.parse(message.data)
-            );
-            const text = errDataResult.isOk ? errDataResult.value.message ?? message.data : message.data;
-            close();
-            input.onError(text);
-            return;
-          }
-        }
-      }
-      if (!closed) {
-        input.onClose();
-      }
-    };
-    void run();
-    return { close };
-  }
-  return { send, openStream, parseError };
+  return { send, parseError };
 }
 function parseError(error) {
   try {
@@ -515,22 +403,20 @@ function createPaymentInstance(initialResponse, deps) {
     fetchTransaction: deps.fetchTransaction,
     pollIntervalMs: deps.pollIntervalMs ?? 2e3,
     maxPollDuration: deps.maxPollDuration ?? 3e5,
-    maxPollAttempts: deps.maxPollAttempts ?? 150,
-    streaming: deps.streaming ?? false,
-    openStream: deps.openStream,
-    streamHandle: null,
-    streamReconnects: 0
+    maxPollAttempts: deps.maxPollAttempts ?? 150
   };
   function resolveWithError(error) {
     state.resolved = true;
     stopUpdates();
     emitEvent("error", parseError(error).message);
   }
-  function emitEvent(event, error) {
+  function emitEvent(event, error, category, retryable) {
     const data = {
       event,
       transaction: state.transaction ?? void 0,
       error,
+      category,
+      retryable,
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
     };
     state.emitter.emit(event, data);
@@ -553,6 +439,9 @@ function createPaymentInstance(initialResponse, deps) {
     stopUpdates();
   }
   async function handleStatusUpdate(response) {
+    if (state.resolved) {
+      return;
+    }
     if (response.reference !== state.reference) {
       resolveWithError(
         `Reference mismatch: expected ${state.reference} but got ${response.reference}`
@@ -586,10 +475,11 @@ function createPaymentInstance(initialResponse, deps) {
     if (state.resolved || state.pollingTimer) {
       return;
     }
+    const delay2 = state.pollIntervalMs + Math.random() * POLL_JITTER_MS;
     state.pollingTimer = setTimeout(() => {
       state.pollingTimer = null;
       void pollStatus();
-    }, state.pollIntervalMs);
+    }, delay2);
   }
   async function pollStatus() {
     if (state.resolved) {
@@ -617,42 +507,6 @@ function createPaymentInstance(initialResponse, deps) {
     }
     scheduleNextPoll();
   }
-  function closeStream() {
-    if (state.streamHandle) {
-      state.streamHandle.close();
-      state.streamHandle = null;
-    }
-  }
-  function startStream() {
-    if (state.resolved || !state.openStream) {
-      return;
-    }
-    state.streamHandle = state.openStream({
-      reference: state.reference,
-      onStatus: (status) => {
-        void handleStatusUpdate(status);
-      },
-      onError: () => handleStreamFailure(),
-      onClose: () => handleStreamFailure()
-    });
-  }
-  function handleStreamFailure() {
-    closeStream();
-    if (state.resolved) {
-      return;
-    }
-    if (state.streamReconnects < MAX_STREAM_RECONNECTS) {
-      state.streamReconnects += 1;
-      const backoff = 500 * 2 ** (state.streamReconnects - 1) + Math.random() * 250;
-      setTimeout(() => {
-        if (!state.resolved) {
-          startStream();
-        }
-      }, backoff);
-      return;
-    }
-    scheduleNextPoll();
-  }
   function startUpdates() {
     if (TERMINAL_STATES.has(state.status)) {
       setTimeout(() => {
@@ -660,10 +514,6 @@ function createPaymentInstance(initialResponse, deps) {
       }, 0);
       return;
     }
-    if (state.streaming && state.openStream) {
-      startStream();
-      return;
-    }
     scheduleNextPoll();
   }
   function stopUpdates() {
@@ -671,7 +521,6 @@ function createPaymentInstance(initialResponse, deps) {
       clearTimeout(state.pollingTimer);
       state.pollingTimer = null;
     }
-    closeStream();
   }
   function on(event, handler) {
     state.emitter.on(event, handler);
@@ -733,24 +582,76 @@ function createPaymentInstance(initialResponse, deps) {
     off,
     wait
   };
-  startUpdates();
+  if (deps.initialError) {
+    state.resolved = true;
+    const err = deps.initialError;
+    setTimeout(() => {
+      emitEvent("error", err.message, err.category, err.retryable);
+    }, 0);
+  } else {
+    startUpdates();
+  }
   return paymentInstance;
 }
+var DEFAULT_TOLERANCE_SECONDS = 300;
+function decodePayload(payload) {
+  return typeof payload === "string" ? payload : Buffer.from(payload).toString("utf8");
+}
+function extractSignedTimestampMs(payloadString) {
+  let parsed;
+  try {
+    parsed = JSON.parse(payloadString);
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object") {
+    return null;
+  }
+  const raw = parsed.timestamp;
+  if (typeof raw === "number" && Number.isFinite(raw)) {
+    return raw < 1e12 ? raw * 1e3 : raw;
+  }
+  if (typeof raw === "string") {
+    const ms = Date.parse(raw);
+    return Number.isNaN(ms) ? null : ms;
+  }
+  return null;
+}
 function verifyWebhookSignature(input) {
-  const payloadBytes = typeof input.payload === "string" ? Buffer.from(input.payload, "utf8") : Buffer.from(input.payload);
+  const payloadString = decodePayload(input.payload);
+  const payloadBytes = Buffer.from(payloadString, "utf8");
   const expectedSignature = createHmac("sha256", input.secret).update(payloadBytes).digest("hex");
   const providedBuffer = Buffer.from(input.signature, "hex");
   const expectedBuffer = Buffer.from(expectedSignature, "hex");
   if (providedBuffer.length !== expectedBuffer.length) {
     return false;
   }
-  return timingSafeEqual(providedBuffer, expectedBuffer);
+  if (!timingSafeEqual(providedBuffer, expectedBuffer)) {
+    return false;
+  }
+  const toleranceSeconds = input.toleranceSeconds ?? DEFAULT_TOLERANCE_SECONDS;
+  if (toleranceSeconds <= 0) {
+    return true;
+  }
+  const timestampMs = extractSignedTimestampMs(payloadString);
+  if (timestampMs === null) {
+    return false;
+  }
+  const ageMs = Math.abs(Date.now() - timestampMs);
+  return ageMs <= toleranceSeconds * 1e3;
 }
 
 // src/sdk.ts
 function generateReference() {
   return randomBytes(16).toString("hex").slice(0, 15);
 }
+async function runHook(hook, ...args) {
+  if (!hook || hook.enabled === false) return void 0;
+  const result = await safeTry(async () => hook.fn(...args));
+  if (result.isOk) return result.value;
+  await safeTry(async () => hook.onError(result.error));
+  return void 0;
+}
 function throwValidation(message) {
   throw createSdkError({ category: "validation", message });
 }
@@ -784,9 +685,7 @@ function createSdkInstance(config) {
     }),
     pollIntervalMs: config.maxPollIntervalMs,
     maxPollDuration: config.maxPollDurationMs,
-    maxPollAttempts: config.maxPollAttempts,
-    streaming: config.streaming,
-    openStream: config.streaming ? transport.openStream : void 0
+    maxPollAttempts: config.maxPollAttempts
   };
   async function collectPayment(input) {
     const reference = input.reference ?? generateReference();
@@ -798,26 +697,24 @@ function createSdkInstance(config) {
       throwValidation('bank details are required when method is "bank"');
     }
     let payload = { ...input, reference };
-    if (config.hooks?.beforeCollect) {
-      const mutated = await config.hooks.beforeCollect(payload);
-      if (mutated != null)
-        payload = { ...mutated, reference: mutated.reference ?? reference };
-    }
+    const mutated = await runHook(config.hooks?.beforeCollect, payload);
+    if (mutated != null)
+      payload = { ...mutated, reference: mutated.reference ?? reference };
     const result = await transport.send({
       action: SDK_ACTIONS.collectPayment,
       payload
     });
-    if (config.hooks?.afterCollect) {
-      await config.hooks.afterCollect(
-        result.isOk ? Ok({
-          reference: result.value.reference,
-          status: result.value.status
-        }) : Err(result.error),
-        payload
-      );
-    }
+    await runHook(
+      config.hooks?.afterCollect,
+      result.isOk ? Ok({ reference: result.value.reference, status: result.value.status }) : Err(result.error),
+      payload
+    );
     if (result.isErr) {
-      throw createSdkError(parseError(result.error));
+      const sdkErr = parseError(result.error);
+      return createPaymentInstance(
+        { reference, status: "pending" },
+        { ...commonDeps, initialError: sdkErr }
+      );
     }
     return createPaymentInstance(result.value, commonDeps);
   }
@@ -831,24 +728,18 @@ function createSdkInstance(config) {
       throwValidation('bank details are required when method is "bank"');
     }
     let payload = { ...input, reference };
-    if (config.hooks?.beforeCollect) {
-      const mutated = await config.hooks.beforeCollect(payload);
-      if (mutated != null)
-        payload = { ...mutated, reference: mutated.reference ?? reference };
-    }
+    const mutated = await runHook(config.hooks?.beforeCollect, payload);
+    if (mutated != null)
+      payload = { ...mutated, reference: mutated.reference ?? reference };
     const result = await transport.send({
       action: SDK_ACTIONS.collectPaymentAndResolve,
       payload
     });
-    if (config.hooks?.afterCollect) {
-      await config.hooks.afterCollect(
-        result.isOk ? Ok({
-          reference: result.value.reference,
-          status: result.value.status
-        }) : Err(result.error),
-        payload
-      );
-    }
+    await runHook(
+      config.hooks?.afterCollect,
+      result.isOk ? Ok({ reference: result.value.reference, status: result.value.status }) : Err(result.error),
+      payload
+    );
     if (result.isOk) {
       return Ok(result.value);
     }
@@ -869,26 +760,24 @@ function createSdkInstance(config) {
       "destination.accountNumber"
     );
     let payload = { ...input, reference };
-    if (config.hooks?.beforePayout) {
-      const mutated = await config.hooks.beforePayout(payload);
-      if (mutated != null)
-        payload = { ...mutated, reference: mutated.reference ?? reference };
-    }
+    const mutated = await runHook(config.hooks?.beforePayout, payload);
+    if (mutated != null)
+      payload = { ...mutated, reference: mutated.reference ?? reference };
     const result = await transport.send({
       action: SDK_ACTIONS.makePayout,
       payload
     });
-    if (config.hooks?.afterPayout) {
-      await config.hooks.afterPayout(
-        result.isOk ? Ok({
-          reference: result.value.reference,
-          status: result.value.status
-        }) : Err(result.error),
-        payload
-      );
-    }
+    await runHook(
+      config.hooks?.afterPayout,
+      result.isOk ? Ok({ reference: result.value.reference, status: result.value.status }) : Err(result.error),
+      payload
+    );
     if (result.isErr) {
-      throw createSdkError(parseError(result.error));
+      const sdkErr = parseError(result.error);
+      return createPaymentInstance(
+        { reference, status: "pending" },
+        { ...commonDeps, initialError: sdkErr }
+      );
     }
     return createPaymentInstance(result.value, commonDeps);
   }
@@ -907,24 +796,18 @@ function createSdkInstance(config) {
       "destination.accountNumber"
     );
     let payload = { ...input, reference };
-    if (config.hooks?.beforePayout) {
-      const mutated = await config.hooks.beforePayout(payload);
-      if (mutated != null)
-        payload = { ...mutated, reference: mutated.reference ?? reference };
-    }
+    const mutated = await runHook(config.hooks?.beforePayout, payload);
+    if (mutated != null)
+      payload = { ...mutated, reference: mutated.reference ?? reference };
     const result = await transport.send({
       action: SDK_ACTIONS.makePayoutAndResolve,
       payload
     });
-    if (config.hooks?.afterPayout) {
-      await config.hooks.afterPayout(
-        result.isOk ? Ok({
-          reference: result.value.reference,
-          status: result.value.status
-        }) : Err(result.error),
-        payload
-      );
-    }
+    await runHook(
+      config.hooks?.afterPayout,
+      result.isOk ? Ok({ reference: result.value.reference, status: result.value.status }) : Err(result.error),
+      payload
+    );
     if (result.isOk) {
       return Ok(result.value);
     }
@@ -1024,7 +907,8 @@ function createNylonPay(config) {
     throw new Error('apiSecret must start with "nps_"');
   }
   const baseUrl = config.baseUrl ?? DEFAULT_BASE_URL;
-  const instanceKey = `${config.apiKey}:${baseUrl}`;
+  const secretHash = createHash("sha256").update(config.apiSecret).digest("hex").slice(0, 16);
+  const instanceKey = `${config.apiKey}:${baseUrl}:${secretHash}`;
   if (!config.force) {
     const existing = instances.get(instanceKey);
     if (existing) return existing;
@@ -1038,7 +922,6 @@ function createNylonPay(config) {
     maxPollIntervalMs: config.maxPollIntervalMs ?? DEFAULT_MAX_POLL_INTERVAL_MS,
     maxPollDurationMs: config.maxPollDurationMs ?? DEFAULT_MAX_POLL_DURATION_MS,
     maxPollAttempts: config.maxPollAttempts ?? DEFAULT_MAX_POLL_ATTEMPTS,
-    streaming: config.streaming ?? DEFAULT_STREAMING,
     fetch: config.fetch ?? globalThis.fetch.bind(globalThis),
     hooks: config.hooks
   };