scichart 2.2.2397 → 2.2.2407

package/Charting/Visuals/licenseManager2D.js

@@ -134,7 +134,7 @@ var setRuntimeLicenseKey = function (value) {
     runtimeLicenseKey = value;
     if (runtimeLicenseKey !== prev && runtimeLicenseKey !== "") {
         if (licenseContext2D !== undefined) {
-            (0, exports.applyLicense)(licenseContext2D);
+            (0, exports.applyLicense)(licenseContext2D, sciChartSurface2D);
         }
     }
 };
@@ -161,7 +161,7 @@ var callbacks3D = {
 };
 var setCallbacks3D = function (callbacks) { return (callbacks3D = callbacks); };
 exports.setCallbacks3D = setCallbacks3D;
-var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0, function () {
+var getlicenseFromWizard = function (licenseContext, sciChartSurface) { return __awaiter(void 0, void 0, void 0, function () {
     var response, keyCode, _a, requiresValidation, trialExpired, err_3;
     return __generator(this, function (_b) {
         switch (_b.label) {
@@ -179,16 +179,16 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 return [4 /*yield*/, response.text()];
             case 2:
                 keyCode = _b.sent();
-                _a = setNewLicense(keyCode), requiresValidation = _a.requiresValidation, trialExpired = _a.trialExpired;
+                _a = setNewLicense(keyCode, licenseContext, sciChartSurface), requiresValidation = _a.requiresValidation, trialExpired = _a.trialExpired;
                 if (requiresValidation) {
                     debug("Got a developer license from local license wizard.  Validating...");
                     checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
-                    dolicenseChallenge();
+                    dolicenseChallenge(licenseContext, sciChartSurface);
                 }
                 else if (trialExpired) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
                     debug("No valid license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
-                    wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
+                    wizardTimer = setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     debug("Got a valid license from local license wizard.");
@@ -198,7 +198,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
             case 3:
                 checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
                 debug("No license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
-                wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
+                wizardTimer = setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
                 _b.label = 4;
             case 4: return [3 /*break*/, 6];
             case 5:
@@ -207,7 +207,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 getLicenseFailCounts += 1;
                 if (getLicenseFailCounts < maxretries) {
                     debug("Could not find licensing wizard. Trying again in ".concat(retryTime, " seconds"));
-                    setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
+                    setTimeout(function () { return getlicenseFromWizard(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     // give up.
@@ -217,8 +217,8 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 }
                 return [3 /*break*/, 6];
             case 6:
-                if (licenseContext2D !== undefined) {
-                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
+                if (licenseContext !== undefined) {
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -247,12 +247,12 @@ var getLicenseCookie = function () {
 exports.getLicenseCookie = getLicenseCookie;
 var refreshLicense = function () {
     (0, cookie_1.deleteCookie)("scLicense");
-    (0, exports.applyLicense)(licenseContext2D);
+    (0, exports.applyLicense)(licenseContext2D, sciChartSurface2D);
 };
-var setChallengeResponse = function (token) {
+var setChallengeResponse = function (token, licenseContext) {
     var expirySeconds = -1;
-    if (licenseContext2D !== undefined) {
-        expirySeconds = licenseContext2D.SCRTCredentials.ApplyLicenseResponse(token);
+    if (licenseContext !== undefined) {
+        expirySeconds = licenseContext.SCRTCredentials.ApplyLicenseResponse(token);
     }
     var expirySeconds3D = callbacks3D.setChallengeResponse3D(token);
     if (expirySeconds3D !== undefined)
@@ -260,7 +260,7 @@ var setChallengeResponse = function (token) {
     return expirySeconds;
 };
 var challengeFailCounts = 0;
-var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0, function () {
+var dolicenseChallenge = function (licenseContext, sciChartSurface) { return __awaiter(void 0, void 0, void 0, function () {
     var server, challenge, orderId, response, queryString, url, url, token, expirySeconds, key, timeNow, timeToExpiry, err_4, expiry, msg;
     var _a;
     return __generator(this, function (_b) {
@@ -275,9 +275,9 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 debug("Attempting to validate license with ".concat(server));
                 challenge = void 0;
                 orderId = void 0;
-                if (licenseContext2D !== undefined) {
-                    challenge = licenseContext2D.SCRTCredentials.GetLicenseChallenge();
-                    orderId = licenseContext2D.SCRTCredentials.GetOrderId();
+                if (licenseContext !== undefined) {
+                    challenge = licenseContext.SCRTCredentials.GetLicenseChallenge();
+                    orderId = licenseContext.SCRTCredentials.GetOrderId();
                 }
                 else {
                     (_a = callbacks3D.getLicenseChallenge3D(), challenge = _a.challenge, orderId = _a.orderId);
@@ -308,7 +308,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
             case 8:
                 token = _b.sent();
                 if (!token.startsWith("Error")) {
-                    expirySeconds = setChallengeResponse(token);
+                    expirySeconds = setChallengeResponse(token, licenseContext);
                     if (expirySeconds > 0) {
                         key = (0, exports.getLicenseCookie)().key;
                         timeNow = Math.floor(new Date().getTime() / 1000);
@@ -317,7 +317,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                         checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
                         timeToExpiry = expirySeconds - timeNow;
                         challengeFailCounts = 0;
-                        setTimeout(function () { return dolicenseChallenge(); }, Math.floor(timeToExpiry * 0.95 * 1000)); // Allow 5%
+                        setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, Math.floor(timeToExpiry * 0.95 * 1000)); // Allow 5%
                     }
                     else {
                         // Something went wrong with the apply
@@ -350,9 +350,9 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                     console.warn("Server license validation failed.  Looking for local developer license");
                     runtimeLicenseKey = "";
                     checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicense;
-                    licenseContext2D.SCRTCredentials.ResetRuntimeLicense();
+                    licenseContext.SCRTCredentials.ResetRuntimeLicense();
                     isRuntimeKey = false;
-                    (0, exports.applyLicense)(licenseContext2D);
+                    (0, exports.applyLicense)(licenseContext, sciChartSurface);
                     // licenseManager2dState.setIsDev(true);
                     // checkStatus = LicenseCheckStatus.LookingForLicenseWizard;
                     // getlicenseFromWizard();
@@ -366,7 +366,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 challengeFailCounts += 1;
                 if (challengeFailCounts < maxretries) {
                     debug("Could not find ".concat(server, "/").concat(serverLicenseEndpoint, ". Trying again in ").concat(retryTime, " seconds"));
-                    setTimeout(function () { return dolicenseChallenge(); }, retryTime * 1000);
+                    setTimeout(function () { return dolicenseChallenge(licenseContext, sciChartSurface); }, retryTime * 1000);
                 }
                 else {
                     expiry = (0, exports.getLicenseCookie)().expiry;
@@ -381,8 +381,8 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 }
                 return [3 /*break*/, 12];
             case 12:
-                if (licenseContext2D !== undefined) {
-                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
+                if (licenseContext !== undefined) {
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -396,10 +396,12 @@ var sciChartSurface2D;
 var isRuntimeKey = false;
 var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     debug("applyLicense 2D");
-    sciChartSurface2D = sciChartSurface;
-    if (isSingle || shouldApplyLicense2D) {
+    if (shouldApplyLicense2D) {
+        sciChartSurface2D = sciChartSurface;
         licenseContext2D = licenseContext;
-        (0, exports.applyLicense)(licenseContext);
+    }
+    if (isSingle || shouldApplyLicense2D) {
+        (0, exports.applyLicense)(licenseContext, sciChartSurface);
     }
     else {
         if (checkStatus !== licensingClasses_1.LicenseCheckStatus.LicenseOK) {
@@ -409,7 +411,7 @@ var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     if (!isSingle)
         shouldApplyLicense2D = false;
 };
-var applyLicense = function (licenseContext) {
+var applyLicense = function (licenseContext, sciChartSurface) {
     var _a;
     debug("applyLicense running");
     var licenseKey = "";
@@ -505,7 +507,7 @@ var applyLicense = function (licenseContext) {
             }
             else if (licenseCookie.expiry > new Date() && licenseCookie.key === licenseKey) {
                 debug("current token in cookie");
-                var expirySeconds = setChallengeResponse(licenseCookie.token);
+                var expirySeconds = setChallengeResponse(licenseCookie.token, licenseContext);
                 lt = licenseContext.SCRTCredentials.GetLicenseType();
                 if (lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_FULL ||
                     lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL) {
@@ -521,12 +523,13 @@ var applyLicense = function (licenseContext) {
                 if (secondsSinceValidated > validationInterval &&
                     checkStatus !== licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
-                    dolicenseChallenge();
+                    dolicenseChallenge(licenseContext, sciChartSurface);
                 }
             }
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicense) {
                 checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
-                dolicenseChallenge();
+                setLicenseCookie(licenseKey, "", 0, 0);
+                dolicenseChallenge(licenseContext, sciChartSurface);
             }
         }
         else {
@@ -538,11 +541,11 @@ var applyLicense = function (licenseContext) {
         if (wizardTimer === undefined) {
             checkStatus = licensingClasses_1.LicenseCheckStatus.LookingForLicenseWizard;
             licenseManager2dState_1.licenseManager2dState.setIsDev(true);
-            getlicenseFromWizard();
+            getlicenseFromWizard(licenseContext, sciChartSurface);
         }
     }
-    if (licenseContext2D !== undefined) {
-        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
+    if (licenseContext !== undefined) {
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, false);
     }
     callbacks3D.updateLicenseDisplay3D();
 };
@@ -551,7 +554,7 @@ var licenseModal;
 var openLicenseModal = function () {
     console.error("Modal not initialized");
 };
-var setNewLicense = function (keyCode) {
+var setNewLicense = function (keyCode, licenseContext, sciChartSurface) {
     var requiresValidation = false;
     var trialExpired;
     if (licenseModal) {
@@ -559,13 +562,13 @@ var setNewLicense = function (keyCode) {
     }
     isRuntimeKey = false;
     setLicenseCookie(keyCode, null, null, null);
-    if (licenseContext2D !== undefined) {
-        licenseContext2D.SCRTCredentials.SetRuntimeLicenseKeyW(keyCode);
-        requiresValidation = licenseContext2D.SCRTCredentials.RequiresValidation();
+    if (licenseContext !== undefined) {
+        licenseContext.SCRTCredentials.SetRuntimeLicenseKeyW(keyCode);
+        requiresValidation = licenseContext.SCRTCredentials.RequiresValidation();
         trialExpired =
-            licenseContext2D.SCRTCredentials.GetLicenseType() ===
-                licenseContext2D.SCRTLicenseType.LICENSE_TYPE_TRIAL_EXPIRED;
-        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
+            licenseContext.SCRTCredentials.GetLicenseType() ===
+                licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL_EXPIRED;
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext), sciChartSurface, true, true);
     }
     var result3D = callbacks3D.setNewLicense3D(keyCode);
     if (result3D !== undefined) {

package/Charting3D/Visuals/licenseManager3D.js

@@ -32,7 +32,7 @@ var applyLicense3D = function (licenseContext, sciChartSurface, isSingle) {
         sciChartSurface3D = sciChartSurface;
         // set up callbacks
         (0, licenseManager2D_1.setCallbacks3D)(callbacks3D);
-        (0, licenseManager2D_1.applyLicense)(licenseContext);
+        (0, licenseManager2D_1.applyLicense)(licenseContext, sciChartSurface3D);
     }
     else {
         (0, licenseManager2D_1.updateLicenseDisplay)((0, licenseManager2D_1.getLicenseInfo)(licenseContext), sciChartSurface, false, false);

package/Core/BuildStamp.d.ts

@@ -1,4 +1,4 @@
 import { TSciChart } from "../types/TSciChart";
 import { TSciChart3D } from "../types/TSciChart3D";
-export declare const libraryVersion = "2.2.2397";
+export declare const libraryVersion = "2.2.2407";
 export declare const checkBuildStamp: (wasmContext: TSciChart | TSciChart3D) => boolean;

package/Core/BuildStamp.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkBuildStamp = exports.libraryVersion = void 0;
-var buildStamp = "2022-07-01T00:00:00";
+var buildStamp = "2022-08-09T00:00:00";
 var result;
 // tslint:disable-next-line:no-var-requires
-exports.libraryVersion = "2.2.2397";
+exports.libraryVersion = "2.2.2407";
 var checkBuildStamp = function (wasmContext) {
     if (result !== undefined)
         return result;

package/README.md

@@ -72,7 +72,7 @@ See more at the Release Notes section at bottom of the page.
             <meta name="viewport" content="width=device-width, initial-scale=1" />
             <!-- Include SciChart.js -->
             <script
-                src="https://cdn.jsdelivr.net/npm/scichart@2.1.2261/_wasm/scichart.browser.js"
+                src="https://cdn.jsdelivr.net/npm/scichart@2.2.2401/_wasm/scichart.browser.js"
                 crossorigin="anonymous"
             ></script>
             <script src="scichart-example.js" defer></script>
@@ -119,7 +119,8 @@ SciChart.js can be loaded as an ES6 module with Babel or TypeScript transpiler.
 
 4. **Add webpack.config.js file**
 
-    Use CopyPlugin to copy wasm and data files and serve them by webpack-dev-server. SciChart.js uses WebAssembly and those files must be loaded.
+    Use CopyPlugin to copy wasm and data files and serve them by webpack-dev-server. SciChart.js uses WebAssembly and those files must be loaded. You can avoid this by using SciChart.SciChartSurface.useWasmFromCDN() as noted below,
+    but in many scenarios it will be important to be able to serve the webassembly files directly.
 
     ```
     const path = require('path');