taon 19.0.39 → 19.0.46

package/websql/fesm2022/taon.mjs

@@ -14,7 +14,6 @@ import axios from 'axios';
 import { JSON10 } from 'json10/websql';
 import { Observable, Subject, from } from 'rxjs';
 import { io } from 'socket.io-client';
-import { Stor } from 'taon-storage/websql';
 import { MySqlQuerySource } from 'taon-type-sql/websql';
 
 //#region @websql
@@ -1374,8 +1373,6 @@ class DITaonContainer {
     }
 }
 
-const ENV$1 = Helpers.isBrowser ? window['ENV'] : global['ENV'];
-
 const getResponseValue = (response, options) => {
     //#region @websqlFunc
     const { req, res } = options || {};
@@ -2551,8 +2548,9 @@ class RealtimeCore {
     }
 }
 
+//#region import
 //#endregion
-const ENV = Helpers.isBrowser ? window['ENV'] : global['ENV'];
+const ENV = globalThis['ENV'];
 // @Injectable({ providedIn: 'root' }) TODO make it angular service
 class TaonAdminService {
     static get Instance() {
@@ -2595,22 +2593,6 @@ class TaonAdminService {
     }
     logout() { }
 }
-__decorate([
-    (Stor.property.in.localstorage.for(TaonAdminService).withDefaultValue(false)),
-    __metadata("design:type", Boolean)
-], TaonAdminService.prototype, "adminPanelIsOpen", void 0);
-__decorate([
-    (Stor.property.in.localstorage.for(TaonAdminService).withDefaultValue(false)),
-    __metadata("design:type", Boolean)
-], TaonAdminService.prototype, "draggablePopupMode", void 0);
-__decorate([
-    (Stor.property.in.localstorage.for(TaonAdminService).withDefaultValue(false)),
-    __metadata("design:type", Boolean)
-], TaonAdminService.prototype, "draggablePopupModeFullScreen", void 0);
-__decorate([
-    (Stor.property.in.localstorage.for(TaonAdminService).withDefaultValue(false)),
-    __metadata("design:type", Boolean)
-], TaonAdminService.prototype, "keepWebsqlDbDataAfterReload", void 0);
 
 //#endregion
 class EndpointContext {
@@ -2668,6 +2650,11 @@ class EndpointContext {
     constructor(originalConfig, configFn) {
         this.originalConfig = originalConfig;
         this.configFn = configFn;
+        //#region static
+        /**
+         * JUST FOR TESTING PURPOSES
+         */
+        this.USE_MARIADB_MYSQL_IN_DOCKER = false;
         //#endregion
         // public static findForTraget(classFnOrObject: any): EndpointContext {
         //   const obj = ClassHelpers.getClassFnFromObject(classFnOrObject) || {};
@@ -2839,7 +2826,7 @@ class EndpointContext {
         this.onlyMigrationRun = onlyMigrationRun;
         // @ts-ignore
         this.onlyMigrationRevertToTimestamp = onlyMigrationRevertToTimestamp;
-        this.config = this.configFn(ENV$1);
+        this.config = this.configFn({});
         if (_.isObject(this.config.database)) {
             this.config.database = Models.DatabaseConfig.from(this.config.database).databaseConfigTypeORM;
         }
@@ -2903,10 +2890,34 @@ class EndpointContext {
         //#endregion
         //#region resolve database config
         if (this.config.database === true) {
+            this.logFramework &&
+                console.log(`
+
+        ASSIGNING AUTO GENERATED DATABASE CONFIG
+
+        `);
             this.databaseConfig = this.getAutoGeneratedConfig();
         }
         else if (_.isObject(this.config.database)) {
-            this.databaseConfig = _.merge(this.getAutoGeneratedConfig(), _.cloneDeep(this.config.database));
+            this.logFramework &&
+                console.log(`
+
+        OVERRIDE DATABASE CONFIG FROM CONFIGURATION
+
+        `);
+            this.databaseConfig = this.getAutoGeneratedConfig();
+            walk.Object(this.config.database, (value, lodashPath) => {
+                if (_.isNil(value) || _.isFunction(value) || _.isObject(value)) {
+                    // skipping
+                }
+                else {
+                    this.logFramework &&
+                        console.info(`Overriding database config: ${lodashPath}=${value}`);
+                    _.set(this.databaseConfig, lodashPath, value);
+                }
+            }, {
+                walkGetters: false,
+            });
         }
         //#endregion
         //#region resolve session
@@ -3057,23 +3068,66 @@ class EndpointContext {
     //#endregion
     //#region methods & getters / get auto generated config
     getAutoGeneratedConfig() {
+        this.logFramework &&
+            console.log(`
+
+
+         IS RUNNING IN DOCKER: ${UtilsOs.isRunningInDocker()}
+
+    `);
         //#region @websqlFunc
         let databaseConfig = Models.DatabaseConfig.from({});
         if (UtilsOs.isRunningInDocker()) {
-            Helpers.info('Running in docker, using in mysql database');
-            // TODO auto resolve database config in docker
-            databaseConfig = Models.DatabaseConfig.from({
-                database: `db-${this.contextName}.sqlite`,
-                type: 'mysql',
-                recreateMode: 'PRESERVE_DATA+MIGRATIONS',
-                logging: this.logDb,
-                databasePort: 3306,
-                databaseHost: 'localhost',
-                databaseUsername: 'root',
-                databasePassword: 'admin',
-            });
+            if (this.USE_MARIADB_MYSQL_IN_DOCKER) {
+                // Helpers.info('Running in docker, using in mysql database');
+                // // TODO auto resolve database config in docker
+                // databaseConfig = Models.DatabaseConfig.from({
+                //   database: `db-${this.contextName}.sqlite`,
+                //   type: 'mysql',
+                //   recreateMode: 'PRESERVE_DATA+MIGRATIONS',
+                //   logging: this.logDb,
+                //   databasePort: 3306,
+                //   databaseHost: 'localhost',
+                //   databaseUsername: 'root',
+                //   databasePassword: 'admin',
+                // });
+            }
+            else {
+                // TOOD @LAST for now.. just use sqljs in docker
+                this.logFramework &&
+                    console.log(`
+
+          USING GENERATED CONFIG FOR SQLJS IN DOCKER
+
+          `);
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                databaseConfig = databaseConfig = Models.DatabaseConfig.from({
+                    location: `db-${this.contextName}.sqlite`,
+                    type: 'sqljs',
+                    useLocalForage: false,
+                    recreateMode: 'PRESERVE_DATA+MIGRATIONS',
+                    logging: true,
+                });
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+            }
         }
         else {
+            //#region auto resolve db config
             this.logFramework &&
                 Helpers.info(`[taon][database] Automatically resolving database config for mode ${this.mode}`);
             switch (this.mode) {
@@ -3133,6 +3187,7 @@ class EndpointContext {
                     break;
                 //#endregion
             }
+            //#endregion
         }
         return databaseConfig.databaseConfigTypeORM;
         //#endregion
@@ -3167,6 +3222,7 @@ class EndpointContext {
         /* */
         /* */
         /* */
+        /* */
         return (void 0);
     }
     //#endregion
@@ -3603,6 +3659,18 @@ class EndpointContext {
             return ClassHelpers.getOrginalClass(entityFn);
         });
         const subscribers = this.getClassFunByArr(Models.ClassType.SUBSCRIBER);
+        let autoSave = false;
+        if (!_.isNil(this.databaseConfig.autoSave)) {
+            autoSave = this.databaseConfig.autoSave;
+        }
+        else {
+            if (this.USE_MARIADB_MYSQL_IN_DOCKER) {
+                autoSave = !UtilsOs.isRunningInDocker(); // in docker I am using mysql or posgress
+            }
+            else {
+                autoSave = true; // on docker with sqljs I need to save db
+            }
+        }
         const dataSourceDbConfig = _.isObject(this.databaseConfig)
             ? {
                 type: this.databaseConfig.type,
@@ -3618,9 +3686,7 @@ class EndpointContext {
                 synchronize: this.isRunOrRevertOnlyMigrationAppStart
                     ? false
                     : this.databaseConfig.synchronize,
-                autoSave: !_.isNil(this.databaseConfig.autoSave)
-                    ? this.databaseConfig.autoSave
-                    : !UtilsOs.isRunningInDocker(), // in docker I am using mysql or posgress
+                autoSave,
                 dropSchema: this.isRunOrRevertOnlyMigrationAppStart
                     ? false
                     : this.databaseConfig.dropSchema,
@@ -3641,7 +3707,10 @@ class EndpointContext {
                 await this.connection.initialize();
             }
             catch (error) {
+                console.error(`[taon][typeorm] Error while initializing connection for ${this.contextName}, ERROR STARTED `);
+                console.error(error?.stack || '< No stack trace > ');
                 console.error(error?.message || error);
+                console.error(`[taon][typeorm] Error while initializing connection for ${this.contextName}, ERROR ENDS `);
             }
             if (!this.connection?.isInitialized) {
                 console.log('WRONG CONFIG', dataSourceDbConfig);
@@ -4219,14 +4288,8 @@ class EndpointContext {
         this.logHttp && console.log(`${type?.toUpperCase()} ${expressPath} `);
         // console.log('INITING', methodConfig); // TODO inject in static
         //#region resolve storage
-        let storage;
-        if (Helpers.isBrowser) {
-            storage = window;
-        }
-        /* */
-        /* */
-        /* */
-        /* */
+        // TODO not a good idea
+        const storage = globalThis;
         //#endregion
         const orgMethods = target.prototype[methodConfig.methodName];
         //#region handle electron ipc request
@@ -4274,22 +4337,23 @@ class EndpointContext {
         //#region resolve variables
         const MIN_TIMEOUT = 500;
         const MIN_TIMEOUT_STEP = 200;
-        const timeout = window[Symbols.old.WEBSQL_REST_PROGRESS_TIMEOUT] || MIN_TIMEOUT;
-        let updateFun = window[Symbols.old.WEBSQL_REST_PROGRESS_FUN];
-        if (!window[Symbols.old.WEBSQL_REST_PROGRESS_FUN]) {
-            window[Symbols.old.WEBSQL_REST_PROGRESS_FUN] = new Subject();
-        }
-        updateFun = window[Symbols.old.WEBSQL_REST_PROGRESS_FUN];
-        let startFun = window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START];
-        if (!window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START]) {
-            window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START] = new Subject();
-        }
-        startFun = window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START];
-        let doneFun = window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE];
-        if (!window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE]) {
-            window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE] = new Subject();
-        }
-        doneFun = window[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE];
+        const globalThisVar = globalThis; // TODO not a good idea! probably should be in context
+        const timeout = globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_TIMEOUT] || MIN_TIMEOUT;
+        let updateFun = globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN];
+        if (!globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN]) {
+            globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN] = new Subject();
+        }
+        updateFun = globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN];
+        let startFun = globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START];
+        if (!globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START]) {
+            globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START] = new Subject();
+        }
+        startFun = globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_START];
+        let doneFun = globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE];
+        if (!globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE]) {
+            globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE] = new Subject();
+        }
+        doneFun = globalThisVar[Symbols.old.WEBSQL_REST_PROGRESS_FUN_DONE];
         let periodsToUpdate = 0;
         if (timeout >= MIN_TIMEOUT) {
             periodsToUpdate = Math.floor(timeout / MIN_TIMEOUT_STEP);
@@ -4541,13 +4605,22 @@ instead
 
 //#region imports
 //#endregion
+/**
+ * @returns function that returns context function.
+ * Context function can be used to dynamically
+ * create context with specific configuration.
+ */
 const createContextTemplate = (configFn) => {
     return () => {
         return createContext(configFn);
     };
 };
+/**
+ * REQURIED PROPERTY:
+ * - contextName
+ */
 const createContext = (configFn) => {
-    let config = configFn(ENV$1);
+    let config = configFn({});
     const endpointContextRef = new EndpointContext(config, configFn);
     const res = {
         //#region types