create-dacosta-proj 1.0.26 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dacosta-proj",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "bin": {
     "create-dacosta-proj": "./index.js"
   }

package/template/.deploy/restart.js

@@ -26,6 +26,7 @@ const targets = new Array(servers).fill().map((_, server) => {
 		password: process.env[`DEPLOY_${server+1}_PASSWORD`],
 		path: process.env[`DEPLOY_${server+1}_PATH`],
 		src: process.env[`DEPLOY_${server+1}_PM2_SRC`],
+		nodejs: process.env[`DEPLOY_${server+1}_NODEJS`],
 		pm2,
 	};
 });
@@ -74,8 +75,15 @@ async function restartOn(server) {
 				console.error(`  ✗ ${name} — ${result.stderr || result.stdout}`);
 			}
 		} else {
+
+			if (server.nodejs) {
+				const node = await ssh.execCommand(withNvm(`nvm ls ${server.nodejs} > /dev/null 2>&1 || nvm install ${server.nodejs}`));
+				if (node.code === 0) console.log(`  ✓ node ${server.nodejs}`);
+				else console.error(`  ✗ node ${server.nodejs} — ${node.stderr || node.stdout}`);
+			}
+
 			const result = await ssh.execCommand(
-				withNvm(`${args ? `${args} ` : ''}pm2 start ${server.src} --name "${name}" --log-date-format "YYYY-MM-DD HH:mm"`),
+				withNvm(`${server.nodejs ? `nvm use ${server.nodejs} && ` : ''}${args ? `${args} ` : ''}pm2 start ${server.src} --name "${name}" --log-date-format "YYYY-MM-DD HH:mm" --interpreter $(which node)`),
 				{ cwd: server.path }
 			);
 			if (result.code === 0) {

package/template/.env.template

@@ -14,6 +14,7 @@ DEPLOY_1_PM2_SRC=src/index.js
 DEPLOY_1_PM2_ARGS= # Optional
 # EXAMPLE 1: DEPLOY_1_PM2_ARGS=PROJECT_INSTANCE_ID=1 PROJECT_INSTANCE_TYPE=video
 # EXAMPLE 2: DEPLOY_1_PM2_ARGS=PROJECT_INSTANCE_ID=1 PROJECT_INSTANCE_TYPE=video;PROJECT_INSTANCE_ID=1 PROJECT_INSTANCE_TYPE=live
+DEPLOY_1_NODEJS=22.22.3
 
 # Supabase
 

package/template/src/helpers/loadGlobals.js

@@ -6,6 +6,7 @@ const { SimpleSupabase } = require('simple-supabase');
 const { createClient: createSupabaseClient } = require('@supabase/supabase-js');
 const { createClient: createRedisClient } = require('redis');
 const redisLock = require('@/helpers/redisLock');
+const wait = require('./wait');
 
 module.exports = async () => {
 
@@ -27,7 +28,17 @@ module.exports = async () => {
 	// Redis
 
 	const redis = createRedisClient();
-	await redis.connect();
+	try {
+		await redis.connect();
+		while (true) {
+			try { await redis.ping(); break; }
+			catch (err) {
+				if (!err?.message?.includes('LOADING')) throw err;
+				await wait(500);
+			}
+		}
+	}
+	catch (err) { console.log('Redis Failed', err); return; }
 
 	global.redis = redis;
 	global.redisLock = redisLock(redis);