@push.rocks/smartdaemon 2.15.0 → 2.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartdaemon',
6
- version: '2.15.0',
6
+ version: '2.16.0',
7
7
  description: 'Start scripts as long running daemons and manage them.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
@@ -10,6 +10,11 @@ export interface ISystemdUnitOptions {
10
10
  runtimeDirectory?: string;
11
11
  /** Absolute executable path supplied by trusted owning code. */
12
12
  systemctlPath?: string;
13
+ /**
14
+ * Absolute `busctl` path supplied by trusted owning code. `inspectServiceSettings()` reads the
15
+ * loaded `ExecStart` through it from the manager's bus object. Defaults to `/usr/bin/busctl`.
16
+ */
17
+ busctlPath?: string;
13
18
  /** Bounds the systemctl client, not the server-side job. Defaults to 120 seconds. */
14
19
  commandTimeoutMs?: number;
15
20
  }
@@ -75,6 +80,22 @@ export interface ISystemdExitStatusSet {
75
80
  */
76
81
  readonly signals: readonly string[];
77
82
  }
83
+ /**
84
+ * One command of a service's `ExecStart` as the manager loaded it, from the unit's D-Bus
85
+ * `ExecStart` property (`a(sasbttttuii)`): exact, with every argument as its own string.
86
+ */
87
+ export interface ISystemdExecCommand {
88
+ /** The executable the manager runs. */
89
+ readonly path: string;
90
+ /**
91
+ * The argument vector, `argv[0]` included, exactly as loaded: an argument that holds a space is
92
+ * one string. systemd resolves `%` specifiers when it loads the unit (`%i` reads as the instance
93
+ * name); `$VAR`, `${VAR}` and `$$` are expanded only at exec time, so they appear as written.
94
+ */
95
+ readonly argv: readonly string[];
96
+ /** Whether the manager ignores the command's failure (a `-` prefix). */
97
+ readonly ignoreFailure: boolean;
98
+ }
78
99
  /**
79
100
  * Service settings as the manager loaded them, drop-ins included. Timespans are exact integer
80
101
  * microseconds; a limit systemd reports as unbounded is `'infinity'`. Mode strings are systemd's
@@ -111,6 +132,11 @@ export interface ISystemdServiceSettings {
111
132
  * passes to every unit, `EnvironmentFile=` contents and `PassEnvironment=` are not part of it.
112
133
  */
113
134
  readonly environment: Readonly<Record<string, string>>;
135
+ /**
136
+ * Every `ExecStart` command in the order the manager runs them, drop-ins included; empty for a
137
+ * unit that sets none or that the manager could not load.
138
+ */
139
+ readonly execStart: readonly ISystemdExecCommand[];
114
140
  }
