@porulle/adapter-shopify 0.67.0 → 0.68.1

package/dist/graphql.js

@@ -1,4 +1,4 @@
-import { Err, Ok } from "@porulle/core";
+import { CHANNEL_CREDENTIALS_REJECTED, Err, Ok } from "@porulle/core";
 import { z } from "zod";
 /**
  * The one way this adapter talks to a store: the GraphQL Admin API.
@@ -51,6 +51,10 @@ async function readEnvelope(response) {
  */
 export async function shopifyGraphql(target, query, variables, schema) {
     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) {
@@ -58,7 +62,7 @@ export async function shopifyGraphql(target, query, variables, schema) {
         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 },
@@ -69,7 +73,7 @@ export async function shopifyGraphql(target, query, variables, schema) {
             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/dist/index.js

@@ -107,11 +107,11 @@ export function shopifyConnector(options) {
                 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/dist/oauth.d.ts

@@ -63,4 +63,6 @@ export declare 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>>;

package/dist/oauth.js

@@ -149,11 +149,13 @@ export async function exchangeCallback(params) {
  */
 export async function refreshIfExpiring(params) {
     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, {