@nu-art/build-and-install 0.204.100 → 0.204.102

package/build-and-install.js

@@ -5,7 +5,7 @@ const params_1 = require("./core/params/params");
 const PhaseRunner_1 = require("./v2/phase-runner/PhaseRunner");
 const thunderstorm_1 = require("./v2/unit/thunderstorm");
 ts_common_1.DebugFlag.DefaultLogLevel = params_1.RuntimeParams.debug ? ts_common_1.LogLevel.Debug : ts_common_1.LogLevel.Info;
-const runner = new PhaseRunner_1.PhaseRunner('./.config/project-config-v2.ts');
+const runner = new PhaseRunner_1.PhaseRunner('./.config/project-config.ts');
 if (params_1.RuntimeParams.runWithThunderstorm)
     runner.registerUnits(thunderstorm_1.allTSUnits);
 runner

package/defaults/.firebase_config/database.rules.json

@@ -1,7 +1,20 @@
 {
   "rules": {
     ".read": false,
-    ".write": false
+    ".write": false,
+    "state": {
+      "ModuleBE_SyncManager": {
+        "syncData": {
+          ".read": true,
+          ".write": false
+        }
+      },
+      "ModuleBE_FocusedObject": {
+        "focusedData": {
+          ".read": true,
+          ".write": false
+        }
+      }
+    }
   }
-}
-  
+}

package/defaults/backend-proxy/proxy._ts

