ramm 0.0.34 → 0.0.36

package/dist/ramm.js

@@ -175,55 +175,6 @@ var createSystemdService = async (context, serviceName, pathToServiceFile) => {
   await execCommand(formatUserspace(context, `sysyemctl start ${serviceName}`));
 };
 
-// src/podman.ts
-var installPodman = async () => {
-  if ((await $2`command -v podman`.nothrow().quiet()).exitCode !== 0) {
-    await installSystemPackage("podman");
-  }
-  await createNetwork();
-};
-var createNetwork = async () => {
-  const netwroks = await execCommand("podman network inspect $(podman network ls -q) -f '{{.NetworkInterface}}'");
-  const podmanNetworks = await execCommand("podman network ls");
-  if (podmanNetworks.stdout.includes("ramm")) {
-    return;
-  }
-  if (netwroks.stdout.includes("podman_ramm")) {
-    return;
-  }
-  await execCommand("podman network create --interface-name=podman_ramm ramm");
-};
-var getCreateCommand = async (name) => {
-  const podmanCreateCommand = await $2`podman inspect --format '{{.Config.CreateCommand}}' ${name}`.nothrow().quiet();
-  return podmanCreateCommand.text().slice(0, -1).slice(1, -1) || "";
-};
-var loginPodman = async (address, login, password) => {
-  return await execCommand(`echo "${password}" | podman login --username "${login}" --password-stdin ${address}`);
-};
-var runPodmanContainer = async (name, command) => {
-  if (await getCreateCommand(name) !== command) {
-    await $2`podman rm -f ${name}`;
-    await execCommand(command);
-    return;
-  }
-  console.info("Podman container is already running");
-};
-var runPodmanContainerService = async (name, command, context = defaultContext) => {
-  const serviceName = getSysyemdServiceName(name);
-  if (await checkSystemdService(context, serviceName)) {
-    await stopSystemdService(context, serviceName);
-  }
-  await runPodmanContainer(name, command);
-  await execCommand(`podman generate systemd --name --new ${name} > ${serviceName}`);
-  await createSystemdService(context, serviceName, serviceName);
-};
-var addNftPodmanRule = async () => {
-  const podmanNetworksResult = await execCommand("podman network inspect $(podman network ls -q) -f '{{.NetworkInterface}}'");
-  const podmanNetworks = podmanNetworksResult.stdout.trim().split(`
-`);
-  await execCommand(`nft add set inet ramm podman_interfaces '{ type ifname; flags dynamic; elements = { ${podmanNetworks.join(", ")} }; }'`);
-  await execCommand("nft insert rule inet ramm prerouting iifname @podman_interfaces accept");
-};
 // src/nft.ts
 var createNftTable = ({
   allowedIpV4,
@@ -266,14 +217,71 @@ var setupNftable = async ({
   allowedIpV4,
   allowedPorts
 }) => {
-  await execCommand("nft flush ruleset");
+  const listTable = await execCommand("nft list table inet ramm");
+  if (listTable.spawnResult.exitCode === 0) {
+    await execCommand("nft delete table inet ramm");
+  }
   const nftTable = createNftTable({ allowedIpV4, allowedPorts });
   await execCommand(`nft -f - <<EOF
 ${nftTable}
 EOF`);
+  await safeNftTable();
+};
+var safeNftTable = async () => {
   await execCommand("nft list ruleset > /etc/nftables.conf");
   await execCommand("systemctl enable nftables");
 };
+
+// src/podman.ts
+var installPodman = async () => {
+  if ((await $2`command -v podman`.nothrow().quiet()).exitCode !== 0) {
+    await installSystemPackage("podman");
+  }
+  await createNetwork();
+};
+var createNetwork = async () => {
+  const netwroks = await execCommand("podman network inspect $(podman network ls -q) -f '{{.NetworkInterface}}'");
+  const podmanNetworks = await execCommand("podman network ls");
+  if (podmanNetworks.stdout.includes("ramm")) {
+    return;
+  }
+  if (netwroks.stdout.includes("podman_ramm")) {
+    return;
+  }
+  await execCommand("podman network create --interface-name=podman_ramm ramm");
+};
+var getCreateCommand = async (name) => {
+  const podmanCreateCommand = await $2`podman inspect --format '{{.Config.CreateCommand}}' ${name}`.nothrow().quiet();
+  return podmanCreateCommand.text().slice(0, -1).slice(1, -1) || "";
+};
+var loginPodman = async (address, login, password) => {
+  return await execCommand(`echo "${password}" | podman login --username "${login}" --password-stdin ${address}`);
+};
+var runPodmanContainer = async (name, command) => {
+  if (await getCreateCommand(name) !== command) {
+    await $2`podman rm -f ${name}`;
+    await execCommand(command);
+    return;
+  }
+  console.info("Podman container is already running");
+};
+var runPodmanContainerService = async (name, command, context = defaultContext) => {
+  const serviceName = getSysyemdServiceName(name);
+  if (await checkSystemdService(context, serviceName)) {
+    await stopSystemdService(context, serviceName);
+  }
+  await runPodmanContainer(name, command);
+  await execCommand(`podman generate systemd --name --new ${name} > ${serviceName}`);
+  await createSystemdService(context, serviceName, serviceName);
+};
+var addNftPodmanRule = async () => {
+  const podmanNetworksResult = await execCommand("podman network inspect $(podman network ls -q) -f '{{.NetworkInterface}}'");
+  const podmanNetworks = podmanNetworksResult.stdout.trim().split(`
+`);
+  await execCommand(`nft add set inet ramm podman_interfaces '{ type ifname; flags dynamic; elements = { ${podmanNetworks.join(", ")} }; }'`);
+  await execCommand("nft insert rule inet ramm prerouting iifname @podman_interfaces accept");
+  await safeNftTable();
+};
 // src/files.ts
 import { appendFile, exists } from "fs/promises";
 var {file, write } = globalThis.Bun;
@@ -327,7 +335,7 @@ var createFileIfNeed = async (rawFilePath) => {
     await execCommand(`touch ${filePath}`);
   }
 };
-var writeIfNew = async (rawFilePath, str) => {
+var writeIfNewStr = async (rawFilePath, str) => {
   const filePath = normalizePath(rawFilePath);
   await createFileIfNeed(filePath);
   if (await checkStrInFile(filePath, str)) {
@@ -340,7 +348,7 @@ var writeFile = async (pathToFile, str) => {
   await createFileIfNeed(normalizedPath);
   await write(normalizedPath, str);
 };
-var writeIfNewCompletely = async (pathToFile, str) => {
+var writeFileFull = async (pathToFile, str) => {
   const normalizedPath = normalizePath(pathToFile);
   await createFileIfNeed(normalizedPath);
   const fileText = await file(normalizedPath).text();
@@ -355,7 +363,7 @@ var addKeyToHostConfig = async (pathToHost, address, pathToKey) => {
   const text = `Host ${address}
   IdentityFile ${pathToKey}
 `;
-  await writeIfNew(pathToHost, text);
+  await writeIfNewStr(pathToHost, text);
 };
 var getServerFingerprint = async (context) => {
   const { stdout } = await execCommandOverSsh('ssh-keyscan -t ed25519 localhost | grep -v "^#"', context);
@@ -364,7 +372,7 @@ var getServerFingerprint = async (context) => {
 var saveSshFingerptint = async (filePath, context) => {
   const normalizedPath = normalizePath(filePath);
   const fingerprint = await getServerFingerprint(context);
-  await writeIfNewCompletely(filePath, normalizedPath);
+  await writeFileFull(filePath, normalizedPath);
 };
 async function createSshKey(filePath, comment) {
   printFunction(`${createSshKey.name} ${filePath}`);
@@ -405,9 +413,9 @@ var addSshKeyToUse = async ({
 }) => {
   printFunction(`${addSshKeyToUse.name} ${filePath}`);
   const normalizedFilePath = normalizePath(filePath);
-  await writeIfNewCompletely(normalizedFilePath, key);
+  await writeFileFull(normalizedFilePath, key);
   await execCommand(`chmod 0600 ${normalizedFilePath}`);
-  await writeIfNew("~/.ssh/known_hosts", fingerprint);
+  await writeIfNewStr("~/.ssh/known_hosts", fingerprint);
   await addKeyToHostConfig("~/.ssh/config", server, normalizedFilePath);
 };
 // src/cron.ts
@@ -469,8 +477,8 @@ var passVarsServer = async () => {
   return jsonData;
 };
 export {
-  writeIfNewCompletely,
-  writeIfNew,
+  writeIfNewStr,
+  writeFileFull,
   writeFile,
   setupNftable,
   saveSshFingerptint,

package/dist/types/files.d.ts

@@ -1,4 +1,4 @@
 export declare const normalizeFileContent: (str: string) => string;
-export declare const writeIfNew: (rawFilePath: string, str: string) => Promise<void>;
+export declare const writeIfNewStr: (rawFilePath: string, str: string) => Promise<void>;
 export declare const writeFile: (pathToFile: string, str: string) => Promise<void>;
-export declare const writeIfNewCompletely: (pathToFile: string, str: string) => Promise<void>;
+export declare const writeFileFull: (pathToFile: string, str: string) => Promise<void>;

package/dist/types/nft.d.ts

@@ -3,3 +3,4 @@ export declare const setupNftable: ({ allowedIpV4, allowedPorts, }: {
     allowedIpV4: string[];
     allowedPorts: string[];
 }) => Promise<void>;
+export declare const safeNftTable: () => Promise<void>;

package/dist/types/ramm.d.ts

@@ -7,7 +7,7 @@ export { restartSystemdService } from "./systemd.ts";
 export { installSystemPackage } from "./packages.ts";
 export { printBlock } from "./print.ts";
 export { setupNftable } from "./nft.ts";
-export { writeIfNew, writeFile, writeIfNewCompletely, normalizeFileContent, } from "./files.ts";
+export { writeIfNewStr, writeFile, writeFileFull, normalizeFileContent, } from "./files.ts";
 export { createAndAddSshKey, getServerFingerprint, addKeyToHostConfig, addSshKeyToUse, saveSshFingerptint, } from "./ssh.ts";
 export { normalizePath } from "./path.ts";
 export { createCron } from "./cron.ts";

package/package.json

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