create-dacosta-proj 1.0.27 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-dacosta-proj",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "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/config/global.js

@@ -3,7 +3,6 @@
  * db: import('simple-supabase').DB | null,
  * supabase: import('@supabase/supabase-js').SupabaseClient | null,
  * redis: import('redis').RedisClientType | null,
- * redisLock: ((lockName: string, timeout?: number) => Promise<() => Promise<void>>) | null,
  * }}
 */
 
@@ -11,6 +10,5 @@ const global = {
 	db: null,
 	supabase: null,
 	redis: null,
-	redisLock: null,
 };
 module.exports = { global };

package/template/src/helpers/loadGlobals.js

@@ -5,7 +5,6 @@ const { global } = require('@/config/global');
 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 () => {
@@ -17,7 +16,7 @@ module.exports = async () => {
 
 	let db = await SimpleSupabase({
 		credentials: { projectUrl, serviceKey },
-		redisPrefix: process.env.PROJECT_ID
+		redisPrefix: `${process.env.PROJECT_ID}${dev ? '_dev' : ''}`
 	});
 
 	const supabase = createSupabaseClient(projectUrl, serviceKey, { auth: { persistSession: false } });
@@ -41,5 +40,4 @@ module.exports = async () => {
 	catch (err) { console.log('Redis Failed', err); return; }
 
 	global.redis = redis;
-	global.redisLock = redisLock(redis);
 };

package/template/src/helpers/redisLock.js

@@ -1,39 +0,0 @@
-'use strict';
-
-const crypto = require('crypto');
-
-const DEFAULT_TIMEOUT = 5_000;
-const DEFAULT_RETRY_DELAY = 50;
-const DEFAULT_WAIT_TIMEOUT = 30_000;
-
-// Atomic compare-and-delete so we only release a lock we still hold.
-// Without this, an expired lock that another caller already re-acquired
-// would be deleted by our release(), letting a third caller acquire it
-// while the second is still inside its critical section.
-const RELEASE_SCRIPT = 'if redis.call("GET", KEYS[1]) == ARGV[1] then return redis.call("DEL", KEYS[1]) else return 0 end';
-
-function redisLock(client, retryDelay = DEFAULT_RETRY_DELAY) {
-	async function lock(lockName, timeout = DEFAULT_TIMEOUT, waitTimeout = DEFAULT_WAIT_TIMEOUT) {
-		const lockKey = `lock.${lockName}`;
-		const token = crypto.randomBytes(16).toString('hex');
-		const deadline = Date.now() + waitTimeout;
-		let released = false;
-
-		while (true) {
-			const result = await client.set(lockKey, token, { PX: timeout, NX: true });
-			if (result !== null) {
-				return async () => {
-					if (released) return;
-					released = true;
-					try { await client.sendCommand(['EVAL', RELEASE_SCRIPT, '1', lockKey, token]); }
-					catch {}
-				};
-			}
-			if (Date.now() >= deadline) throw new Error(`redisLock: timed out waiting for "${lockName}" after ${waitTimeout}ms`);
-			await new Promise(r => setTimeout(r, retryDelay));
-		}
-	}
-	return lock;
-}
-
-module.exports = redisLock;