@@ -16,20 +16,24 @@ _express.all('*', (req, res) => {
 
 	console.log(`PROXY ${counter} - [${req.method}] ${url}`);
 
+	const handleError = (error: any) => {
+		console.log(`ERROR calling: ${url}`, error);
+	};
+
 	try {
 		let reqContent;
 		if (req.method === 'POST') {
-			reqContent = request.post({uri: url, body: req.body});
+			reqContent = request.post({uri: url, body: req.body}, handleError);
 		} else if (req.method === 'PUT') {
-			reqContent = request.put({uri: url, body: req.body});
+			reqContent = request.put({uri: url, body: req.body}, handleError);
 		} else if (req.method === 'GET') {
-			reqContent = request.get(url);
+			reqContent = request.get(url, handleError);
 		} else if (req.method === 'DELETE') {
-			reqContent = request.delete(url);
+			reqContent = request.delete(url, handleError);
 		} else if (req.method === 'HEAD') {
-			reqContent = request.head(url);
+			reqContent = request.head(url, handleError);
 		} else {
-			reqContent = request(url);
+			reqContent = request(url, handleError);
 		}
 
 		req.pipe(reqContent).pipe(res, {end: true});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.204.100",
+  "version": "0.204.102",
   "description": "",
   "keywords": [
     "TacB0sS",

package/v2/phase-runner/PhaseRunner.js

@@ -215,10 +215,15 @@ class PhaseRunner extends core_1.BaseUnit {
     }
     async executeImpl() {
         for (const phase of this.phases) {
-            const phaseDidRun = await this.executePhase(phase);
-            //If phase is terminating
-            if (phaseDidRun && phase.terminateAfterPhase)
-                break;
+            try {
+                const phaseDidRun = await this.executePhase(phase);
+                //If phase is terminating
+                if (phaseDidRun && phase.terminateAfterPhase)
+                    break;
+            }
+            catch (e) {
+                this.logError(`Error running phase: ${phase.name}`, e);
+            }
         }
         this.killed = false;
     }

package/v2/unit/core/Unit_TypescriptLib.js

@@ -69,7 +69,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         if (this.config.customTSConfig) {
             //If ts config file does not exist in the main folder
             if (!fs.existsSync(pathToUnitTSConfig))
-                throw new ts_common_1.BadImplementationException(`Unit ${this.config.label} is set to use a custom tsconfig but is missing a tsconfig.json file in /src/main`);
+                throw new ts_common_1.BadImplementationException(`Unit "${this.config.label}" is set to use a custom tsconfig but is missing a tsconfig.json file in /src/main`);
             return;
         }
         //Copy project ts config file into the unit main folder

package/v2/unit/core/Unit_TypescriptProject.js

@@ -116,7 +116,7 @@ class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
             const onUnitChange = (path) => {
                 const unit = this.findUnit(pathDeclarations, path);
                 // @ts-ignore - FIXME: should be a better way
-                unit.setStatus('dirty');
+                unit.setStatus('Dirty');
                 //add unit to set
                 units.add(unit);
                 return unit;

package/v2/unit/firebase-units/Unit_FirebaseHostingApp.js

@@ -81,21 +81,17 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
             hostname: 'localhost',
             port: this.config.firebaseConfig.basePort + 2,
         };
-        const feConfig = {
-            ModuleFE_Thunderstorm: {
+        const feConfig = Object.assign({ ModuleFE_Thunderstorm: {
                 appName: `${this.config.key} - (${envConfig.env})`
-            },
-            ModuleFE_XHR: {
+            }, ModuleFE_XHR: {
                 origin: envConfig.isLocal ? `https://localhost:${this.config.firebaseConfig.basePort}` : envConfig.backend.url,
                 timeout: envConfig.backend.timeout || 30000,
                 compress: envConfig.backend.compress || false,
                 minLogLevel: envConfig.backend.minLogLevel || false,
-            },
-            ModuleFE_FirebaseListener: {
+            }, ModuleFE_FirebaseListener: {
                 emulatorConfig: envConfig.isLocal ? emulatorConfig : undefined,
                 firebaseConfig: (_a = envConfig.firebase.listener) === null || _a === void 0 ? void 0 : _a.config
-            }
-        };
+            } }, envConfig.otherConfig);
         const targetPath = (0, tools_1.convertToFullPath)(`${this.config.pathToPackage}/src/main/config.ts`);
         const fileContent = `export const config = ${JSON.stringify(feConfig, null, 2)};`;
         await fs_1.promises.writeFile(targetPath, fileContent, { encoding: 'utf-8' });

package/core/package/generate.d.ts

@@ -1,24 +0,0 @@
-import { FirebaseEnvConfig, Package_FirebaseFunctionsApp, Package_FirebaseHostingAndFunctionApp, Package_FirebaseHostingApp } from '../types';
-export declare function createFirebaseHostingConfig<Env extends string>(pkg: Package_FirebaseHostingApp, env: Env): {
-    projects: {
-        default: string;
-    };
-};
-export declare function createFirebaseFunctionConfig<Env extends string>(pkg: Package_FirebaseHostingApp, env: Env): void;
-export declare function createFirebaseRC<Env extends string>(pkg: Package_FirebaseHostingApp | Package_FirebaseFunctionsApp, env: Env): {
-    projects: {
-        default: string;
-    };
-};
-export declare function writeToFile_HostingFirebaseJSON<Env extends string>(pkg: Package_FirebaseHostingApp | Package_FirebaseHostingAndFunctionApp, env: Env): Promise<void>;
-export declare function writeToFile_HostingFirebaseConfigJSON<Env extends string>(pkg: Package_FirebaseHostingApp | Package_FirebaseHostingAndFunctionApp, env: Env): Promise<void>;
-export declare function writeToFile_functionFirebaseConfigJSON<Env extends string>(pkg: Package_FirebaseFunctionsApp | Package_FirebaseHostingAndFunctionApp, env: Env): Promise<void>;
-export declare function writeToFile_FunctionFirebaseJSON<Env extends string>(pkg: Package_FirebaseFunctionsApp | Package_FirebaseHostingAndFunctionApp, env: Env): Promise<void>;
-export declare function createFirebaseFullJSON<Env extends string>(pkg: Package_FirebaseHostingAndFunctionApp, env: Env): {
-    then<TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null | undefined): Promise<void | TResult>;
-    finally(onfinally?: (() => void) | null | undefined): Promise<void>;
-    [Symbol.toStringTag]: string;
-};
-export declare function getEnvConfig(pkg: Package_FirebaseHostingApp | Package_FirebaseFunctionsApp | Package_FirebaseHostingAndFunctionApp): FirebaseEnvConfig<string>;
-export declare function generateProxyFile(firebasePkg: Package_FirebaseHostingApp | Package_FirebaseFunctionsApp, pathToFile: string): Promise<void>;

package/core/package/generate.js

@@ -1,180 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateProxyFile = exports.getEnvConfig = exports.createFirebaseFullJSON = exports.writeToFile_FunctionFirebaseJSON = exports.writeToFile_functionFirebaseConfigJSON = exports.writeToFile_HostingFirebaseConfigJSON = exports.writeToFile_HostingFirebaseJSON = exports.createFirebaseRC = exports.createFirebaseFunctionConfig = exports.createFirebaseHostingConfig = void 0;
-const ts_common_1 = require("@nu-art/ts-common");
-const fs_1 = require("fs");
-const consts_1 = require("../consts");
-const consts_2 = require("../../defaults/consts");
-const params_1 = require("../params/params");
-function createFirebaseHostingConfig(pkg, env) {
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`Could not find env: ${env}`);
-    return {
-        projects: {
-            default: envConfig.projectId,
-        }
-    };
-}
-exports.createFirebaseHostingConfig = createFirebaseHostingConfig;
-function createFirebaseFunctionConfig(pkg, env) {
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`Could not find env: ${env}`);
-    return;
-}
-exports.createFirebaseFunctionConfig = createFirebaseFunctionConfig;
-function createFirebaseRC(pkg, env) {
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`Could not find env: ${env}`);
-    return {
-        projects: {
-            default: envConfig.projectId,
-        }
-    };
-}
-exports.createFirebaseRC = createFirebaseRC;
-function getHostingConfig(pkg, envConfig) {
-    if (envConfig.isLocal)
-        return {};
-    return {
-        hosting: pkg.envConfig.hosting
-    };
-}
-async function writeToFile_HostingFirebaseJSON(pkg, env) {
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`Could not find env: ${env}`);
-    const fileContent = getHostingConfig(pkg, envConfig);
-    await fs_1.promises.writeFile(`${pkg.path}/${consts_1.CONST_FirebaseJSON}`, JSON.stringify(fileContent, null, 2), { encoding: 'utf-8' });
-}
-exports.writeToFile_HostingFirebaseJSON = writeToFile_HostingFirebaseJSON;
-async function writeToFile_HostingFirebaseConfigJSON(pkg, env) {
-    var _a;
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`Could not find env: ${env}`);
-    const emulatorConfig = {
-        hostname: 'localhost',
-        port: pkg.envConfig.basePort + 2,
-    };
-    const feConfig = {
-        ModuleFE_Thunderstorm: {
-            appName: `${pkg.name} - (${env})`
-        },
-        ModuleFE_XHR: {
-            origin: envConfig.isLocal ? `https://localhost:${pkg.envConfig.basePort}` : envConfig.backend.url,
-            timeout: envConfig.backend.timeout || 30000,
-            compress: envConfig.backend.compress || false,
-            minLogLevel: envConfig.backend.minLogLevel || false,
-        },
-        ModuleFE_FirebaseListener: {
-            emulatorConfig: envConfig.isLocal ? emulatorConfig : undefined,
-            firebaseConfig: (_a = envConfig.firebase.listener) === null || _a === void 0 ? void 0 : _a.config
-        }
-    };
-    const fileContent = `export const config = ${JSON.stringify(feConfig, null, 2)};`;
-    await fs_1.promises.writeFile(`${pkg.path}/src/main/config.ts`, fileContent, { encoding: 'utf-8' });
-}
-exports.writeToFile_HostingFirebaseConfigJSON = writeToFile_HostingFirebaseConfigJSON;
-async function writeToFile_functionFirebaseConfigJSON(pkg, env) {
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`Could not find env: ${env}`);
-    const beConfig = {
-        name: envConfig.env
-    };
-    const fileContent = `${envConfig.isLocal ? '// @ts-ignore\nprocess.env[\'NODE_TLS_REJECT_UNAUTHORIZED\'] = 0;\n' : ''}
-export const Environment = ${JSON.stringify(beConfig)};`;
-    await fs_1.promises.writeFile(`${pkg.path}/src/main/config.ts`, fileContent, { encoding: 'utf-8' });
-}
-exports.writeToFile_functionFirebaseConfigJSON = writeToFile_functionFirebaseConfigJSON;
-function getFunctionConfig(pkg, envConfig) {
-    var _a, _b;
-    if (envConfig.isLocal) {
-        const port = pkg.envConfig.basePort;
-        return {
-            database: {
-                rules: `${pkg.envConfig.pathToFirebaseConfig}/database.rules.json`
-            },
-            firestore: {
-                rules: `${pkg.envConfig.pathToFirebaseConfig}/firestore.rules`,
-                indexes: `${pkg.envConfig.pathToFirebaseConfig}/firestore.indexes.json`
-            },
-            storage: {
-                rules: `${pkg.envConfig.pathToFirebaseConfig}/storage.rules`
-            },
-            remoteconfig: {
-                template: `${pkg.envConfig.pathToFirebaseConfig}/remoteconfig.template.json`
-            },
-            functions: {
-                ignore: (_a = pkg.envConfig.functions) === null || _a === void 0 ? void 0 : _a.ignore,
-                source: '.',
-                predeploy: [
-                    'echo "Thunderstorm - Local environment is not deployable... Aborting..." && exit 2'
-                ]
-            },
-            emulators: {
-                functions: { port: port + 1 },
-                database: { port: port + 2 },
-                firestore: {
-                    port: port + 3,
-                    websocketPort: port + 4
-                },
-                pubsub: { port: port + 5 },
-                storage: { port: port + 6 },
-                auth: { port: port + 7 },
-                ui: { port: port + 8, enabled: true },
-                hub: { port: port + 9 },
-                logging: { port: port + 10 }
-            }
-        };
-    }
-    else {
-        return {
-            functions: {
-                source: pkg.output.replace(`${pkg.path}/`, ''),
-                ignore: (_b = pkg.envConfig.functions) === null || _b === void 0 ? void 0 : _b.ignore
-            }
-        };
-    }
-}
-async function writeToFile_FunctionFirebaseJSON(pkg, env) {
-    const envConfig = getEnvConfig(pkg);
-    const fileContent = getFunctionConfig(pkg, envConfig);
-    await fs_1.promises.writeFile(`${pkg.path}/${consts_1.CONST_FirebaseJSON}`, JSON.stringify(fileContent, null, 2), { encoding: 'utf-8' });
-}
-exports.writeToFile_FunctionFirebaseJSON = writeToFile_FunctionFirebaseJSON;
-function createFirebaseFullJSON(pkg, env) {
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`Could not find env: ${env}`);
-    const hosting = writeToFile_HostingFirebaseJSON(pkg, env);
-    const functions = writeToFile_FunctionFirebaseJSON(pkg, env);
-    return Object.assign(Object.assign({}, hosting), functions);
-}
-exports.createFirebaseFullJSON = createFirebaseFullJSON;
-function getEnvConfig(pkg) {
-    const env = params_1.RuntimeParams.environment;
-    const envConfig = pkg.envConfig.envs.find(_env => _env.env === env);
-    if (!envConfig)
-        throw new ts_common_1.BadImplementationException(`No env config for env ${env} in package ${pkg.name}`);
-    return envConfig;
-}
-exports.getEnvConfig = getEnvConfig;
-async function generateProxyFile(firebasePkg, pathToFile) {
-    var _a, _b, _c;
-    const envConfig = getEnvConfig(firebasePkg);
-    const defaultFiles = consts_2.MemKey_DefaultFiles.get();
-    if (!((_a = defaultFiles === null || defaultFiles === void 0 ? void 0 : defaultFiles.backend) === null || _a === void 0 ? void 0 : _a.proxy))
-        return;
-    let fileContent = await fs_1.promises.readFile(defaultFiles.backend.proxy, { encoding: 'utf-8' });
-    fileContent = fileContent.replace(/PROJECT_ID/g, `${envConfig.projectId}`);
-    fileContent = fileContent.replace(/PROXY_PORT/g, `${firebasePkg.envConfig.basePort}`);
-    fileContent = fileContent.replace(/SERVER_PORT/g, `${firebasePkg.envConfig.basePort + 1}`);
-    fileContent = fileContent.replace(/PATH_TO_SSL_KEY/g, `${(_b = firebasePkg.envConfig.ssl) === null || _b === void 0 ? void 0 : _b.pathToKey}`);
-    fileContent = fileContent.replace(/PATH_TO_SSL_CERTIFICATE/g, `${(_c = firebasePkg.envConfig.ssl) === null || _c === void 0 ? void 0 : _c.pathToCertificate}`);
-    await fs_1.promises.writeFile(pathToFile, fileContent, { encoding: 'utf-8' });
-}
-exports.generateProxyFile = generateProxyFile;