ramm 0.0.40 → 0.0.41

package/dist/ramm.js

@@ -218,45 +218,41 @@ var writeFileFull = async (pathToFile, str) => {
 
 // src/systemd.ts
 var systemctlWordLangth = "systemctl ".length;
-var formatUserspace = (context, command) => {
+var formatUserspace = (command, context = defaultContext) => {
   const userPart = context.userspace ? " --user " : "";
   return "systemctl" + userPart + " " + command.slice(systemctlWordLangth);
 };
-var getSysyemdServiceName = (name) => {
-  return `${name}.service`;
+var startSystemdUnit = async (unitName, context = defaultContext) => {
+  await execCommand(formatUserspace(`systemctl start ${unitName}`, context));
 };
-var getSystemdPathToService = (context, serviceName) => {
-  if (context.userspace) {
-    return `~/.config/systemd/user/${serviceName}`;
-  }
-  return `/etc/systemd/system/${serviceName}`;
+var enabledSystemdUnit = async (unitName, context = defaultContext) => {
+  await execCommand(formatUserspace(`systemctl enable ${unitName}`, context));
 };
-var stopSystemdService = async (constext, name) => {
-  await execCommand(formatUserspace(constext, `systemctl stop ${name}`));
+var restartSystemdUnit = async (name, context = defaultContext) => {
+  await execCommand(formatUserspace(`systemctl restart ${name}`, context));
 };
-var restartSystemdService = async (name, constext = defaultContext) => {
-  printFunction(`restartSystemdService ${name}`);
-  await execCommand(formatUserspace(constext, `systemctl restart ${name}`));
+var stopSystemdUnit = async (name, context = defaultContext) => {
+  await execCommand(formatUserspace(`systemctl stop ${name}`, context));
 };
-var checkSystemdService = async (context, serviceName) => {
-  const { spawnResult } = await execCommandMayError(formatUserspace(context, `systemctl is-active ${serviceName}`));
+var checkSystemdUnit = async (serviceName, context = defaultContext) => {
+  const { spawnResult } = await execCommandMayError(formatUserspace(`systemctl is-active ${serviceName}`, context));
   return spawnResult.exitCode === 0;
 };
-var createSystemdServiceByContent = async (serviceName, content, context = defaultContext) => {
-  printFunction(`createSystemdServiceByContent ${serviceName}`);
-  const pathToSeviceTarget = getSystemdPathToService(context, serviceName);
+var createSystemdUnit = async (unitName, content, context = defaultContext) => {
+  const pathToSeviceTarget = getSystemdPathToService(unitName, context);
   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);
-  await execCommand(`cp -v ${pathToServiceFile} ${pathToSeviceTarget}`);
-  await execCommand(formatUserspace(context, "systemctl daemon-reload"));
-  await execCommand(formatUserspace(context, `systemctl enable ${serviceName}`));
-  await execCommand(formatUserspace(context, `sysyemctl start ${serviceName}`));
+  await execCommand(formatUserspace(`systemctl daemon-reload ${unitName}`, context));
+};
+var getSystemdPathToService = (serviceName, context = defaultContext) => {
+  if (context.userspace) {
+    return `~/.config/systemd/user/${serviceName}`;
+  }
+  return `/etc/systemd/system/${serviceName}`;
+};
+var createSystemdService = async (serviceName, content, context = defaultContext) => {
+  await createSystemdUnit(serviceName, content, context);
+  await enabledSystemdUnit(`systemctl enable ${serviceName}`, context);
+  await startSystemdUnit(`systemctl start ${serviceName}`, context);
 };
 
 // src/nft.ts
@@ -350,13 +346,13 @@ var runPodmanContainer = async (name, command) => {
   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);
+  const serviceName = `${name}.service`;
+  if (await checkSystemdUnit(serviceName, context)) {
+    await stopSystemdUnit(serviceName, context);
   }
   await runPodmanContainer(name, command);
   await execCommand(`podman generate systemd --name --new ${name} > ${serviceName}`);
-  await createSystemdService(context, serviceName, serviceName);
+  await createSystemdService(serviceName, serviceName, context);
 };
 var addNftPodmanRule = async () => {
   const podmanNetworksResult = await execCommand("podman network inspect $(podman network ls -q) -f '{{.NetworkInterface}}'");
@@ -489,11 +485,12 @@ export {
   writeIfNewStr,
   writeFileFull,
   writeFile,
+  startSystemdUnit,
   setupNftable,
   saveSshFingerptint,
   runPodmanContainerService,
   runPodmanContainer,
-  restartSystemdService,
+  restartSystemdUnit,
   printBlock,
   passVarsServer,
   passVarsClient,
@@ -503,12 +500,15 @@ export {
   installSystemPackage,
   installPodman,
   installBun,
+  getSystemdPathToService,
   getServerFingerprint,
   execCommandRaw,
   execCommandOverSsh,
   execCommandMayError,
   execCommand,
-  createSystemdServiceByContent,
+  enabledSystemdUnit,
+  createSystemdUnit,
+  createSystemdService,
   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, createSystemdServiceByContent, } from "./systemd.ts";
+export { startSystemdUnit, enabledSystemdUnit, restartSystemdUnit, createSystemdService, getSystemdPathToService, createSystemdUnit, } from "./systemd.ts";
 export { installSystemPackage } from "./packages.ts";
 export { printBlock } from "./print.ts";
 export { setupNftable } from "./nft.ts";

package/dist/types/systemd.d.ts

@@ -1,7 +1,9 @@
 import { Context } from "./context.ts";
-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: (serviceName: string, content: string, context?: Context) => Promise<void>;
-export declare const createSystemdService: (context: Context, serviceName: string, pathToServiceFile: string) => Promise<void>;
+export declare const startSystemdUnit: (unitName: string, context?: Context) => Promise<void>;
+export declare const enabledSystemdUnit: (unitName: string, context?: Context) => Promise<void>;
+export declare const restartSystemdUnit: (name: string, context?: Context) => Promise<void>;
+export declare const stopSystemdUnit: (name: string, context?: Context) => Promise<void>;
+export declare const checkSystemdUnit: (serviceName: string, context?: Context) => Promise<boolean>;
+export declare const createSystemdUnit: (unitName: string, content: string, context?: Context) => Promise<void>;
+export declare const getSystemdPathToService: (serviceName: string, context?: Context) => string;
+export declare const createSystemdService: (serviceName: string, content: string, context?: Context) => Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ramm",
   "type": "module",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "scripts": {
     "build": "bun build ./src/ramm.ts --target bun --outdir ./dist && cp ./src/bun.sh ./dist/bun.sh",
     "types": "tsc --project tsconfig.types.json"
@@ -18,5 +18,8 @@
     "@types/bun": "latest",
     "typescript": "^5.8.2",
     "dapes": "^0.0.26"
+  },
+  "dependencies": {
+    "vitest": "^3.2.4"
   }
 }

package/dist/types/base.d.ts

@@ -1,18 +0,0 @@
-import { Context } from "./context.ts";
-export declare const defaultContext: Context;
-export declare const teeErr: (read: ReadableStream) => Promise<string>;
-export declare const execCommand: (command: string) => Promise<{
-    outputErr: string;
-    output: string;
-    spawnResult: import("bun").Subprocess<"inherit", "pipe", "pipe">;
-}>;
-export declare const execCommandSilent: (command: string) => Promise<{
-    output: string;
-    spawnResult: import("bun").Subprocess<"ignore", "pipe", "inherit">;
-}>;
-export declare const copyFilesBySsh: (from: string, to: string, context: Context) => Promise<void>;
-export declare const execBySsh: (command: string, context: Context) => Promise<{
-    outputErr: string;
-    output: string;
-    spawnResult: import("bun").Subprocess<"inherit", "pipe", "pipe">;
-}>;

package/dist/types/debug.d.ts

@@ -1,4 +0,0 @@
-export declare const debugCommand: (command: string) => void;
-export declare const debugApiCall: (command: string) => void;
-export declare const debugBlock: (text: string) => void;
-export declare const debug: (text: string) => void;