From 78a55768cb55f34b61d779e2171120f3520cae7f Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Mon, 9 Sep 2024 18:51:34 +0000
Subject: [PATCH] upate bootloader

---
 packages/server/.gitignore   | 41 ++++++++++++++++++++++++++++++++++++
 packages/server/boot         | 11 +++++++---
 packages/server/package.json | 11 ++--------
 3 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100755 packages/server/.gitignore

diff --git a/packages/server/.gitignore b/packages/server/.gitignore
new file mode 100755
index 00000000..ba52c6c4
--- /dev/null
+++ b/packages/server/.gitignore
@@ -0,0 +1,41 @@
+# Secrets
+/**/**/.env
+/**/**/origin.server
+/**/**/server.manifest
+/**/**/server.registry
+
+/**/**/_shared
+
+# Trash
+/**/**/*.log
+/**/**/dumps.log
+/**/**/.crash.log
+/**/**/.tmp
+/**/**/.cache
+/**/**/cache
+/**/**/out
+/**/**/.out
+/**/**/dist
+/**/**/node_modules
+/**/**/corenode_modules
+/**/**/.DS_Store
+/**/**/package-lock.json
+/**/**/yarn.lock
+/**/**/.evite
+/**/**/uploads
+/**/**/d_data
+/**/**/redis_data
+/**/**/*.tar
+/**/**/*.7z
+/**/**/*.zip
+/**/**/*.env
+
+# Logs
+/**/**/npm-debug.log*
+/**/**/yarn-error.log
+/**/**/dumps.log
+/**/**/corenode.log
+
+# Temporal configurations
+/**/**/.aliaser
+/ssl/
\ No newline at end of file
diff --git a/packages/server/boot b/packages/server/boot
index 50330407..6b80c823 100755
--- a/packages/server/boot
+++ b/packages/server/boot
@@ -107,7 +107,12 @@ async function injectEnvFromInfisical() {
     console.log(`[BOOT] 🔑 Injecting env variables from INFISICAL in [${envMode}] mode...`)
 
     const client = new InfisicalClient({
-        accessToken: process.env.INFISICAL_TOKEN,
+        auth: {
+            universalAuth: {
+                clientId: process.env.INFISICAL_CLIENT_ID,
+                clientSecret: process.env.INFISICAL_CLIENT_SECRET,
+            }
+        },
     })
 
     const secrets = await client.listSecrets({
@@ -130,8 +135,8 @@ async function Boot(main) {
         throw new Error("main class is not defined")
     }
 
-    if (process.env.INFISICAL_TOKEN) {
-        console.log(`[BOOT] INFISICAL_TOKEN found, injecting env variables from INFISICAL...`)
+    if (process.env.INFISICAL_CLIENT_ID && process.env.INFISICAL_CLIENT_SECRET) {
+        console.log(`[BOOT] INFISICAL Credentials found, injecting env variables from INFISICAL...`)
         await injectEnvFromInfisical()
     }
 
diff --git a/packages/server/package.json b/packages/server/package.json
index b110698b..01631115 100755
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,11 +1,10 @@
 {
 	"name": "@comty/server",
-	"version": "0.70.0",
-	"license": "MIT",
+	"version": "1.0.0-beta",
+	"license": "ComtyLicense",
 	"workspaces": [
 		"services/*"
 	],
-	"private": true,
 	"scripts": {
 		"start:prod": "cross-env NODE_ENV=production hermes-node ./index.js",
 		"dev": "cross-env NODE_ENV=development hermes-node ./index.js",
@@ -44,11 +43,5 @@
 	},
 	"resolutions": {
 		"string-width": "4.2.3"
-	},
-	"pkg": {
-		"targets": [
-			"node18-linux-arm64"
-		],
-		"outputPath": "dist"
 	}
 }