@shopify/shopify-api 6.0.0-rc1 → 6.0.0-rc2

package/dist/session-storage/kv.js

@@ -0,0 +1,183 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KVSessionStorage = void 0;
+var tslib_1 = require("tslib");
+var session_storage_1 = require("../session/session_storage");
+var shop_validator_1 = require("../utils/shop-validator");
+var session_utils_1 = require("../session/session-utils");
+var KVSessionStorage = /** @class */ (function (_super) {
+    tslib_1.__extends(KVSessionStorage, _super);
+    function KVSessionStorage(bucket) {
+        var _this = _super.call(this) || this;
+        if (bucket) {
+            _this.setBucket(bucket);
+        }
+        return _this;
+    }
+    KVSessionStorage.prototype.setBucket = function (bucket) {
+        this.bucket = bucket;
+    };
+    KVSessionStorage.prototype.storeSession = function (session) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.bucket.put(session.id, JSON.stringify((0, session_utils_1.sessionEntries)(session)))];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.addShopIds(session.shop, [session.id])];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    KVSessionStorage.prototype.loadSession = function (id) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var sessionData;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.bucket.get(id, 'json')];
+                    case 1:
+                        sessionData = _a.sent();
+                        return [2 /*return*/, sessionData ? (0, session_utils_1.sessionFromEntries)(sessionData) : undefined];
+                }
+            });
+        });
+    };
+    KVSessionStorage.prototype.deleteSession = function (id) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var session;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.loadSession(id)];
+                    case 1:
+                        session = _a.sent();
+                        if (!session) {
+                            return [2 /*return*/, true];
+                        }
+                        return [4 /*yield*/, this.bucket.delete(id)];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, this.removeShopIds(session.shop, [session.id])];
+                    case 3:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    KVSessionStorage.prototype.deleteSessions = function (ids) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var result, ids_1, ids_1_1, id, _a, e_1_1;
+            var e_1, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        result = true;
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 7, 8, 9]);
+                        ids_1 = tslib_1.__values(ids), ids_1_1 = ids_1.next();
+                        _c.label = 2;
+                    case 2:
+                        if (!!ids_1_1.done) return [3 /*break*/, 6];
+                        id = ids_1_1.value;
+                        _a = result;
+                        if (!_a) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.deleteSession(id)];
+                    case 3:
+                        _a = (_c.sent());
+                        _c.label = 4;
+                    case 4:
+                        result = _a;
+                        _c.label = 5;
+                    case 5:
+                        ids_1_1 = ids_1.next();
+                        return [3 /*break*/, 2];
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
+                        e_1_1 = _c.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 9];
+                    case 8:
+                        try {
+                            if (ids_1_1 && !ids_1_1.done && (_b = ids_1.return)) _b.call(ids_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 9: return [2 /*return*/, result];
+                }
+            });
+        });
+    };
+    KVSessionStorage.prototype.findSessionsByShop = function (shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var cleanShop, sessionIds;
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        cleanShop = (0, shop_validator_1.createSanitizeShop)(this.config)(shop, true);
+                        return [4 /*yield*/, this.bucket.get(this.getShopSessionIdsKey(cleanShop), {
+                                type: 'json',
+                            })];
+                    case 1:
+                        sessionIds = _a.sent();
+                        if (!sessionIds) {
+                            return [2 /*return*/, []];
+                        }
+                        return [2 /*return*/, Promise.all(sessionIds.map(function (id) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.loadSession(id)];
+                                    case 1: return [2 /*return*/, (_a.sent())];
+                                }
+                            }); }); }))];
+                }
+            });
+        });
+    };
+    KVSessionStorage.prototype.getShopSessionIdsKey = function (shop) {
+        return "shop:".concat(shop);
+    };
+    KVSessionStorage.prototype.addShopIds = function (shop, ids) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var key, shopIds;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        key = this.getShopSessionIdsKey(shop);
+                        return [4 /*yield*/, this.bucket.get(key, 'json')];
+                    case 1:
+                        shopIds = (_a = (_b.sent())) !== null && _a !== void 0 ? _a : [];
+                        return [4 /*yield*/, this.bucket.put(key, JSON.stringify(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(shopIds), false), tslib_1.__read(ids), false)))];
+                    case 2:
+                        _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    KVSessionStorage.prototype.removeShopIds = function (shop, ids) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var key, shopIds;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        key = this.getShopSessionIdsKey(shop);
+                        return [4 /*yield*/, this.bucket.get(key, 'json')];
+                    case 1:
+                        shopIds = (_a = (_b.sent())) !== null && _a !== void 0 ? _a : [];
+                        return [4 /*yield*/, this.bucket.put(key, JSON.stringify(shopIds.filter(function (id) { return !ids.includes(id); })))];
+                    case 2:
+                        _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return KVSessionStorage;
+}(session_storage_1.SessionStorage));
+exports.KVSessionStorage = KVSessionStorage;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const SHOPIFY_API_LIBRARY_VERSION = "6.0.0-rc1";
+export declare const SHOPIFY_API_LIBRARY_VERSION = "6.0.0-rc2";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SHOPIFY_API_LIBRARY_VERSION = void 0;
-exports.SHOPIFY_API_LIBRARY_VERSION = '6.0.0-rc1';
+exports.SHOPIFY_API_LIBRARY_VERSION = '6.0.0-rc2';

