@easyquery/enterprise 7.5.0-rc03 → 7.5.1

package/dist/easyquery.enterprise.cjs.js

@@ -659,11 +659,81 @@ function strIsEmpty(str) {
 }
 const baseLicApiUrl = 'https://account.korzh.com/api/license';
 const eqVersion = lcv.versionNum;
+const installIdStorageKey = 'eq.iid';
+/**
+ * A random id for this sample in this browser, kept in localStorage.
+ * Returns null when storage is blocked - the version check works without it.
+ */
+function installId() {
+    try {
+        let id = localStorage.getItem(installIdStorageKey);
+        if (!id) {
+            const bytes = new Uint8Array(16);
+            crypto.getRandomValues(bytes);
+            id = 's_' + Array.from(bytes, b => ('0' + b.toString(16)).slice(-2)).join('');
+            localStorage.setItem(installIdStorageKey, id);
+        }
+        return id;
+    }
+    catch (_a) {
+        return null;
+    }
+}
 class LCDialog {
     constructor(context) {
         this.http = new core$1.HttpClient();
         this.context = context;
     }
+    isVersionCheckEnabled() {
+        return !window.EQ_NO_VERSION_CHECK && !this.context.options.noVersionCheck;
+    }
+    /** The install id to send, or undefined when the developer opted out of the version check. */
+    getInstallId() {
+        return this.isVersionCheckEnabled() ? installId() || undefined : undefined;
+    }
+    /**
+     * Asks korzh.com whether this is the latest EasyQuery.JS release and, if it is not,
+     * adds a line to the dialog. Never delays the dialog; any failure changes nothing.
+     */
+    checkVersion() {
+        if (!this.isVersionCheckEnabled())
+            return;
+        try {
+            const backend = this.context.backendInfo || {};
+            this.http.post(core.equtils.combinePath(baseLicApiUrl, 'version-check'), {
+                version: core.eqjsVersion,
+                iid: this.getInstallId(),
+                ptag: backend.type,
+                apptype: backend.subType,
+                appName: this.context.getAppName() || undefined
+            }, { dataType: 'json' })
+                .then(result => {
+                if (result && result.status === 'outdated' && result.latest) {
+                    this.showVersionNotice(result);
+                }
+            })
+                .catch(() => { });
+        }
+        catch (_a) {
+            // the check is optional - the dialog works the same without it
+        }
+    }
+    showVersionNotice(result) {
+        const el = this.versionNoticeElement;
+        if (!el)
+            return;
+        el.textContent = `You are using EasyQuery.JS ${core.eqjsVersion}. The latest release is ${result.latest}.`;
+        if (result.releaseNotes && /^https:\/\//i.test(result.releaseNotes)) {
+            el.appendChild(document.createTextNode(' '));
+            const link = document.createElement('a');
+            link.href = result.releaseNotes;
+            link.target = '_blank';
+            link.rel = 'noopener';
+            link.textContent = "What's new";
+            el.appendChild(link);
+        }
+        el.style.display = '';
+    }
     show() {
         const dialogService = new ui.DefaultDialogService();
         this.dialogSet = dialogService.createSet([
@@ -703,6 +773,7 @@ class LCDialog {
             },
         ]);
         const dialog1 = this.dialogSet.open(0);
+        this.checkVersion();
         setTimeout(() => {
             this.validateForm(dialog1);
             const emailInput = document.getElementById('eqAuthEmail');
@@ -756,6 +827,14 @@ class LCDialog {
         formBuilder.addChild('div', b => b
             .html('<div style="font-size:1.2em">The EasyQuery license key is either absent, invalid or was issued for a different version of the library.</div>' +
             '<div style="font-size:1.2em">Please fill out the form to obtain a valid trial license key.</div>'));
+        // filled in by checkVersion() when a newer release exists
+        formBuilder.addChild('div', b => {
+            b.setStyle('display', 'none');
+            b.setStyle('margin-top', '14px');
+            b.setStyle('font-size', '0.9em');
+            b.setStyle('opacity', '0.8');
+            this.versionNoticeElement = b.toDOM();
+        });
         formBuilder
             .addClass('kfrm-form')
             .addChild('div', b => {
@@ -836,6 +915,7 @@ class LCDialog {
             data: {
                 ptag: this.context.backendInfo.type,
                 apptype: this.context.backendInfo.subType,
+                iid: this.getInstallId()
             }
         }, { dataType: 'json' })
             .then(result => {
@@ -866,7 +946,8 @@ class LCDialog {
             email: this.authEmail,
             ptag: this.context.backendInfo.type,
             apptype: this.context.backendInfo.subType,
-            version: eqVersion
+            version: eqVersion,
+            iid: this.getInstallId()
         }, { dataType: 'json' })
             .then(result => {
             switch (result.status) {

package/dist/easyquery.enterprise.esm.js

@@ -1,4 +1,4 @@
-import { Condition, CondTag, QueryColumn, Query, LinkType, Tree, DataModel, EqAggregatesContainer, equtils, registerEqContextResolver, EqContext, ExprTag, Expression } from '@easyquery/core';
+import { Condition, CondTag, QueryColumn, Query, LinkType, Tree, DataModel, EqAggregatesContainer, equtils, eqjsVersion, registerEqContextResolver, EqContext, ExprTag, Expression } from '@easyquery/core';
 import { HttpClient, EasyDataTable } from '@easydata/core';
 import { DefaultDialogService, domel } from '@easydata/ui';
 
@@ -657,11 +657,81 @@ function strIsEmpty(str) {
 }
 const baseLicApiUrl = 'https://account.korzh.com/api/license';
 const eqVersion = lcv.versionNum;
+const installIdStorageKey = 'eq.iid';
+/**
+ * A random id for this sample in this browser, kept in localStorage.
+ * Returns null when storage is blocked - the version check works without it.
+ */
+function installId() {
+    try {
+        let id = localStorage.getItem(installIdStorageKey);
+        if (!id) {
+            const bytes = new Uint8Array(16);
+            crypto.getRandomValues(bytes);
+            id = 's_' + Array.from(bytes, b => ('0' + b.toString(16)).slice(-2)).join('');
+            localStorage.setItem(installIdStorageKey, id);
+        }
+        return id;
+    }
+    catch (_a) {
+        return null;
+    }
+}
 class LCDialog {
     constructor(context) {
         this.http = new HttpClient();
         this.context = context;
     }
+    isVersionCheckEnabled() {
+        return !window.EQ_NO_VERSION_CHECK && !this.context.options.noVersionCheck;
+    }
+    /** The install id to send, or undefined when the developer opted out of the version check. */
+    getInstallId() {
+        return this.isVersionCheckEnabled() ? installId() || undefined : undefined;
+    }
+    /**
+     * Asks korzh.com whether this is the latest EasyQuery.JS release and, if it is not,
+     * adds a line to the dialog. Never delays the dialog; any failure changes nothing.
+     */
+    checkVersion() {
+        if (!this.isVersionCheckEnabled())
+            return;
+        try {
+            const backend = this.context.backendInfo || {};
+            this.http.post(equtils.combinePath(baseLicApiUrl, 'version-check'), {
+                version: eqjsVersion,
+                iid: this.getInstallId(),
+                ptag: backend.type,
+                apptype: backend.subType,
+                appName: this.context.getAppName() || undefined
+            }, { dataType: 'json' })
+                .then(result => {
+                if (result && result.status === 'outdated' && result.latest) {
+                    this.showVersionNotice(result);
+                }
+            })
+                .catch(() => { });
+        }
+        catch (_a) {
+            // the check is optional - the dialog works the same without it
+        }
+    }
+    showVersionNotice(result) {
+        const el = this.versionNoticeElement;
+        if (!el)
+            return;
+        el.textContent = `You are using EasyQuery.JS ${eqjsVersion}. The latest release is ${result.latest}.`;
+        if (result.releaseNotes && /^https:\/\//i.test(result.releaseNotes)) {
+            el.appendChild(document.createTextNode(' '));
+            const link = document.createElement('a');
+            link.href = result.releaseNotes;
+            link.target = '_blank';
+            link.rel = 'noopener';
+            link.textContent = "What's new";
+            el.appendChild(link);
+        }
+        el.style.display = '';
+    }
     show() {
         const dialogService = new DefaultDialogService();
         this.dialogSet = dialogService.createSet([
@@ -701,6 +771,7 @@ class LCDialog {
             },
         ]);
         const dialog1 = this.dialogSet.open(0);
+        this.checkVersion();
         setTimeout(() => {
             this.validateForm(dialog1);
             const emailInput = document.getElementById('eqAuthEmail');
@@ -754,6 +825,14 @@ class LCDialog {
         formBuilder.addChild('div', b => b
             .html('<div style="font-size:1.2em">The EasyQuery license key is either absent, invalid or was issued for a different version of the library.</div>' +
             '<div style="font-size:1.2em">Please fill out the form to obtain a valid trial license key.</div>'));
+        // filled in by checkVersion() when a newer release exists
+        formBuilder.addChild('div', b => {
+            b.setStyle('display', 'none');
+            b.setStyle('margin-top', '14px');
+            b.setStyle('font-size', '0.9em');
+            b.setStyle('opacity', '0.8');
+            this.versionNoticeElement = b.toDOM();
+        });
         formBuilder
             .addClass('kfrm-form')
             .addChild('div', b => {
@@ -834,6 +913,7 @@ class LCDialog {
             data: {
                 ptag: this.context.backendInfo.type,
                 apptype: this.context.backendInfo.subType,
+                iid: this.getInstallId()
             }
         }, { dataType: 'json' })
             .then(result => {
@@ -864,7 +944,8 @@ class LCDialog {
             email: this.authEmail,
             ptag: this.context.backendInfo.type,
             apptype: this.context.backendInfo.subType,
-            version: eqVersion
+            version: eqVersion,
+            iid: this.getInstallId()
         }, { dataType: 'json' })
             .then(result => {
             switch (result.status) {

package/dist/types/license/lc-dialog.d.ts

@@ -1,12 +1,28 @@
 import { DomElementBuilder, Dialog } from '@easydata/ui';
 import { EqContext } from '@easyquery/core';
+interface VersionCheckResponse {
+    status: 'latest' | 'outdated' | 'unknown';
+    latest?: string;
+    beta?: string;
+    releaseNotes?: string;
+}
 export declare class LCDialog {
     private dialogSet;
     private http;
     private context;
     private authName;
     private authEmail;
+    private versionNoticeElement;
     constructor(context: EqContext);
+    protected isVersionCheckEnabled(): boolean;
+    /** The install id to send, or undefined when the developer opted out of the version check. */
+    protected getInstallId(): string | undefined;
+    /**
+     * Asks korzh.com whether this is the latest EasyQuery.JS release and, if it is not,
+     * adds a line to the dialog. Never delays the dialog; any failure changes nothing.
+     */
+    protected checkVersion(): void;
+    protected showVersionNotice(result: VersionCheckResponse): void;
     show(): void;
     protected isValidForm(form: HTMLElement): boolean | RegExpMatchArray;
     protected validateForm(dialog: Dialog): void;
@@ -19,3 +35,4 @@ export declare class LCDialog {
     protected codePageOnSubmit(dlg: Dialog): boolean;
 }
 export declare function showNoLicenseAlert(context: EqContext): void;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@easyquery/enterprise",
-    "version": "7.5.0-rc03",
+    "version": "7.5.1",
     "description": "EasyQuery.JS Enterprise",
     "types": "./dist/types/public_api.d.ts",
     "main": "./dist/easyquery.enterprise.cjs.js",
@@ -28,8 +28,8 @@
     "bugs": "https://korzh.com/support",
     "license": "SEE LICENSE IN LICENSE.txt",
     "peerDependencies": {
-        "@easyquery/core": "^7.5.0-rc03",
-        "@easyquery/ui": "^7.5.0-rc03"
+        "@easyquery/core": "^7.5.1",
+        "@easyquery/ui": "^7.5.1"
     },
     "files": [
         "dist"