ramm 0.0.37 → 0.0.39

package/dist/ramm.js

@@ -140,6 +140,82 @@ var installSystemPackage = async (packageName) => {
   }
 };
 
+// src/files.ts
+import { appendFile, exists } from "fs/promises";
+var {file, write } = globalThis.Bun;
+
+// src/path.ts
+import { homedir } from "os";
+import { join } from "path";
+function normalizePath(rawFilePath) {
+  let finalFilePath = rawFilePath.trim();
+  if (finalFilePath.startsWith("~/")) {
+    finalFilePath = join(homedir(), finalFilePath.slice(2));
+  }
+  return finalFilePath;
+}
+
+// src/files.ts
+var normalizeFileContent = (str) => {
+  if (str === "") {
+    return str;
+  }
+  if (str.at(-1) !== `
+`) {
+    return str + `
+`;
+  }
+  return str;
+};
+var createDir = async (str) => {
+  const dirname = str.split("/").slice(0, -1).join("/");
+  const exist = await exists(dirname);
+  if (exist) {
+    return;
+  }
+  await execCommand(`mkdir -p ${dirname}`);
+};
+var checkStrInFile = async (filePath, str) => {
+  const file2 = Bun.file(filePath);
+  if (!await file2.exists()) {
+    return false;
+  }
+  const fileText = await file2.text();
+  if (fileText.includes(str)) {
+    return true;
+  }
+  return false;
+};
+var createFileIfNeed = async (rawFilePath) => {
+  const filePath = normalizePath(rawFilePath);
+  await createDir(filePath);
+  if (!await file(filePath).exists()) {
+    await execCommand(`touch ${filePath}`);
+  }
+};
+var writeIfNewStr = async (rawFilePath, str) => {
+  const filePath = normalizePath(rawFilePath);
+  await createFileIfNeed(filePath);
+  if (await checkStrInFile(filePath, str)) {
+    return;
+  }
+  await appendFile(filePath, normalizeFileContent(str));
+};
+var writeFile = async (pathToFile, str) => {
+  const normalizedPath = normalizePath(pathToFile);
+  await createFileIfNeed(normalizedPath);
+  await write(normalizedPath, str);
+};
+var writeFileFull = async (pathToFile, str) => {
+  const normalizedPath = normalizePath(pathToFile);
+  await createFileIfNeed(normalizedPath);
+  const fileText = await file(normalizedPath).text();
+  if (fileText === str) {
+    return;
+  }
+  await write(normalizedPath, str);
+};
+
 // src/systemd.ts
 var systemctlWordLangth = "systemctl ".length;
 var formatUserspace = (context, command) => {
@@ -166,6 +242,14 @@ var checkSystemdService = async (context, serviceName) => {
   const { spawnResult } = await execCommandMayError(formatUserspace(context, `systemctl is-active ${serviceName}`));
   return spawnResult.exitCode === 0;
 };
+var createSystemdServiceByContent = async (context, serviceName, content) => {
+  printFunction(`createSystemdServiceByContent ${serviceName}`);
+  const pathToSeviceTarget = getSystemdPathToService(context, serviceName);
+  await writeFileFull(pathToSeviceTarget, content);
+  await execCommand(formatUserspace(context, "systemctl daemon-reload"));
+  await execCommand(formatUserspace(context, `systemctl enable ${serviceName}`));
+  await execCommand(formatUserspace(context, `sysyemctl start ${serviceName}`));
+};
 var createSystemdService = async (context, serviceName, pathToServiceFile) => {
   printFunction(`createSystemdService ${serviceName}`);
   const pathToSeviceTarget = getSystemdPathToService(context, serviceName);
@@ -178,7 +262,7 @@ var createSystemdService = async (context, serviceName, pathToServiceFile) => {
 // src/nft.ts
 var createNftTable = ({
   allowedIpV4,
-  allowedPorts
+  allowedPorts = []
 }) => {
   const nftTable = `table inet ramm {
     set allowed_ipv4 {
@@ -217,7 +301,7 @@ var setupNftable = async ({
   allowedIpV4,
   allowedPorts
 }) => {
-  const listTable = await execCommand("nft list table inet ramm");
+  const listTable = await execCommandMayError("nft list table inet ramm");
   if (listTable.spawnResult.exitCode === 0) {
     await execCommand("nft delete table inet ramm");
   }
@@ -282,81 +366,6 @@ var addNftPodmanRule = async () => {
   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;
-
-// src/path.ts
-import { homedir } from "os";
-import { join } from "path";
-function normalizePath(rawFilePath) {
-  let finalFilePath = rawFilePath.trim();
-  if (finalFilePath.startsWith("~/")) {
-    finalFilePath = join(homedir(), finalFilePath.slice(2));
-  }
-  return finalFilePath;
-}
-
-// src/files.ts
-var normalizeFileContent = (str) => {
-  if (str === "") {
-    return str;
-  }
-  if (str.at(-1) !== `
-`) {
-    return str + `
-`;
-  }
-  return str;
-};
-var createDir = async (str) => {
-  const dirname = str.split("/").slice(0, -1).join("/");
-  const exist = await exists(dirname);
-  if (exist) {
-    return;
-  }
-  await execCommand(`mkdir -p ${dirname}`);
-};
-var checkStrInFile = async (filePath, str) => {
-  const file2 = Bun.file(filePath);
-  if (!await file2.exists()) {
-    return false;
-  }
-  const fileText = await file2.text();
-  if (fileText.includes(str)) {
-    return true;
-  }
-  return false;
-};
-var createFileIfNeed = async (rawFilePath) => {
-  const filePath = normalizePath(rawFilePath);
-  await createDir(filePath);
-  if (!await file(filePath).exists()) {
-    await execCommand(`touch ${filePath}`);
-  }
-};
-var writeIfNewStr = async (rawFilePath, str) => {
-  const filePath = normalizePath(rawFilePath);
-  await createFileIfNeed(filePath);
-  if (await checkStrInFile(filePath, str)) {
-    return;
-  }
-  await appendFile(filePath, normalizeFileContent(str));
-};
-var writeFile = async (pathToFile, str) => {
-  const normalizedPath = normalizePath(pathToFile);
-  await createFileIfNeed(normalizedPath);
-  await write(normalizedPath, str);
-};
-var writeFileFull = async (pathToFile, str) => {
-  const normalizedPath = normalizePath(pathToFile);
-  await createFileIfNeed(normalizedPath);
-  const fileText = await file(normalizedPath).text();
-  if (fileText === str) {
-    return;
-  }
-  await write(normalizedPath, str);
-};
 // src/ssh.ts
 var {file: file2 } = globalThis.Bun;
 var addKeyToHostConfig = async (pathToHost, address, pathToKey) => {
@@ -499,6 +508,7 @@ export {
   execCommandOverSsh,
   execCommandMayError,
   execCommand,
+  createSystemdServiceByContent,
   createCron,
   createAndAddSshKey,
   copyFilesBySsh,

package/dist/types/ramm.d.ts

@@ -3,7 +3,7 @@ export { Context } from "./context.ts";
 export { installBun } from "./init.ts";
 export { installPodman, runPodmanContainer, loginPodman } from "./podman.ts";
 export { runPodmanContainerService, addNftPodmanRule } from "./podman.ts";
-export { restartSystemdService } from "./systemd.ts";
+export { restartSystemdService, createSystemdServiceByContent, } from "./systemd.ts";
 export { installSystemPackage } from "./packages.ts";
 export { printBlock } from "./print.ts";
 export { setupNftable } from "./nft.ts";

package/dist/types/systemd.d.ts

@@ -3,4 +3,5 @@ export declare const getSysyemdServiceName: (name: string) => string;
 export declare const stopSystemdService: (constext: Context, name: string) => Promise<void>;
 export declare const restartSystemdService: (name: string, constext?: Context) => Promise<void>;
 export declare const checkSystemdService: (context: Context, serviceName: string) => Promise<boolean>;
+export declare const createSystemdServiceByContent: (context: Context, serviceName: string, content: string) => Promise<void>;
 export declare const createSystemdService: (context: Context, serviceName: string, pathToServiceFile: string) => Promise<void>;

package/package.json

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