ramm 0.0.47 → 0.0.49

package/dist/bun.sh

@@ -2,6 +2,10 @@
 
 if ! command -v unzip &> /dev/null; then
   . /etc/os-release
+
+  if [[ "$ID_LIKE" == *"rhel"* ]]; then
+    sudo dnf install -y unzip
+  fi
   
   if [[ "$ID" == "ubuntu" ]]; then
     sudo apt update
@@ -10,10 +14,10 @@ if ! command -v unzip &> /dev/null; then
 fi
 
 if ! command -v bun &> /dev/null; then
-    echo "Installing..."
+    echo "Installing bun..."
     
     curl -fsSL https://bun.sh/install | bash
     ln -s "$HOME/.bun/bin/bun" /usr/local/bin/bun
 else
-    echo "Already installed."
+    echo "Already installed bun."
 fi

package/dist/ramm.js

@@ -81,8 +81,9 @@ var defaultContext = new Context({
   userspace: false,
   sudo: false
 });
-var execCommandRaw = async (command, { store = {}, signal, env, cwd, prefix = "" } = {}) => {
-  const spawnResult = spawn(["bash", "-c", command], {
+var execCommandRaw = async (command, { store = {}, signal, env, cwd, prefix = "" } = {}, ctx) => {
+  const finalCommand = ctx?.sudo ? `sudo ${command}` : command;
+  const spawnResult = spawn(["bash", "-c", finalCommand], {
     stdin: "inherit",
     stdout: "pipe",
     stderr: "pipe",
@@ -106,7 +107,7 @@ var execCommandMayError = async (command, props) => {
   printCommand(command);
   return execCommandRaw(command, props);
 };
-var execCommand = async (command, props) => {
+var execCommand = async (command, props, context) => {
   const result = await execCommandMayError(command, props);
   if (result.spawnResult.exitCode !== 0) {
     console.error(`Error exit code: ${result.spawnResult.exitCode}`);
@@ -133,10 +134,19 @@ var {$: $2 } = globalThis.Bun;
 
 // src/packages.ts
 var {$ } = globalThis.Bun;
-var installSystemPackage = async (packageName) => {
+var dnf_os = ["rocky", "fedora", "alma"];
+var installSystemPackage = async (packageName, context) => {
   const osName = (await $`cat /etc/os-release | grep ^ID= | cut -d'=' -f2`.text()).trim();
+  const checkWhich = await $`which ${packageName}`;
+  if (checkWhich.exitCode !== 0) {
+    return;
+  }
   if (osName === "ubuntu") {
-    await execCommandMayError(`apt-get install -y ${packageName}`);
+    await execCommand(`apt-get install -y ${packageName}`, {}, context);
+  } else if (dnf_os.includes(osName)) {
+    await execCommand(`dnf install -y ${packageName}`, {}, context);
+  } else {
+    throw new Error(`Unsupported OS: ${osName}`);
   }
 };
 
@@ -300,6 +310,7 @@ var setupNftable = async ({
   allowedIpV4,
   allowedPorts
 }) => {
+  await installSystemPackage("nftables");
   const listTable = await execCommandMayError("nft list table inet ramm");
   if (listTable.spawnResult.exitCode === 0) {
     await execCommand("nft delete table inet ramm");

package/dist/types/base/base.d.ts

@@ -11,7 +11,7 @@ type ExecProps = {
     prefix?: string;
     signal?: AbortSignal;
 } | void;
-export declare const execCommandRaw: (command: string, { store, signal, env, cwd, prefix }?: ExecProps) => Promise<{
+export declare const execCommandRaw: (command: string, { store, signal, env, cwd, prefix }?: ExecProps, ctx?: Context) => Promise<{
     stderr: string;
     stdout: string;
     spawnResult: Subprocess<"inherit", "pipe", "pipe">;
@@ -21,7 +21,7 @@ export declare const execCommandMayError: (command: string, props: ExecProps) =>
     stdout: string;
     spawnResult: Subprocess<"inherit", "pipe", "pipe">;
 }>;
-export declare const execCommand: (command: string, props: ExecProps) => Promise<{
+export declare const execCommand: (command: string, props: ExecProps, context?: Context) => Promise<{
     stderr: string;
     stdout: string;
     spawnResult: Subprocess<"inherit", "pipe", "pipe">;

package/dist/types/packages.d.ts

@@ -1 +1,2 @@
-export declare const installSystemPackage: (packageName: string) => Promise<void>;
+import type { Context } from "./context.ts";
+export declare const installSystemPackage: (packageName: string, context?: Context) => Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ramm",
   "type": "module",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "scripts": {
     "build": "bun build ./src/ramm.ts --target bun --outdir ./dist && cp ./src/bun.sh ./dist/bun.sh",
     "types": "tsc --project tsconfig.types.json"