@nu-art/build-and-install 0.204.23 → 0.204.24

package/core/package/generate.d.ts

@@ -1,4 +1,4 @@
-import { Package_FirebaseFunctionsApp, Package_FirebaseHostingAndFunctionApp, Package_FirebaseHostingApp } from '../types';
+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;
@@ -20,3 +20,5 @@ export declare function createFirebaseFullJSON<Env extends string>(pkg: Package_
     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,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFirebaseFullJSON = exports.writeToFile_FunctionFirebaseJSON = exports.writeToFile_functionFirebaseConfigJSON = exports.writeToFile_HostingFirebaseConfigJSON = exports.writeToFile_HostingFirebaseJSON = exports.createFirebaseRC = exports.createFirebaseFunctionConfig = exports.createFirebaseHostingConfig = void 0;
+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)
@@ -62,7 +64,7 @@ async function writeToFile_HostingFirebaseConfigJSON(pkg, env) {
             appName: `${pkg.name} - (${env})`
         },
         ModuleFE_XHR: {
-            origin: envConfig.isLocal ? `https://localhost:${pkg.envConfig.basePort + 1}` : envConfig.backend.url,
+            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,
@@ -139,9 +141,7 @@ function getFunctionConfig(pkg, envConfig) {
     }
 }
 async function writeToFile_FunctionFirebaseJSON(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 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' });
 }
@@ -155,3 +155,24 @@ function createFirebaseFullJSON(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;
+    const envConfig = getEnvConfig(firebasePkg);
+    const defaultFiles = consts_2.MemKey_DefaultFiles.get();
+    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, `${(_a = firebasePkg.envConfig.ssl) === null || _a === void 0 ? void 0 : _a.pathToKey}`);
+    fileContent = fileContent.replace(/PATH_TO_SSL_CERTIFICATE/g, `${(_b = firebasePkg.envConfig.ssl) === null || _b === void 0 ? void 0 : _b.pathToCertificate}`);
+    await fs_1.promises.writeFile(pathToFile, fileContent, { encoding: 'utf-8' });
+}
+exports.generateProxyFile = generateProxyFile;

package/core/types/package/package.d.ts

@@ -38,6 +38,7 @@ export type FirebasePackageConfig<Env extends string = string> = {
     name: string;
     debugPort: number;
     basePort: number;
+    hostingPort?: number;
     pathToFirebaseConfig: string;
     ssl?: {
         pathToKey: string;

package/defaults/backend-proxy/proxy._ts

@@ -10,9 +10,9 @@ _express.all('*', (req, res) => {
 	const qMark = req.originalUrl.indexOf('?');
 	const query = qMark > 1 ? req.originalUrl.substring(qMark) : '';
 	const path = req.path;
-	let url = `http://127.0.0.1:SERVER_PORT/shopify-manager-tool-dev/us-central1/api${path}${query}`;
+	let url = `http://127.0.0.1:SERVER_PORT/PROJECT_ID/us-central1/api${path}${query}`;
 	if (path.startsWith('/emulatorDownload') || path.startsWith('/emulatorUpload'))
-		url = `http://127.0.0.1:SERVER_PORT/shopify-manager-tool-dev/us-central1${path}${query}`;
+		url = `http://127.0.0.1:SERVER_PORT/PROJECT_ID/us-central1${path}${query}`;
 
 	console.log(`PROXY ${counter} - [${req.method}] ${url}`);
 
@@ -60,5 +60,5 @@ const options = {
 	requestCert: false,
 };
 
-require('https').createServer(options, _express).listen(8008);
+require('https').createServer(options, _express).listen(PROXY_PORT);
 console.log('SSL proxy started!!!');

package/package.json

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

package/phases/phases.js

@@ -177,7 +177,6 @@ exports.Phase_ResolveEnv = {
     mandatoryPhases: [exports.Phase_ResolveTemplate, exports.Phase_PrepareParams, exports.Phase_SetupProject, exports.Phase_SetWithThunderstorm],
     filter: async (pkg) => pkg.type === 'firebase-functions-app' || pkg.type === 'firebase-hosting-app',
     action: async (pkg) => {
-        var _a, _b;
         const firebasePkg = pkg;
         await fs_1.promises.writeFile(`${firebasePkg.path}/${consts_1.CONST_FirebaseRC}`, JSON.stringify((0, generate_1.createFirebaseRC)(firebasePkg, params_1.RuntimeParams.environment), null, 2), { encoding: 'utf-8' });
         const defaultFiles = consts_2.MemKey_DefaultFiles.get();
@@ -196,14 +195,8 @@ exports.Phase_ResolveEnv = {
             catch (e) {
                 await fs_1.promises.mkdir(pathToFirebaseConfigFolder, { recursive: true });
             }
-            if (firebasePkg.envConfig.ssl) {
-                const pathToProxyFile = `${firebaseFunctionPkg.path}/src/main/proxy.ts`;
-                let defaultFileContent = await fs_1.promises.readFile(defaultFiles.backend.proxy, { encoding: 'utf-8' });
-                defaultFileContent = defaultFileContent.replace(/SERVER_PORT/g, `${firebasePkg.envConfig.basePort}`);
-                defaultFileContent = defaultFileContent.replace(/PATH_TO_SSL_KEY/g, `${(_a = firebasePkg.envConfig.ssl) === null || _a === void 0 ? void 0 : _a.pathToKey}`);
-                defaultFileContent = defaultFileContent.replace(/PATH_TO_SSL_CERTIFICATE/g, `${(_b = firebasePkg.envConfig.ssl) === null || _b === void 0 ? void 0 : _b.pathToCertificate}`);
-                await fs_1.promises.writeFile(pathToProxyFile, defaultFileContent, { encoding: 'utf-8' });
-            }
+            if (firebasePkg.envConfig.ssl)
+                await (0, generate_1.generateProxyFile)(firebasePkg, `${firebaseFunctionPkg.path}/src/main/proxy.ts`);
             await Promise.all(consts_2.Const_FirebaseConfigKeys.map(async (firebaseConfigKey) => {
                 const pathToConfigFile = `${pathToFirebaseConfigFolder}/${consts_2.Const_FirebaseDefaultsKeyToFile[firebaseConfigKey]}`;
                 try {
@@ -633,10 +626,12 @@ exports.Phase_Launch = {
         }
         if (pkg.type === 'firebase-hosting-app') {
             runningAppsLogs.registerApp(pkg.name, logClient);
+            if (!pkg.envConfig.hostingPort)
+                throw new ts_common_1.BadImplementationException('Missing hosting port in envConfig');
             return nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
                 .setUID(pkg.name)
                 .cd(pkg.path)
-                .append(`array=($(lsof -ti:${[pkg.envConfig.basePort - 1].join(',')}))`)
+                .append(`array=($(lsof -ti:${[pkg.envConfig.hostingPort].join(',')}))`)
                 .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
                 .append(`nvm use`)
                 .append(`npm run start`)