@ejfdelgado/ejflab-common 1.5.1 → 1.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-common.git"

package/src/MyConstants.js

@@ -6,9 +6,6 @@ class MyConstants {
     static NO_AUTO_PAGE_NAVITATION = ["/guides", "/assessment"];
     static CLOUD_RUN_URL = "https://mainapp-7b6hvjg6ia-uc.a.run.app/";
     static FIREBASE_CONFIG_FILE = "./credentials/firebase.pro.json";
-    static DOMAIN_ROUTER = {
-        "srv/opencv/solvepnp": MyConstants.CLOUD_RUN_URL
-    };
     static ANONYMOUS_PATHS = ['/uechat', '/call', '/nogales'];
     static BUCKET = {
         URL_BASE: "https://storage.googleapis.com",
@@ -85,18 +82,11 @@ class MyConstants {
         }
     }
     static resolveDomain(path) {
-        if (/https?:\/\//.test(path)) {
+        if (/^https?:\/\//i.test(path)) {
+            // It is a complete route
             return '';
         }
-        if (location.hostname == "localhost") {
-            return MyConstants.SRV_ROOT;
-        }
-        let domain = MyConstants.DOMAIN_ROUTER[path];
-        if (!domain) {
-            return MyConstants.SRV_ROOT;
-        } else {
-            return domain;
-        }
+        return MyConstants.SRV_ROOT;
     }
     //MyConstants.getPublicUrl()
     static getPublicUrl(keyName, addRandom = true) {
@@ -144,4 +134,4 @@ try {
 
 module.exports = {
     MyConstants
-};
+};

package/src/MyUtilities.js

@@ -133,9 +133,13 @@ class MyUtilities {
 
     // MyUtilities.removeRepeatedSlash(
     static removeRepeatedSlash(url) {
-        return url.replace(/^(https?:\/\/)(.*)$/g, (a, b, c) => {
-            return b + c.replace(/[/]{2,}/g, '/');
-        });
+        if (/^https?:/.test(url)) {
+            return url.replace(/^(https?:\/\/)(.*)$/g, (a, b, c) => {
+                return b + c.replace(/[/]{2,}/g, '/');
+            });
+        } else {
+            return url.replace(/[/]{2,}/g, '/');
+        }
     }
 }
 

package/src/changePath.js

@@ -16,6 +16,9 @@ const FILE_PATHS = [
     "./node_modules/@ejfdelgado/ejflab-common/src/MyConstants.js",
     "./node_modules/@ejfdelgado/ejflab-back/node_modules/@ejfdelgado/ejflab-common/src/MyConstants.js"
 ];
+const HTML_PATHS = [
+    `${DIST_DIR}/index.html`
+];
 
 // Search bundle reference
 const fileList = fs.readdirSync(DIST_DIR).filter((fileName) => {
@@ -42,4 +45,24 @@ function changeSimpleFile(filePath) {
 
 for (let i = 0; i < FILE_PATHS.length; i++) {
     changeSimpleFile(FILE_PATHS[i]);
+}
+
+// Change also the html
+function changeHtmlTag(filePath) {
+    console.log(`Modifiying ${filePath}...`);
+    // Read content
+    if (fs.existsSync(filePath)) {
+        let myConstantsContent = fs.readFileSync(filePath, { encoding: "utf8" });
+        // Change content
+        myConstantsContent = myConstantsContent.replaceAll(/(<\s*base\s+href\s*=\s*")[^"]+("\s*>)/ig, `$1${NODE_SERVER_PATH}$2`);
+        // Write content
+        fs.writeFileSync(filePath, myConstantsContent, { encoding: "utf8" });
+        //console.log(myConstantsContent);
+    } else {
+        console.log(`Error ${filePath} dont exists! continue...`);
+    }
+}
+
+for (let i = 0; i < HTML_PATHS.length; i++) {
+    changeHtmlTag(HTML_PATHS[i]);
 }