scichart 2.0.2185 → 2.0.2204

package/Charting3D/Visuals/createMaster3d.js

@@ -43,6 +43,7 @@ var chartBuilder_1 = require("../../Builder/chartBuilder");
 var loader_1 = require("../../Charting/Visuals/loader");
 var sciChartInitCommon_1 = require("../../Charting/Visuals/sciChartInitCommon");
 var SciChartSurfaceBase_1 = require("../../Charting/Visuals/SciChartSurfaceBase");
+var BuildStamp_1 = require("../../Core/BuildStamp");
 var licenseManager3D_1 = require("./licenseManager3D");
 var SciChart3DSurface_1 = require("./SciChart3DSurface");
 /** @ignore */
@@ -55,7 +56,7 @@ var sciChartMaster3D = {
 var sciChartMaster3DPromise;
 /** @ignore */
 var createMultichart3d = function (divElementId, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var canvases, loader, loaderDiv, master, createChildSurface, wasmContext, sciChart3DSurface;
+    var canvases, loader, loaderDiv, master, createChildSurface, wasmContext_1, sciChart3DSurface_1, err_1;
     var _a, _b, _c, _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
@@ -63,29 +64,42 @@ var createMultichart3d = function (divElementId, options) { return __awaiter(voi
                 (0, chartBuilder_1.ensureRegistrations)();
                 sciChartInitCommon_1.default.checkChartDivExists(divElementId);
                 canvases = sciChartInitCommon_1.default.initCanvas(divElementId, (_a = options === null || options === void 0 ? void 0 : options.widthAspect) !== null && _a !== void 0 ? _a : 0, (_b = options === null || options === void 0 ? void 0 : options.heightAspect) !== null && _b !== void 0 ? _b : 0, sciChartInitCommon_1.default.ECanvasType.canvas2D);
-                if (!(!sciChartMaster3D.wasmContext || !sciChartMaster3D.createChildSurface || !sciChartMaster3D.getChildSurfaces)) return [3 /*break*/, 2];
+                loader = (_c = options === null || options === void 0 ? void 0 : options.loader) !== null && _c !== void 0 ? _c : new loader_1.DefaultSciChartLoader();
+                loaderDiv = loader.addChartLoader(canvases.domDivContainer, (_d = options === null || options === void 0 ? void 0 : options.theme) !== null && _d !== void 0 ? _d : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME);
+                _f.label = 1;
+            case 1:
+                _f.trys.push([1, 4, , 5]);
+                if (!(!sciChartMaster3D.wasmContext ||
+                    !sciChartMaster3D.createChildSurface ||
+                    !sciChartMaster3D.getChildSurfaces)) return [3 /*break*/, 3];
                 if (!sciChartMaster3DPromise) {
                     sciChartMaster3DPromise = createMaster();
                 }
-                loader = (_c = options === null || options === void 0 ? void 0 : options.loader) !== null && _c !== void 0 ? _c : new loader_1.DefaultSciChartLoader();
-                loaderDiv = loader.addChartLoader(canvases.domDivContainer, (_d = options === null || options === void 0 ? void 0 : options.theme) !== null && _d !== void 0 ? _d : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME);
                 return [4 /*yield*/, sciChartMaster3DPromise];
-            case 1:
+            case 2:
                 master = _f.sent();
-                loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                (0, BuildStamp_1.checkBuildStamp)(master.wasmContext);
                 sciChartMaster3D.wasmContext = master.wasmContext;
                 sciChartMaster3D.createChildSurface = master.createChildSurface;
                 sciChartMaster3D.getChildSurfaces = master.getChildSurfaces;
-                _f.label = 2;
-            case 2:
-                createChildSurface = sciChartMaster3D.createChildSurface, wasmContext = sciChartMaster3D.wasmContext;
-                sciChart3DSurface = createChildSurface(divElementId, canvases, (_e = options === null || options === void 0 ? void 0 : options.theme) !== null && _e !== void 0 ? _e : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME);
+                _f.label = 3;
+            case 3:
+                createChildSurface = sciChartMaster3D.createChildSurface, wasmContext_1 = sciChartMaster3D.wasmContext;
+                sciChart3DSurface_1 = createChildSurface(divElementId, canvases, (_e = options === null || options === void 0 ? void 0 : options.theme) !== null && _e !== void 0 ? _e : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME);
                 return [2 /*return*/, new Promise(function (resolve) {
                         setTimeout(function () {
-                            sciChart3DSurface.setIsInitialized();
-                            resolve({ wasmContext: wasmContext, sciChart3DSurface: sciChart3DSurface });
+                            loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                            sciChart3DSurface_1.setIsInitialized();
+                            resolve({ wasmContext: wasmContext_1, sciChart3DSurface: sciChart3DSurface_1 });
                         }, 0);
                     })];
+            case 4:
+                err_1 = _f.sent();
+                console.error(err_1);
+                // replace with div with error message
+                loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                return [2 /*return*/, Promise.reject(err_1)];
+            case 5: return [2 /*return*/];
         }
     });
 }); };
@@ -112,10 +126,11 @@ var createMaster = function () {
         chartInitObj3D.AddDestination(dest);
         exports.sciChartDestinations.push({ canvasElementId: canvasElementId, sciChartSurface: sciChartSurface, width: width, height: height });
     };