115
141
  export declare class SystemdUnitError extends Error {
116
142
  readonly code: 'invalid_options' | 'command_failed' | 'invalid_state';
@@ -120,6 +146,7 @@ export declare class SystemdUnitError extends Error {
120
146
  export declare class SystemdUnit {
121
147
  private readonly unitName;
122
148
  private readonly executable;
149
+ private readonly busctl;
123
150
  private readonly timeout;
124
151
  private readonly scope;
125
152
  /** Present exactly for user scope. */
@@ -157,4 +184,10 @@ export declare class SystemdUnit {
157
184
  */
158
185
  private userManagerEnvironment;
159
186
  private command;
187
+ /**
188
+ * Runs one manager client (systemctl, or busctl for a bus property) with the scope's fixed
189
+ * environment. For user scope busctl reaches the manager through the user's bus at
190
+ * `$XDG_RUNTIME_DIR/bus`.
191
+ */
192
+ private run;
160
193
  }
@@ -92,6 +92,58 @@ const parseEnvironment = (text) => {
92
92
  }
93
93
  return Object.freeze(Object.fromEntries([...entries].sort(([left], [right]) => left < right ? -1 : 1)));
94
94
  };
95
+ /**
96
+ * The D-Bus object path of a unit: the unit name with every character but an ASCII letter or digit
97
+ * escaped as `_` and two lowercase hex digits. systemd's own unit_dbus_path_from_name() also escapes
98
+ * a leading digit; its decoder accepts both forms, so both name the same unit. The constructor
99
+ * admits ASCII unit names only.
100
+ */
101
+ const unitObjectPath = (unitName) => '/org/freedesktop/systemd1/unit/' +
102
+ [...unitName].map((character) => /^[A-Za-z0-9]$/.test(character)
103
+ ? character : `_${character.charCodeAt(0).toString(16).padStart(2, '0')}`).join('');
104
+ /**
105
+ * Parses `busctl --json=short get-property` of a service's `ExecStart`: the signature
106
+ * `a(sasbttttuii)` and one tuple per command (path, argv, ignore-failure, then the last run's
107
+ * start and stop timestamps, PID, code and status, which are not reported). An absolute path, a
108
+ * non-empty argv of strings and a boolean are required; anything else is refused.
109
+ */
110
+ const parseExecStart = (text) => {
111
+ let value;
112
+ try {
113
+ value = JSON.parse(text);
114
+ }
115
+ catch {
116
+ return undefined;
117
+ }
118
+ if (typeof value !== 'object' || value === null || Array.isArray(value) || !('type' in value) ||
119
+ !('data' in value) || Object.keys(value).length !== 2 || value.type !== 'a(sasbttttuii)')
120
+ return undefined;
121
+ const data = value.data;
122
+ if (!Array.isArray(data))
123
+ return undefined;
124
+ const entries = data;
125
+ const commands = [];
126
+ for (const entry of entries) {
127
+ if (!Array.isArray(entry) || entry.length !== 10)
128
+ return undefined;
129
+ const fields = entry;
130
+ const [path, argvValue, ignoreFailure] = fields;
131
+ if (typeof path !== 'string' || !path.startsWith('/') || path.includes('\0') ||
132
+ !Array.isArray(argvValue) || argvValue.length === 0 || typeof ignoreFailure !== 'boolean' ||
133
+ fields.slice(3).some((field) => typeof field !== 'number' || !Number.isInteger(field))) {
134
+ return undefined;
135
+ }
136
+ const argvItems = argvValue;
137
+ const argv = [];
138
+ for (const item of argvItems) {
139
+ if (typeof item !== 'string' || item.includes('\0'))
140
+ return undefined;
141
+ argv.push(item);
142
+ }
143
+ commands.push(Object.freeze({ path, argv: Object.freeze(argv), ignoreFailure }));
144
+ }
145
+ return Object.freeze(commands);
146
+ };
95
147
  /**
96
148
  * Output limit of every systemctl call, sized for the largest output read: inspectServiceSettings()
97
149
  * of a unit rendered from any accepted SystemdServiceDefinition. `systemctl show` prints Environment
@@ -104,6 +156,13 @@ const parseEnvironment = (text) => {
104
156
  * 16384 bytes, printed verbatim.
105
157
  */
106
158
  const outputLimit = 2 * environmentByteLimit + 3 * environmentVariableLimit + 2048 + 1024;
159
+ /**
160
+ * Output limit of the busctl ExecStart read, sized for a unit rendered from any accepted
161
+ * SystemdServiceDefinition: one command whose path and argv hold the executable twice and at most
162
+ * 128 arguments, each at most 4096 UTF-16 code units. Every code unit prints as at most six JSON
163
+ * bytes (a `\uXXXX` escape); the rest of the reply fits in 4096.
164
+ */
165
+ const execStartOutputLimit = 6 * 4096 * (128 + 2) + 4096;
107
166
  const properties = [
108
167
  'Id',
109
168
  'LoadState',
@@ -133,6 +192,7 @@ export class SystemdUnit {
133
192
  constructor(optionsArg) {
134
193
  this.unitName = optionsArg?.unitName;
135
194
  this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
195
+ this.busctl = optionsArg?.busctlPath ?? '/usr/bin/busctl';
136
196
  this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
137
197
  this.scope = optionsArg?.scope ?? 'system';
138
198
  this.userEnvironment = this.scope === 'user'
@@ -145,7 +205,8 @@ export class SystemdUnit {
145
205
  if (typeof this.unitName !== 'string' ||
146
206
  !/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
147
207
  typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
148
- this.executable.includes('\0') || !Number.isSafeInteger(this.timeout) ||
208
+ this.executable.includes('\0') || typeof this.busctl !== 'string' || !plugins.path.isAbsolute(this.busctl) ||
209
+ this.busctl.includes('\0') || !Number.isSafeInteger(this.timeout) ||
149
210
  this.timeout < 1 || this.timeout > 600000 ||
150
211
  !['system', 'user'].includes(this.scope) ||
151
212
  (this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
@@ -296,6 +357,13 @@ export class SystemdUnit {
296
357
  return value;
297
358
  };
298
359
  const oomScoreAdjust = parsed('OOMScoreAdjust', (text) => /^(0|-?[1-9]\d{0,3})$/.test(text) && Math.abs(Number(text)) <= 1000 ? Number(text) : undefined);
360
+ // `systemctl show` joins ExecStart's argv with spaces, so an argument holding one cannot be told
361
+ // apart; the unit's bus property carries every argument as its own string.
362
+ const execStart = parseExecStart(await this.run(this.busctl, [this.scope === 'user' ? '--user' : '--system',
363
+ '--json=short', 'get-property', 'org.freedesktop.systemd1', unitObjectPath(this.unitName),
364
+ 'org.freedesktop.systemd1.Service', 'ExecStart'], execStartOutputLimit));
365
+ if (execStart === undefined)
366
+ throw new SystemdUnitError('invalid_state');
299
367
  return Object.freeze({
300
368
  unitName: this.unitName,
301
369
  type: mode('Type', true),
@@ -318,6 +386,7 @@ export class SystemdUnit {
318
386
  tasksMax: parsed('TasksMax', parseLimit),
319
387
  oomScoreAdjust,
320
388
  environment: parsed('Environment', parseEnvironment),
389
+ execStart,
321
390
  });
322
391
  }
323
392
  /** Reloads unit definitions globally; does not enable, unmask, start or stop a unit. */
@@ -340,14 +409,22 @@ export class SystemdUnit {
340
409
  }
341
410
  return environment;
342
411
  }
343
- async command(argsArg) {
412
+ command(argsArg) {
413
+ return this.run(this.executable, [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg], outputLimit);
414
+ }
415
+ /**
416
+ * Runs one manager client (systemctl, or busctl for a bus property) with the scope's fixed
417
+ * environment. For user scope busctl reaches the manager through the user's bus at
418
+ * `$XDG_RUNTIME_DIR/bus`.
419
+ */
420
+ async run(executableArg, argsArg, limitArg) {
344
421
  const userEnvironment = await this.userManagerEnvironment();
345
422
  return new Promise((resolve, reject) => {
346
- plugins.childProcess.execFile(this.executable, [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg], {
423
+ plugins.childProcess.execFile(executableArg, argsArg, {
347
424
  encoding: 'utf8',
348
425
  timeout: this.timeout,
349
426
  killSignal: 'SIGKILL',
350
- maxBuffer: outputLimit,
427
+ maxBuffer: limitArg,
351
428
  windowsHide: true,
352
429
  env: userEnvironment
353
430
  ? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
@@ -367,4 +444,4 @@ export class SystemdUnit {
367
444
  });
368
445
  }
369
446
  }
370
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunit.js","sourceRoot":"","sources":["../ts/classes.systemdunit.ts"],"names":[],"mappings":"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"}
447
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunit.js","sourceRoot":"","sources":["../ts/classes.systemdunit.ts"],"names":[],"mappings":"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"}
@@ -77,14 +77,10 @@ export class SmartDaemonSystemdManager {
77
77
  async getServices() {
78
78
  const existingServices = [];
79
79
  if (await this.checkElegibility()) {
80
- const smartfmInstance = new plugins.smartfm.Smartfm({
81
- fmType: 'yaml',
82
- });
83
80
  const availableServices = await this.smartFs.directory(paths.systemdDir).filter('smartdaemon_*.service').list();
84
81
  for (const serviceFile of availableServices) {
85
82
  const serviceFileContent = await this.smartFs.file(serviceFile.path).encoding('utf8').read();
86
- const data = smartfmInstance.parseFromComments('# ', serviceFileContent.toString())
87
- .data;
83
+ const data = (await plugins.smartmarkdown.parseCommentFrontmatter(serviceFileContent.toString(), '# ')).data;
88
84
  const service = await SmartDaemonService.createFromOptions(this.smartdaemonRef, data);
89
85
  service.alreadyExists = true;
90
86
  existingServices.push(service);
@@ -150,4 +146,4 @@ export class SmartDaemonSystemdManager {
150
146
  }
151
147
  }
152
148
  }
153
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24uY2xhc3Nlcy5zeXN0ZW1kbWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLmNsYXNzZXMuc3lzdGVtZG1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEtBQUssS0FBSyxNQUFNLHdCQUF3QixDQUFDO0FBQ2hELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEVBRUwsa0JBQWtCLEdBQ25CLE1BQU0sa0NBQWtDLENBQUM7QUFFMUMsTUFBTSxPQUFPLHlCQUF5QjtJQUNwQyxTQUFTO2FBQ00seUJBQW9CLEdBQUcsYUFBYSxBQUFoQixDQUFpQjtJQUU3QyxNQUFNLENBQUMsZ0NBQWdDLENBQUMsY0FBc0I7UUFDbkUsT0FBTyxHQUFHLHlCQUF5QixDQUFDLG9CQUFvQixJQUFJLGNBQWMsRUFBRSxDQUFDO0lBQy9FLENBQUM7SUFFTSxNQUFNLENBQUMsNkJBQTZCLENBQUMsY0FBc0I7UUFDaEUsT0FBTyxHQUFHLHlCQUF5QixDQUFDLGdDQUFnQyxDQUFDLGNBQWMsQ0FBQyxVQUFVLENBQUM7SUFDakcsQ0FBQztJQUVNLE1BQU0sQ0FBQyw2QkFBNkIsQ0FBQyxjQUFzQjtRQUNoRSxPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUN0QixLQUFLLENBQUMsVUFBVSxFQUNoQix5QkFBeUIsQ0FBQyw2QkFBNkIsQ0FBQyxjQUFjLENBQUMsQ0FDeEUsQ0FBQztJQUNKLENBQUM7SUFZRCxZQUFZLGlCQUE4QixFQUFFLGVBQXdCO1FBSjdELGtCQUFhLEdBQVksS0FBSyxDQUFDO1FBQy9CLFdBQU0sR0FBWSxLQUFLLENBQUM7UUFJN0IsSUFBSSxDQUFDLGNBQWMsR0FBRyxpQkFBaUIsQ0FBQztRQUN4QyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsSUFBSSxPQUFP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
149
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24uY2xhc3Nlcy5zeXN0ZW1kbWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLmNsYXNzZXMuc3lzdGVtZG1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEtBQUssS0FBSyxNQUFNLHdCQUF3QixDQUFDO0FBQ2hELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEVBRUwsa0JBQWtCLEdBQ25CLE1BQU0sa0NBQWtDLENBQUM7QUFFMUMsTUFBTSxPQUFPLHlCQUF5QjtJQUNwQyxTQUFTO2FBQ00seUJBQW9CLEdBQUcsYUFBYSxBQUFoQixDQUFpQjtJQUU3QyxNQUFNLENBQUMsZ0NBQWdDLENBQUMsY0FBc0I7UUFDbkUsT0FBTyxHQUFHLHlCQUF5QixDQUFDLG9CQUFvQixJQUFJLGNBQWMsRUFBRSxDQUFDO0lBQy9FLENBQUM7SUFFTSxNQUFNLENBQUMsNkJBQTZCLENBQUMsY0FBc0I7UUFDaEUsT0FBTyxHQUFHLHlCQUF5QixDQUFDLGdDQUFnQyxDQUFDLGNBQWMsQ0FBQyxVQUFVLENBQUM7SUFDakcsQ0FBQztJQUVNLE1BQU0sQ0FBQyw2QkFBNkIsQ0FBQyxjQUFzQjtRQUNoRSxPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUN0QixLQUFLLENBQUMsVUFBVSxFQUNoQix5QkFBeUIsQ0FBQyw2QkFBNkIsQ0FBQyxjQUFjLENBQUMsQ0FDeEUsQ0FBQztJQUNKLENBQUM7SUFZRCxZQUFZLGlCQUE4QixFQUFFLGVBQXdCO1FBSjdELGtCQUFhLEdBQVksS0FBSyxDQUFDO1FBQy9CLFdBQU0sR0FBWSxLQUFLLENBQUM7UUFJN0IsSUFBSSxDQUFDLGNBQWMsR0FBRyxpQkFBaUIsQ0FBQztRQUN4QyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsSUFBSSxPQUFP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
@@ -4,5 +4,11 @@ export declare class SmartDaemonTemplateManager {
4
4
  smartdaemonRef: SmartDaemon;
5
5
  constructor(smartdaemonRefArg: SmartDaemon);
6
6
  private generateEnvironmentLines;
7
+ /**
8
+ * renders the service options as the commented YAML frontmatter block that getServices() reads back.
9
+ * Every value is written as a double-quoted YAML scalar (JSON string syntax is valid YAML), so values
10
+ * containing ": ", " #", quotes or line breaks round-trip unchanged and stay on their comment line.
11
+ */
12
+ private generateFrontmatterLines;
7
13
  generateUnitFileForService: (serviceArg: SmartDaemonService) => string;
8
14
  }
@@ -5,13 +5,7 @@ export class SmartDaemonTemplateManager {
5
5
  this.generateUnitFileForService = (serviceArg) => {
6
6
  const environmentLines = this.generateEnvironmentLines(serviceArg);
7
7
  return `# ---
8
- # name: ${serviceArg.name}
9
- # version: ${serviceArg.version}
10
- # description: ${serviceArg.description}
11
- # command: ${serviceArg.command}
12
- # workingDir: ${serviceArg.workingDir}${serviceArg.user ? `
13
- # user: ${serviceArg.user}` : ''}${serviceArg.group ? `
14
- # group: ${serviceArg.group}` : ''}
8
+ ${this.generateFrontmatterLines(serviceArg)}
15
9
  # ---
16
10
  [Unit]
17
11
  Description=${serviceArg.description}
@@ -50,5 +44,25 @@ WantedBy=multi-user.target
50
44
  })
51
45
  .join('\n');
52
46
  }
47
+ /**
48
+ * renders the service options as the commented YAML frontmatter block that getServices() reads back.
49
+ * Every value is written as a double-quoted YAML scalar (JSON string syntax is valid YAML), so values
50
+ * containing ": ", " #", quotes or line breaks round-trip unchanged and stay on their comment line.
51
+ */
52
+ generateFrontmatterLines(serviceArg) {
53
+ const entries = [
54
+ ['name', serviceArg.name],
55
+ ['version', serviceArg.version],
56
+ ['description', serviceArg.description],
57
+ ['command', serviceArg.command],
58
+ ['workingDir', serviceArg.workingDir],
59
+ ['user', serviceArg.user || undefined],
60
+ ['group', serviceArg.group || undefined],
61
+ ];
62
+ return entries
63
+ .filter((entry) => entry[1] !== undefined)
64
+ .map(([key, value]) => `# ${key}: ${JSON.stringify(value)}`)
65
+ .join('\n');
66
+ }
53
67
  }
54
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24uY2xhc3Nlcy50ZW1wbGF0ZW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhZW1vbi5jbGFzc2VzLnRlbXBsYXRlbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDbkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFdEUsTUFBTSxPQUFPLDBCQUEwQjtJQUdyQyxZQUFZLGlCQUE4QjtRQWlCbkMsK0JBQTBCLEdBQUcsQ0FBQyxVQUE4QixFQUFFLEVBQUU7WUFDckUsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsd0JBQXdCLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDbkUsT0FBTztVQUNELFVBQVUsQ0FBQyxJQUFJO2FBQ1osVUFBVSxDQUFDLE9BQU87aUJBQ2QsVUFBVSxDQUFDLFdBQVc7YUFDMUIsVUFBVSxDQUFDLE9BQU87Z0JBQ2YsVUFBVSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztVQUNoRCxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztXQUMzQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUU7OztjQUdwQixVQUFVLENBQUMsV0FBVzs7Ozs7YUFLdkIsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7T0FDeEIsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDM0MsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0VBQ25ELGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUU7NkJBQ0ksVUFBVSxDQUFDLFVBQVUsT0FBTyxVQUFVLENBQUMsT0FBTzttQkFDeEQsVUFBVSxDQUFDLFVBQVU7Ozs7Ozs7Ozs7Q0FVdkMsQ0FBQztRQUNBLENBQUMsQ0FBQztRQWpEQSxJQUFJLENBQUMsY0FBYyxHQUFHLGlCQUFpQixDQUFDO0lBQzFDLENBQUM7SUFFTyx3QkFBd0IsQ0FBQyxVQUE4QjtRQUM3RCxNQUFNLFdBQVcsR0FBRyxVQUFVLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQztRQUNqRCxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO2FBQy9CLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDcEIsSUFBSSxDQUFDLDBCQUEwQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUMxQyxNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQzdELENBQUM7WUFDRCxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ3ZFLE9BQU8sZ0JBQWdCLEdBQUcsSUFBSSxZQUFZLEdBQUcsQ0FBQztRQUNoRCxDQUFDLENBQUM7YUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEIsQ0FBQztDQW9DRiJ9
68
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24uY2xhc3Nlcy50ZW1wbGF0ZW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhZW1vbi5jbGFzc2VzLnRlbXBsYXRlbWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDbkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFdEUsTUFBTSxPQUFPLDBCQUEwQjtJQUdyQyxZQUFZLGlCQUE4QjtRQXNDbkMsK0JBQTBCLEdBQUcsQ0FBQyxVQUE4QixFQUFFLEVBQUU7WUFDckUsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsd0JBQXdCLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDbkUsT0FBTztFQUNULElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxVQUFVLENBQUM7OztjQUc3QixVQUFVLENBQUMsV0FBVzs7Ozs7YUFLdkIsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7T0FDeEIsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDM0MsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0VBQ25ELGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUU7NkJBQ0ksVUFBVSxDQUFDLFVBQVUsT0FBTyxVQUFVLENBQUMsT0FBTzttQkFDeEQsVUFBVSxDQUFDLFVBQVU7Ozs7Ozs7Ozs7Q0FVdkMsQ0FBQztRQUNBLENBQUMsQ0FBQztRQWhFQSxJQUFJLENBQUMsY0FBYyxHQUFHLGlCQUFpQixDQUFDO0lBQzFDLENBQUM7SUFFTyx3QkFBd0IsQ0FBQyxVQUE4QjtRQUM3RCxNQUFNLFdBQVcsR0FBRyxVQUFVLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQztRQUNqRCxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDO2FBQy9CLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDcEIsSUFBSSxDQUFDLDBCQUEwQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUMxQyxNQUFNLElBQUksS0FBSyxDQUFDLG9DQUFvQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQzdELENBQUM7WUFDRCxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ3ZFLE9BQU8sZ0JBQWdCLEdBQUcsSUFBSSxZQUFZLEdBQUcsQ0FBQztRQUNoRCxDQUFDLENBQUM7YUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEIsQ0FBQztJQUVEOzs7O09BSUc7SUFDSyx3QkFBd0IsQ0FBQyxVQUE4QjtRQUM3RCxNQUFNLE9BQU8sR0FBd0M7WUFDbkQsQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQztZQUN6QixDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsT0FBTyxDQUFDO1lBQy9CLENBQUMsYUFBYSxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQUM7WUFDdkMsQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLE9BQU8sQ0FBQztZQUMvQixDQUFDLFlBQVksRUFBRSxVQUFVLENBQUMsVUFBVSxDQUFDO1lBQ3JDLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDO1lBQ3RDLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxLQUFLLElBQUksU0FBUyxDQUFDO1NBQ3pDLENBQUM7UUFDRixPQUFPLE9BQU87YUFDWCxNQUFNLENBQUMsQ0FBQyxLQUFLLEVBQTZCLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssU0FBUyxDQUFDO2FBQ3BFLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxLQUFLLEdBQUcsS0FBSyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7YUFDM0QsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hCLENBQUM7Q0E4QkYifQ==
@@ -8,11 +8,11 @@ import * as os from 'node:os';
8
8
  export type { Stats } from 'node:fs';
9
9
  export { path, childProcess, fs, fsConstants, crypto, util, os };
10
10
  import * as lik from '@push.rocks/lik';
11
- import * as smartfm from '@push.rocks/smartfm';
12
11
  import * as smartfs from '@push.rocks/smartfs';
13
12
  import * as smartlog from '@push.rocks/smartlog';
14
13
  import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
14
+ import * as smartmarkdown from '@push.rocks/smartmarkdown/iso';
15
15
  import * as smartpath from '@push.rocks/smartpath';
16
16
  import * as smartshell from '@push.rocks/smartshell';
17
17
  import * as smartsystem from '@push.rocks/smartsystem';
18
- export { lik, smartfm, smartfs, smartlog, smartlogDestinationLocal, smartpath, smartshell, smartsystem, };
18
+ export { lik, smartfs, smartlog, smartlogDestinationLocal, smartmarkdown, smartpath, smartshell, smartsystem, };
@@ -9,13 +9,13 @@ import * as os from 'node:os';
9
9
  export { path, childProcess, fs, fsConstants, crypto, util, os };
10
10
  // @pushrocks scope
11
11
  import * as lik from '@push.rocks/lik';
12
- import * as smartfm from '@push.rocks/smartfm';
13
12
  import * as smartfs from '@push.rocks/smartfs';
14
13
  import * as smartlog from '@push.rocks/smartlog';
15
14
  import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
15
+ import * as smartmarkdown from '@push.rocks/smartmarkdown/iso';
16
16
  import * as smartpath from '@push.rocks/smartpath';
17
17
  import * as smartshell from '@push.rocks/smartshell';
18
18
  import * as smartsystem from '@push.rocks/smartsystem';
19
- export { lik, smartfm, smartfs, smartlog, smartlogDestinationLocal, smartpath, smartshell, smartsystem, };
19
+ export { lik, smartfs, smartlog, smartlogDestinationLocal, smartmarkdown, smartpath, smartshell, smartsystem, };
20
20
  // third party
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUNsQyxPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUc5QixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7QUFFakUsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssT0FBTyxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLHdCQUF3QixNQUFNLHdDQUF3QyxDQUFDO0FBQ25GLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFDTCxHQUFHLEVBQ0gsT0FBTyxFQUNQLE9BQU8sRUFDUCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxHQUNaLENBQUM7QUFFRixjQUFjIn0=
21
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUNsQyxPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUc5QixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7QUFFakUsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyx3QkFBd0IsTUFBTSx3Q0FBd0MsQ0FBQztBQUNuRixPQUFPLEtBQUssYUFBYSxNQUFNLCtCQUErQixDQUFDO0FBQy9ELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFDTCxHQUFHLEVBQ0gsT0FBTyxFQUNQLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsYUFBYSxFQUNiLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxHQUNaLENBQUM7QUFFRixjQUFjIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartdaemon",
3
- "version": "2.15.0",
3
+ "version": "2.16.0",
4
4
  "private": false,
5
5
  "description": "Start scripts as long running daemons and manage them.",
6
6
  "main": "dist_ts/index.js",
@@ -26,17 +26,17 @@
26
26
  },
27
27
  "homepage": "https://code.foss.global/push.rocks/smartdaemon",
28
28
  "devDependencies": {
29
- "@git.zone/tsbuild": "^5.0.0",
29
+ "@git.zone/tsbuild": "^5.1.0",
30
30
  "@git.zone/tsrun": "^3.0.2",
31
31
  "@git.zone/tstest": "^6.3.2",
32
32
  "@types/node": "^26.6.2"
33
33
  },
34
34
  "dependencies": {
35
35
  "@push.rocks/lik": "^6.4.1",
36
- "@push.rocks/smartfm": "^2.2.2",
37
36
  "@push.rocks/smartfs": "^1.5.1",
38
37
  "@push.rocks/smartlog": "^3.2.2",
39
38
  "@push.rocks/smartlog-destination-local": "^9.0.2",
39
+ "@push.rocks/smartmarkdown": "^3.3.0",
40
40
  "@push.rocks/smartpath": "^6.0.0",
41
41
  "@push.rocks/smartshell": "^3.3.8",
42
42
  "@push.rocks/smartsystem": "^3.0.8"
package/readme.md CHANGED
@@ -226,7 +226,7 @@ group-accessible runtime directory, a malformed XDG root and a missing or malfor
226
226
  home directory each fail with `invalid_options` before contacting systemd.
227
227
 
228
228
  Construction validates only the options it is given: the unit name, `systemctlPath`,
229
- `commandTimeoutMs`, `scope` and a supplied `runtimeDirectory`, which must be a
229
+ `busctlPath`, `commandTimeoutMs`, `scope` and a supplied `runtimeDirectory`, which must be a
230
230
  well-formed path (and is refused for system scope). It reads, but does not validate,
231
231
  the process environment above, so a unit can be constructed without a login session
232
232
  (cron, a plain ssh command) or with a malformed XDG variable; its calls then refuse.
@@ -255,6 +255,20 @@ them fails closed; this includes an `Environment=` value holding a control chara
255
255
  `systemctl show` prints as a C escape. Every environment a `SystemdServiceDefinition` accepts
256
256
  reads back. Reload changed files first; the snapshot describes what the manager loaded.
257
257
 
258
+ `execStart` lists every `ExecStart=` command of the loaded unit, drop-ins included, in the order
259
+ the manager runs them, each as a frozen `ISystemdExecCommand`: `path` (the executable), `argv`
260
+ (the argument vector, `argv[0]` included, one string per argument exactly as loaded; `%`
261
+ specifiers resolved as systemd loaded the unit, `$VARIABLES` and `$$` as written) and `ignoreFailure` (a `-` prefix). It is empty for a unit
262
+ that sets none or that the manager could not find. `systemctl show` joins `argv` with spaces, so
263
+ an argument holding a space could not be told apart there; this field is read instead from the
264
+ unit's D-Bus `ExecStart` property (`a(sasbttttuii)`) with `busctl --json=short get-property`,
265
+ through an absolute `busctlPath` (default `/usr/bin/busctl`, systemd 240 or newer) with the same
266
+ clean environment and timeout. The system scope reads the system bus; the user scope reads the
267
+ user's bus at `$XDG_RUNTIME_DIR/bus`, so a user manager without a user D-Bus fails
268
+ `inspectServiceSettings()` with `command_failed`. A failed bus read rejects with
269
+ `command_failed`, and a reply that is not exactly that signature with an absolute `path`, a
270
+ non-empty `argv` of strings and a boolean flag per command rejects with `invalid_state`.
271
+
258
272
  ```typescript
259
273
  const settings = await new SystemdUnit({ unitName: 'pallet-containerd.service' }).inspectServiceSettings();
260
274
  const carriesContract = settings.type === 'notify' && settings.notifyAccess === 'all' &&
@@ -262,6 +276,9 @@ const carriesContract = settings.type === 'notify' && settings.notifyAccess ===
262
276
  settings.limitNoFileSoft === 'infinity' && settings.tasksMax === 'infinity' &&
263
277
  settings.oomScoreAdjust === -999 && settings.restart === 'always' &&
264
278
  settings.restartMicroseconds === 2_000_000 && settings.timeoutStopMicroseconds === 60_000_000;
279
+ // The exact command line the manager runs, argument by argument.
280
+ const runsServe = settings.execStart.length === 1 &&
281
+ settings.execStart[0].argv.join('\0') === ['/opt/pallet/pallet-control', 'containerd-serve'].join('\0');
265
282
  ```
266
283
 
267
284
  `enable()` persistently enables the existing unit definition and returns a fresh
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartdaemon',
6
- version: '2.15.0',
6
+ version: '2.16.0',
7
7
  description: 'Start scripts as long running daemons and manage them.'
8
8
  }
@@ -21,6 +21,11 @@ export interface ISystemdUnitOptions {
21
21
  runtimeDirectory?: string;
22
22
  /** Absolute executable path supplied by trusted owning code. */
23
23
  systemctlPath?: string;
24
+ /**
25
+ * Absolute `busctl` path supplied by trusted owning code. `inspectServiceSettings()` reads the
26
+ * loaded `ExecStart` through it from the manager's bus object. Defaults to `/usr/bin/busctl`.
27
+ */
28
+ busctlPath?: string;
24
29
  /** Bounds the systemctl client, not the server-side job. Defaults to 120 seconds. */
25
30
  commandTimeoutMs?: number;
26
31
  }
@@ -92,6 +97,23 @@ export interface ISystemdExitStatusSet {
92
97
  readonly signals: readonly string[];
93
98
  }
94
99
 
100
+ /**
101
+ * One command of a service's `ExecStart` as the manager loaded it, from the unit's D-Bus
102
+ * `ExecStart` property (`a(sasbttttuii)`): exact, with every argument as its own string.
103
+ */
104
+ export interface ISystemdExecCommand {
105
+ /** The executable the manager runs. */
106
+ readonly path: string;
107
+ /**
108
+ * The argument vector, `argv[0]` included, exactly as loaded: an argument that holds a space is
109
+ * one string. systemd resolves `%` specifiers when it loads the unit (`%i` reads as the instance
110
+ * name); `$VAR`, `${VAR}` and `$$` are expanded only at exec time, so they appear as written.
111
+ */
112
+ readonly argv: readonly string[];
113
+ /** Whether the manager ignores the command's failure (a `-` prefix). */
114
+ readonly ignoreFailure: boolean;
115
+ }
116
+
95
117
  /**
96
118
  * Service settings as the manager loaded them, drop-ins included. Timespans are exact integer
97
119
  * microseconds; a limit systemd reports as unbounded is `'infinity'`. Mode strings are systemd's
@@ -128,6 +150,11 @@ export interface ISystemdServiceSettings {
128
150
  * passes to every unit, `EnvironmentFile=` contents and `PassEnvironment=` are not part of it.
129
151
  */
130
152
  readonly environment: Readonly<Record<string, string>>;
153
+ /**
154
+ * Every `ExecStart` command in the order the manager runs them, drop-ins included; empty for a
155
+ * unit that sets none or that the manager could not load.
156
+ */
157
+ readonly execStart: readonly ISystemdExecCommand[];
131
158
  }
132
159
 
133
160
  export class SystemdUnitError extends Error {
@@ -217,6 +244,55 @@ const parseEnvironment = (text: string): Readonly<Record<string, string>> | unde
217
244
  return Object.freeze(Object.fromEntries([...entries].sort(([left], [right]) => left < right ? -1 : 1)));
218
245
  };
219
246
 
247
+ /**
248
+ * The D-Bus object path of a unit: the unit name with every character but an ASCII letter or digit
249
+ * escaped as `_` and two lowercase hex digits. systemd's own unit_dbus_path_from_name() also escapes
250
+ * a leading digit; its decoder accepts both forms, so both name the same unit. The constructor
251
+ * admits ASCII unit names only.
252
+ */
253
+ const unitObjectPath = (unitName: string): string => '/org/freedesktop/systemd1/unit/' +
254
+ [...unitName].map((character) => /^[A-Za-z0-9]$/.test(character)
255
+ ? character : `_${character.charCodeAt(0).toString(16).padStart(2, '0')}`).join('');
256
+
257
+ /**
258
+ * Parses `busctl --json=short get-property` of a service's `ExecStart`: the signature
259
+ * `a(sasbttttuii)` and one tuple per command (path, argv, ignore-failure, then the last run's
260
+ * start and stop timestamps, PID, code and status, which are not reported). An absolute path, a
261
+ * non-empty argv of strings and a boolean are required; anything else is refused.
262
+ */
263
+ const parseExecStart = (text: string): readonly ISystemdExecCommand[] | undefined => {
264
+ let value: unknown;
265
+ try {
266
+ value = JSON.parse(text);
267
+ } catch {
268
+ return undefined;
269
+ }
270
+ if (typeof value !== 'object' || value === null || Array.isArray(value) || !('type' in value) ||
271
+ !('data' in value) || Object.keys(value).length !== 2 || value.type !== 'a(sasbttttuii)') return undefined;
272
+ const data = value.data;
273
+ if (!Array.isArray(data)) return undefined;
274
+ const entries: readonly unknown[] = data;
275
+ const commands: ISystemdExecCommand[] = [];
276
+ for (const entry of entries) {
277
+ if (!Array.isArray(entry) || entry.length !== 10) return undefined;
278
+ const fields: readonly unknown[] = entry;
279
+ const [path, argvValue, ignoreFailure] = fields;
280
+ if (typeof path !== 'string' || !path.startsWith('/') || path.includes('\0') ||
281
+ !Array.isArray(argvValue) || argvValue.length === 0 || typeof ignoreFailure !== 'boolean' ||
282
+ fields.slice(3).some((field) => typeof field !== 'number' || !Number.isInteger(field))) {
283
+ return undefined;
284
+ }
285
+ const argvItems: readonly unknown[] = argvValue;
286
+ const argv: string[] = [];
287
+ for (const item of argvItems) {
288
+ if (typeof item !== 'string' || item.includes('\0')) return undefined;
289
+ argv.push(item);
290
+ }
291
+ commands.push(Object.freeze({ path, argv: Object.freeze(argv), ignoreFailure }));
292
+ }
293
+ return Object.freeze(commands);
294
+ };
295
+
220
296
  /**
221
297
  * Output limit of every systemctl call, sized for the largest output read: inspectServiceSettings()
222
298
  * of a unit rendered from any accepted SystemdServiceDefinition. `systemctl show` prints Environment
@@ -230,6 +306,14 @@ const parseEnvironment = (text: string): Readonly<Record<string, string>> | unde
230
306
  */
231
307
  const outputLimit = 2 * environmentByteLimit + 3 * environmentVariableLimit + 2048 + 1024;
232
308
 
309
+ /**
310
+ * Output limit of the busctl ExecStart read, sized for a unit rendered from any accepted
311
+ * SystemdServiceDefinition: one command whose path and argv hold the executable twice and at most
312
+ * 128 arguments, each at most 4096 UTF-16 code units. Every code unit prints as at most six JSON
313
+ * bytes (a `\uXXXX` escape); the rest of the reply fits in 4096.
314
+ */
315
+ const execStartOutputLimit = 6 * 4096 * (128 + 2) + 4096;
316
+
233
317
  const properties = [
234
318
  'Id',
235
319
  'LoadState',
@@ -260,6 +344,7 @@ const jobArguments = (optionsArg: ISystemdUnitJobOptions | undefined): string[]
260
344
  export class SystemdUnit {
261
345
  private readonly unitName: string;
262
346
  private readonly executable: string;
347
+ private readonly busctl: string;
263
348
  private readonly timeout: number;
264
349
  private readonly scope: 'system' | 'user';
265
350
  /** Present exactly for user scope. */
@@ -268,6 +353,7 @@ export class SystemdUnit {
268
353
  constructor(optionsArg: ISystemdUnitOptions) {
269
354
  this.unitName = optionsArg?.unitName;
270
355
  this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
356
+ this.busctl = optionsArg?.busctlPath ?? '/usr/bin/busctl';
271
357
  this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
272
358
  this.scope = optionsArg?.scope ?? 'system';
273
359
  this.userEnvironment = this.scope === 'user'
@@ -281,7 +367,8 @@ export class SystemdUnit {
281
367
  typeof this.unitName !== 'string' ||
282
368
  !/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
283
369
  typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
284
- this.executable.includes('\0') || !Number.isSafeInteger(this.timeout) ||
370
+ this.executable.includes('\0') || typeof this.busctl !== 'string' || !plugins.path.isAbsolute(this.busctl) ||
371
+ this.busctl.includes('\0') || !Number.isSafeInteger(this.timeout) ||
285
372
  this.timeout < 1 || this.timeout > 600000 ||
286
373
  !['system', 'user'].includes(this.scope) ||
287
374
  (this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
@@ -436,6 +523,12 @@ export class SystemdUnit {
436
523
  };
437
524
  const oomScoreAdjust = parsed('OOMScoreAdjust', (text) =>
438
525
  /^(0|-?[1-9]\d{0,3})$/.test(text) && Math.abs(Number(text)) <= 1000 ? Number(text) : undefined);
526
+ // `systemctl show` joins ExecStart's argv with spaces, so an argument holding one cannot be told
527
+ // apart; the unit's bus property carries every argument as its own string.
528
+ const execStart = parseExecStart(await this.run(this.busctl, [this.scope === 'user' ? '--user' : '--system',
529
+ '--json=short', 'get-property', 'org.freedesktop.systemd1', unitObjectPath(this.unitName),
530
+ 'org.freedesktop.systemd1.Service', 'ExecStart'], execStartOutputLimit));
531
+ if (execStart === undefined) throw new SystemdUnitError('invalid_state');
439
532
  return Object.freeze({
440
533
  unitName: this.unitName,
441
534
  type: mode('Type', true),
@@ -458,6 +551,7 @@ export class SystemdUnit {
458
551
  tasksMax: parsed('TasksMax', parseLimit),
459
552
  oomScoreAdjust,
460
553
  environment: parsed('Environment', parseEnvironment),
554
+ execStart,
461
555
  });
462
556
  }
463
557
 
@@ -481,17 +575,27 @@ export class SystemdUnit {
481
575
  return environment;
482
576
  }
483
577
 
484
- private async command(argsArg: string[]): Promise<string> {
578
+ private command(argsArg: string[]): Promise<string> {
579
+ return this.run(this.executable,
580
+ [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg], outputLimit);
581
+ }
582
+
583
+ /**
584
+ * Runs one manager client (systemctl, or busctl for a bus property) with the scope's fixed
585
+ * environment. For user scope busctl reaches the manager through the user's bus at
586
+ * `$XDG_RUNTIME_DIR/bus`.
587
+ */
588
+ private async run(executableArg: string, argsArg: string[], limitArg: number): Promise<string> {
485
589
  const userEnvironment = await this.userManagerEnvironment();
486
590
  return new Promise((resolve, reject) => {
487
591
  plugins.childProcess.execFile(
488
- this.executable,
489
- [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg],
592
+ executableArg,
593
+ argsArg,
490
594
  {
491
595
  encoding: 'utf8',
492
596
  timeout: this.timeout,
493
597
  killSignal: 'SIGKILL',
494
- maxBuffer: outputLimit,
598
+ maxBuffer: limitArg,
495
599
  windowsHide: true,
496
600
  env: userEnvironment
497
601
  ? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
@@ -101,14 +101,12 @@ export class SmartDaemonSystemdManager {
101
101
  public async getServices() {
102
102
  const existingServices: SmartDaemonService[] = [];
103
103
  if (await this.checkElegibility()) {
104
- const smartfmInstance = new plugins.smartfm.Smartfm({
105
- fmType: 'yaml',
106
- });
107
104
  const availableServices = await this.smartFs.directory(paths.systemdDir).filter('smartdaemon_*.service').list();
108
105
  for (const serviceFile of availableServices) {
109
106
  const serviceFileContent = await this.smartFs.file(serviceFile.path).encoding('utf8').read();
110
- const data = smartfmInstance.parseFromComments('# ', serviceFileContent.toString())
111
- .data as ISmartDaemonServiceConstructorOptions;
107
+ const data = (
108
+ await plugins.smartmarkdown.parseCommentFrontmatter(serviceFileContent.toString(), '# ')
109
+ ).data as unknown as ISmartDaemonServiceConstructorOptions;
112
110
  const service = await SmartDaemonService.createFromOptions(this.smartdaemonRef, data);
113
111
  service.alreadyExists = true;
114
112
  existingServices.push(service);
@@ -21,16 +21,31 @@ export class SmartDaemonTemplateManager {
21
21
  .join('\n');
22
22
  }
23
23
 
24
+ /**
25
+ * renders the service options as the commented YAML frontmatter block that getServices() reads back.
26
+ * Every value is written as a double-quoted YAML scalar (JSON string syntax is valid YAML), so values
27
+ * containing ": ", " #", quotes or line breaks round-trip unchanged and stay on their comment line.
28
+ */
29
+ private generateFrontmatterLines(serviceArg: SmartDaemonService): string {
30
+ const entries: Array<[string, string | undefined]> = [
31
+ ['name', serviceArg.name],
32
+ ['version', serviceArg.version],
33
+ ['description', serviceArg.description],
34
+ ['command', serviceArg.command],
35
+ ['workingDir', serviceArg.workingDir],
36
+ ['user', serviceArg.user || undefined],
37
+ ['group', serviceArg.group || undefined],
38
+ ];
39
+ return entries
40
+ .filter((entry): entry is [string, string] => entry[1] !== undefined)
41
+ .map(([key, value]) => `# ${key}: ${JSON.stringify(value)}`)
42
+ .join('\n');
43
+ }
44
+
24
45
  public generateUnitFileForService = (serviceArg: SmartDaemonService) => {
25
46
  const environmentLines = this.generateEnvironmentLines(serviceArg);
26
47
  return `# ---
27
- # name: ${serviceArg.name}
28
- # version: ${serviceArg.version}
29
- # description: ${serviceArg.description}
30
- # command: ${serviceArg.command}
31
- # workingDir: ${serviceArg.workingDir}${serviceArg.user ? `
32
- # user: ${serviceArg.user}` : ''}${serviceArg.group ? `
33
- # group: ${serviceArg.group}` : ''}
48
+ ${this.generateFrontmatterLines(serviceArg)}
34
49
  # ---
35
50
  [Unit]
36
51
  Description=${serviceArg.description}
@@ -12,20 +12,20 @@ export { path, childProcess, fs, fsConstants, crypto, util, os };
12
12
 
13
13
  // @pushrocks scope
14
14
  import * as lik from '@push.rocks/lik';
15
- import * as smartfm from '@push.rocks/smartfm';
16
15
  import * as smartfs from '@push.rocks/smartfs';
17
16
  import * as smartlog from '@push.rocks/smartlog';
18
17
  import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
18
+ import * as smartmarkdown from '@push.rocks/smartmarkdown/iso';
19
19
  import * as smartpath from '@push.rocks/smartpath';
20
20
  import * as smartshell from '@push.rocks/smartshell';
21
21
  import * as smartsystem from '@push.rocks/smartsystem';
22
22
 
23
23
  export {
24
24
  lik,
25
- smartfm,
26
25
  smartfs,
27
26
  smartlog,
28
27
  smartlogDestinationLocal,
28
+ smartmarkdown,
29
29
  smartpath,
30
30
  smartshell,
31
31
  smartsystem,