@push.rocks/smartdaemon 2.4.0 → 2.5.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.4.0',
6
+ version: '2.5.0',
7
7
  description: 'Start scripts as long running daemons and manage them.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
@@ -1,3 +1,5 @@
1
+ import { type ISystemdServiceStartup, type ISystemdServiceDependencies, type ISystemdServiceInstallTargets } from './systemd.definition.js';
2
+ export type { ISystemdServiceStartup, ISystemdServiceDependencies, ISystemdServiceInstallTargets } from './systemd.definition.js';
1
3
  export interface ISystemdServiceDefinitionOptions {
2
4
  unitName: string;
3
5
  description: string;
@@ -9,6 +11,9 @@ export interface ISystemdServiceDefinitionOptions {
9
11
  restart: 'no' | 'on-failure' | 'always';
10
12
  killMode: 'mixed' | 'control-group';
11
13
  timeoutStopSeconds: number;
14
+ startup?: ISystemdServiceStartup;
15
+ dependencies?: ISystemdServiceDependencies;
16
+ install?: ISystemdServiceInstallTargets;
12
17
  }
13
18
  export declare class SystemdServiceDefinitionError extends Error {
14
19
  constructor();
@@ -1,4 +1,5 @@
1
1
  import * as plugins from './smartdaemon.plugins.js';
2
+ import { renderServiceRelations } from './systemd.definition.js';
2
3
  export class SystemdServiceDefinitionError extends Error {
3
4
  constructor() {
4
5
  super('Invalid direct systemd service definition.');
@@ -28,8 +29,9 @@ export class SystemdServiceDefinition {
28
29
  'killMode',
29
30
  'timeoutStopSeconds',
30
31
  ];
31
- requireValue(options && Object.getPrototypeOf(options) === Object.prototype &&
32
- Reflect.ownKeys(options).length === keys.length && keys.every((key) => {
32
+ requireValue(options && !plugins.util.types.isProxy(options) && Object.getPrototypeOf(options) === Object.prototype &&
33
+ Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'startup', 'dependencies', 'install'].includes(key)
34
+ && Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)) && keys.every((key) => {
33
35
  const descriptor = Object.getOwnPropertyDescriptor(options, key);
34
36
  return descriptor && 'value' in descriptor;
35
37
  }));
@@ -42,7 +44,7 @@ export class SystemdServiceDefinition {
42
44
  absolute(options.workingDirectory) &&
43
45
  options.workingDirectory.trim() === options.workingDirectory &&
44
46
  !options.workingDirectory.includes('\\'));
45
- requireValue(Array.isArray(options.args) && Object.getPrototypeOf(options.args) === Array.prototype &&
47
+ requireValue(Array.isArray(options.args) && !plugins.util.types.isProxy(options.args) && Object.getPrototypeOf(options.args) === Array.prototype &&
46
48
  options.args.length <= 128 &&
47
49
  Reflect.ownKeys(options.args).length === options.args.length + 1 &&
48
50
  Array.from({ length: options.args.length }, (_, index) => Object.getOwnPropertyDescriptor(options.args, String(index)))
@@ -57,14 +59,15 @@ export class SystemdServiceDefinition {
57
59
  .replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('%', '%%')
58
60
  .replaceAll('$', () => command ? '$$' : '$') +
59
61
  '"';
62
+ const relations = renderServiceRelations(options, options.unitName, options.restart, () => { throw new SystemdServiceDefinitionError(); });
60
63
  this.unitName = options.unitName;
61
64
  this.content = [
62
65
  '[Unit]',
63
66
  `Description=${options.description.replaceAll('%', '%%')}`,
64
- 'After=local-fs.target',
67
+ ...relations.unit,
65
68
  '',
66
69
  '[Service]',
67
- 'Type=exec',
70
+ ...relations.service,
68
71
  `User=${options.user}`,
69
72
  `Group=${options.group}`,
70
73
  `ExecStart=${[quote(options.executable), ...options.args.map((value) => quote(value, true))].join(' ')}`,
@@ -82,7 +85,7 @@ export class SystemdServiceDefinition {
82
85
  'StandardError=journal',
83
86
  '',
84
87
  '[Install]',
85
- 'WantedBy=multi-user.target',
88
+ ...relations.install,
86
89
  '',
87
90
  ].join('\n');
88
91
  requireValue(Buffer.byteLength(this.content) <= 16384);
@@ -90,4 +93,4 @@ export class SystemdServiceDefinition {
90
93
  Object.freeze(this);
91
94
  }
92
95
  }
93
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zeXN0ZW1kc2VydmljZWRlZmluaXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnN5c3RlbWRzZXJ2aWNlZGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBZXBELE1BQU0sT0FBTyw2QkFBOEIsU0FBUSxLQUFLO0lBQ3REO1FBQ0UsS0FBSyxDQUFDLDRDQUE0QyxDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLElBQUksR0FBRywrQkFBK0IsQ0FBQztJQUM5QyxDQUFDO0NBQ0Y7QUFFRCw4RkFBOEY7QUFDOUYsTUFBTSxPQUFPLHdCQUF3QjtJQUtuQyxZQUFZLE9BQXlDO1FBQ25ELE1BQU0sWUFBWSxHQUFHLENBQUMsS0FBYyxFQUFRLEVBQUU7WUFDNUMsSUFBSSxDQUFDLEtBQUs7Z0JBQUUsTUFBTSxJQUFJLDZCQUE2QixFQUFFLENBQUM7UUFDeEQsQ0FBQyxDQUFDO1FBQ0YsTUFBTSxJQUFJLEdBQUcsQ0FBQyxLQUFjLEVBQUUsT0FBTyxHQUFHLElBQUksRUFBbUIsRUFBRSxDQUMvRCxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sSUFBSSxPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1lBQ3RGLENBQUMseUVBQXlFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3pGLE1BQU0sUUFBUSxHQUFHLENBQUMsS0FBYyxFQUFFLEVBQUUsQ0FDbEMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztZQUM3QyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsS0FBSyxLQUFLLENBQUM7UUFDMUMsTUFBTSxJQUFJLEdBQUc7WUFDWCxVQUFVO1lBQ1YsYUFBYTtZ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
96
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zeXN0ZW1kc2VydmljZWRlZmluaXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnN5c3RlbWRzZXJ2aWNlZGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxzQkFBc0IsRUFDTyxNQUFNLHlCQUF5QixDQUFDO0FBbUJ0RSxNQUFNLE9BQU8sNkJBQThCLFNBQVEsS0FBSztJQUN0RDtRQUNFLEtBQUssQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxJQUFJLEdBQUcsK0JBQStCLENBQUM7SUFDOUMsQ0FBQztDQUNGO0FBRUQsOEZBQThGO0FBQzlGLE1BQU0sT0FBTyx3QkFBd0I7SUFLbkMsWUFBWSxPQUF5QztRQUNuRCxNQUFNLFlBQVksR0FBRyxDQUFDLEtBQWMsRUFBUSxFQUFFO1lBQzVDLElBQUksQ0FBQyxLQUFLO2dCQUFFLE1BQU0sSUFBSSw2QkFBNkIsRUFBRSxDQUFDO1FBQ3hELENBQUMsQ0FBQztRQUNGLE1BQU0sSUFBSSxHQUFHLENBQUMsS0FBYyxFQUFFLE9BQU8sR0FBRyxJQUFJLEVBQW1CLEVBQUUsQ0FDL0QsT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxNQUFNLElBQUksT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztZQUN0RixDQUFDLHlFQUF5RSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6RixNQUFNLFFBQVEsR0FBRyxDQUFDLEtBQWMsRUFBRSxFQUFFLENBQ2xDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUM7WUFDN0MsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEtBQUssS0FBSyxD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
@@ -59,7 +59,7 @@ export class SystemdUnitFile {
59
59
  let temporaryInfo;
60
60
  try {
61
61
  const before = await this.unit.inspect();
62
- await this.admit(before);
62
+ const beforeConfiguration = await this.admit(before);
63
63
  await this.directories(true);
64
64
  const parent = await plugins.fs.lstat(this.directory);
65
65
  const previous = await this.read(this.path);
@@ -88,13 +88,14 @@ export class SystemdUnitFile {
88
88
  requireValue(sameFile(parent, await plugins.fs.lstat(this.directory)), 'unsafe_path');
89
89
  const rechecked = await this.unit.inspect();
90
90
  requireValue(JSON.stringify(rechecked) === JSON.stringify(before), 'changed');
91
- await this.admit(rechecked);
91
+ const recheckedConfiguration = await this.admit(rechecked);
92
+ requireValue(recheckedConfiguration.fragmentPath === beforeConfiguration.fragmentPath, 'changed');
92
93
  await plugins.fs.rename(temporary, this.path);
93
94
  temporary = undefined;
94
95
  await this.flushDirectory(parent);
95
96
  }
96
97
  try {
97
- await this.unit.reloadConfiguration();
98
+ const reloadedConfiguration = await this.unit.reloadConfiguration();
98
99
  const after = await this.unit.inspect();
99
100
  requireValue(quiet(after) &&
100
101
  (before.loadState === 'not-found'
@@ -102,8 +103,9 @@ export class SystemdUnitFile {
102
103
  : after.loadState === before.loadState &&
103
104
  after.unitFileState === before.unitFileState), 'changed');
104
105
  const configuration = await this.unit.inspectConfiguration();
105
- requireValue(!configuration.needsReload && configuration.dropInPaths === '' &&
106
- configuration.fragmentPath === (masked(after) ? '/dev/null' : this.path), 'unsafe_unit');
106
+ requireValue([reloadedConfiguration, configuration].every((snapshot) => !snapshot.needsReload && snapshot.dropInPaths === '' &&
107
+ snapshot.fragmentPath ===
108
+ (masked(after) ? beforeConfiguration.fragmentPath : this.path)), 'unsafe_unit');
107
109
  const installed = await this.inspect();
108
110
  requireValue(installed?.sha256 === definition.sha256, 'changed');
109
111
  return Object.freeze({ changed, record: installed, masked: masked(after) });
@@ -136,8 +138,13 @@ export class SystemdUnitFile {
136
138
  ['enabled', 'enabled-runtime', 'disabled'].includes(state.unitFileState) ||
137
139
  state.loadState === 'not-found' && state.unitFileState === ''), 'unsafe_unit');
138
140
  const configuration = await this.unit.inspectConfiguration();
139
- requireValue(configuration.dropInPaths === '' && configuration.fragmentPath ===
140
- (masked(state) ? '/dev/null' : state.loadState === 'not-found' ? '' : this.path), 'unsafe_unit');
141
+ const maskPath = plugins.path.join(state.unitFileState === 'masked-runtime' ? '/run/systemd/system' : '/etc/systemd/system', this.name);
142
+ requireValue(!configuration.needsReload && configuration.dropInPaths === '' &&
143
+ (masked(state)
144
+ ? configuration.fragmentPath !== this.path &&
145
+ ['/dev/null', maskPath].includes(configuration.fragmentPath)
146
+ : configuration.fragmentPath === (state.loadState === 'not-found' ? '' : this.path)), 'unsafe_unit');
147
+ return configuration;
141
148
  }
142
149
  async directories(create) {
143
150
  requireValue(process.platform === 'linux' && process.getuid?.() === this.uid, 'unsafe_path');
@@ -239,4 +246,4 @@ export class SystemdUnitFile {
239
246
  }
240
247
  }
241
248
  }
242
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
249
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
@@ -3,8 +3,9 @@ import * as childProcess from 'node:child_process';
3
3
  import * as fs from 'node:fs/promises';
4
4
  import { constants as fsConstants } from 'node:fs';
5
5
  import * as crypto from 'node:crypto';
6
+ import * as util from 'node:util';
6
7
  export type { Stats } from 'node:fs';
7
- export { path, childProcess, fs, fsConstants, crypto };
8
+ export { path, childProcess, fs, fsConstants, crypto, util };
8
9
  import * as lik from '@push.rocks/lik';
9
10
  import * as smartfm from '@push.rocks/smartfm';
10
11
  import * as smartfs from '@push.rocks/smartfs';
@@ -4,7 +4,8 @@ import * as childProcess from 'node:child_process';
4
4
  import * as fs from 'node:fs/promises';
5
5
  import { constants as fsConstants } from 'node:fs';
6
6
  import * as crypto from 'node:crypto';
7
- export { path, childProcess, fs, fsConstants, crypto };
7
+ import * as util from 'node:util';
8
+ export { path, childProcess, fs, fsConstants, crypto, util };
8
9
  // @pushrocks scope
9
10
  import * as lik from '@push.rocks/lik';
10
11
  import * as smartfm from '@push.rocks/smartfm';
@@ -16,4 +17,4 @@ import * as smartshell from '@push.rocks/smartshell';
16
17
  import * as smartsystem from '@push.rocks/smartsystem';
17
18
  export { lik, smartfm, smartfs, smartlog, smartlogDestinationLocal, smartpath, smartshell, smartsystem, };
18
19
  // third party
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUd0QyxPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxDQUFDO0FBRXZELG1CQUFtQjtBQUNuQixPQUFPLEtBQUssR0FBRyxNQUFNLGlCQUFpQixDQUFDO0FBQ3ZDLE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUFDL0MsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyx3QkFBd0IsTUFBTSx3Q0FBd0MsQ0FBQztBQUNuRixPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RCxPQUFPLEVBQ0wsR0FBRyxFQUNILE9BQU8sRUFDUCxPQUFPLEVBQ1AsUUFBUSxFQUNSLHdCQUF3QixFQUN4QixTQUFTLEVBQ1QsVUFBVSxFQUNWLFdBQVcsR0FDWixDQUFDO0FBRUYsY0FBYyJ9
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUdsQyxPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUU3RCxtQkFBbUI7QUFDbkIsT0FBTyxLQUFLLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQztBQUN2QyxPQUFPLEtBQUssT0FBTyxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUFDL0MsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sd0NBQXdDLENBQUM7QUFDbkYsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUNMLEdBQUcsRUFDSCxPQUFPLEVBQ1AsT0FBTyxFQUNQLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsU0FBUyxFQUNULFVBQVUsRUFDVixXQUFXLEdBQ1osQ0FBQztBQUVGLGNBQWMifQ==
@@ -0,0 +1,29 @@
1
+ export interface ISystemdServiceStartup {
2
+ type: 'oneshot';
3
+ remainAfterExit: boolean;
4
+ timeoutStartSeconds: number;
5
+ }
6
+ /** Complete literal relations. After=local-fs.target is always retained. */
7
+ export interface ISystemdServiceDependencies {
8
+ defaultDependencies: boolean;
9
+ after: readonly string[];
10
+ before: readonly string[];
11
+ requires: readonly string[];
12
+ wants: readonly string[];
13
+ conflicts: readonly string[];
14
+ }
15
+ /** Install metadata only; rendering and file installation do not enable these links. */
16
+ export interface ISystemdServiceInstallTargets {
17
+ wantedBy: readonly string[];
18
+ requiredBy: readonly string[];
19
+ }
20
+ /** Internal validated renderer; no systemd/process/filesystem effects. */
21
+ export declare const renderServiceRelations: (options: {
22
+ startup?: ISystemdServiceStartup;
23
+ dependencies?: ISystemdServiceDependencies;
24
+ install?: ISystemdServiceInstallTargets;
25
+ }, unitName: string, restart: string, fail: () => never) => {
26
+ unit: string[];
27
+ service: string[];
28
+ install: string[];
29
+ };
@@ -0,0 +1,57 @@
1
+ import * as plugins from './smartdaemon.plugins.js';
2
+ /** Internal validated renderer; no systemd/process/filesystem effects. */
3
+ export const renderServiceRelations = (options, unitName, restart, fail) => {
4
+ const requireValue = (value) => { if (!value)
5
+ fail(); };
6
+ const record = (value, keys) => {
7
+ requireValue(value !== null && typeof value === 'object' && !plugins.util.types.isProxy(value)
8
+ && Object.getPrototypeOf(value) === Object.prototype);
9
+ const actual = Reflect.ownKeys(value);
10
+ requireValue(actual.length === keys.length && actual.every(key => typeof key === 'string' && keys.includes(key)
11
+ && Object.getOwnPropertyDescriptor(value, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(value, key)));
12
+ };
13
+ const units = (value) => {
14
+ requireValue(Array.isArray(value) && !plugins.util.types.isProxy(value)
15
+ && Object.getPrototypeOf(value) === Array.prototype && value.length <= 32
16
+ && Reflect.ownKeys(value).length === value.length + 1);
17
+ const result = [];
18
+ for (let index = 0; index < value.length; index++) {
19
+ const descriptor = Object.getOwnPropertyDescriptor(value, String(index));
20
+ requireValue(descriptor?.enumerable && 'value' in descriptor);
21
+ const item = descriptor.value;
22
+ requireValue(typeof item === 'string' && item !== unitName && item.length <= 255
23
+ && /^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,230}\.(service|target|socket|mount|automount|swap|timer|path|slice|scope|device)$/.test(item));
24
+ result.push(item);
25
+ }
26
+ requireValue(new Set(result).size === result.length);
27
+ return result.sort();
28
+ };
29
+ const line = (key, value) => value.length ? [`${key}=${value.join(' ')}`] : [];
30
+ const result = { unit: ['After=local-fs.target'], service: ['Type=exec'], install: ['WantedBy=multi-user.target'] };
31
+ if (options.startup !== undefined) {
32
+ const value = options.startup;
33
+ record(value, ['type', 'remainAfterExit', 'timeoutStartSeconds']);
34
+ requireValue(value.type === 'oneshot' && typeof value.remainAfterExit === 'boolean' && restart !== 'always'
35
+ && Number.isSafeInteger(value.timeoutStartSeconds) && value.timeoutStartSeconds >= 1 && value.timeoutStartSeconds <= 600);
36
+ result.service = ['Type=oneshot', `RemainAfterExit=${value.remainAfterExit ? 'yes' : 'no'}`, `TimeoutStartSec=${value.timeoutStartSeconds}s`];
37
+ }
38
+ if (options.dependencies !== undefined) {
39
+ const value = options.dependencies;
40
+ record(value, ['defaultDependencies', 'after', 'before', 'requires', 'wants', 'conflicts']);
41
+ requireValue(typeof value.defaultDependencies === 'boolean');
42
+ const after = [...new Set(['local-fs.target', ...units(value.after)])].sort();
43
+ const before = units(value.before), requires = units(value.requires), wants = units(value.wants), conflicts = units(value.conflicts);
44
+ requireValue(before.every(item => !after.includes(item)) && conflicts.every(item => !requires.includes(item) && !wants.includes(item)));
45
+ result.unit = [`DefaultDependencies=${value.defaultDependencies ? 'yes' : 'no'}`, ...line('After', after),
46
+ ...line('Before', before), ...line('Requires', requires), ...line('Wants', wants), ...line('Conflicts', conflicts)];
47
+ }
48
+ if (options.install !== undefined) {
49
+ const value = options.install;
50
+ record(value, ['wantedBy', 'requiredBy']);
51
+ const wanted = units(value.wantedBy), required = units(value.requiredBy);
52
+ requireValue(wanted.length + required.length > 0 && wanted.every(item => !required.includes(item)));
53
+ result.install = [...line('WantedBy', wanted), ...line('RequiredBy', required)];
54
+ }
55
+ return result;
56
+ };
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3lzdGVtZC5kZWZpbml0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc3lzdGVtZC5kZWZpbml0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUF3QnBELDBFQUEwRTtBQUMxRSxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLE9BSXRDLEVBQUUsUUFBZ0IsRUFBRSxPQUFlLEVBQUUsSUFBaUIsRUFFckQsRUFBRTtJQUNGLE1BQU0sWUFBWSxHQUFHLENBQUMsS0FBYyxFQUFRLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSztRQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLE1BQU0sTUFBTSxHQUFHLENBQUMsS0FBYyxFQUFFLElBQXVCLEVBQVEsRUFBRTtRQUMvRCxZQUFZLENBQUMsS0FBSyxLQUFLLElBQUksSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO2VBQ3pGLE1BQU0sQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLEtBQUssTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3hELE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBZSxDQUFDLENBQUM7UUFDaEQsWUFBWSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEtBQUssSUFBSSxDQUFDLE1BQU0sSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDO2VBQzFHLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUUsVUFBVSxJQUFJLE9BQU8sSUFBSSxNQUFNLENBQUMsd0JBQXdCLENBQUMsS0FBSyxF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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartdaemon",
3
- "version": "2.4.0",
3
+ "version": "2.5.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,7 +26,7 @@
26
26
  },
27
27
  "homepage": "https://code.foss.global/push.rocks/smartdaemon",
28
28
  "devDependencies": {
29
- "@git.zone/tsbuild": "^4.4.2",
29
+ "@git.zone/tsbuild": "^4.4.3",
30
30
  "@git.zone/tsrun": "^2.0.6",
31
31
  "@git.zone/tstest": "^6.0.0",
32
32
  "@types/node": "^26.4.1"
package/readme.md CHANGED
@@ -194,7 +194,7 @@ operation changes enablement or masks.
194
194
  ### Installing a direct systemd service definition
195
195
 
196
196
  `SystemdServiceDefinition` encodes a literal executable and argument list, with
197
- explicit user, group, restart policy, kill mode and stop timeout. It uses `Type=exec`,
197
+ explicit user, group, restart policy, kill mode and stop timeout. It defaults to `Type=exec`,
198
198
  journal output and null stdin. It introduces no shell; percent specifiers and
199
199
  argument environment expansion are escaped. Paths must be absolute and normalized;
200
200
  control characters are rejected. Descriptions and working directories cannot have
@@ -223,6 +223,62 @@ const installed = await file.install(definition, previous?.sha256 ?? null);
223
223
  console.log(installed.changed, installed.masked, installed.record.sha256);
224
224
  ```
225
225
 
226
+ For a boot prerequisite that must finish before dependent services start, supply
227
+ `startup: { type: 'oneshot', remainAfterExit: true, timeoutStartSeconds: 120 }`.
228
+ Systemd waits for successful process exit; `RemainAfterExit` keeps the completed
229
+ unit active. The start timeout is an integer from 1 to 600 seconds. Oneshot
230
+ services reject `restart: 'always'`; the default exec definition remains unchanged.
231
+
232
+ Optional `dependencies` describes the complete literal runtime relationships:
233
+
234
+ ```typescript
235
+ dependencies: {
236
+ defaultDependencies: false,
237
+ after: [],
238
+ before: ['network-pre.target', 'shutdown.target', 'systemd-networkd.service'],
239
+ requires: [],
240
+ wants: ['network-pre.target'],
241
+ conflicts: ['shutdown.target'],
242
+ },
243
+ install: { wantedBy: [], requiredBy: ['network-pre.target', 'systemd-networkd.service'] },
244
+ ```
245
+
246
+ `After=local-fs.target` is always retained. Disable default dependencies only for
247
+ an intentionally early boot or late shutdown service. Every list is bounded to
248
+ 32 distinct literal unit names, sorted deterministically; templates, specifiers,
249
+ self references and contradictory direct relationships are rejected. These local
250
+ checks do not prove the complete host dependency graph is free of cycles.
251
+
252
+ Consumers must declare both `requires: ['the-bootstrap.service']` and
253
+ `after: ['the-bootstrap.service']` for a failed bootstrap to prevent their start.
254
+ Ordering alone does not propagate failure. A prerequisite must actually fail its
255
+ start on failure; a skipped condition is not equivalent. Reverse stop ordering
256
+ keeps the prerequisite active until its ordered consumers stop.
257
+ The example assumes the host uses `systemd-networkd.service`: requiring the guard
258
+ only from `network-pre.target` does not block a network manager that merely orders
259
+ itself after that target. Select and verify the actual host network owner's edges.
260
+
261
+ `install` supplies only `WantedBy`/`RequiredBy` metadata, with at least one target.
262
+ The privileged installer must separately enable and verify the intended links;
263
+ rendering or installing the file does not activate them. A successful oneshot
264
+ proves only that its executable returned success, so that executable must finish
265
+ and verify all required work before exiting. See the upstream
266
+ [service readiness](https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html)
267
+ and [dependency semantics](https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html).
268
+
269
+ `test/native/qualify-systemd.py` exercises the generated units under Ubuntu systemd
270
+ PID 1 across provisioning, successful cold boot and failed cold boot. It checks
271
+ actual networkd failure coupling and reverse shutdown order in a disposable QEMU
272
+ overlay without an external network backend. The fixture requires QEMU/KVM,
273
+ OVMF, xorriso, Python PyYAML and global `tsx`. Supply the unmodified
274
+ [Ubuntu Noble 20260826 image](https://cloud-images.ubuntu.com/noble/20260826/noble-server-cloudimg-amd64.img)
275
+ with SHA-256 `d0fe84bb5f80853425fa6be28e2c106f30104c3cfe8611933f2e65c9b63f0e30`:
276
+
277
+ ```sh
278
+ python3 test/native/qualify-systemd.py --image /path/to/noble-server-cloudimg-amd64.img \
279
+ --work-root /tmp/smartdaemon-systemd-qualification-local
280
+ ```
281
+
226
282
  Installation requires Linux, root and a quiescent exact unit with no process,
227
283
  cgroup or job. It rejects effective drop-ins and shadowing fragments. Definitions
228
284
  default to `/usr/local/lib/systemd/system`, below administrator configuration in
@@ -230,6 +286,13 @@ the load path, so existing persistent/runtime masks remain intact. Existing
230
286
  enablement is preserved; an absent unit becomes disabled. It never enables,
231
287
  unmasks, starts or stops a service, or invokes sudo.
232
288
 
289
+ Masked units may report `/dev/null` or their exact administrator mask path:
290
+ `/etc/systemd/system/<unit>` for a persistent mask, `/run/systemd/system/<unit>`
291
+ for a runtime mask. Installation preserves that exact manager-selected fragment
292
+ through the write and reload, and never replaces the masking fragment itself.
293
+ Pending manager reloads are rejected before writing; inspect and explicitly
294
+ reload an existing changed configuration before retrying installation.
295
+
233
296
  The caller must already serialize privileged installation across processes;
234
297
  `SystemdUnitFile` only excludes simultaneous operations on the same instance.
235
298
  The expected previous SHA-256 is mandatory (`null` requires an absent file),
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartdaemon',
6
- version: '2.4.0',
6
+ version: '2.5.0',
7
7
  description: 'Start scripts as long running daemons and manage them.'
8
8
  }
@@ -1,4 +1,7 @@
1
1
  import * as plugins from './smartdaemon.plugins.js';
2
+ import { renderServiceRelations, type ISystemdServiceStartup, type ISystemdServiceDependencies,
3
+ type ISystemdServiceInstallTargets } from './systemd.definition.js';
4
+ export type { ISystemdServiceStartup, ISystemdServiceDependencies, ISystemdServiceInstallTargets } from './systemd.definition.js';
2
5
 
3
6
  export interface ISystemdServiceDefinitionOptions {
4
7
  unitName: string;
@@ -11,6 +14,9 @@ export interface ISystemdServiceDefinitionOptions {
11
14
  restart: 'no' | 'on-failure' | 'always';
12
15
  killMode: 'mixed' | 'control-group';
13
16
  timeoutStopSeconds: number;
17
+ startup?: ISystemdServiceStartup;
18
+ dependencies?: ISystemdServiceDependencies;
19
+ install?: ISystemdServiceInstallTargets;
14
20
  }
15
21
 
16
22
  export class SystemdServiceDefinitionError extends Error {
@@ -49,8 +55,9 @@ export class SystemdServiceDefinition {
49
55
  'timeoutStopSeconds',
50
56
  ];
51
57
  requireValue(
52
- options && Object.getPrototypeOf(options) === Object.prototype &&
53
- Reflect.ownKeys(options).length === keys.length && keys.every((key) => {
58
+ options && !plugins.util.types.isProxy(options) && Object.getPrototypeOf(options) === Object.prototype &&
59
+ Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'startup', 'dependencies', 'install'].includes(key)
60
+ && Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)!) && keys.every((key) => {
54
61
  const descriptor = Object.getOwnPropertyDescriptor(options, key);
55
62
  return descriptor && 'value' in descriptor;
56
63
  }),
@@ -71,7 +78,7 @@ export class SystemdServiceDefinition {
71
78
  !options.workingDirectory.includes('\\'),
72
79
  );
73
80
  requireValue(
74
- Array.isArray(options.args) && Object.getPrototypeOf(options.args) === Array.prototype &&
81
+ Array.isArray(options.args) && !plugins.util.types.isProxy(options.args) && Object.getPrototypeOf(options.args) === Array.prototype &&
75
82
  options.args.length <= 128 &&
76
83
  Reflect.ownKeys(options.args).length === options.args.length + 1 &&
77
84
  Array.from(
@@ -97,14 +104,15 @@ export class SystemdServiceDefinition {
97
104
  .replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('%', '%%')
98
105
  .replaceAll('$', () => command ? '$$' : '$') +
99
106
  '"';
107
+ const relations = renderServiceRelations(options, options.unitName, options.restart, () => { throw new SystemdServiceDefinitionError(); });
100
108
  this.unitName = options.unitName;
101
109
  this.content = [
102
110
  '[Unit]',
103
111
  `Description=${options.description.replaceAll('%', '%%')}`,
104
- 'After=local-fs.target',
112
+ ...relations.unit,
105
113
  '',
106
114
  '[Service]',
107
- 'Type=exec',
115
+ ...relations.service,
108
116
  `User=${options.user}`,
109
117
  `Group=${options.group}`,
110
118
  `ExecStart=${
@@ -124,7 +132,7 @@ export class SystemdServiceDefinition {
124
132
  'StandardError=journal',
125
133
  '',
126
134
  '[Install]',
127
- 'WantedBy=multi-user.target',
135
+ ...relations.install,
128
136
  '',
129
137
  ].join('\n');
130
138
  requireValue(Buffer.byteLength(this.content) <= 16384);
@@ -2,6 +2,7 @@ import * as plugins from './smartdaemon.plugins.js';
2
2
  import { SystemdServiceDefinition } from './classes.systemdservicedefinition.js';
3
3
  import {
4
4
  type ISystemdUnitOptions,
5
+ type ISystemdUnitConfigurationState,
5
6
  type ISystemdUnitState,
6
7
  SystemdUnit,
7
8
  } from './classes.systemdunit.js';
@@ -102,7 +103,7 @@ export class SystemdUnitFile {
102
103
  let temporaryInfo: plugins.Stats | undefined;
103
104
  try {
104
105
  const before = await this.unit.inspect();
105
- await this.admit(before);
106
+ const beforeConfiguration = await this.admit(before);
106
107
  await this.directories(true);
107
108
  const parent = await plugins.fs.lstat(this.directory);
108
109
  const previous = await this.read(this.path);
@@ -135,13 +136,17 @@ export class SystemdUnitFile {
135
136
  requireValue(sameFile(parent, await plugins.fs.lstat(this.directory)), 'unsafe_path');
136
137
  const rechecked = await this.unit.inspect();
137
138
  requireValue(JSON.stringify(rechecked) === JSON.stringify(before), 'changed');
138
- await this.admit(rechecked);
139
+ const recheckedConfiguration = await this.admit(rechecked);
140
+ requireValue(
141
+ recheckedConfiguration.fragmentPath === beforeConfiguration.fragmentPath,
142
+ 'changed',
143
+ );
139
144
  await plugins.fs.rename(temporary, this.path);
140
145
  temporary = undefined;
141
146
  await this.flushDirectory(parent);
142
147
  }
143
148
  try {
144
- await this.unit.reloadConfiguration();
149
+ const reloadedConfiguration = await this.unit.reloadConfiguration();
145
150
  const after = await this.unit.inspect();
146
151
  requireValue(
147
152
  quiet(after) &&
@@ -153,8 +158,11 @@ export class SystemdUnitFile {
153
158
  );
154
159
  const configuration = await this.unit.inspectConfiguration();
155
160
  requireValue(
156
- !configuration.needsReload && configuration.dropInPaths === '' &&
157
- configuration.fragmentPath === (masked(after) ? '/dev/null' : this.path),
161
+ [reloadedConfiguration, configuration].every((snapshot) =>
162
+ !snapshot.needsReload && snapshot.dropInPaths === '' &&
163
+ snapshot.fragmentPath ===
164
+ (masked(after) ? beforeConfiguration.fragmentPath : this.path)
165
+ ),
158
166
  'unsafe_unit',
159
167
  );
160
168
  const installed = await this.inspect();
@@ -179,7 +187,7 @@ export class SystemdUnitFile {
179
187
  }
180
188
  }
181
189
 
182
- private async admit(state: ISystemdUnitState): Promise<void> {
190
+ private async admit(state: ISystemdUnitState): Promise<ISystemdUnitConfigurationState> {
183
191
  requireValue(
184
192
  quiet(state) && (masked(state) ||
185
193
  state.loadState === 'loaded' &&
@@ -188,11 +196,19 @@ export class SystemdUnitFile {
188
196
  'unsafe_unit',
189
197
  );
190
198
  const configuration = await this.unit.inspectConfiguration();
199
+ const maskPath = plugins.path.join(
200
+ state.unitFileState === 'masked-runtime' ? '/run/systemd/system' : '/etc/systemd/system',
201
+ this.name,
202
+ );
191
203
  requireValue(
192
- configuration.dropInPaths === '' && configuration.fragmentPath ===
193
- (masked(state) ? '/dev/null' : state.loadState === 'not-found' ? '' : this.path),
204
+ !configuration.needsReload && configuration.dropInPaths === '' &&
205
+ (masked(state)
206
+ ? configuration.fragmentPath !== this.path &&
207
+ ['/dev/null', maskPath].includes(configuration.fragmentPath)
208
+ : configuration.fragmentPath === (state.loadState === 'not-found' ? '' : this.path)),
194
209
  'unsafe_unit',
195
210
  );
211
+ return configuration;
196
212
  }
197
213
 
198
214
  private async directories(create: boolean): Promise<boolean> {
@@ -4,9 +4,10 @@ import * as childProcess from 'node:child_process';
4
4
  import * as fs from 'node:fs/promises';
5
5
  import { constants as fsConstants } from 'node:fs';
6
6
  import * as crypto from 'node:crypto';
7
+ import * as util from 'node:util';
7
8
  export type { Stats } from 'node:fs';
8
9
 
9
- export { path, childProcess, fs, fsConstants, crypto };
10
+ export { path, childProcess, fs, fsConstants, crypto, util };
10
11
 
11
12
  // @pushrocks scope
12
13
  import * as lik from '@push.rocks/lik';
@@ -0,0 +1,84 @@
1
+ import * as plugins from './smartdaemon.plugins.js';
2
+
3
+ export interface ISystemdServiceStartup {
4
+ type: 'oneshot';
5
+ remainAfterExit: boolean;
6
+ timeoutStartSeconds: number;
7
+ }
8
+
9
+ /** Complete literal relations. After=local-fs.target is always retained. */
10
+ export interface ISystemdServiceDependencies {
11
+ defaultDependencies: boolean;
12
+ after: readonly string[];
13
+ before: readonly string[];
14
+ requires: readonly string[];
15
+ wants: readonly string[];
16
+ conflicts: readonly string[];
17
+ }
18
+
19
+ /** Install metadata only; rendering and file installation do not enable these links. */
20
+ export interface ISystemdServiceInstallTargets {
21
+ wantedBy: readonly string[];
22
+ requiredBy: readonly string[];
23
+ }
24
+
25
+ /** Internal validated renderer; no systemd/process/filesystem effects. */
26
+ export const renderServiceRelations = (options: {
27
+ startup?: ISystemdServiceStartup;
28
+ dependencies?: ISystemdServiceDependencies;
29
+ install?: ISystemdServiceInstallTargets;
30
+ }, unitName: string, restart: string, fail: () => never): {
31
+ unit: string[]; service: string[]; install: string[];
32
+ } => {
33
+ const requireValue = (value: unknown): void => { if (!value) fail(); };
34
+ const record = (value: unknown, keys: readonly string[]): void => {
35
+ requireValue(value !== null && typeof value === 'object' && !plugins.util.types.isProxy(value)
36
+ && Object.getPrototypeOf(value) === Object.prototype);
37
+ const actual = Reflect.ownKeys(value as object);
38
+ requireValue(actual.length === keys.length && actual.every(key => typeof key === 'string' && keys.includes(key)
39
+ && Object.getOwnPropertyDescriptor(value, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(value, key)!));
40
+ };
41
+ const units = (value: readonly string[]): string[] => {
42
+ requireValue(Array.isArray(value) && !plugins.util.types.isProxy(value)
43
+ && Object.getPrototypeOf(value) === Array.prototype && value.length <= 32
44
+ && Reflect.ownKeys(value).length === value.length + 1);
45
+ const result: string[] = [];
46
+ for (let index = 0; index < value.length; index++) {
47
+ const descriptor = Object.getOwnPropertyDescriptor(value, String(index));
48
+ requireValue(descriptor?.enumerable && 'value' in descriptor);
49
+ const item = descriptor!.value;
50
+ requireValue(typeof item === 'string' && item !== unitName && item.length <= 255
51
+ && /^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,230}\.(service|target|socket|mount|automount|swap|timer|path|slice|scope|device)$/.test(item));
52
+ result.push(item);
53
+ }
54
+ requireValue(new Set(result).size === result.length);
55
+ return result.sort();
56
+ };
57
+ const line = (key: string, value: readonly string[]): string[] => value.length ? [`${key}=${value.join(' ')}`] : [];
58
+ const result = { unit: ['After=local-fs.target'], service: ['Type=exec'], install: ['WantedBy=multi-user.target'] };
59
+ if (options.startup !== undefined) {
60
+ const value = options.startup;
61
+ record(value, ['type', 'remainAfterExit', 'timeoutStartSeconds']);
62
+ requireValue(value.type === 'oneshot' && typeof value.remainAfterExit === 'boolean' && restart !== 'always'
63
+ && Number.isSafeInteger(value.timeoutStartSeconds) && value.timeoutStartSeconds >= 1 && value.timeoutStartSeconds <= 600);
64
+ result.service = ['Type=oneshot', `RemainAfterExit=${value.remainAfterExit ? 'yes' : 'no'}`, `TimeoutStartSec=${value.timeoutStartSeconds}s`];
65
+ }
66
+ if (options.dependencies !== undefined) {
67
+ const value = options.dependencies;
68
+ record(value, ['defaultDependencies', 'after', 'before', 'requires', 'wants', 'conflicts']);
69
+ requireValue(typeof value.defaultDependencies === 'boolean');
70
+ const after = [...new Set(['local-fs.target', ...units(value.after)])].sort();
71
+ const before = units(value.before), requires = units(value.requires), wants = units(value.wants), conflicts = units(value.conflicts);
72
+ requireValue(before.every(item => !after.includes(item)) && conflicts.every(item => !requires.includes(item) && !wants.includes(item)));
73
+ result.unit = [`DefaultDependencies=${value.defaultDependencies ? 'yes' : 'no'}`, ...line('After', after),
74
+ ...line('Before', before), ...line('Requires', requires), ...line('Wants', wants), ...line('Conflicts', conflicts)];
75
+ }
76
+ if (options.install !== undefined) {
77
+ const value = options.install;
78
+ record(value, ['wantedBy', 'requiredBy']);
79
+ const wanted = units(value.wantedBy), required = units(value.requiredBy);
80
+ requireValue(wanted.length + required.length > 0 && wanted.every(item => !required.includes(item)));
81
+ result.install = [...line('WantedBy', wanted), ...line('RequiredBy', required)];
82
+ }
83
+ return result;
84
+ };