-    return new Promise(function (resolve) {
+    return new Promise(function (resolve, reject) {
         var locateFile3d = (0, SciChartSurfaceBase_1.getLocateFile)(SciChart3DSurface_1.sciChartConfig3D);
         // @ts-ignore
-        new WasmModule3D({ locateFile3d: locateFile3d, noInitialRun: true }).then(function (wasmContext) {
+        new WasmModule3D({ locateFile3d: locateFile3d, noInitialRun: true })
+            .then(function (wasmContext) {
             var getChildSurfaces = function () { return exports.sciChartDestinations.map(function (el) { return el.sciChartSurface; }); };
             // Create of replace child surface
             var createChildSurface = function (divElementId, canvases, theme) {
@@ -173,6 +188,9 @@ var createMaster = function () {
             wasmContext.TSRSetDrawRequestsEnabled(true);
             // @ts-ignore
             wasmContext.callMain();
+        })
+            .catch(function () {
+            reject("Could not load SciChart WebAssembly module.\n            Check your build process and ensure that your scichart2d.wasm, scichart2d.data and scichart2d.js files are from the same version");
         });
     });
 };

package/Charting3D/Visuals/createSingle3d.js

@@ -7,28 +7,35 @@ var chartBuilder_1 = require("../../Builder/chartBuilder");
 var loader_1 = require("../../Charting/Visuals/loader");
 var sciChartInitCommon_1 = require("../../Charting/Visuals/sciChartInitCommon");
 var SciChartSurfaceBase_1 = require("../../Charting/Visuals/SciChartSurfaceBase");
+var BuildStamp_1 = require("../../Core/BuildStamp");
 var WebGlHelper_1 = require("../../Core/WebGlHelper");
 var logger_1 = require("../../utils/logger");
 var licenseManager3D_1 = require("./licenseManager3D");
 var SciChart3DSurface_1 = require("./SciChart3DSurface");
 var createSingle3dInternal = function (divElementId, options) {
     (0, chartBuilder_1.ensureRegistrations)();
-    return new Promise(function (resolve) {
+    return new Promise(function (resolve, reject) {
         var _a, _b, _c, _d;
         var canvases = sciChartInitCommon_1.default.initCanvas(divElementId, (_a = options === null || options === void 0 ? void 0 : options.widthAspect) !== null && _a !== void 0 ? _a : 0, (_b = options === null || options === void 0 ? void 0 : options.heightAspect) !== null && _b !== void 0 ? _b : 0);
         var loader = (_c = options === null || options === void 0 ? void 0 : options.loader) !== null && _c !== void 0 ? _c : new loader_1.DefaultSciChartLoader();
         var loaderDiv = loader.addChartLoader(canvases.domDivContainer, (_d = options === null || options === void 0 ? void 0 : options.theme) !== null && _d !== void 0 ? _d : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME);
         var webGLSupport = WebGlHelper_1.WebGlHelper.getWebGlSupport();
-        console.log("webGLSupport", webGLSupport);
+        // console.log("webGLSupport", webGLSupport);
         if (webGLSupport === WebGlHelper_1.EWebGLSupport.WebGL2 || webGLSupport === WebGlHelper_1.EWebGLSupport.WebGL1) {
             var locateFile3d = (0, SciChartSurfaceBase_1.getLocateFile)(SciChart3DSurface_1.sciChartConfig3D);
             // @ts-ignore
-            new WasmModule3D({ locateFile3d: locateFile3d, noInitialRun: true }).then(function (wasmContext) {
+            new WasmModule3D({ locateFile3d: locateFile3d, noInitialRun: true })
+                .then(function (wasmContext) {
                 var _a;
                 loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
                 // @ts-ignore
                 wasmContext.doNotCaptureKeyboard = true;
                 initDrawEngineSingleChart(wasmContext, canvases, resolve, (_a = options === null || options === void 0 ? void 0 : options.theme) !== null && _a !== void 0 ? _a : SciChartSurfaceBase_1.SciChartSurfaceBase.DEFAULT_THEME);
+                (0, BuildStamp_1.checkBuildStamp)(wasmContext);
+            })
+                .catch(function () {
+                loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                reject("Could not load SciChart WebAssembly module.\n                Check your build process and ensure that your scichart3d.wasm, scichart3d.data and scichart3d.js files are from the same version");
             });
         }
         else {

package/Core/BuildStamp.d.ts

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

package/Core/BuildStamp.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkBuildStamp = exports.libraryVersion = void 0;
+var buildStamp = "2022-01-11T00:00:00";
+var result;
+// tslint:disable-next-line:no-var-requires
+exports.libraryVersion = "2.0.2204";
+var checkBuildStamp = function (wasmContext) {
+    if (result !== undefined)
+        return result;
+    if (!wasmContext)
+        return false;
+    if (wasmContext.SCRTCredentials.GetBuildStamp) {
+        if (wasmContext.SCRTCredentials.GetBuildStamp() === buildStamp) {
+            result = true;
+            return result;
+        }
+    }
+    console.warn("The SciChart webassembly module is from a different version than the javascript that is calling it.\n    Ensure that your build process is copying the correct wasm and data files.");
+    result = false;
+    return result;
+};
+exports.checkBuildStamp = checkBuildStamp;