@porulle/plugin-channel-connector 0.70.0 → 0.70.2

package/dist/service.js

@@ -2285,6 +2285,7 @@ export class ChannelConnectorService {
                 "orders/fulfilled",
                 "orders/partially_fulfilled",
                 "orders/cancelled",
+                "refunds/create",
                 "app/uninstalled",
             ], callbackUrl);
             if (!registration.ok) {
@@ -4186,7 +4187,15 @@ export class ChannelConnectorService {
         const existing = await this.db.select().from(channelRefundRequests).where(and(eq(channelRefundRequests.storeId, store.id), eq(channelRefundRequests.remoteRefundId, remoteRefundId)));
         if (existing[0])
             return Ok(existing[0]);
-        const lineData = Array.isArray(data.line_items) ? data.line_items : Array.isArray(data.lineItems) ? data.lineItems : [];
+        // Shopify names the refunded lines in `refund_line_items`, each with its order line under
+        // `line_item`; other providers send a flat `line_items`. Both reduce to { variant_id, quantity }.
+        const lineData = Array.isArray(data.refund_line_items)
+            ? data.refund_line_items.map((raw) => {
+                const entry = (raw ?? {});
+                const orderLine = (entry.line_item ?? {});
+                return { variant_id: orderLine.variant_id, product_id: orderLine.product_id, quantity: entry.quantity };
+            })
+            : Array.isArray(data.line_items) ? data.line_items : Array.isArray(data.lineItems) ? data.lineItems : [];
         const orderLines = await this.db.select().from(orderLineItems).where(eq(orderLineItems.orderId, orderId));
         const mappings = await this.db.select().from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, store.id)));
         const refundLines = [];
@@ -4217,8 +4226,12 @@ export class ChannelConnectorService {
         await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: request.id, fromState: null, toState: request.state, reason: auto ? "Automatic guarded refund" : "Operator approval required", changedBy: requireUserId(actor) });
         if (auto) {
             const result = await this.executeRefund(request, refundLines, actor);
-            if (!result.ok)
-                return PluginErr(result.error);
+            if (!result.ok) {
+                // Nothing moved: an operator decides instead, rather than the request sticking as approved.
+                await this.db.update(channelRefundRequests).set({ state: "requested", approvedBy: null, updatedAt: new Date() }).where(and(eq(channelRefundRequests.organizationId, orgId), eq(channelRefundRequests.id, request.id), eq(channelRefundRequests.state, "approved")));
+                await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: request.id, fromState: "approved", toState: "requested", reason: `Automatic refund failed: ${result.error}`, changedBy: requireUserId(actor) });
+                return Ok({ ...request, state: "requested" });
+            }
         }
         return Ok(request);
     }