package/dist/webhooks/index.d.ts

@@ -1,13 +1,11 @@
 import { ConfigInterface } from '../base-types';
-import { addHandler, addHandlers, getHandler, getTopics, isWebhookPath } from './registry';
 export declare function shopifyWebhooks(config: ConfigInterface): {
-    addHandler: typeof addHandler;
-    addHandlers: typeof addHandlers;
-    getHandler: typeof getHandler;
-    getTopics: typeof getTopics;
-    isWebhookPath: typeof isWebhookPath;
-    process: ({ rawBody, ...adapterArgs }: import("./registry").WebhookProcessParams) => Promise<any>;
+    addHttpHandler: (params: import("./types").AddHandlerParams) => void;
+    addHttpHandlers: (handlers: import("./types").AddHandlerParams[]) => void;
+    getHttpHandler: (topic: string) => import("./types").WebhookHandlerFunction | null;
+    getTopicsAdded: () => string[];
+    process: ({ rawBody, ...adapterArgs }: import("./types").WebhookProcessParams) => Promise<any>;
     register: ({ path, topic, accessToken, shop, deliveryMethod, }: import("./types").RegisterParams) => Promise<import("./types").RegisterReturn>;
-    registerAll: ({ accessToken, shop, deliveryMethod, }: import("./types").ShortenedRegisterParams) => Promise<import("./types").RegisterReturn>;
+    registerAllHttp: ({ path, accessToken, shop, }: import("./types").ShortenedRegisterParams) => Promise<import("./types").RegisterReturn>;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/webhooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/webhooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAE9C,OAAO,EACL,UAAU,EACV,WAAW,EAIX,UAAU,EACV,SAAS,EACT,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe;;;;;;;;;EAWtD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/webhooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAa9C,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe;;;;;;;;EAYtD"}

package/dist/webhooks/index.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.shopifyWebhooks = void 0;
 var registry_1 = require("./registry");
 function shopifyWebhooks(config) {
+    var httpWebhookRegistry = {};
     return {
-        addHandler: registry_1.addHandler,
-        addHandlers: registry_1.addHandlers,
-        getHandler: registry_1.getHandler,
-        getTopics: registry_1.getTopics,
-        isWebhookPath: registry_1.isWebhookPath,
-        process: (0, registry_1.createProcess)(config),
+        addHttpHandler: (0, registry_1.createAddHttpHandler)(httpWebhookRegistry),
+        addHttpHandlers: (0, registry_1.createAddHttpHandlers)(httpWebhookRegistry),
+        getHttpHandler: (0, registry_1.createGetHttpHandler)(httpWebhookRegistry),
+        getTopicsAdded: (0, registry_1.createGetTopicsAdded)(httpWebhookRegistry),
+        process: (0, registry_1.createProcess)(config, httpWebhookRegistry),
         register: (0, registry_1.createRegister)(config),
-        registerAll: (0, registry_1.createRegisterAll)(config),
+        registerAllHttp: (0, registry_1.createRegisterAllHttp)(config, httpWebhookRegistry),
     };
 }
 exports.shopifyWebhooks = shopifyWebhooks;

package/dist/webhooks/registry.d.ts

@@ -1,21 +1,13 @@
-import { AdapterArgs, AdapterResponse } from '../runtime/http';
+import { AdapterResponse } from '../runtime/http';
 import { ConfigInterface } from '../base-types';
-import { AddHandlerParams, AddHandlersProps, BuildCheckQueryParams, BuildQueryParams, GetHandlerParams, RegisterParams, RegisterReturn, WebhookRegistryEntry, ShortenedRegisterParams } from './types';
+import { AddHandlerParams, BuildCheckQueryParams, BuildQueryParams, HttpWebhookRegistry, RegisterParams, RegisterReturn, ShortenedRegisterParams, WebhookHandlerFunction, WebhookProcessParams } from './types';
 export declare function buildCheckQuery({ topic }: BuildCheckQueryParams): string;
 export declare function buildQuery({ topic, address, deliveryMethod, webhookId, }: BuildQueryParams): string;
-export declare const webhookRegistry: {
-    [topic: string]: WebhookRegistryEntry;
-};
-export declare function resetWebhookRegistry(): void;
-export declare function addHandler(params: AddHandlerParams): void;
-export declare function addHandlers(handlers: AddHandlersProps): void;
-export declare function getHandler({ topic, }: GetHandlerParams): WebhookRegistryEntry | null;
-export declare function getTopics(): string[];
+export declare function createAddHttpHandler(httpWebhookRegistry: HttpWebhookRegistry): (params: AddHandlerParams) => void;
+export declare function createAddHttpHandlers(httpWebhookRegistry: HttpWebhookRegistry): (handlers: AddHandlerParams[]) => void;
+export declare function createGetHttpHandler(httpWebhookRegistry: HttpWebhookRegistry): (topic: string) => WebhookHandlerFunction | null;
+export declare function createGetTopicsAdded(httpWebhookRegistry: HttpWebhookRegistry): () => string[];
 export declare function createRegister(config: ConfigInterface): ({ path, topic, accessToken, shop, deliveryMethod, }: RegisterParams) => Promise<RegisterReturn>;
-export declare function createRegisterAll(config: ConfigInterface): ({ accessToken, shop, deliveryMethod, }: ShortenedRegisterParams) => Promise<RegisterReturn>;
-export interface WebhookProcessParams extends AdapterArgs {
-    rawBody: string;
-}
-export declare function createProcess(config: ConfigInterface): ({ rawBody, ...adapterArgs }: WebhookProcessParams) => Promise<AdapterResponse>;
-export declare function isWebhookPath(path: string): boolean;
+export declare function createRegisterAllHttp(config: ConfigInterface, httpWebhookRegistry: HttpWebhookRegistry): ({ path, accessToken, shop, }: ShortenedRegisterParams) => Promise<RegisterReturn>;
+export declare function createProcess(config: ConfigInterface, httpWebhookRegistry: HttpWebhookRegistry): ({ rawBody, ...adapterArgs }: WebhookProcessParams) => Promise<AdapterResponse>;
 //# sourceMappingURL=registry.d.ts.map

package/dist/webhooks/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/webhooks/registry.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,WAAW,EACX,eAAe,EAMhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,eAAe,EAA4B,MAAM,eAAe,CAAC;AAMzE,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,EAEhB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,oBAAoB,EAEpB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAiCjB,wBAAgB,eAAe,CAAC,EAAC,KAAK,EAAC,EAAE,qBAAqB,GAAG,MAAM,CAuBtE;AAED,wBAAgB,UAAU,CAAC,EACzB,KAAK,EACL,OAAO,EACP,cAAoC,EACpC,SAAS,GACV,EAAE,gBAAgB,GAAG,MAAM,CAmD3B;AAED,eAAO,MAAM,eAAe,EAAE;IAAC,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAA;CAAM,CAAC;AAE3E,wBAAgB,oBAAoB,SAMnC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,QAGlD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAM5D;AAED,wBAAgB,UAAU,CAAC,EACzB,KAAK,GACN,EAAE,gBAAgB,GAAG,oBAAoB,GAAG,IAAI,CAEhD;AAED,wBAAgB,SAAS,IAAI,MAAM,EAAE,CAEpC;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,yDASjD,cAAc,KAAG,QAAQ,cAAc,CAAC,CAuE5C;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,4CAOpD,uBAAuB,KAAG,QAAQ,cAAc,CAAC,CAqBrD;AACD,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,OAAO,EAAE,MAAM,CAAC;CACjB;AA8DD,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,iCAIhD,oBAAoB,KAAG,QAAQ,eAAe,CAAC,CA0DnD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOnD"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/webhooks/registry.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAMhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,eAAe,EAA4B,MAAM,eAAe,CAAC;AAMzE,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,EAEhB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,uBAAuB,EAEvB,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AA6BjB,wBAAgB,eAAe,CAAC,EAAC,KAAK,EAAC,EAAE,qBAAqB,GAAG,MAAM,CAuBtE;AAED,wBAAgB,UAAU,CAAC,EACzB,KAAK,EACL,OAAO,EACP,cAAoC,EACpC,SAAS,GACV,EAAE,gBAAgB,GAAG,MAAM,CAkD3B;AAMD,wBAAgB,oBAAoB,CAAC,mBAAmB,EAAE,mBAAmB,YACpC,gBAAgB,UAIxD;AAED,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,mBAAmB,cAGE,gBAAgB,EAAE,KAAG,IAAI,CAGpE;AAED,wBAAgB,oBAAoB,CAAC,mBAAmB,EAAE,mBAAmB,WACrC,MAAM,KAAG,sBAAsB,GAAG,IAAI,CAG7E;AAED,wBAAgB,oBAAoB,CAAC,mBAAmB,EAAE,mBAAmB,SACzC,MAAM,EAAE,CAG3C;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,yDASjD,cAAc,KAAG,QAAQ,cAAc,CAAC,CAsE5C;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,eAAe,EACvB,mBAAmB,EAAE,mBAAmB,kCAUrC,uBAAuB,KAAG,QAAQ,cAAc,CAAC,CAoBrD;AA6DD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,mBAAmB,EAAE,mBAAmB,iCAOrC,oBAAoB,KAAG,QAAQ,eAAe,CAAC,CAwDnD"}

