taon 19.0.49 → 19.0.50

package/browser/fesm2022/taon.mjs

@@ -1511,6 +1511,15 @@ class RealtimeClient {
             realtime: this.core.pathFor(Symbols.REALTIME.NAMESPACE(this.core.ctx.contextName)),
         };
         // console.log('[browser] nspPath', nspPath);
+        if (this.core.ctx.config.frontendHost &&
+            this.core.ctx.config.frontendHost !== '') {
+            console.log(`[${this.core.ctx.contextName}] USING FRONTEND HOST ${this.core.ctx.config.frontendHost}`);
+            nspPath.global = new URL(`${this.core.ctx.frontendHostUri.origin}${nspPath.global.pathname}`);
+            nspPath.realtime = new URL(`${this.core.ctx.frontendHostUri.origin}${nspPath.realtime.pathname}`);
+        }
+        else {
+            console.log(`[${this.core.ctx.contextName}] NOT USING FRONTEND HOST`);
+        }
         this.core.ctx.logRealtime &&
             console.info('[CLIENT] NAMESPACE GLOBAL ', nspPath.global.href + ` host: ${this.core.ctx.host}`);
         this.core.ctx.logRealtime &&
@@ -1837,10 +1846,6 @@ class RealtimeServer {
         /* */
         /* */
         /* */
-        /* */
-        /* */
-        /* */
-        /* */
     }
     //#endregion
     //#region methods & getters / trigger changes
@@ -2697,9 +2702,6 @@ class EndpointContext {
         }
         return this.config?.logs === true;
     }
-    //#endregion
-    //#endregion
-    //#region constructor
     constructor(originalConfig, configFn) {
         this.originalConfig = originalConfig;
         this.configFn = configFn;
@@ -2773,6 +2775,13 @@ class EndpointContext {
         //#region fields / entities triggers
         this.entitiesTriggers = {};
         //#endregion
+        //#endregion
+        //#region constructor
+        /**
+         * Inside docker there is not need for https secure server
+         */
+        this.isRunningInsideDocker = false;
+        //#endregion
         //#region methods & getters / clone class
         this.cloneClassWithNewMetadata = ({ BaseClass, className, config, ctx, classType, }) => {
             // Return a new class that extends the base class
@@ -2868,6 +2877,7 @@ class EndpointContext {
             }
             return classes;
         };
+        this.isRunningInsideDocker = UtilsOs.isRunningInDocker();
     }
     //#endregion
     //#region methods & getters / init
@@ -3089,6 +3099,14 @@ class EndpointContext {
                 /* */
                 /* */
                 /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
             }
             //#endregion
             //#region prepare realtime
@@ -3132,7 +3150,7 @@ class EndpointContext {
             console.log(`
 
 
-         IS RUNNING IN DOCKER: ${UtilsOs.isRunningInDocker()}
+         IS RUNNING IN DOCKER: ${this.isRunningInsideDocker}
 
     `);
         /* */
@@ -3619,6 +3637,13 @@ class EndpointContext {
     }
     //#endregion
     //#region methods & getters / uri
+    get frontendHostUri() {
+        const url = this.config?.frontendHost?.startsWith('http')
+            ? this.config.frontendHost
+            : `${globalThis?.location?.protocol || 'http:'}//${this.config?.frontendHost}`;
+        const uri = new URL(url.replace(/\/$/, ''));
+        return uri;
+    }
     get uri() {
         const url = this.host
             ? new URL(this.host)
@@ -3629,6 +3654,9 @@ class EndpointContext {
     }
     //#endregion
     get uriPort() {
+        if (!this.uri?.origin?.includes('localhost')) {
+            return this.config?.hostPortNumber?.toString();
+        }
         return this.uri?.port;
     }
     get uriProtocol() {
@@ -3685,6 +3713,9 @@ class EndpointContext {
         return this.config.contextName;
     }
     //#endregion
+    get activeContext() {
+        return this.config.activeContext || null;
+    }
     get appId() {
         return this.config.appId;
     }
@@ -3964,8 +3995,13 @@ class EndpointContext {
                 const methodConfig = classConfig.methods[methodName];
                 // debugger
                 const type = methodConfig.type;
+                // this is quick fix - in docker global path should not be used
+                const globalPathPart = this.isRunningInsideDocker ||
+                    !this.frontendHostUri?.origin?.includes('localhost') // fe with domain -> is in docker
+                    ? `${this.uriPathnameOrNothingIfRoot.replace(/\/$/, '')}/${apiPrefix}/${this.contextName}`.replace(/\/\//, '/')
+                    : '';
                 const expressPath = methodConfig.global
-                    ? `/${methodConfig.path?.replace(/\//, '')}`
+                    ? `${globalPathPart}/${methodConfig.path?.replace(/\/$/, '')}`.replace(/\/\//, '/')
                     : TaonHelpers.getExpressPath(classConfig, methodConfig);
                 // console.log({ expressPath });
                 if (Helpers.isNode || Helpers.isWebSQL) {
@@ -4866,6 +4902,11 @@ const createContextTemplate = (configFn) => {
  */
 const createContext = (configFn) => {
     let config = configFn({});
+    // console.log(
+    //   `
+    //   [Taon] Creating context ${config.contextName}...`,
+    //   {config},
+    // );
     const endpointContextRef = new EndpointContext(config, configFn);
     const res = {
         //#region types
@@ -4966,6 +5007,16 @@ const createContext = (configFn) => {
             return await new Promise(async (resolve, reject) => {
                 //#region init in set timeout
                 setTimeout(async () => {
+                    if (UtilsOs.isRunningInDocker()) {
+                        const activeContext = config?.activeContext || null;
+                        if (_.isString(activeContext) &&
+                            activeContext !== '' &&
+                            activeContext !== config?.contextName) {
+                            console.warn(`[taon] Context ${endpointContextRef.contextName} is not active context, skipping initialization.`);
+                            resolve(endpointContextRef);
+                            return;
+                        }
+                    }
                     await endpointContextRef.init({
                         ...overrideOptions,
                     });