@adobe/alloy 2.11.0-beta.2 → 2.12.0-beta.0

package/libEs5/components/LibraryInfo/index.js

@@ -4,26 +4,62 @@ exports.default = void 0;
 
 var _libraryVersion = require("../../constants/libraryVersion");
 
-/*
-Copyright 2019 Adobe. All rights reserved.
-This file is licensed to you under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License. You may obtain a copy
-of the License at http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under
-the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
-OF ANY KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License.
-*/
-var createLibraryInfo = function createLibraryInfo() {
+var _coreCommands = require("../../constants/coreCommands");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+var prepareLibraryInfo = function prepareLibraryInfo(_ref) {
+  var config = _ref.config,
+      componentRegistry = _ref.componentRegistry;
+  var allCommands = [].concat(_toConsumableArray(componentRegistry.getCommandNames()), [_coreCommands.CONFIGURE, _coreCommands.SET_DEBUG]).sort();
+
+  var resultConfig = _objectSpread({}, config);
+
+  Object.keys(config).forEach(function (key) {
+    var value = config[key];
+
+    if (typeof value !== "function") {
+      return;
+    }
+
+    resultConfig[key] = value.toString();
+  });
+  return {
+    version: _libraryVersion.default,
+    configs: resultConfig,
+    commands: allCommands
+  };
+};
+
+var createLibraryInfo = function createLibraryInfo(_ref2) {
+  var config = _ref2.config,
+      componentRegistry = _ref2.componentRegistry;
+  var libraryInfo = prepareLibraryInfo({
+    config: config,
+    componentRegistry: componentRegistry
+  });
   return {
     commands: {
       getLibraryInfo: {
         run: function run() {
           return {
-            libraryInfo: {
-              version: _libraryVersion.default
-            }
+            libraryInfo: libraryInfo
           };
         }
       }

package/libEs5/constants/cookieNameKey.js

@@ -1,6 +1,6 @@
 "use strict";
 
-exports.IDENTITY = exports.CONSENT = void 0;
+exports.IDENTITY = exports.CONSENT = exports.CLUSTER = void 0;
 
 /*
 Copyright 2019 Adobe. All rights reserved.
@@ -16,4 +16,6 @@ governing permissions and limitations under the License.
 var IDENTITY = "identity";
 exports.IDENTITY = IDENTITY;
 var CONSENT = "consent";
-exports.CONSENT = CONSENT;
+exports.CONSENT = CONSENT;
+var CLUSTER = "cluster";
+exports.CLUSTER = CLUSTER;

package/libEs5/constants/coreCommands.js

@@ -0,0 +1,19 @@
+"use strict";
+
+exports.SET_DEBUG = exports.CONFIGURE = void 0;
+
+/*
+Copyright 2020 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+var CONFIGURE = "configure";
+exports.CONFIGURE = CONFIGURE;
+var SET_DEBUG = "setDebug";
+exports.SET_DEBUG = SET_DEBUG;

package/libEs5/constants/libraryVersion.js

@@ -15,5 +15,5 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-var _default = "2.11.0-beta.2";
+var _default = "2.12.0-beta.0";
 exports.default = _default;

package/libEs5/core/edgeNetwork/injectGetLocationHint.js

@@ -0,0 +1,29 @@
+"use strict";
+
+exports.default = void 0;
+
+var _utils = require("../../utils");
+
+var _cookieNameKey = require("../../constants/cookieNameKey");
+
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+var _default = function _default(_ref) {
+  var orgId = _ref.orgId,
+      cookieJar = _ref.cookieJar;
+  var clusterCookieName = (0, _utils.getNamespacedCookieName)(orgId, _cookieNameKey.CLUSTER);
+  return function () {
+    return cookieJar.get(clusterCookieName);
+  };
+};
+
+exports.default = _default;

package/libEs5/core/edgeNetwork/injectSendEdgeNetworkRequest.js

@@ -26,7 +26,8 @@ var _default = function _default(_ref) {
       cookieTransfer = _ref.cookieTransfer,
       sendNetworkRequest = _ref.sendNetworkRequest,
       createResponse = _ref.createResponse,
-      processWarningsAndErrors = _ref.processWarningsAndErrors;
+      processWarningsAndErrors = _ref.processWarningsAndErrors,
+      getLocationHint = _ref.getLocationHint;
   var edgeDomain = config.edgeDomain,
       edgeBasePath = config.edgeBasePath,
       edgeConfigId = config.edgeConfigId;
@@ -53,7 +54,9 @@ var _default = function _default(_ref) {
       onRequestFailure: onRequestFailureCallbackAggregator.add
     }).then(function () {
       var endpointDomain = request.getUseIdThirdPartyDomain() ? _domain.ID_THIRD_PARTY : edgeDomain;
-      var url = "https://" + endpointDomain + "/" + edgeBasePath + "/" + _apiVersion.default + "/" + request.getAction() + "?configId=" + edgeConfigId + "&requestId=" + request.getId();
+      var locationHint = getLocationHint();
+      var edgeBasePathWithLocationHint = locationHint ? edgeBasePath + "/" + locationHint : edgeBasePath;
+      var url = "https://" + endpointDomain + "/" + edgeBasePathWithLocationHint + "/" + _apiVersion.default + "/" + request.getAction() + "?configId=" + edgeConfigId + "&requestId=" + request.getId();
       cookieTransfer.cookiesToPayload(request.getPayload(), endpointDomain);
       return sendNetworkRequest({
         requestId: request.getId(),

package/libEs5/core/index.js

@@ -58,6 +58,8 @@ var _injectSendEdgeNetworkRequest = require("./edgeNetwork/injectSendEdgeNetwork
 
 var _injectProcessWarningsAndErrors = require("./edgeNetwork/injectProcessWarningsAndErrors");
 
+var _injectGetLocationHint = require("./edgeNetwork/injectGetLocationHint");
+
 var _isRequestRetryable = require("./network/isRequestRetryable");
 
 var _getRequestRetryDelay = require("./network/getRequestRetryDelay");
@@ -123,9 +125,10 @@ var createExecuteCommand = function createExecuteCommand(_ref) {
       logger: logger,
       setDebugEnabled: setDebugEnabled
     });
+    var orgId = config.orgId;
     var cookieTransfer = (0, _createCookieTransfer.default)({
       cookieJar: loggingCookieJar,
-      orgId: config.orgId,
+      orgId: orgId,
       apexDomain: apexDomain,
       dateProvider: function dateProvider() {
         return new Date();
@@ -154,13 +157,18 @@ var createExecuteCommand = function createExecuteCommand(_ref) {
     var createResponse = (0, _injectCreateResponse.default)({
       extractEdgeInfo: extractEdgeInfo
     });
+    var getLocationHint = (0, _injectGetLocationHint.default)({
+      orgId: orgId,
+      cookieJar: _utils.cookieJar
+    });
     var sendEdgeNetworkRequest = (0, _injectSendEdgeNetworkRequest.default)({
       config: config,
       lifecycle: lifecycle,
       cookieTransfer: cookieTransfer,
       sendNetworkRequest: sendNetworkRequest,
       createResponse: createResponse,
-      processWarningsAndErrors: processWarningsAndErrors
+      processWarningsAndErrors: processWarningsAndErrors,
+      getLocationHint: getLocationHint
     });
     var generalConsentState = (0, _createConsentStateMachine.default)({
       logger: logger
@@ -187,6 +195,7 @@ var createExecuteCommand = function createExecuteCommand(_ref) {
         var componentLogger = createComponentLogger(componentName);
         return {
           config: config,
+          componentRegistry: componentRegistry,
           consent: consent,
           eventManager: eventManager,
           fireReferrerHideableImage: fireReferrerHideableImage,

package/libEs5/core/injectExecuteCommand.js

@@ -4,6 +4,8 @@ exports.default = void 0;
 
 var _utils = require("../utils");
 
+var _coreCommands = require("../constants/coreCommands");
+
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -15,11 +17,6 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-var coreCommands = {
-  CONFIGURE: "configure",
-  SET_DEBUG: "setDebug"
-};
-
 var _default = function _default(_ref) {
   var logger = _ref.logger,
       configureCommand = _ref.configureCommand,
@@ -31,7 +28,7 @@ var _default = function _default(_ref) {
   var getExecutor = function getExecutor(commandName, options) {
     var executor;
 
-    if (commandName === coreCommands.CONFIGURE) {
+    if (commandName === _coreCommands.CONFIGURE) {
       if (configurePromise) {
         throw new Error("The library has already been configured and may only be configured once.");
       }
@@ -46,7 +43,7 @@ var _default = function _default(_ref) {
         throw new Error("The library must be configured first. Please do so by executing the configure command.");
       }
 
-      if (commandName === coreCommands.SET_DEBUG) {
+      if (commandName === _coreCommands.SET_DEBUG) {
         executor = function executor() {
           return setDebugCommand(options);
         };
@@ -56,7 +53,7 @@ var _default = function _default(_ref) {
             var command = componentRegistry.getCommand(commandName);
 
             if (!command || !(0, _utils.isFunction)(command.run)) {
-              var commandNames = (0, _utils.values)(coreCommands).concat(componentRegistry.getCommandNames()).join(", ");
+              var commandNames = [_coreCommands.CONFIGURE, _coreCommands.SET_DEBUG].concat(componentRegistry.getCommandNames()).join(", ");
               throw new Error("The " + commandName + " command does not exist. List of available commands: " + commandNames + ".");
             }
 

package/libEs6/components/LibraryInfo/index.js

@@ -10,16 +10,45 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 import libraryVersion from "../../constants/libraryVersion";
+import { CONFIGURE, SET_DEBUG } from "../../constants/coreCommands";
 
-const createLibraryInfo = () => {
+const prepareLibraryInfo = ({
+  config,
+  componentRegistry
+}) => {
+  const allCommands = [...componentRegistry.getCommandNames(), CONFIGURE, SET_DEBUG].sort();
+  const resultConfig = { ...config
+  };
+  Object.keys(config).forEach(key => {
+    const value = config[key];
+
+    if (typeof value !== "function") {
+      return;
+    }
+
+    resultConfig[key] = value.toString();
+  });
+  return {
+    version: libraryVersion,
+    configs: resultConfig,
+    commands: allCommands
+  };
+};
+
+const createLibraryInfo = ({
+  config,
+  componentRegistry
+}) => {
+  const libraryInfo = prepareLibraryInfo({
+    config,
+    componentRegistry
+  });
   return {
     commands: {
       getLibraryInfo: {
         run: () => {
           return {
-            libraryInfo: {
-              version: libraryVersion
-            }
+            libraryInfo
           };
         }
       }

package/libEs6/constants/cookieNameKey.js

@@ -10,4 +10,5 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 export const IDENTITY = "identity";
-export const CONSENT = "consent";
+export const CONSENT = "consent";
+export const CLUSTER = "cluster";

package/libEs6/constants/coreCommands.js

@@ -0,0 +1,13 @@
+/*
+Copyright 2020 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+export const CONFIGURE = "configure";
+export const SET_DEBUG = "setDebug";

package/libEs6/constants/libraryVersion.js

@@ -11,4 +11,4 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-export default "2.11.0-beta.2";
+export default "2.12.0-beta.0";

package/libEs6/core/edgeNetwork/injectGetLocationHint.js

@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+import { getNamespacedCookieName } from "../../utils";
+import { CLUSTER } from "../../constants/cookieNameKey";
+export default (({
+  orgId,
+  cookieJar
+}) => {
+  const clusterCookieName = getNamespacedCookieName(orgId, CLUSTER);
+  return () => cookieJar.get(clusterCookieName);
+});

package/libEs6/core/edgeNetwork/injectSendEdgeNetworkRequest.js

@@ -18,7 +18,8 @@ export default (({
   cookieTransfer,
   sendNetworkRequest,
   createResponse,
-  processWarningsAndErrors
+  processWarningsAndErrors,
+  getLocationHint
 }) => {
   const {
     edgeDomain,
@@ -47,7 +48,9 @@ export default (({
       onRequestFailure: onRequestFailureCallbackAggregator.add
     }).then(() => {
       const endpointDomain = request.getUseIdThirdPartyDomain() ? ID_THIRD_PARTY_DOMAIN : edgeDomain;
-      const url = `https://${endpointDomain}/${edgeBasePath}/${apiVersion}/${request.getAction()}?configId=${edgeConfigId}&requestId=${request.getId()}`;
+      const locationHint = getLocationHint();
+      const edgeBasePathWithLocationHint = locationHint ? `${edgeBasePath}/${locationHint}` : edgeBasePath;
+      const url = `https://${endpointDomain}/${edgeBasePathWithLocationHint}/${apiVersion}/${request.getAction()}?configId=${edgeConfigId}&requestId=${request.getId()}`;
       cookieTransfer.cookiesToPayload(request.getPayload(), endpointDomain);
       return sendNetworkRequest({
         requestId: request.getId(),

package/libEs6/core/index.js

@@ -37,6 +37,7 @@ import createCookieTransfer from "./createCookieTransfer";
 import { createDataCollectionRequest, createDataCollectionRequestPayload } from "../utils/request";
 import injectSendEdgeNetworkRequest from "./edgeNetwork/injectSendEdgeNetworkRequest";
 import injectProcessWarningsAndErrors from "./edgeNetwork/injectProcessWarningsAndErrors";
+import injectGetLocationHint from "./edgeNetwork/injectGetLocationHint";
 import isRequestRetryable from "./network/isRequestRetryable";
 import getRequestRetryDelay from "./network/getRequestRetryDelay";
 const createNamespacedStorage = injectStorage(window);
@@ -89,9 +90,12 @@ export const createExecuteCommand = ({
       logger,
       setDebugEnabled
     });
+    const {
+      orgId
+    } = config;
     const cookieTransfer = createCookieTransfer({
       cookieJar: loggingCookieJar,
-      orgId: config.orgId,
+      orgId,
       apexDomain,
       dateProvider: () => new Date()
     });
@@ -118,13 +122,18 @@ export const createExecuteCommand = ({
     const createResponse = injectCreateResponse({
       extractEdgeInfo
     });
+    const getLocationHint = injectGetLocationHint({
+      orgId,
+      cookieJar
+    });
     const sendEdgeNetworkRequest = injectSendEdgeNetworkRequest({
       config,
       lifecycle,
       cookieTransfer,
       sendNetworkRequest,
       createResponse,
-      processWarningsAndErrors
+      processWarningsAndErrors,
+      getLocationHint
     });
     const generalConsentState = createConsentStateMachine({
       logger
@@ -152,6 +161,7 @@ export const createExecuteCommand = ({
         const componentLogger = createComponentLogger(componentName);
         return {
           config,
+          componentRegistry,
           consent,
           eventManager,
           fireReferrerHideableImage,

package/libEs6/core/injectExecuteCommand.js

@@ -9,11 +9,8 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-import { isFunction, isObject, values } from "../utils";
-const coreCommands = {
-  CONFIGURE: "configure",
-  SET_DEBUG: "setDebug"
-};
+import { isFunction, isObject } from "../utils";
+import { CONFIGURE, SET_DEBUG } from "../constants/coreCommands";
 export default (({
   logger,
   configureCommand,
@@ -26,7 +23,7 @@ export default (({
   const getExecutor = (commandName, options) => {
     let executor;
 
-    if (commandName === coreCommands.CONFIGURE) {
+    if (commandName === CONFIGURE) {
       if (configurePromise) {
         throw new Error("The library has already been configured and may only be configured once.");
       }
@@ -41,7 +38,7 @@ export default (({
         throw new Error(`The library must be configured first. Please do so by executing the configure command.`);
       }
 
-      if (commandName === coreCommands.SET_DEBUG) {
+      if (commandName === SET_DEBUG) {
         executor = () => setDebugCommand(options);
       } else {
         executor = () => {
@@ -49,7 +46,7 @@ export default (({
             const command = componentRegistry.getCommand(commandName);
 
             if (!command || !isFunction(command.run)) {
-              const commandNames = values(coreCommands).concat(componentRegistry.getCommandNames()).join(", ");
+              const commandNames = [CONFIGURE, SET_DEBUG].concat(componentRegistry.getCommandNames()).join(", ");
               throw new Error(`The ${commandName} command does not exist. List of available commands: ${commandNames}.`);
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.11.0-beta.2",
+  "version": "2.12.0-beta.0",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",
@@ -64,7 +64,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.11.0-beta.1",
+    "@adobe/alloy": "^2.11.0",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",