@nu-art/build-and-install 0.204.10 → 0.204.12

package/logic/ProjectManager.js

@@ -250,7 +250,6 @@ class ProjectManager extends ts_common_1.Logger {
             catch (e) {
                 this.logError(e);
             }
-            ProjectScreen_1.MemKey_ProjectScreen.get().endRun();
             process.off('SIGINT', listener);
             await this.updateRunningStatus();
         });

package/package.json

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

package/phases/phases.js

@@ -48,6 +48,7 @@ const CONST_ProjectVersionKey = 'APP_VERSION';
 const CONST_ProjectDependencyKey = 'APP_VERSION_DEPENDENCY';
 const CONST_TS_Config = `tsconfig.json`;
 const CONST_RunningRoot = process.cwd();
+const CONST_VersionApp = 'version-app.json';
 const pathToProjectTS_Config = (0, tools_1.convertToFullPath)(`./.config/${CONST_TS_Config}`);
 const pathToProjectEslint = (0, tools_1.convertToFullPath)('./.config/.eslintrc.js');
 const runInDebug = false;
@@ -387,11 +388,12 @@ exports.Phase_PrepareCompile = {
         compileActions[sourceFolder] = async () => {
             const pathToLocalTsConfig = `${sourceFolder}/${CONST_TS_Config}`;
             projectScreen.updateOrCreatePackage(pkg.name, 'Compiling');
+            const counter = timeCounter();
             const commando = nvm_1.NVM.createCommando();
             await commando
                 .append(`tsc -p "${pathToLocalTsConfig}" --rootDir "${sourceFolder}" --outDir "${pkg.output}"`)
                 .execute();
-            projectScreen.updateOrCreatePackage(pkg.name, 'Compiled');
+            projectScreen.updateOrCreatePackage(pkg.name, `Compiled (${counter.format('mm:ss.zzz')})`);
         };
     }
 };
