@porulle/adapter-shopify 0.67.0 → 0.68.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@porulle/adapter-shopify",
-  "version": "0.67.0",
+  "version": "0.68.1",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -16,12 +16,14 @@
   },
   "dependencies": {
     "zod": "^4.1.11",
-    "@porulle/core": "0.67.0"
+    "@porulle/core": "0.68.1"
   },
   "devDependencies": {
     "@types/node": "^24.5.2",
+    "esbuild": "0.25.12",
     "eslint": "^9.39.1",
     "graphql": "^16.11.0",
+    "miniflare": "4.20260722.1",
     "typescript": "5.9.2",
     "vitest": "^3.2.4",
     "@porulle/eslint-config": "0.1.0",

package/src/graphql.ts

@@ -1,4 +1,4 @@
-import { Err, Ok } from "@porulle/core";
+import { CHANNEL_CREDENTIALS_REJECTED, Err, Ok } from "@porulle/core";
 import type { ChannelConnectorError, Result } from "@porulle/core";
 import { z } from "zod";
 
@@ -73,6 +73,10 @@ export async function shopifyGraphql<T>(
   schema: z.ZodType<T>,
 ): Promise<Result<T, ChannelConnectorError>> {
   const sleep = target.sleep ?? defaultSleep;
+  // Called unbound, never as `target.fetchImpl(...)`: workerd's global `fetch` refuses any `this`
+  // but the global scope ("Illegal invocation"), and Node's does not, so a method call passes on
+  // Node and fails every Admin API call on a Worker. test/workerd-fetch.e2e.test.ts holds it.
+  const { fetchImpl } = target;
   const url = `${target.origin}/admin/api/${SHOPIFY_API_VERSION}/graphql.json`;
   let waited = 0;
   for (let attempt = 0; ; attempt += 1) {
@@ -80,7 +84,7 @@ export async function shopifyGraphql<T>(
     try {
       // `manual`, never `error`: workerd implements only `follow` and `manual` and throws on `error`
       // from the Request constructor. A 3xx is then simply not ok, which refuses the redirect.
-      response = await target.fetchImpl(url, {
+      response = await fetchImpl(url, {
         method: "POST",
         redirect: "manual",
         headers: { accept: "application/json", "content-type": "application/json", "x-shopify-access-token": target.accessToken },
@@ -90,7 +94,7 @@ export async function shopifyGraphql<T>(
       return Err({ code: "SHOPIFY_API_FAILED", message: error instanceof Error ? error.message : "Shopify API request failed.", retriable: true });
     }
     if (response.status === 401 || response.status === 403) {
-      return Err({ code: "SHOPIFY_UNAUTHORIZED", message: `Shopify refused the access token (${response.status}); the store must be reconnected.`, retriable: false });
+      return Err({ code: CHANNEL_CREDENTIALS_REJECTED, message: `Shopify refused the access token (${response.status}).`, retriable: false });
     }
     if (response.status !== 429 && !response.ok) {
       return Err({ code: "SHOPIFY_API_FAILED", message: `Shopify API request failed (${response.status}).`, retriable: response.status >= 500 });

package/src/index.ts

@@ -152,10 +152,10 @@ export function shopifyConnector(options: ShopifyConnectorOptions): ChannelConne
       if (!credentials.ok) return credentials;
       return Ok({ credentials: { ...credentials.value }, storeDomain: shop });
     },
-    async liveCredentials(store) {
+    async liveCredentials(store, refresh) {
       const credentials = parseShopifyCredentials(store.credentials);
       if (!credentials) return Err(credentialsRequired);
-      const refreshed = await refreshIfExpiring({ fetchImpl, origin: origin(store.storeDomain), clientId: options.clientId, clientSecret: options.clientSecret, credentials, now: Date.now() });
+      const refreshed = await refreshIfExpiring({ fetchImpl, origin: origin(store.storeDomain), clientId: options.clientId, clientSecret: options.clientSecret, credentials, now: Date.now(), ...(refresh?.force === true ? { force: true } : {}) });
       if (!refreshed.ok) return refreshed;
       return Ok(refreshed.value === null ? null : { ...refreshed.value });
     },

package/src/oauth.ts

@@ -181,11 +181,15 @@ export async function refreshIfExpiring(params: {
   clientSecret: string;
   credentials: ShopifyCredentials;
   now: number;
+  /** Refresh even though the stated expiry is far off: Shopify just rejected the token. */
+  force?: boolean;
 }): Promise<Result<ShopifyCredentials | null, ChannelConnectorError>> {
   const { credentials } = params;
-  if (credentials.accessTokenExpiresAt === undefined) return Ok(null);
-  const expiresAt = Date.parse(credentials.accessTokenExpiresAt);
-  if (Number.isFinite(expiresAt) && expiresAt - params.now > ACCESS_TOKEN_REFRESH_MARGIN_MS) return Ok(null);
+  if (params.force !== true) {
+    if (credentials.accessTokenExpiresAt === undefined) return Ok(null);
+    const expiresAt = Date.parse(credentials.accessTokenExpiresAt);
+    if (Number.isFinite(expiresAt) && expiresAt - params.now > ACCESS_TOKEN_REFRESH_MARGIN_MS) return Ok(null);
+  }
   if (credentials.refreshToken === undefined) return oauthError("SHOPIFY_REAUTHORIZATION_REQUIRED", "The store's access token expired and no refresh token is held; the store must be reconnected.");
   const token = await postTokenEndpoint(params.fetchImpl, params.origin, {
     client_id: params.clientId,