@@ -4239,7 +4252,13 @@ export class ChannelConnectorService {
         if (!request)
             return PluginErr("Refund request not found or already handled.", "NOT_FOUND");
         const lines = await this.refundLinesForRequest(request);
-        return this.executeRefund(request, lines, createSystemActor(orgId));
+        const executed = await this.executeRefund(request, lines, createSystemActor(orgId));
+        if (!executed.ok) {
+            // Nothing moved: back to `requested`, so the operator can approve again once the cause is fixed.
+            await this.db.update(channelRefundRequests).set({ state: "requested", approvedBy: null, updatedAt: new Date() }).where(and(eq(channelRefundRequests.organizationId, orgId), eq(channelRefundRequests.id, id), eq(channelRefundRequests.state, "approved")));
+            await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: id, fromState: "approved", toState: "requested", reason: `Execution failed: ${executed.error}`, changedBy: actor.userId });
+        }
+        return executed;
     }
     async rejectRefund(orgId, id, actor) {
         const [request] = await this.db.update(channelRefundRequests).set({ state: "rejected", approvedBy: actor.userId, updatedAt: new Date() }).where(and(eq(channelRefundRequests.organizationId, orgId), eq(channelRefundRequests.id, id), eq(channelRefundRequests.state, "requested"))).returning();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@porulle/plugin-channel-connector",
-  "version": "0.70.0",
+  "version": "0.70.2",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@hono/zod-openapi": "^1.2.2",
     "hono": "^4.12.5",
-    "@porulle/core": "0.70.0"
+    "@porulle/core": "0.70.2"
   },
   "devDependencies": {
     "@types/node": "^24.5.2",

package/src/service.ts

@@ -3203,6 +3203,7 @@ export class ChannelConnectorService {
         "orders/fulfilled",
         "orders/partially_fulfilled",
         "orders/cancelled",
+        "refunds/create",
         "app/uninstalled",
       ], callbackUrl);
       if (!registration.ok) {
@@ -5313,7 +5314,15 @@ export class ChannelConnectorService {
     if (!remoteRefundId || !orderId) return PluginErr("Refund webhook is missing a mapped order or refund id.", "REFUND_MAPPING_MISSING");
     const existing = await this.db.select().from(channelRefundRequests).where(and(eq(channelRefundRequests.storeId, store.id), eq(channelRefundRequests.remoteRefundId, remoteRefundId)));
     if (existing[0]) return Ok(existing[0] as ChannelRefundRequest);
-    const lineData = Array.isArray(data.line_items) ? data.line_items : Array.isArray(data.lineItems) ? data.lineItems : [];
+    // Shopify names the refunded lines in `refund_line_items`, each with its order line under
+    // `line_item`; other providers send a flat `line_items`. Both reduce to { variant_id, quantity }.
+    const lineData = Array.isArray(data.refund_line_items)
+      ? data.refund_line_items.map((raw) => {
+        const entry = (raw ?? {}) as Record<string, unknown>;
+        const orderLine = (entry.line_item ?? {}) as Record<string, unknown>;
+        return { variant_id: orderLine.variant_id, product_id: orderLine.product_id, quantity: entry.quantity };
+      })
+      : Array.isArray(data.line_items) ? data.line_items : Array.isArray(data.lineItems) ? data.lineItems : [];
     const orderLines = await this.db.select().from(orderLineItems).where(eq(orderLineItems.orderId, orderId));
     const mappings = await this.db.select().from(channelEntityMap).where(and(eq(channelEntityMap.organizationId, orgId), eq(channelEntityMap.storeId, store.id)));
     const refundLines: Array<{ lineItemId: string; quantity: number }> = [];
@@ -5341,7 +5350,12 @@ export class ChannelConnectorService {
     await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: request.id, fromState: null, toState: request.state, reason: auto ? "Automatic guarded refund" : "Operator approval required", changedBy: requireUserId(actor) });
     if (auto) {
       const result = await this.executeRefund(request, refundLines, actor);
-      if (!result.ok) return PluginErr(result.error);
+      if (!result.ok) {
+        // Nothing moved: an operator decides instead, rather than the request sticking as approved.
+        await this.db.update(channelRefundRequests).set({ state: "requested", approvedBy: null, updatedAt: new Date() }).where(and(eq(channelRefundRequests.organizationId, orgId), eq(channelRefundRequests.id, request.id), eq(channelRefundRequests.state, "approved")));
+        await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: request.id, fromState: "approved", toState: "requested", reason: `Automatic refund failed: ${result.error}`, changedBy: requireUserId(actor) });
+        return Ok({ ...request, state: "requested" });
+      }
     }
     return Ok(request);
   }
@@ -5363,7 +5377,13 @@ export class ChannelConnectorService {
     const [request] = await this.db.update(channelRefundRequests).set({ state: "approved", approvedBy: actor.userId, updatedAt: new Date() }).where(and(eq(channelRefundRequests.organizationId, orgId), eq(channelRefundRequests.id, id), eq(channelRefundRequests.state, "requested"))).returning();
     if (!request) return PluginErr("Refund request not found or already handled.", "NOT_FOUND");
     const lines = await this.refundLinesForRequest(request as ChannelRefundRequest);
-    return this.executeRefund(request as ChannelRefundRequest, lines, createSystemActor(orgId));
+    const executed = await this.executeRefund(request as ChannelRefundRequest, lines, createSystemActor(orgId));
+    if (!executed.ok) {
+      // Nothing moved: back to `requested`, so the operator can approve again once the cause is fixed.
+      await this.db.update(channelRefundRequests).set({ state: "requested", approvedBy: null, updatedAt: new Date() }).where(and(eq(channelRefundRequests.organizationId, orgId), eq(channelRefundRequests.id, id), eq(channelRefundRequests.state, "approved")));
+      await this.db.insert(channelRefundEvents).values({ organizationId: orgId, requestId: id, fromState: "approved", toState: "requested", reason: `Execution failed: ${executed.error}`, changedBy: actor.userId });
+    }
+    return executed;
   }
 
   async rejectRefund(orgId: string, id: string, actor: { userId: string }): Promise<PluginResult<ChannelRefundRequest>> {