@@ -425,6 +427,7 @@ exports.Phase_Compile = {
             return;
         try {
             const otherFiles = [
+                'json',
                 'scss',
                 'svg',
                 'png',
@@ -444,6 +447,9 @@ exports.Phase_Compile = {
         const folder = 'main';
         const sourceFolder = `${pkg.path}/src/${folder}`;
         const pathToLocalTsConfig = `${sourceFolder}/${CONST_TS_Config}`;
+        const pathToVersionAppJSON = `${CONST_RunningRoot}/${CONST_VersionApp}`;
+        //copy version-app.json file
+        const versionAppJSON = await fs_1.promises.readFile(pathToVersionAppJSON, { encoding: 'utf-8' });
         // only read if exists
         let inPackageTsConfig = '';
         if (fs.existsSync(pathToLocalTsConfig))
@@ -455,7 +461,9 @@ exports.Phase_Compile = {
         }
         // --- HERE ---
         await fs_1.promises.writeFile(`${pkg.output}/${consts_1.CONST_PackageJSON}`, JSON.stringify(pkg.packageJsonOutput, null, 2), { encoding: 'utf-8' });
-        if (pkg.type == 'firebase-functions-app') {
+        if (pkg.type === types_1.PackageType_FirebaseFunctionsApp || pkg.type === types_1.PackageType_FirebaseHostingApp)
+            await fs_1.promises.writeFile(`${sourceFolder}/${CONST_VersionApp}`, versionAppJSON, { encoding: 'utf-8' });
+        if (pkg.type === 'firebase-functions-app') {
             pkg.packageJsonRuntime.main = pkg.packageJsonRuntime.main.replace('dist/', '');
             pkg.packageJsonRuntime.types = pkg.packageJsonRuntime.types.replace('dist/', '');
             await fs_1.promises.writeFile(`${pkg.output}/${consts_1.CONST_PackageJSON}`, JSON.stringify(pkg.packageJsonRuntime, null, 2), { encoding: 'utf-8' });
@@ -579,17 +587,15 @@ exports.Phase_Launch = {
     filter: async (pkg) => { var _a; return !!((_a = pkg.name.match(new RegExp(params_1.RuntimeParams.launch))) === null || _a === void 0 ? void 0 : _a[0]) && (pkg.type === 'firebase-functions-app' || pkg.type === 'firebase-hosting-app'); },
     action: async (pkg) => {
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
-        projectScreen.updateOrCreatePackage(pkg.name, 'Deploying Application');
+        projectScreen.updateOrCreatePackage(pkg.name, 'Launching...');
         if (pkg.type === 'firebase-functions-app') {
             await (0, ts_common_1.sleep)(1000 * counter++);
             const allPorts = Array.from({ length: 10 }, (_, i) => `${pkg.envConfig.basePort + i}`);
             const command = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
-                .cd(pkg.path).debug()
+                .cd(pkg.path)
                 .append(`nvm use`)
-                .append(`echo RUNNING PACKAGE1 ${pkg.name}`)
                 .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
-                .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
-                .append(`echo RUNNING PACKAGE2 ${pkg.name}`);
+                .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`);
             command.append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''}`);
             return command
                 .execute();
@@ -597,11 +603,12 @@ exports.Phase_Launch = {
         if (pkg.type === 'firebase-hosting-app')
             return nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
                 .cd(pkg.path)
+                .append(`array=($(lsof -ti:${[pkg.envConfig.basePort - 1].join(',')}))`)
+                .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
                 .append(`nvm use`)
-                .append(`pwd`)
                 .append(`npm run start`)
                 .execute();
-        projectScreen.updateOrCreatePackage(pkg.name, 'Application Deployed');
+        projectScreen.updateOrCreatePackage(pkg.name, 'Died');
     }
 };
 exports.Phase_DeployFrontend = {
@@ -617,12 +624,13 @@ exports.Phase_DeployFrontend = {
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
         if (pkg.type !== 'firebase-hosting-app')
             throw new ts_common_1.BadImplementationException(`Somehow got a non firebase hosting package here: ${(0, ts_common_1.__stringify)(pkg)}`);
-        projectScreen.updateOrCreatePackage(pkg.name, 'Deploying Hosting');
+        projectScreen.updateOrCreatePackage(pkg.name, 'Deploying');
+        const counter = timeCounter();
         await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
             .cd(pkg.path)
             .append(`firebase deploy --only hosting`)
             .execute();
-        projectScreen.updateOrCreatePackage(pkg.name, 'Hosting Deployed');
+        projectScreen.updateOrCreatePackage(pkg.name, `Deployed (${counter.format('mm:ss.zzz')})`);
     }
 };
 exports.Phase_DeployBackend = {
@@ -635,11 +643,33 @@ exports.Phase_DeployBackend = {
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
         if (pkg.type !== 'firebase-functions-app')
             throw new ts_common_1.BadImplementationException(`Somehow got a non firebase functions package here: ${(0, ts_common_1.__stringify)(pkg)}`);
-        projectScreen.updateOrCreatePackage(pkg.name, 'Deploying Functions');
+        projectScreen.updateOrCreatePackage(pkg.name, 'Deploying...');
+        const counter = timeCounter();
         await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
             .cd(pkg.path)
             .append(`firebase --debug deploy --only functions --force`)
             .execute();
-        projectScreen.updateOrCreatePackage(pkg.name, 'Functions Deployed');
+        projectScreen.updateOrCreatePackage(pkg.name, `Deployed (${counter.format('mm:ss.zzz')})`);
     }
 };
+function timeCounter() {
+    const started = (0, ts_common_1.currentTimeMillis)();
+    return {
+        dt: () => (0, ts_common_1.currentTimeMillis)() - started,
+        format: (format) => {
+            let dt = (0, ts_common_1.currentTimeMillis)() - started;
+            const hours = Math.floor(dt / ts_common_1.Hour);
+            dt -= hours * ts_common_1.Hour;
+            const minutes = Math.floor(dt / ts_common_1.Minute);
+            dt -= minutes * ts_common_1.Minute;
+            const seconds = Math.floor(dt / ts_common_1.Second);
+            dt -= seconds * ts_common_1.Second;
+            const millis = dt;
+            return format
+                .replace('hh', String(hours).padStart(2, '0'))
+                .replace('mm', String(minutes).padStart(2, '0'))
+                .replace('ss', String(seconds).padStart(2, '0'))
+                .replace('zzz', String(millis).padStart(3, '0'));
+        }
+    };
+}