package/dist/webhooks/registry.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWebhookPath = exports.createProcess = exports.createRegisterAll = exports.createRegister = exports.getTopics = exports.getHandler = exports.addHandlers = exports.addHandler = exports.resetWebhookRegistry = exports.webhookRegistry = exports.buildQuery = exports.buildCheckQuery = void 0;
+exports.createProcess = exports.createRegisterAllHttp = exports.createRegister = exports.createGetTopicsAdded = exports.createGetHttpHandler = exports.createAddHttpHandlers = exports.createAddHttpHandler = exports.buildQuery = exports.buildCheckQuery = void 0;
 var tslib_1 = require("tslib");
 var network_1 = require("@shopify/network");
 var http_1 = require("../runtime/http");
@@ -32,9 +32,6 @@ function isSuccess(result, deliveryMethod, webhookId) {
         result.data[endpoint] &&
         result.data[endpoint].webhookSubscription);
 }
-function validateDeliveryMethod(_deliveryMethod) {
-    return true;
-}
 function buildCheckQuery(_a) {
     var topic = _a.topic;
     return "{\n    webhookSubscriptions(first: 1, topics: ".concat(topic, ") {\n      edges {\n        node {\n          id\n          endpoint {\n            __typename\n            ... on WebhookHttpEndpoint {\n              callbackUrl\n            }\n            ... on WebhookEventBridgeEndpoint {\n              arn\n            }\n            ... on WebhookPubSubEndpoint {\n              pubSubProject\n              pubSubTopic\n            }\n          }\n        }\n      }\n    }\n  }");
@@ -43,7 +40,6 @@ exports.buildCheckQuery = buildCheckQuery;
 function buildQuery(_a) {
     var _b;
     var topic = _a.topic, address = _a.address, _c = _a.deliveryMethod, deliveryMethod = _c === void 0 ? types_2.DeliveryMethod.Http : _c, webhookId = _a.webhookId;
-    validateDeliveryMethod(deliveryMethod);
     var identifier;
     if (webhookId) {
         identifier = "id: \"".concat(webhookId, "\"");
@@ -81,37 +77,36 @@ function buildQuery(_a) {
     return "\n    mutation webhookSubscription {\n      ".concat(mutationName, "(").concat(identifier, ", webhookSubscription: ").concat(webhookSubscriptionArgs, ") {\n        userErrors {\n          field\n          message\n        }\n        webhookSubscription {\n          id\n        }\n      }\n    }\n  ");
 }
 exports.buildQuery = buildQuery;
-exports.webhookRegistry = {};
-function resetWebhookRegistry() {
-    for (var key in exports.webhookRegistry) {
-        if ({}.hasOwnProperty.call(exports.webhookRegistry, key)) {
-            delete exports.webhookRegistry[key];
-        }
-    }
+function topicForStorage(topic) {
+    return topic.toUpperCase().replace(/\//g, '_');
 }
-exports.resetWebhookRegistry = resetWebhookRegistry;
-function addHandler(params) {
-    var topic = params.topic, rest = tslib_1.__rest(params, ["topic"]);
-    exports.webhookRegistry[topic] = rest;
+function createAddHttpHandler(httpWebhookRegistry) {
+    return function addHttpHandler(params) {
+        var topic = params.topic, handler = params.handler;
+        httpWebhookRegistry[topicForStorage(topic)] = handler;
+    };
 }
-exports.addHandler = addHandler;
-function addHandlers(handlers) {
-    Object.entries(handlers).forEach(function (_a) {
-        var _b = tslib_1.__read(_a, 2), topic = _b[0], registryEntry = _b[1];
-        addHandler(tslib_1.__assign({ topic: topic }, registryEntry));
-    });
+exports.createAddHttpHandler = createAddHttpHandler;
+function createAddHttpHandlers(httpWebhookRegistry) {
+    var addHttpHandler = createAddHttpHandler(httpWebhookRegistry);
+    return function addHttpHandlers(handlers) {
+        handlers.forEach(function (handlerParam) { return addHttpHandler(handlerParam); });
+    };
 }
-exports.addHandlers = addHandlers;
-function getHandler(_a) {
-    var _b;
-    var topic = _a.topic;
-    return (_b = exports.webhookRegistry[topic]) !== null && _b !== void 0 ? _b : null;
+exports.createAddHttpHandlers = createAddHttpHandlers;
+function createGetHttpHandler(httpWebhookRegistry) {
+    return function getHttpHandler(topic) {
+        var _a;
+        return (_a = httpWebhookRegistry[topicForStorage(topic)]) !== null && _a !== void 0 ? _a : null;
+    };
 }
-exports.getHandler = getHandler;
-function getTopics() {
-    return Object.keys(exports.webhookRegistry);
+exports.createGetHttpHandler = createGetHttpHandler;
+function createGetTopicsAdded(httpWebhookRegistry) {
+    return function getTopicsAdded() {
+        return Object.keys(httpWebhookRegistry);
+    };
 }
-exports.getTopics = getTopics;
+exports.createGetTopicsAdded = createGetTopicsAdded;
 function createRegister(config) {
     var GraphqlClient = (0, graphql_client_1.createGraphqlClientClass)({ config: config });
     return function register(_a) {
@@ -135,7 +130,6 @@ function createRegister(config) {
                             };
                             return [2 /*return*/, registerReturn];
                         }
-                        validateDeliveryMethod(deliveryMethod);
                         client = new GraphqlClient({ domain: shop, accessToken: accessToken });
                         address = deliveryMethod === types_2.DeliveryMethod.Http
                             ? "".concat(config.hostScheme, "://").concat(config.hostName).concat(path)
@@ -194,52 +188,53 @@ function createRegister(config) {
     };
 }
 exports.createRegister = createRegister;
-function createRegisterAll(config) {
+function createRegisterAllHttp(config, httpWebhookRegistry) {
     var register = createRegister(config);
-    return function registerAll(_a) {
-        var accessToken = _a.accessToken, shop = _a.shop, _b = _a.deliveryMethod, deliveryMethod = _b === void 0 ? types_2.DeliveryMethod.Http : _b;
+    var getTopicsAdded = createGetTopicsAdded(httpWebhookRegistry);
+    var getHttpHandler = createGetHttpHandler(httpWebhookRegistry);
+    return function registerAllHttp(_a) {
+        var path = _a.path, accessToken = _a.accessToken, shop = _a.shop;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var registerReturn, topics, topics_1, topics_1_1, topic, handler, path, webhook, returnedRegister, e_1_1;
-            var e_1, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var registerReturn, topics, topics_1, topics_1_1, topic, handler, webhook, returnedRegister, e_1_1;
+            var e_1, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         registerReturn = {};
-                        topics = getTopics();
-                        _d.label = 1;
+                        topics = getTopicsAdded();
+                        _c.label = 1;
                     case 1:
-                        _d.trys.push([1, 6, 7, 8]);
+                        _c.trys.push([1, 6, 7, 8]);
                         topics_1 = tslib_1.__values(topics), topics_1_1 = topics_1.next();
-                        _d.label = 2;
+                        _c.label = 2;
                     case 2:
                         if (!!topics_1_1.done) return [3 /*break*/, 5];
                         topic = topics_1_1.value;
-                        handler = getHandler({ topic: topic });
+                        handler = getHttpHandler(topic);
                         if (!handler) return [3 /*break*/, 4];
-                        path = handler.path;
                         webhook = {
                             path: path,
                             topic: topic,
                             accessToken: accessToken,
                             shop: shop,
-                            deliveryMethod: deliveryMethod,
+                            deliveryMethod: types_2.DeliveryMethod.Http,
                         };
                         return [4 /*yield*/, register(webhook)];
                     case 3:
-                        returnedRegister = _d.sent();
+                        returnedRegister = _c.sent();
                         registerReturn = tslib_1.__assign(tslib_1.__assign({}, registerReturn), returnedRegister);
-                        _d.label = 4;
+                        _c.label = 4;
                     case 4:
                         topics_1_1 = topics_1.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_1_1 = _d.sent();
+                        e_1_1 = _c.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (topics_1_1 && !topics_1_1.done && (_c = topics_1.return)) _c.call(topics_1);
+                            if (topics_1_1 && !topics_1_1.done && (_b = topics_1.return)) _b.call(topics_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
@@ -249,7 +244,7 @@ function createRegisterAll(config) {
         });
     };
 }
-exports.createRegisterAll = createRegisterAll;
+exports.createRegisterAllHttp = createRegisterAllHttp;
 var statusTextLookup = (_a = {},
     _a[network_1.StatusCode.Ok] = 'OK',
     _a[network_1.StatusCode.BadRequest] = 'Bad Request',
@@ -295,11 +290,12 @@ function checkWebhookRequest(rawBody, headers) {
     }
     return retVal;
 }
-function createProcess(config) {
+function createProcess(config, httpWebhookRegistry) {
+    var getHttpHandler = createGetHttpHandler(httpWebhookRegistry);
     return function process(_a) {
         var rawBody = _a.rawBody, adapterArgs = tslib_1.__rest(_a, ["rawBody"]);
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var request, response, webhookCheck, webhookOk, hmac, topic, domain, errorMessage, generatedHash, graphqlTopic, webhookEntry, returnResponse;
+            var request, response, webhookCheck, webhookOk, hmac, topic, domain, errorMessage, generatedHash, graphqlTopic, handler, returnResponse;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, (0, http_1.abstractConvertRequest)(adapterArgs)];
@@ -318,13 +314,11 @@ function createProcess(config) {
                     case 2:
                         generatedHash = _b.sent();
                         if ((0, safe_compare_1.safeCompare)(generatedHash, hmac)) {
-                            graphqlTopic = topic.toUpperCase().replace(/\//g, '_');
-                            webhookEntry = getHandler({
-                                topic: graphqlTopic,
-                            });
-                            if (webhookEntry) {
+                            graphqlTopic = topicForStorage(topic);
+                            handler = getHttpHandler(graphqlTopic);
+                            if (handler) {
                                 try {
-                                    webhookEntry.webhookHandler(graphqlTopic, domain, rawBody);
+                                    handler(graphqlTopic, domain, rawBody);
                                     response.statusCode = network_1.StatusCode.Ok;
                                 }
                                 catch (error) {
@@ -363,12 +357,3 @@ function createProcess(config) {
     };
 }
 exports.createProcess = createProcess;
-function isWebhookPath(path) {
-    for (var key in exports.webhookRegistry) {
-        if (exports.webhookRegistry[key].path === path) {
-            return true;
-        }
-    }
-    return false;
-}
-exports.isWebhookPath = isWebhookPath;

package/dist/webhooks/types.d.ts

@@ -1,20 +1,21 @@
+import { AdapterArgs } from '../runtime';
 import type { shopifyWebhooks } from '.';
 export declare enum DeliveryMethod {
     Http = "http",
     EventBridge = "eventbridge",
     PubSub = "pubsub"
 }
-declare type WebhookHandlerFunction = (topic: string, shop_domain: string, body: string) => Promise<void>;
-export interface RegisterParams {
-    topic: string;
-    path: string;
-    shop: string;
-    accessToken: string;
-    deliveryMethod?: DeliveryMethod;
+export declare type WebhookHandlerFunction = (topic: string, shop_domain: string, body: string) => Promise<void>;
+export interface HttpWebhookRegistry {
+    [topic: string]: WebhookHandlerFunction;
 }
 export interface ShortenedRegisterParams {
+    path: string;
     shop: string;
     accessToken: string;
+}
+export interface RegisterParams extends ShortenedRegisterParams {
+    topic: string;
     deliveryMethod?: DeliveryMethod;
 }
 export interface RegisterReturn {
@@ -23,10 +24,6 @@ export interface RegisterReturn {
         result: unknown;
     };
 }
-export interface WebhookRegistryEntry {
-    path: string;
-    webhookHandler: WebhookHandlerFunction;
-}
 interface WebhookCheckResponseNode<T = {
     endpoint: {
         __typename: 'WebhookHttpEndpoint';
@@ -60,14 +57,12 @@ export interface BuildQueryParams {
     deliveryMethod: DeliveryMethod;
     webhookId?: string;
 }
-export interface AddHandlersProps {
-    [topic: string]: WebhookRegistryEntry;
-}
-export interface AddHandlerParams extends WebhookRegistryEntry {
+export interface AddHandlerParams {
     topic: string;
+    handler: WebhookHandlerFunction;
 }
-export interface GetHandlerParams {
-    topic: string;
+export interface WebhookProcessParams extends AdapterArgs {
+    rawBody: string;
 }
 export declare type ShopifyWebhooks = ReturnType<typeof shopifyWebhooks>;
 export {};

package/dist/webhooks/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/webhooks/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,GAAG,CAAC;AAEvC,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,WAAW,gBAAgB;IAC3B,MAAM,WAAW;CAClB;AAED,aAAK,sBAAsB,GAAG,CAC5B,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,WAAW,cAAc;IAE7B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,uBAAuB;IAEtC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,sBAAsB,CAAC;CACxC;AAED,UAAU,wBAAwB,CAChC,CAAC,GAAG;IACF,QAAQ,EACJ;QACE,UAAU,EAAE,qBAAqB,CAAC;QAClC,WAAW,EAAE,MAAM,CAAC;KACrB,GACD;QACE,UAAU,EAAE,4BAA4B,CAAC;QACzC,GAAG,EAAE,MAAM,CAAC;KACb,GACD;QACE,UAAU,EAAE,uBAAuB,CAAC;QACpC,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACP;IAED,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;KACZ,GAAG,CAAC,CAAC;CACP;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC,GAAG,wBAAwB;IAChE,IAAI,EAAE;QACJ,oBAAoB,EAAE;YACpB,KAAK,EAAE,CAAC,EAAE,CAAC;SACZ,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACvC;AAED,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,eAAe,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/webhooks/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,GAAG,CAAC;AAEvC,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,WAAW,gBAAgB;IAC3B,MAAM,WAAW;CAClB;AAED,oBAAY,sBAAsB,GAAG,CACnC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,WAAW,mBAAmB;IAClC,CAAC,KAAK,EAAE,MAAM,GAAG,sBAAsB,CAAC;CACzC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,uBAAuB;IAE7D,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED,UAAU,wBAAwB,CAChC,CAAC,GAAG;IACF,QAAQ,EACJ;QACE,UAAU,EAAE,qBAAqB,CAAC;QAClC,WAAW,EAAE,MAAM,CAAC;KACrB,GACD;QACE,UAAU,EAAE,4BAA4B,CAAC;QACzC,GAAG,EAAE,MAAM,CAAC;KACb,GACD;QACE,UAAU,EAAE,uBAAuB,CAAC;QACpC,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACP;IAED,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;KACZ,GAAG,CAAC,CAAC;CACP;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC,GAAG,wBAAwB;IAChE,IAAI,EAAE;QACJ,oBAAoB,EAAE;YACpB,KAAK,EAAE,CAAC,EAAE,CAAC;SACZ,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,sBAAsB,CAAC;CACjC;AAED,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACvD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,eAAe,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/shopify-api",
-  "version": "6.0.0-rc1",
+  "version": "6.0.0-rc2",
   "description": "Shopify API Library for Node - accelerate development with support for authentication, graphql proxy, webhooks",
   "exports": {
     ".": {
@@ -15,6 +15,10 @@
       "import": "./dist/rest/admin/*/index.js",
       "types": "./dist/rest/admin/*/index.d.ts"
     },
+    "./runtime": {
+      "import": "./dist/runtime/index.js",
+      "types": "./dist/runtime/index.d.ts"
+    },
     "./adapters/node": {
       "import": "./dist/adapters/node/index.js",
       "types": "./dist/adapters/node/index.d.ts"
@@ -30,7 +34,7 @@
   "scripts": {
     "test:all": "jest",
     "test": "jest --selectProjects library",
-    "pretest:adapters": "yarn build",
+    "pretest:adapters": "yarn build && yarn rollup -c src/adapters/__e2etests__/rollup.test-cf-worker-app.config.js",
     "test:adapters": "jest --selectProjects adapters:mock adapters:node adapters:cf-worker",
     "test:session_storage": "jest --selectProjects session_storage",
     "test:rest_resources": "jest --selectProjects rest_resources",
@@ -85,9 +89,13 @@
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^3.14.1",
+    "@cloudflare/workers-types": "^3.16.0",
+    "@rollup/plugin-alias": "^3.1.9",
+    "@rollup/plugin-commonjs": "^22.0.2",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "@shopify/eslint-plugin": "^41.1.0",
     "@shopify/prettier-config": "^1.1.2",
+    "@swc/core": "^1.3.3",
     "@types/cookies": "^0.7.5",
     "@types/jest": "^26.0.15",
     "@types/node": "^14.18.12",
@@ -104,6 +112,8 @@
     "miniflare": "^2.6.0",
     "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
+    "rollup": "^2.79.1",
+    "rollup-plugin-swc": "^0.2.1",
     "supertest": "^6.1.3",
     "ts-jest": "^27.1.1",
     "typescript": "^4.6.3"

package/dist/rest/admin/2021-10/customer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"customer.d.ts","sourceRoot":"","sources":["../../../../src/rest/admin/2021-10/customer.ts"],"names":[],"mappings":"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"}