@push.rocks/smartdaemon 2.5.0 → 2.7.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.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.systemdservicedefinition.d.ts +11 -3
- package/dist_ts/classes.systemdservicedefinition.js +20 -10
- package/dist_ts/classes.systemdunit.d.ts +26 -1
- package/dist_ts/classes.systemdunit.js +79 -6
- package/dist_ts/classes.systemdunitfile.d.ts +4 -1
- package/dist_ts/classes.systemdunitfile.js +27 -10
- package/dist_ts/smartdaemon.plugins.d.ts +2 -1
- package/dist_ts/smartdaemon.plugins.js +3 -2
- package/dist_ts/systemd.definition.d.ts +2 -2
- package/dist_ts/systemd.definition.js +8 -4
- package/package.json +4 -4
- package/readme.md +79 -7
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.systemdservicedefinition.ts +29 -15
- package/ts/classes.systemdunit.ts +96 -5
- package/ts/classes.systemdunitfile.ts +34 -13
- package/ts/smartdaemon.plugins.ts +2 -1
- package/ts/systemd.definition.ts +8 -4
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdaemon',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.7.0',
|
|
7
7
|
description: 'Start scripts as long running daemons and manage them.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHdEQUF3RDtDQUN0RSxDQUFBIn0=
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import { type ISystemdServiceStartup, type ISystemdServiceDependencies, type ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
2
2
|
export type { ISystemdServiceStartup, ISystemdServiceDependencies, ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
3
|
-
|
|
3
|
+
interface ISystemdServiceDefinitionBaseOptions {
|
|
4
4
|
unitName: string;
|
|
5
5
|
description: string;
|
|
6
6
|
executable: string;
|
|
7
7
|
args: readonly string[];
|
|
8
8
|
workingDirectory: string;
|
|
9
|
-
user: string;
|
|
10
|
-
group: string;
|
|
11
9
|
restart: 'no' | 'on-failure' | 'always';
|
|
12
10
|
killMode: 'mixed' | 'control-group';
|
|
13
11
|
timeoutStopSeconds: number;
|
|
@@ -15,12 +13,22 @@ export interface ISystemdServiceDefinitionOptions {
|
|
|
15
13
|
dependencies?: ISystemdServiceDependencies;
|
|
16
14
|
install?: ISystemdServiceInstallTargets;
|
|
17
15
|
}
|
|
16
|
+
export type ISystemdServiceDefinitionOptions = ISystemdServiceDefinitionBaseOptions & ({
|
|
17
|
+
scope?: 'system';
|
|
18
|
+
user: string;
|
|
19
|
+
group: string;
|
|
20
|
+
} | {
|
|
21
|
+
scope: 'user';
|
|
22
|
+
user?: never;
|
|
23
|
+
group?: never;
|
|
24
|
+
});
|
|
18
25
|
export declare class SystemdServiceDefinitionError extends Error {
|
|
19
26
|
constructor();
|
|
20
27
|
}
|
|
21
28
|
/** Literal direct-execution definition; never introduces a shell or environment expansion. */
|
|
22
29
|
export declare class SystemdServiceDefinition {
|
|
23
30
|
readonly unitName: string;
|
|
31
|
+
readonly scope: 'system' | 'user';
|
|
24
32
|
readonly content: string;
|
|
25
33
|
readonly sha256: string;
|
|
26
34
|
constructor(options: ISystemdServiceDefinitionOptions);
|
|
@@ -13,6 +13,16 @@ export class SystemdServiceDefinition {
|
|
|
13
13
|
if (!value)
|
|
14
14
|
throw new SystemdServiceDefinitionError();
|
|
15
15
|
};
|
|
16
|
+
requireValue(options && !plugins.util.types.isProxy(options) &&
|
|
17
|
+
Object.getPrototypeOf(options) === Object.prototype);
|
|
18
|
+
const scopeDescriptor = Object.getOwnPropertyDescriptor(options, 'scope');
|
|
19
|
+
requireValue(scopeDescriptor === undefined ||
|
|
20
|
+
scopeDescriptor.enumerable && 'value' in scopeDescriptor);
|
|
21
|
+
const scopeValue = scopeDescriptor?.value ?? 'system';
|
|
22
|
+
if (scopeValue !== 'system' && scopeValue !== 'user') {
|
|
23
|
+
throw new SystemdServiceDefinitionError();
|
|
24
|
+
}
|
|
25
|
+
const scope = scopeValue;
|
|
16
26
|
const text = (value, maximum = 4096) => typeof value === 'string' && value.length <= maximum && !/[\x00-\x1f\x7f]/.test(value) &&
|
|
17
27
|
!/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/u.test(value);
|
|
18
28
|
const absolute = (value) => text(value) && plugins.path.isAbsolute(value) &&
|
|
@@ -23,15 +33,13 @@ export class SystemdServiceDefinition {
|
|
|
23
33
|
'executable',
|
|
24
34
|
'args',
|
|
25
35
|
'workingDirectory',
|
|
26
|
-
'user',
|
|
27
|
-
'group',
|
|
28
36
|
'restart',
|
|
29
37
|
'killMode',
|
|
30
38
|
'timeoutStopSeconds',
|
|
39
|
+
...(scope === 'system' ? ['user', 'group'] : []),
|
|
31
40
|
];
|
|
32
|
-
requireValue(
|
|
33
|
-
|
|
34
|
-
&& Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)) && keys.every((key) => {
|
|
41
|
+
requireValue(Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'scope', 'startup', 'dependencies', 'install'].includes(key)
|
|
42
|
+
&& Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)) && keys.every((key) => {
|
|
35
43
|
const descriptor = Object.getOwnPropertyDescriptor(options, key);
|
|
36
44
|
return descriptor && 'value' in descriptor;
|
|
37
45
|
}));
|
|
@@ -49,7 +57,9 @@ export class SystemdServiceDefinition {
|
|
|
49
57
|
Reflect.ownKeys(options.args).length === options.args.length + 1 &&
|
|
50
58
|
Array.from({ length: options.args.length }, (_, index) => Object.getOwnPropertyDescriptor(options.args, String(index)))
|
|
51
59
|
.every((descriptor) => descriptor && 'value' in descriptor && text(descriptor.value)));
|
|
52
|
-
|
|
60
|
+
if (scope === 'system') {
|
|
61
|
+
requireValue([options.user, options.group].every((value) => typeof value === 'string' && /^[a-zA-Z_][a-zA-Z0-9_-]{0,63}$/.test(value)));
|
|
62
|
+
}
|
|
53
63
|
requireValue(['no', 'on-failure', 'always'].includes(options.restart) &&
|
|
54
64
|
['mixed', 'control-group'].includes(options.killMode) &&
|
|
55
65
|
Number.isSafeInteger(options.timeoutStopSeconds) &&
|
|
@@ -59,8 +69,9 @@ export class SystemdServiceDefinition {
|
|
|
59
69
|
.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('%', '%%')
|
|
60
70
|
.replaceAll('$', () => command ? '$$' : '$') +
|
|
61
71
|
'"';
|
|
62
|
-
const relations = renderServiceRelations(options, options.unitName, options.restart, () => { throw new SystemdServiceDefinitionError(); });
|
|
72
|
+
const relations = renderServiceRelations(options, options.unitName, options.restart, scope, () => { throw new SystemdServiceDefinitionError(); });
|
|
63
73
|
this.unitName = options.unitName;
|
|
74
|
+
this.scope = scope;
|
|
64
75
|
this.content = [
|
|
65
76
|
'[Unit]',
|
|
66
77
|
`Description=${options.description.replaceAll('%', '%%')}`,
|
|
@@ -68,8 +79,7 @@ export class SystemdServiceDefinition {
|
|
|
68
79
|
'',
|
|
69
80
|
'[Service]',
|
|
70
81
|
...relations.service,
|
|
71
|
-
`User=${options.user}`,
|
|
72
|
-
`Group=${options.group}`,
|
|
82
|
+
...(scope === 'system' ? [`User=${options.user}`, `Group=${options.group}`] : []),
|
|
73
83
|
`ExecStart=${[quote(options.executable), ...options.args.map((value) => quote(value, true))].join(' ')}`,
|
|
74
84
|
// WorkingDirectory is a raw path value, not an ExecStart word list.
|
|
75
85
|
`WorkingDirectory=${options.workingDirectory.replaceAll('%', '%%')}`,
|
|
@@ -93,4 +103,4 @@ export class SystemdServiceDefinition {
|
|
|
93
103
|
Object.freeze(this);
|
|
94
104
|
}
|
|
95
105
|
}
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zeXN0ZW1kc2VydmljZWRlZmluaXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLnN5c3RlbWRzZXJ2aWNlZGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxzQkFBc0IsRUFDTyxNQUFNLHlCQUF5QixDQUFDO0FBc0J0RSxNQUFNLE9BQU8sNkJBQThCLFNBQVEsS0FBSztJQUN0RDtRQUNFLEtBQUssQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxJQUFJLEdBQUcsK0JBQStCLENBQUM7SUFDOUMsQ0FBQztDQUNGO0FBRUQsOEZBQThGO0FBQzlGLE1BQU0sT0FBTyx3QkFBd0I7SUFNbkMsWUFBWSxPQUF5QztRQUNuRCxNQUFNLFlBQVksR0FBRyxDQUFDLEtBQWMsRUFBUSxFQUFFO1lBQzVDLElBQUksQ0FBQyxLQUFLO2dCQUFFLE1BQU0sSUFBSSw2QkFBNkIsRUFBRSxDQUFDO1FBQ3hELENBQUMsQ0FBQztRQUNGLFlBQVksQ0FBQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO1lBQzFELE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLEtBQUssTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3ZELE1BQU0sZUFBZSxHQUFHLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDMUUsWUFBWSxDQUFDLGVBQWUsS0FBSyxTQUFTO1lBQ3hDLGVBQWUsQ0FBQyxVQUFVLElBQUksT0FBTyxJQUFJLGVBQWUsQ0FBQyxDQUFDO1FBQzVELE1BQU0sVUFBVSxHQUFZLGVBQWUsRUFBRSxLQUFLLElBQUksUUFBUSxDQUFDO1FBQy9ELElBQUksVUFBVSxLQUFLLFFBQVEsSUFB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
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
export interface ISystemdUnitOptions {
|
|
2
2
|
unitName: string;
|
|
3
|
+
/** Defaults to the system manager. User scope addresses the calling user's manager only. */
|
|
4
|
+
scope?: 'system' | 'user';
|
|
5
|
+
/** User-manager socket directory. Defaults to XDG_RUNTIME_DIR. */
|
|
6
|
+
runtimeDirectory?: string;
|
|
3
7
|
/** Absolute executable path supplied by trusted owning code. */
|
|
4
8
|
systemctlPath?: string;
|
|
5
9
|
/** Bounds the systemctl client, not the server-side job. Defaults to 120 seconds. */
|
|
@@ -25,25 +29,46 @@ export interface ISystemdUnitConfigurationState {
|
|
|
25
29
|
readonly dropInPaths: string;
|
|
26
30
|
readonly needsReload: boolean;
|
|
27
31
|
}
|
|
32
|
+
export interface ISystemdUnitRelationships {
|
|
33
|
+
readonly unitName: string;
|
|
34
|
+
readonly before: readonly string[];
|
|
35
|
+
readonly after: readonly string[];
|
|
36
|
+
readonly requires: readonly string[];
|
|
37
|
+
readonly wants: readonly string[];
|
|
38
|
+
readonly conflicts: readonly string[];
|
|
39
|
+
readonly requiredBy: readonly string[];
|
|
40
|
+
readonly wantedBy: readonly string[];
|
|
41
|
+
}
|
|
28
42
|
export declare class SystemdUnitError extends Error {
|
|
29
43
|
readonly code: 'invalid_options' | 'command_failed' | 'invalid_state';
|
|
30
44
|
constructor(code: 'invalid_options' | 'command_failed' | 'invalid_state');
|
|
31
45
|
}
|
|
32
|
-
/** Controls an existing system unit without
|
|
46
|
+
/** Controls an existing system unit without rewriting its definition or escalating privileges. */
|
|
33
47
|
export declare class SystemdUnit {
|
|
34
48
|
private readonly unitName;
|
|
35
49
|
private readonly executable;
|
|
36
50
|
private readonly timeout;
|
|
51
|
+
private readonly scope;
|
|
52
|
+
private readonly runtimeDirectory?;
|
|
53
|
+
private readonly homeDirectory?;
|
|
54
|
+
private readonly configDirectory?;
|
|
55
|
+
private readonly dataDirectory?;
|
|
37
56
|
constructor(optionsArg: ISystemdUnitOptions);
|
|
38
57
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
39
58
|
inspect(): Promise<ISystemdUnitState>;
|
|
40
59
|
/** Await the systemd job, then inspect. This does not enable or unmask the unit. */
|
|
41
60
|
start(): Promise<ISystemdUnitState>;
|
|
61
|
+
/** Persistently enables the existing definition, then inspects. Never starts, unmasks or forces links.
|
|
62
|
+
* Owning installers must separately verify exact file/configuration and required relationships. */
|
|
63
|
+
enable(): Promise<ISystemdUnitState>;
|
|
64
|
+
/** Loaded manager graph, including reverse edges. Enablement alone does not prove every required link. */
|
|
65
|
+
inspectRelationships(): Promise<ISystemdUnitRelationships>;
|
|
42
66
|
/** Await the systemd job, then inspect. The snapshot alone is not an application data-drain proof. */
|
|
43
67
|
stop(): Promise<ISystemdUnitState>;
|
|
44
68
|
/** Reports the manager's selected definition without reading or changing its contents. */
|
|
45
69
|
inspectConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
46
70
|
/** Reloads unit definitions globally; does not enable, unmask, start or stop a unit. */
|
|
47
71
|
reloadConfiguration(): Promise<ISystemdUnitConfigurationState>;
|
|
72
|
+
private validateUserRuntime;
|
|
48
73
|
private command;
|
|
49
74
|
}
|
|
@@ -18,17 +18,32 @@ const properties = [
|
|
|
18
18
|
'KillMode',
|
|
19
19
|
'Job',
|
|
20
20
|
];
|
|
21
|
-
/** Controls an existing system unit without
|
|
21
|
+
/** Controls an existing system unit without rewriting its definition or escalating privileges. */
|
|
22
22
|
export class SystemdUnit {
|
|
23
23
|
constructor(optionsArg) {
|
|
24
24
|
this.unitName = optionsArg?.unitName;
|
|
25
25
|
this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
|
|
26
26
|
this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
|
|
27
|
+
this.scope = optionsArg?.scope ?? 'system';
|
|
28
|
+
this.runtimeDirectory = this.scope === 'user'
|
|
29
|
+
? optionsArg?.runtimeDirectory ?? process.env.XDG_RUNTIME_DIR : undefined;
|
|
30
|
+
this.homeDirectory = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
31
|
+
this.configDirectory = this.scope === 'user' ? process.env.XDG_CONFIG_HOME || undefined : undefined;
|
|
32
|
+
this.dataDirectory = this.scope === 'user' ? process.env.XDG_DATA_HOME || undefined : undefined;
|
|
33
|
+
const safeDirectory = (value) => typeof value === 'string' && value !== '/' && plugins.path.isAbsolute(value) &&
|
|
34
|
+
plugins.path.normalize(value) === value && !value.endsWith('/') &&
|
|
35
|
+
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
27
36
|
if (typeof this.unitName !== 'string' ||
|
|
28
37
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
29
38
|
typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
|
|
30
39
|
this.executable.includes('\0') || !Number.isSafeInteger(this.timeout) ||
|
|
31
|
-
this.timeout < 1 || this.timeout > 600000
|
|
40
|
+
this.timeout < 1 || this.timeout > 600000 ||
|
|
41
|
+
!['system', 'user'].includes(this.scope) ||
|
|
42
|
+
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
43
|
+
(this.scope === 'user' &&
|
|
44
|
+
(!safeDirectory(this.runtimeDirectory) || !safeDirectory(this.homeDirectory) ||
|
|
45
|
+
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
46
|
+
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory))))
|
|
32
47
|
throw new SystemdUnitError('invalid_options');
|
|
33
48
|
}
|
|
34
49
|
/** Snapshot only. Callers own application-specific admission and restart policy. */
|
|
@@ -70,6 +85,40 @@ export class SystemdUnit {
|
|
|
70
85
|
await this.command(['start', this.unitName]);
|
|
71
86
|
return this.inspect();
|
|
72
87
|
}
|
|
88
|
+
/** Persistently enables the existing definition, then inspects. Never starts, unmasks or forces links.
|
|
89
|
+
* Owning installers must separately verify exact file/configuration and required relationships. */
|
|
90
|
+
async enable() {
|
|
91
|
+
await this.command(['enable', this.unitName]);
|
|
92
|
+
return this.inspect();
|
|
93
|
+
}
|
|
94
|
+
/** Loaded manager graph, including reverse edges. Enablement alone does not prove every required link. */
|
|
95
|
+
async inspectRelationships() {
|
|
96
|
+
const keys = ['Id', 'Before', 'After', 'Requires', 'Wants', 'Conflicts', 'RequiredBy', 'WantedBy'];
|
|
97
|
+
const stdout = await this.command(['show', this.unitName, `--property=${keys.join(',')}`, '--all']);
|
|
98
|
+
const fields = new Map();
|
|
99
|
+
for (const line of (stdout.endsWith('\n') ? stdout.slice(0, -1) : stdout).split('\n')) {
|
|
100
|
+
const separator = line.indexOf('='), key = line.slice(0, separator);
|
|
101
|
+
if (separator < 1 || !keys.includes(key) || fields.has(key))
|
|
102
|
+
throw new SystemdUnitError('invalid_state');
|
|
103
|
+
fields.set(key, line.slice(separator + 1));
|
|
104
|
+
}
|
|
105
|
+
if (fields.size !== keys.length || fields.get('Id') !== this.unitName)
|
|
106
|
+
throw new SystemdUnitError('invalid_state');
|
|
107
|
+
const units = (key) => {
|
|
108
|
+
const text = fields.get(key);
|
|
109
|
+
const values = text === '' ? [] : text.split(' ');
|
|
110
|
+
// Unit names are ASCII; retain systemd's literal hex escapes without decoding
|
|
111
|
+
// them into separators. Output and every individual name remain bounded.
|
|
112
|
+
if (values.some(value => value.length > 255 ||
|
|
113
|
+
!/^(?:[a-zA-Z0-9_.:@-]|\\x[0-9a-fA-F]{2})+\.(?:service|socket|device|mount|automount|swap|target|path|timer|slice|scope)$/.test(value)) ||
|
|
114
|
+
new Set(values).size !== values.length)
|
|
115
|
+
throw new SystemdUnitError('invalid_state');
|
|
116
|
+
return Object.freeze(values.sort());
|
|
117
|
+
};
|
|
118
|
+
return Object.freeze({ unitName: this.unitName, before: units('Before'), after: units('After'),
|
|
119
|
+
requires: units('Requires'), wants: units('Wants'), conflicts: units('Conflicts'),
|
|
120
|
+
requiredBy: units('RequiredBy'), wantedBy: units('WantedBy') });
|
|
121
|
+
}
|
|
73
122
|
/** Await the systemd job, then inspect. The snapshot alone is not an application data-drain proof. */
|
|
74
123
|
async stop() {
|
|
75
124
|
await this.command(['stop', this.unitName]);
|
|
@@ -103,15 +152,39 @@ export class SystemdUnit {
|
|
|
103
152
|
await this.command(['daemon-reload']);
|
|
104
153
|
return this.inspectConfiguration();
|
|
105
154
|
}
|
|
106
|
-
|
|
155
|
+
async validateUserRuntime() {
|
|
156
|
+
if (this.scope !== 'user')
|
|
157
|
+
return;
|
|
158
|
+
try {
|
|
159
|
+
const uid = process.getuid?.();
|
|
160
|
+
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
161
|
+
await plugins.fs.realpath(this.runtimeDirectory) !== this.runtimeDirectory) {
|
|
162
|
+
throw new SystemdUnitError('invalid_options');
|
|
163
|
+
}
|
|
164
|
+
const info = await plugins.fs.lstat(this.runtimeDirectory);
|
|
165
|
+
if (!info.isDirectory() || info.isSymbolicLink() || info.uid !== uid ||
|
|
166
|
+
(info.mode & 0o077) !== 0)
|
|
167
|
+
throw new SystemdUnitError('invalid_options');
|
|
168
|
+
}
|
|
169
|
+
catch {
|
|
170
|
+
throw new SystemdUnitError('invalid_options');
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
async command(argsArg) {
|
|
174
|
+
await this.validateUserRuntime();
|
|
107
175
|
return new Promise((resolve, reject) => {
|
|
108
|
-
plugins.childProcess.execFile(this.executable, ['--system', '--no-ask-password', '--no-pager', ...argsArg], {
|
|
176
|
+
plugins.childProcess.execFile(this.executable, [this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg], {
|
|
109
177
|
encoding: 'utf8',
|
|
110
178
|
timeout: this.timeout,
|
|
111
179
|
killSignal: 'SIGKILL',
|
|
112
180
|
maxBuffer: 16384,
|
|
113
181
|
windowsHide: true,
|
|
114
|
-
env:
|
|
182
|
+
env: this.scope === 'user'
|
|
183
|
+
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
184
|
+
HOME: this.homeDirectory, XDG_RUNTIME_DIR: this.runtimeDirectory,
|
|
185
|
+
...(this.configDirectory ? { XDG_CONFIG_HOME: this.configDirectory } : {}),
|
|
186
|
+
...(this.dataDirectory ? { XDG_DATA_HOME: this.dataDirectory } : {}) }
|
|
187
|
+
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
115
188
|
}, (error, stdout) => {
|
|
116
189
|
// execFile settles after the client closes. A timed-out client's remote job may continue.
|
|
117
190
|
if (error)
|
|
@@ -122,4 +195,4 @@ export class SystemdUnit {
|
|
|
122
195
|
});
|
|
123
196
|
}
|
|
124
197
|
}
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zeXN0ZW1kdW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NsYXNzZXMuc3lzdGVtZHVuaXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSwwQkFBMEIsQ0FBQztBQWdDcEQsTUFBTSxPQUFPLGdCQUFpQixTQUFRLEtBQUs7SUFDekMsWUFBNEIsSUFBNEQ7UUFDdEYsS0FBSyxDQUFDLGtDQUFrQyxJQUFJLEdBQUcsQ0FBQyxDQUFDO1FBRHZCLFNBQUksR0FBSixJQUFJLENBQXdEO1FBRXRGLElBQUksQ0FBQyxJQUFJLEdBQUcsa0JBQWtCLENBQUM7SUFDakMsQ0FBQztDQUNGO0FBRUQsTUFBTSxVQUFVLEdBQUc7SUFDakIsSUFBSTtJQUNKLFdBQVc7SUFDWCxhQUFhO0lBQ2IsVUFBVTtJQUNWLGVBQWU7SUFDZixTQUFTO0lBQ1QsWUFBWTtJQUNaLGNBQWM7SUFDZCxVQUFVO0lBQ1YsS0FBSztDQUNHLENBQUM7QUFFWCw2R0FBNkc7QUFDN0csTUFBTSxPQUFPLFdBQVc7SUFLdEIsWUFBWSxVQUErQjtRQUN6QyxJQUFJLENBQUMsUUFBUSxHQUFHLFVBQVUsRUFBRSxRQUFRLENBQUM7UUFDckMsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLEVBQUUsYUFBYSxJQUFJLG9CQUFvQixDQUFDO1FBQ3BFLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxFQUFFLGdCQUFnQixJQUFJLE1BQU0sQ0FBQztRQUN0RCxJQUNFLE9BQU8sSUFBSSxDQUFDLFFBQVEsS0FBSyxRQUFRO1lBQ2pDLENBQUMsK0NBQStDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDcEUsT0FBTyxJQUFJLENBQUMsVUFBVSxLQUFLLFFBQVEsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUM7WUFDaEYsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDckUsSUFBSSxDQUFDLE9BQU8sR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNO1lBQ3pDLE1BQU0sSUFBSSxnQkFBZ0IsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFRCxvRkFBb0Y7SUFDN0UsS0FBSyxDQUFDLE9BQU87UUFDbEIsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDO1lBQ2hDLE1BQU07WUFDTixJQUFJLENBQUMsUUFBUTtZQUNiLGNBQWMsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUNwQyxPQUFPO1NBQ1IsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7UUFDekMsS0FBSyxNQUFNLElBQUksSUFBSSxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDaEQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNwQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxTQUFTLENBQUMsQ0FBQztZQUNyQyxJQUFJLFNBQVMsR0FBRyxDQUFDLElBQUksQ0FBRSxVQUFnQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQ3pGLE1BQU0sSUFBSSxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUM5QyxDQUFDO1lBQ0QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUM3QyxDQUFDO1FBQ0QsSUFDRSxNQUFNLENBQUMsSUFBSSxLQUFLLFVBQVUsQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsUUFBUTtZQUN2RSxDQUFDLFdBQVcsRUFBRSxhQUFhLEVBQUUsVUFBVSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDeEUsQ0FBQyxTQUFTLEVBQUUsWUFBWSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDckMsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQzNGO1lBQ0QsTUFBTSxJQUFJLGdCQUFnQixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQzlDLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQztZQUNuQixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVE7WUFDdkIsU0FBUyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFFO1lBQ25DLFdBQVcsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBRTtZQUN2QyxRQUFRLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUU7WUFDakMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFFO1lBQzNDLE9BQU8sRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUN0QyxVQUFVLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDNUMsWUFBWSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFFO1lBQ3pDLFFBQVEsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBRTtZQUNqQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUU7U0FDeEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELG9GQUFvRjtJQUM3RSxLQUFLLENBQUMsS0FBSztRQUNoQixNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDN0MsT0FBTyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDeEIsQ0FBQztJQUVELHNHQUFzRztJQUMvRixLQUFLLENBQUMsSUFBSTtRQUNmLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUM1QyxPQUFPLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUN4QixDQUFDO0lBRUQsMEZBQTBGO0lBQ25GLEtBQUssQ0FBQyxvQkFBb0I7UUFDL0IsTUFBTSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEVBQUUsY0FBYyxFQUFFLGFBQWEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFLGNBQWMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDcEcsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7UUFDekMsS0FBSyxNQUFNLElBQUksSUFBSSxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDaEQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsU0FBUyxDQUFDLENBQUM7WUFDcEUsSUFBSSxTQUFTLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUM5QyxDQUFDO1lBQ0QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUM3QyxDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsUUFBUTtZQUNuRSxDQUFDLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFFLENBQUMsRUFBRSxDQUFDO1lBQzNELE1BQU0sSUFBSSxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUM5QyxDQUFDO1FBQ0QsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDO1lBQ25CLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUTtZQUN2QixZQUFZLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUU7WUFDekMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFFO1lBQ3ZDLFdBQVcsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLEtBQUssS0FBSztTQUN0RCxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsd0ZBQXdGO0lBQ2pGLEtBQUssQ0FBQyxtQkFBbUI7UUFDOUIsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQztRQUN0QyxPQUFPLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFTyxPQUFPLENBQUMsT0FBaUI7UUFDL0IsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtZQUNyQyxPQUFPLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FDM0IsSUFBSSxDQUFDLFVBQVUsRUFDZixDQUFDLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFDM0Q7Z0JBQ0UsUUFBUSxFQUFFLE1BQU07Z0JBQ2hCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztnQkFDckIsVUFBVSxFQUFFLFNBQVM7Z0JBQ3JCLFNBQVMsRUFBRSxLQUFLO2dCQUNoQixXQUFXLEVBQUUsSUFBSTtnQkFDakIsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUU7YUFDdkQsRUFDRCxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtnQkFDaEIsMEZBQTBGO2dCQUMxRixJQUFJLEtBQUs7b0JBQUUsTUFBTSxDQUFDLElBQUksZ0JBQWdCLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDOztvQkFDckQsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3ZCLENBQUMsQ0FDRixDQUFDO1FBQ0osQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YifQ==
|
|
198
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunit.js","sourceRoot":"","sources":["../ts/classes.systemdunit.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { type ISystemdUnitOptions } from './classes.systemdunit.js';
|
|
|
3
3
|
export interface ISystemdUnitFileOptions extends ISystemdUnitOptions {
|
|
4
4
|
/** Local vendor definitions can be installed without removing an administrator's mask. */
|
|
5
5
|
unitDirectory?: string;
|
|
6
|
-
/** Trusted owning-code qualification only. Defaults to root. */
|
|
6
|
+
/** Trusted owning-code qualification only. Defaults to root for system, current uid for user. */
|
|
7
7
|
expectedUid?: number;
|
|
8
8
|
}
|
|
9
9
|
export interface ISystemdUnitFileRecord {
|
|
@@ -22,6 +22,9 @@ export declare class SystemdUnitFile {
|
|
|
22
22
|
readonly path: string;
|
|
23
23
|
private readonly directory;
|
|
24
24
|
private readonly uid;
|
|
25
|
+
private readonly scope;
|
|
26
|
+
private readonly configDirectory?;
|
|
27
|
+
private readonly runtimeDirectory?;
|
|
25
28
|
private readonly unit;
|
|
26
29
|
private readonly name;
|
|
27
30
|
private busy;
|
|
@@ -29,13 +29,25 @@ export class SystemdUnitFile {
|
|
|
29
29
|
this.busy = false;
|
|
30
30
|
this.unit = new SystemdUnit(options);
|
|
31
31
|
this.name = options.unitName;
|
|
32
|
-
this.
|
|
33
|
-
this.
|
|
34
|
-
|
|
35
|
-
plugins.path.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
32
|
+
this.scope = options.scope ?? 'system';
|
|
33
|
+
const home = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
34
|
+
const dataDirectory = this.scope === 'user'
|
|
35
|
+
? process.env.XDG_DATA_HOME || plugins.path.join(home, '.local/share') : undefined;
|
|
36
|
+
this.configDirectory = this.scope === 'user'
|
|
37
|
+
? process.env.XDG_CONFIG_HOME || plugins.path.join(home, '.config') : undefined;
|
|
38
|
+
this.runtimeDirectory = this.scope === 'user'
|
|
39
|
+
? options.runtimeDirectory ?? process.env.XDG_RUNTIME_DIR : undefined;
|
|
40
|
+
this.directory = options.unitDirectory ?? (this.scope === 'user'
|
|
41
|
+
? plugins.path.join(dataDirectory, 'systemd/user') : '/usr/local/lib/systemd/system');
|
|
42
|
+
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
43
|
+
const validDirectory = (directory) => typeof directory === 'string' && directory !== '/' &&
|
|
44
|
+
plugins.path.isAbsolute(directory) && plugins.path.normalize(directory) === directory &&
|
|
45
|
+
!directory.endsWith('/') && !/[\x00-\x1f\x7f]/.test(directory) &&
|
|
46
|
+
directory.length <= 4000;
|
|
47
|
+
requireValue(validDirectory(this.directory) && Number.isSafeInteger(this.uid) && this.uid >= 0 &&
|
|
48
|
+
(this.scope === 'system' ||
|
|
49
|
+
this.uid === process.getuid?.() && validDirectory(this.configDirectory) &&
|
|
50
|
+
validDirectory(this.runtimeDirectory)), 'invalid_options');
|
|
39
51
|
this.path = plugins.path.join(this.directory, this.name);
|
|
40
52
|
}
|
|
41
53
|
/** Reads only the exact protected definition; no systemd or filesystem mutation. */
|
|
@@ -51,6 +63,7 @@ export class SystemdUnitFile {
|
|
|
51
63
|
*/
|
|
52
64
|
async install(definition, expectedSha256) {
|
|
53
65
|
requireValue(definition instanceof SystemdServiceDefinition && definition.unitName === this.name &&
|
|
66
|
+
definition.scope === this.scope &&
|
|
54
67
|
(expectedSha256 === null ||
|
|
55
68
|
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256)), 'invalid_options');
|
|
56
69
|
requireValue(!this.busy, 'busy');
|
|
@@ -138,11 +151,15 @@ export class SystemdUnitFile {
|
|
|
138
151
|
['enabled', 'enabled-runtime', 'disabled'].includes(state.unitFileState) ||
|
|
139
152
|
state.loadState === 'not-found' && state.unitFileState === ''), 'unsafe_unit');
|
|
140
153
|
const configuration = await this.unit.inspectConfiguration();
|
|
141
|
-
const
|
|
154
|
+
const maskPaths = this.scope === 'system'
|
|
155
|
+
? [plugins.path.join(state.unitFileState === 'masked-runtime' ? '/run/systemd/system' : '/etc/systemd/system', this.name)]
|
|
156
|
+
: (state.unitFileState === 'masked-runtime'
|
|
157
|
+
? [this.runtimeDirectory, '/run'].map(root => plugins.path.join(root, 'systemd/user', this.name))
|
|
158
|
+
: [this.configDirectory, '/etc'].map(root => plugins.path.join(root, 'systemd/user', this.name)));
|
|
142
159
|
requireValue(!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
143
160
|
(masked(state)
|
|
144
161
|
? configuration.fragmentPath !== this.path &&
|
|
145
|
-
['/dev/null',
|
|
162
|
+
['/dev/null', ...maskPaths].includes(configuration.fragmentPath)
|
|
146
163
|
: configuration.fragmentPath === (state.loadState === 'not-found' ? '' : this.path)), 'unsafe_unit');
|
|
147
164
|
return configuration;
|
|
148
165
|
}
|
|
@@ -246,4 +263,4 @@ export class SystemdUnitFile {
|
|
|
246
263
|
}
|
|
247
264
|
}
|
|
248
265
|
}
|
|
249
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
|
|
266
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.systemdunitfile.js","sourceRoot":"","sources":["../ts/classes.systemdunitfile.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,9 @@ 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
6
|
import * as util from 'node:util';
|
|
7
|
+
import * as os from 'node:os';
|
|
7
8
|
export type { Stats } from 'node:fs';
|
|
8
|
-
export { path, childProcess, fs, fsConstants, crypto, util };
|
|
9
|
+
export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
9
10
|
import * as lik from '@push.rocks/lik';
|
|
10
11
|
import * as smartfm from '@push.rocks/smartfm';
|
|
11
12
|
import * as smartfs from '@push.rocks/smartfs';
|
|
@@ -5,7 +5,8 @@ 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
7
|
import * as util from 'node:util';
|
|
8
|
-
|
|
8
|
+
import * as os from 'node:os';
|
|
9
|
+
export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
9
10
|
// @pushrocks scope
|
|
10
11
|
import * as lik from '@push.rocks/lik';
|
|
11
12
|
import * as smartfm from '@push.rocks/smartfm';
|
|
@@ -17,4 +18,4 @@ import * as smartshell from '@push.rocks/smartshell';
|
|
|
17
18
|
import * as smartsystem from '@push.rocks/smartsystem';
|
|
18
19
|
export { lik, smartfm, smartfs, smartlog, smartlogDestinationLocal, smartpath, smartshell, smartsystem, };
|
|
19
20
|
// third party
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYWVtb24ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGFlbW9uLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUNsQyxPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUc5QixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7QUFFakUsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxHQUFHLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssT0FBTyxNQUFNLHFCQUFxQixDQUFDO0FBQy9DLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLHdCQUF3QixNQUFNLHdDQUF3QyxDQUFDO0FBQ25GLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFDTCxHQUFHLEVBQ0gsT0FBTyxFQUNQLE9BQU8sRUFDUCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLFNBQVMsRUFDVCxVQUFVLEVBQ1YsV0FBVyxHQUNaLENBQUM7QUFFRixjQUFjIn0=
|
|
@@ -3,7 +3,7 @@ export interface ISystemdServiceStartup {
|
|
|
3
3
|
remainAfterExit: boolean;
|
|
4
4
|
timeoutStartSeconds: number;
|
|
5
5
|
}
|
|
6
|
-
/** Complete literal relations. After=local-fs.target
|
|
6
|
+
/** Complete literal relations. System services always retain After=local-fs.target. */
|
|
7
7
|
export interface ISystemdServiceDependencies {
|
|
8
8
|
defaultDependencies: boolean;
|
|
9
9
|
after: readonly string[];
|
|
@@ -22,7 +22,7 @@ export declare const renderServiceRelations: (options: {
|
|
|
22
22
|
startup?: ISystemdServiceStartup;
|
|
23
23
|
dependencies?: ISystemdServiceDependencies;
|
|
24
24
|
install?: ISystemdServiceInstallTargets;
|
|
25
|
-
}, unitName: string, restart: string, fail: () => never) => {
|
|
25
|
+
}, unitName: string, restart: string, scope: "system" | "user", fail: () => never) => {
|
|
26
26
|
unit: string[];
|
|
27
27
|
service: string[];
|
|
28
28
|
install: string[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './smartdaemon.plugins.js';
|
|
2
2
|
/** Internal validated renderer; no systemd/process/filesystem effects. */
|
|
3
|
-
export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
3
|
+
export const renderServiceRelations = (options, unitName, restart, scope, fail) => {
|
|
4
4
|
const requireValue = (value) => { if (!value)
|
|
5
5
|
fail(); };
|
|
6
6
|
const record = (value, keys) => {
|
|
@@ -27,7 +27,11 @@ export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
|
27
27
|
return result.sort();
|
|
28
28
|
};
|
|
29
29
|
const line = (key, value) => value.length ? [`${key}=${value.join(' ')}`] : [];
|
|
30
|
-
const result = {
|
|
30
|
+
const result = {
|
|
31
|
+
unit: scope === 'system' ? ['After=local-fs.target'] : [],
|
|
32
|
+
service: ['Type=exec'],
|
|
33
|
+
install: [scope === 'system' ? 'WantedBy=multi-user.target' : 'WantedBy=default.target'],
|
|
34
|
+
};
|
|
31
35
|
if (options.startup !== undefined) {
|
|
32
36
|
const value = options.startup;
|
|
33
37
|
record(value, ['type', 'remainAfterExit', 'timeoutStartSeconds']);
|
|
@@ -39,7 +43,7 @@ export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
|
39
43
|
const value = options.dependencies;
|
|
40
44
|
record(value, ['defaultDependencies', 'after', 'before', 'requires', 'wants', 'conflicts']);
|
|
41
45
|
requireValue(typeof value.defaultDependencies === 'boolean');
|
|
42
|
-
const after = [...new Set(['local-fs.target', ...units(value.after)])].sort();
|
|
46
|
+
const after = [...new Set([...(scope === 'system' ? ['local-fs.target'] : []), ...units(value.after)])].sort();
|
|
43
47
|
const before = units(value.before), requires = units(value.requires), wants = units(value.wants), conflicts = units(value.conflicts);
|
|
44
48
|
requireValue(before.every(item => !after.includes(item)) && conflicts.every(item => !requires.includes(item) && !wants.includes(item)));
|
|
45
49
|
result.unit = [`DefaultDependencies=${value.defaultDependencies ? 'yes' : 'no'}`, ...line('After', after),
|
|
@@ -54,4 +58,4 @@ export const renderServiceRelations = (options, unitName, restart, fail) => {
|
|
|
54
58
|
}
|
|
55
59
|
return result;
|
|
56
60
|
};
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3lzdGVtZC5kZWZpbml0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc3lzdGVtZC5kZWZpbml0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUF3QnBELDBFQUEwRTtBQUMxRSxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLE9BSXRDLEVBQUUsUUFBZ0IsRUFBRSxPQUFlLEVBQUUsS0FBd0IsRUFBRSxJQUFpQixFQUUvRSxFQUFFO0lBQ0YsTUFBTSxZQUFZLEdBQUcsQ0FBQyxLQUFjLEVBQVEsRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLO1FBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkUsTUFBTSxNQUFNLEdBQUcsQ0FBQyxLQUFjLEVBQUUsSUFBdUIsRUFBUSxFQUFFO1FBQy9ELFlBQVksQ0FBQyxLQUFLLEtBQUssSUFBSSxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7ZUFDekYsTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsS0FBSyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDeEQsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFlLENBQUMsQ0FBQztRQUNoRCxZQUFZLENBQUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxJQUFJLENBQUMsTUFBTSxJQUFJLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEdBQUcsS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUM7ZUFDMUcsTUFBTSxDQUFDLHdCQUF3QixDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRSxVQUFVLElBQUksT0FBTyxJQUFJLE1BQU0sQ0FBQyx3QkFBd0Is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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartdaemon",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.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,10 +26,10 @@
|
|
|
26
26
|
},
|
|
27
27
|
"homepage": "https://code.foss.global/push.rocks/smartdaemon",
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@git.zone/tsbuild": "^4.
|
|
29
|
+
"@git.zone/tsbuild": "^4.5.0",
|
|
30
30
|
"@git.zone/tsrun": "^2.0.6",
|
|
31
|
-
"@git.zone/tstest": "^6.
|
|
32
|
-
"@types/node": "^26.
|
|
31
|
+
"@git.zone/tstest": "^6.1.1",
|
|
32
|
+
"@types/node": "^26.5.1"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@push.rocks/lik": "^6.4.1",
|
package/readme.md
CHANGED
|
@@ -164,6 +164,10 @@ const unit = new SystemdUnit({ unitName: 'smartdaemon_my-api-server.service' });
|
|
|
164
164
|
const state = await unit.inspect();
|
|
165
165
|
console.log(state.loadState, state.activeState, state.unitFileState);
|
|
166
166
|
|
|
167
|
+
// Address the calling user's manager when running as that user.
|
|
168
|
+
const userUnit = new SystemdUnit({ unitName: 'authswitch.service', scope: 'user' });
|
|
169
|
+
const userState = await userUnit.inspect();
|
|
170
|
+
|
|
167
171
|
// Application code decides whether stopping or restarting is appropriate.
|
|
168
172
|
// await unit.stop();
|
|
169
173
|
// await unit.start();
|
|
@@ -185,16 +189,41 @@ Calls use an absolute `systemctlPath` (default `/usr/bin/systemctl`), a clean
|
|
|
185
189
|
environment, no shell or password prompt, and bounded output. Trusted owning code
|
|
186
190
|
can choose another absolute executable path and `commandTimeoutMs` (default
|
|
187
191
|
120000, maximum 600000). This timeout bounds the client process only.
|
|
192
|
+
The default `scope: 'system'` retains system-manager behavior. `scope: 'user'`
|
|
193
|
+
uses `systemctl --user` as the calling user. It requires a real, owned, private
|
|
194
|
+
`XDG_RUNTIME_DIR` (or an explicit `runtimeDirectory`) and passes that directory
|
|
195
|
+
with the user's home and valid XDG config/data roots to the command. The directory
|
|
196
|
+
is checked again before each call; a missing, replaced, linked or group-accessible
|
|
197
|
+
runtime directory fails before contacting systemd.
|
|
188
198
|
|
|
189
199
|
`inspectConfiguration()` reports the selected `fragmentPath`, opaque `dropInPaths`
|
|
190
200
|
list and `needsReload` flag. `reloadConfiguration()` explicitly reloads the manager's
|
|
191
201
|
unit definitions globally and returns a fresh configuration snapshot. Neither
|
|
192
202
|
operation changes enablement or masks.
|
|
193
203
|
|
|
204
|
+
`enable()` persistently enables the existing unit definition and returns a fresh
|
|
205
|
+
state snapshot. It does not rewrite the definition, start the unit, unmask it or
|
|
206
|
+
force conflicting links. Run it inside the owning installer's cross-process
|
|
207
|
+
installation scope, after any required offline commissioning. A failed or timed
|
|
208
|
+
out command can leave partial enablement; inspect and retry the exact operation
|
|
209
|
+
without assuming cancellation or undoing the application's retained protection.
|
|
210
|
+
|
|
211
|
+
`inspectRelationships()` returns immutable sorted arrays for `before`, `after`,
|
|
212
|
+
`requires`, `wants`, `conflicts`, `requiredBy` and `wantedBy` from the loaded manager
|
|
213
|
+
graph. Literal systemd hex escapes are preserved. The bounded snapshot rejects
|
|
214
|
+
missing fields, foreign identities, duplicate relationships and malformed names.
|
|
215
|
+
`unitFileState === 'enabled'` proves only that some enablement links exist. For a
|
|
216
|
+
boot guard, verify that its `requiredBy` and `before` both include every required
|
|
217
|
+
target and the actual network provider; inspect the provider's `requires` and
|
|
218
|
+
`after` as well. Recheck the exact file digest, selected fragment, absence of
|
|
219
|
+
drop-ins and `needsReload === false` before permitting dependent activation.
|
|
220
|
+
|
|
194
221
|
### Installing a direct systemd service definition
|
|
195
222
|
|
|
196
223
|
`SystemdServiceDefinition` encodes a literal executable and argument list, with
|
|
197
|
-
explicit
|
|
224
|
+
explicit restart policy, kill mode and stop timeout. System-scope definitions require
|
|
225
|
+
`user` and `group`; user-scope definitions reject both directives because the user
|
|
226
|
+
manager already runs under the calling identity. It defaults to `Type=exec`,
|
|
198
227
|
journal output and null stdin. It introduces no shell; percent specifiers and
|
|
199
228
|
argument environment expansion are escaped. Paths must be absolute and normalized;
|
|
200
229
|
control characters are rejected. Descriptions and working directories cannot have
|
|
@@ -223,6 +252,33 @@ const installed = await file.install(definition, previous?.sha256 ?? null);
|
|
|
223
252
|
console.log(installed.changed, installed.masked, installed.record.sha256);
|
|
224
253
|
```
|
|
225
254
|
|
|
255
|
+
For a user service, give the definition and installer the same scope:
|
|
256
|
+
|
|
257
|
+
```typescript
|
|
258
|
+
const userDefinition = new SystemdServiceDefinition({
|
|
259
|
+
scope: 'user',
|
|
260
|
+
unitName: 'authswitch.service',
|
|
261
|
+
description: 'Account authority',
|
|
262
|
+
executable: '/opt/authswitch/bin/authswitch',
|
|
263
|
+
args: ['daemon'],
|
|
264
|
+
workingDirectory: '/opt/authswitch',
|
|
265
|
+
restart: 'on-failure',
|
|
266
|
+
killMode: 'mixed',
|
|
267
|
+
timeoutStopSeconds: 60,
|
|
268
|
+
});
|
|
269
|
+
const userFile = new SystemdUnitFile({ scope: 'user', unitName: userDefinition.unitName });
|
|
270
|
+
const previousUserFile = await userFile.inspect();
|
|
271
|
+
await userFile.install(userDefinition, previousUserFile?.sha256 ?? null);
|
|
272
|
+
```
|
|
273
|
+
|
|
274
|
+
User definitions default to `WantedBy=default.target` and have no system-only
|
|
275
|
+
`After=local-fs.target` edge. User unit files default to
|
|
276
|
+
`$XDG_DATA_HOME/systemd/user` (or `~/.local/share/systemd/user`), below the user's
|
|
277
|
+
config directory in the unit load path. Installation and enablement use the
|
|
278
|
+
current user manager and do not escalate privileges. The installer rejects unsafe
|
|
279
|
+
ownership or group-writable path components; prepare those directories explicitly
|
|
280
|
+
before installation. It never changes the permissions of existing directories.
|
|
281
|
+
|
|
226
282
|
For a boot prerequisite that must finish before dependent services start, supply
|
|
227
283
|
`startup: { type: 'oneshot', remainAfterExit: true, timeoutStartSeconds: 120 }`.
|
|
228
284
|
Systemd waits for successful process exit; `RemainAfterExit` keeps the completed
|
|
@@ -243,7 +299,7 @@ dependencies: {
|
|
|
243
299
|
install: { wantedBy: [], requiredBy: ['network-pre.target', 'systemd-networkd.service'] },
|
|
244
300
|
```
|
|
245
301
|
|
|
246
|
-
`After=local-fs.target
|
|
302
|
+
System definitions always retain `After=local-fs.target`. Disable default dependencies only for
|
|
247
303
|
an intentionally early boot or late shutdown service. Every list is bounded to
|
|
248
304
|
32 distinct literal unit names, sorted deterministically; templates, specifiers,
|
|
249
305
|
self references and contradictory direct relationships are rejected. These local
|
|
@@ -279,17 +335,30 @@ python3 test/native/qualify-systemd.py --image /path/to/noble-server-cloudimg-am
|
|
|
279
335
|
--work-root /tmp/smartdaemon-systemd-qualification-local
|
|
280
336
|
```
|
|
281
337
|
|
|
282
|
-
|
|
338
|
+
To exercise the public enablement and relationship APIs in the same guest, bundle
|
|
339
|
+
`test/native/activate-systemd.ts` as a self-contained Node ESM file and also supply
|
|
340
|
+
`--node /path/to/node --activation-bundle /path/to/activate.mjs`. Any library absent
|
|
341
|
+
from the minimal image can be supplied explicitly with repeatable
|
|
342
|
+
`--node-library /path/to/libname.so.N`. These hashed test inputs travel on a
|
|
343
|
+
read-only ISO. The API fixture checks enablement without implicit start, oneshot
|
|
344
|
+
readiness, unchanged definition/configuration, detection of a missing provider
|
|
345
|
+
link despite enabled state, exact enable retry and preservation of a mask.
|
|
346
|
+
|
|
347
|
+
Installation requires Linux, the relevant manager's user identity and a quiescent
|
|
348
|
+
exact unit with no process,
|
|
283
349
|
cgroup or job. It rejects effective drop-ins and shadowing fragments. Definitions
|
|
284
|
-
default to `/usr/local/lib/systemd/system
|
|
285
|
-
|
|
350
|
+
default to `/usr/local/lib/systemd/system` for system scope and the user's data
|
|
351
|
+
unit directory for user scope, below administrator or user configuration in the
|
|
352
|
+
load path, so existing persistent/runtime masks remain intact. Existing
|
|
286
353
|
enablement is preserved; an absent unit becomes disabled. It never enables,
|
|
287
354
|
unmasks, starts or stops a service, or invokes sudo.
|
|
288
355
|
|
|
289
|
-
Masked units may report `/dev/null` or their exact administrator mask path:
|
|
356
|
+
Masked system units may report `/dev/null` or their exact administrator mask path:
|
|
290
357
|
`/etc/systemd/system/<unit>` for a persistent mask, `/run/systemd/system/<unit>`
|
|
291
358
|
for a runtime mask. Installation preserves that exact manager-selected fragment
|
|
292
359
|
through the write and reload, and never replaces the masking fragment itself.
|
|
360
|
+
For user scope, the exact user config or runtime mask path and the global user-unit
|
|
361
|
+
mask paths are also recognized.
|
|
293
362
|
Pending manager reloads are rejected before writing; inspect and explicitly
|
|
294
363
|
reload an existing changed configuration before retrying installation.
|
|
295
364
|
|
|
@@ -303,7 +372,10 @@ the manager and checks its selected fragment and final bytes. A reload failure
|
|
|
303
372
|
leaves the new file and retained previous definition in place; recovery requires
|
|
304
373
|
inspection, never an automatic rollback. Filesystem and definition errors use
|
|
305
374
|
`SystemdUnitFileError` with a local code. Trusted qualification code can set
|
|
306
|
-
`unitDirectory`, `expectedUid` and the inherited `SystemdUnit` command options
|
|
375
|
+
`unitDirectory`, `expectedUid` and the inherited `SystemdUnit` command options;
|
|
376
|
+
user scope requires `expectedUid` to match the caller's actual uid. The manager's
|
|
377
|
+
selected fragment must match the installed file after reload, so an unrecognized
|
|
378
|
+
custom user unit path fails closed.
|
|
307
379
|
|
|
308
380
|
With `killMode: 'mixed'`, the main process owns graceful child shutdown and must
|
|
309
381
|
remain alive until its children have joined. Systemd sends SIGTERM to the main
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,14 +3,12 @@ import { renderServiceRelations, type ISystemdServiceStartup, type ISystemdServi
|
|
|
3
3
|
type ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
4
4
|
export type { ISystemdServiceStartup, ISystemdServiceDependencies, ISystemdServiceInstallTargets } from './systemd.definition.js';
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
interface ISystemdServiceDefinitionBaseOptions {
|
|
7
7
|
unitName: string;
|
|
8
8
|
description: string;
|
|
9
9
|
executable: string;
|
|
10
10
|
args: readonly string[];
|
|
11
11
|
workingDirectory: string;
|
|
12
|
-
user: string;
|
|
13
|
-
group: string;
|
|
14
12
|
restart: 'no' | 'on-failure' | 'always';
|
|
15
13
|
killMode: 'mixed' | 'control-group';
|
|
16
14
|
timeoutStopSeconds: number;
|
|
@@ -19,6 +17,11 @@ export interface ISystemdServiceDefinitionOptions {
|
|
|
19
17
|
install?: ISystemdServiceInstallTargets;
|
|
20
18
|
}
|
|
21
19
|
|
|
20
|
+
export type ISystemdServiceDefinitionOptions = ISystemdServiceDefinitionBaseOptions & (
|
|
21
|
+
{ scope?: 'system'; user: string; group: string } |
|
|
22
|
+
{ scope: 'user'; user?: never; group?: never }
|
|
23
|
+
);
|
|
24
|
+
|
|
22
25
|
export class SystemdServiceDefinitionError extends Error {
|
|
23
26
|
constructor() {
|
|
24
27
|
super('Invalid direct systemd service definition.');
|
|
@@ -29,6 +32,7 @@ export class SystemdServiceDefinitionError extends Error {
|
|
|
29
32
|
/** Literal direct-execution definition; never introduces a shell or environment expansion. */
|
|
30
33
|
export class SystemdServiceDefinition {
|
|
31
34
|
public readonly unitName: string;
|
|
35
|
+
public readonly scope: 'system' | 'user';
|
|
32
36
|
public readonly content: string;
|
|
33
37
|
public readonly sha256: string;
|
|
34
38
|
|
|
@@ -36,6 +40,16 @@ export class SystemdServiceDefinition {
|
|
|
36
40
|
const requireValue = (value: unknown): void => {
|
|
37
41
|
if (!value) throw new SystemdServiceDefinitionError();
|
|
38
42
|
};
|
|
43
|
+
requireValue(options && !plugins.util.types.isProxy(options) &&
|
|
44
|
+
Object.getPrototypeOf(options) === Object.prototype);
|
|
45
|
+
const scopeDescriptor = Object.getOwnPropertyDescriptor(options, 'scope');
|
|
46
|
+
requireValue(scopeDescriptor === undefined ||
|
|
47
|
+
scopeDescriptor.enumerable && 'value' in scopeDescriptor);
|
|
48
|
+
const scopeValue: unknown = scopeDescriptor?.value ?? 'system';
|
|
49
|
+
if (scopeValue !== 'system' && scopeValue !== 'user') {
|
|
50
|
+
throw new SystemdServiceDefinitionError();
|
|
51
|
+
}
|
|
52
|
+
const scope = scopeValue;
|
|
39
53
|
const text = (value: unknown, maximum = 4096): value is string =>
|
|
40
54
|
typeof value === 'string' && value.length <= maximum && !/[\x00-\x1f\x7f]/.test(value) &&
|
|
41
55
|
!/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/u.test(value);
|
|
@@ -48,15 +62,13 @@ export class SystemdServiceDefinition {
|
|
|
48
62
|
'executable',
|
|
49
63
|
'args',
|
|
50
64
|
'workingDirectory',
|
|
51
|
-
'user',
|
|
52
|
-
'group',
|
|
53
65
|
'restart',
|
|
54
66
|
'killMode',
|
|
55
67
|
'timeoutStopSeconds',
|
|
68
|
+
...(scope === 'system' ? ['user', 'group'] : []),
|
|
56
69
|
];
|
|
57
70
|
requireValue(
|
|
58
|
-
|
|
59
|
-
Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'startup', 'dependencies', 'install'].includes(key)
|
|
71
|
+
Reflect.ownKeys(options).every(key => typeof key === 'string' && [...keys, 'scope', 'startup', 'dependencies', 'install'].includes(key)
|
|
60
72
|
&& Object.getOwnPropertyDescriptor(options, key)?.enumerable && 'value' in Object.getOwnPropertyDescriptor(options, key)!) && keys.every((key) => {
|
|
61
73
|
const descriptor = Object.getOwnPropertyDescriptor(options, key);
|
|
62
74
|
return descriptor && 'value' in descriptor;
|
|
@@ -87,11 +99,13 @@ export class SystemdServiceDefinition {
|
|
|
87
99
|
)
|
|
88
100
|
.every((descriptor) => descriptor && 'value' in descriptor && text(descriptor.value)),
|
|
89
101
|
);
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
102
|
+
if (scope === 'system') {
|
|
103
|
+
requireValue(
|
|
104
|
+
[options.user, options.group].every((value) =>
|
|
105
|
+
typeof value === 'string' && /^[a-zA-Z_][a-zA-Z0-9_-]{0,63}$/.test(value)
|
|
106
|
+
),
|
|
107
|
+
);
|
|
108
|
+
}
|
|
95
109
|
requireValue(
|
|
96
110
|
['no', 'on-failure', 'always'].includes(options.restart) &&
|
|
97
111
|
['mixed', 'control-group'].includes(options.killMode) &&
|
|
@@ -104,8 +118,9 @@ export class SystemdServiceDefinition {
|
|
|
104
118
|
.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('%', '%%')
|
|
105
119
|
.replaceAll('$', () => command ? '$$' : '$') +
|
|
106
120
|
'"';
|
|
107
|
-
const relations = renderServiceRelations(options, options.unitName, options.restart, () => { throw new SystemdServiceDefinitionError(); });
|
|
121
|
+
const relations = renderServiceRelations(options, options.unitName, options.restart, scope, () => { throw new SystemdServiceDefinitionError(); });
|
|
108
122
|
this.unitName = options.unitName;
|
|
123
|
+
this.scope = scope;
|
|
109
124
|
this.content = [
|
|
110
125
|
'[Unit]',
|
|
111
126
|
`Description=${options.description.replaceAll('%', '%%')}`,
|
|
@@ -113,8 +128,7 @@ export class SystemdServiceDefinition {
|
|
|
113
128
|
'',
|
|
114
129
|
'[Service]',
|
|
115
130
|
...relations.service,
|
|
116
|
-
`User=${options.user}`,
|
|
117
|
-
`Group=${options.group}`,
|
|
131
|
+
...(scope === 'system' ? [`User=${options.user}`, `Group=${options.group}`] : []),
|
|
118
132
|
`ExecStart=${
|
|
119
133
|
[quote(options.executable), ...options.args.map((value) => quote(value, true))].join(' ')
|
|
120
134
|
}`,
|
|
@@ -2,6 +2,10 @@ import * as plugins from './smartdaemon.plugins.js';
|
|
|
2
2
|
|
|
3
3
|
export interface ISystemdUnitOptions {
|
|
4
4
|
unitName: string;
|
|
5
|
+
/** Defaults to the system manager. User scope addresses the calling user's manager only. */
|
|
6
|
+
scope?: 'system' | 'user';
|
|
7
|
+
/** User-manager socket directory. Defaults to XDG_RUNTIME_DIR. */
|
|
8
|
+
runtimeDirectory?: string;
|
|
5
9
|
/** Absolute executable path supplied by trusted owning code. */
|
|
6
10
|
systemctlPath?: string;
|
|
7
11
|
/** Bounds the systemctl client, not the server-side job. Defaults to 120 seconds. */
|
|
@@ -30,6 +34,17 @@ export interface ISystemdUnitConfigurationState {
|
|
|
30
34
|
readonly needsReload: boolean;
|
|
31
35
|
}
|
|
32
36
|
|
|
37
|
+
export interface ISystemdUnitRelationships {
|
|
38
|
+
readonly unitName: string;
|
|
39
|
+
readonly before: readonly string[];
|
|
40
|
+
readonly after: readonly string[];
|
|
41
|
+
readonly requires: readonly string[];
|
|
42
|
+
readonly wants: readonly string[];
|
|
43
|
+
readonly conflicts: readonly string[];
|
|
44
|
+
readonly requiredBy: readonly string[];
|
|
45
|
+
readonly wantedBy: readonly string[];
|
|
46
|
+
}
|
|
47
|
+
|
|
33
48
|
export class SystemdUnitError extends Error {
|
|
34
49
|
constructor(public readonly code: 'invalid_options' | 'command_failed' | 'invalid_state') {
|
|
35
50
|
super(`Systemd unit operation failed: ${code}.`);
|
|
@@ -50,22 +65,43 @@ const properties = [
|
|
|
50
65
|
'Job',
|
|
51
66
|
] as const;
|
|
52
67
|
|
|
53
|
-
/** Controls an existing system unit without
|
|
68
|
+
/** Controls an existing system unit without rewriting its definition or escalating privileges. */
|
|
54
69
|
export class SystemdUnit {
|
|
55
70
|
private readonly unitName: string;
|
|
56
71
|
private readonly executable: string;
|
|
57
72
|
private readonly timeout: number;
|
|
73
|
+
private readonly scope: 'system' | 'user';
|
|
74
|
+
private readonly runtimeDirectory?: string;
|
|
75
|
+
private readonly homeDirectory?: string;
|
|
76
|
+
private readonly configDirectory?: string;
|
|
77
|
+
private readonly dataDirectory?: string;
|
|
58
78
|
|
|
59
79
|
constructor(optionsArg: ISystemdUnitOptions) {
|
|
60
80
|
this.unitName = optionsArg?.unitName;
|
|
61
81
|
this.executable = optionsArg?.systemctlPath ?? '/usr/bin/systemctl';
|
|
62
82
|
this.timeout = optionsArg?.commandTimeoutMs ?? 120000;
|
|
83
|
+
this.scope = optionsArg?.scope ?? 'system';
|
|
84
|
+
this.runtimeDirectory = this.scope === 'user'
|
|
85
|
+
? optionsArg?.runtimeDirectory ?? process.env.XDG_RUNTIME_DIR : undefined;
|
|
86
|
+
this.homeDirectory = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
87
|
+
this.configDirectory = this.scope === 'user' ? process.env.XDG_CONFIG_HOME || undefined : undefined;
|
|
88
|
+
this.dataDirectory = this.scope === 'user' ? process.env.XDG_DATA_HOME || undefined : undefined;
|
|
89
|
+
const safeDirectory = (value: unknown): value is string =>
|
|
90
|
+
typeof value === 'string' && value !== '/' && plugins.path.isAbsolute(value) &&
|
|
91
|
+
plugins.path.normalize(value) === value && !value.endsWith('/') &&
|
|
92
|
+
value.length <= 4000 && !/[\x00-\x1f\x7f]/.test(value);
|
|
63
93
|
if (
|
|
64
94
|
typeof this.unitName !== 'string' ||
|
|
65
95
|
!/^[a-zA-Z0-9][a-zA-Z0-9_.:@-]{0,230}\.service$/.test(this.unitName) ||
|
|
66
96
|
typeof this.executable !== 'string' || !plugins.path.isAbsolute(this.executable) ||
|
|
67
97
|
this.executable.includes('\0') || !Number.isSafeInteger(this.timeout) ||
|
|
68
|
-
this.timeout < 1 || this.timeout > 600000
|
|
98
|
+
this.timeout < 1 || this.timeout > 600000 ||
|
|
99
|
+
!['system', 'user'].includes(this.scope) ||
|
|
100
|
+
(this.scope === 'system' && optionsArg?.runtimeDirectory !== undefined) ||
|
|
101
|
+
(this.scope === 'user' &&
|
|
102
|
+
(!safeDirectory(this.runtimeDirectory) || !safeDirectory(this.homeDirectory) ||
|
|
103
|
+
this.configDirectory !== undefined && !safeDirectory(this.configDirectory) ||
|
|
104
|
+
this.dataDirectory !== undefined && !safeDirectory(this.dataDirectory)))
|
|
69
105
|
) throw new SystemdUnitError('invalid_options');
|
|
70
106
|
}
|
|
71
107
|
|
|
@@ -113,6 +149,39 @@ export class SystemdUnit {
|
|
|
113
149
|
return this.inspect();
|
|
114
150
|
}
|
|
115
151
|
|
|
152
|
+
/** Persistently enables the existing definition, then inspects. Never starts, unmasks or forces links.
|
|
153
|
+
* Owning installers must separately verify exact file/configuration and required relationships. */
|
|
154
|
+
public async enable(): Promise<ISystemdUnitState> {
|
|
155
|
+
await this.command(['enable', this.unitName]);
|
|
156
|
+
return this.inspect();
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
/** Loaded manager graph, including reverse edges. Enablement alone does not prove every required link. */
|
|
160
|
+
public async inspectRelationships(): Promise<ISystemdUnitRelationships> {
|
|
161
|
+
const keys = ['Id', 'Before', 'After', 'Requires', 'Wants', 'Conflicts', 'RequiredBy', 'WantedBy'];
|
|
162
|
+
const stdout = await this.command(['show', this.unitName, `--property=${keys.join(',')}`, '--all']);
|
|
163
|
+
const fields = new Map<string, string>();
|
|
164
|
+
for (const line of (stdout.endsWith('\n') ? stdout.slice(0, -1) : stdout).split('\n')) {
|
|
165
|
+
const separator = line.indexOf('='), key = line.slice(0, separator);
|
|
166
|
+
if (separator < 1 || !keys.includes(key) || fields.has(key)) throw new SystemdUnitError('invalid_state');
|
|
167
|
+
fields.set(key, line.slice(separator + 1));
|
|
168
|
+
}
|
|
169
|
+
if (fields.size !== keys.length || fields.get('Id') !== this.unitName) throw new SystemdUnitError('invalid_state');
|
|
170
|
+
const units = (key: string): readonly string[] => {
|
|
171
|
+
const text = fields.get(key)!;
|
|
172
|
+
const values = text === '' ? [] : text.split(' ');
|
|
173
|
+
// Unit names are ASCII; retain systemd's literal hex escapes without decoding
|
|
174
|
+
// them into separators. Output and every individual name remain bounded.
|
|
175
|
+
if (values.some(value => value.length > 255 ||
|
|
176
|
+
!/^(?:[a-zA-Z0-9_.:@-]|\\x[0-9a-fA-F]{2})+\.(?:service|socket|device|mount|automount|swap|target|path|timer|slice|scope)$/.test(value)) ||
|
|
177
|
+
new Set(values).size !== values.length) throw new SystemdUnitError('invalid_state');
|
|
178
|
+
return Object.freeze(values.sort());
|
|
179
|
+
};
|
|
180
|
+
return Object.freeze({ unitName: this.unitName, before: units('Before'), after: units('After'),
|
|
181
|
+
requires: units('Requires'), wants: units('Wants'), conflicts: units('Conflicts'),
|
|
182
|
+
requiredBy: units('RequiredBy'), wantedBy: units('WantedBy') });
|
|
183
|
+
}
|
|
184
|
+
|
|
116
185
|
/** Await the systemd job, then inspect. The snapshot alone is not an application data-drain proof. */
|
|
117
186
|
public async stop(): Promise<ISystemdUnitState> {
|
|
118
187
|
await this.command(['stop', this.unitName]);
|
|
@@ -149,18 +218,40 @@ export class SystemdUnit {
|
|
|
149
218
|
return this.inspectConfiguration();
|
|
150
219
|
}
|
|
151
220
|
|
|
152
|
-
private
|
|
221
|
+
private async validateUserRuntime(): Promise<void> {
|
|
222
|
+
if (this.scope !== 'user') return;
|
|
223
|
+
try {
|
|
224
|
+
const uid = process.getuid?.();
|
|
225
|
+
if (process.platform !== 'linux' || uid === undefined || process.geteuid?.() !== uid ||
|
|
226
|
+
await plugins.fs.realpath(this.runtimeDirectory!) !== this.runtimeDirectory) {
|
|
227
|
+
throw new SystemdUnitError('invalid_options');
|
|
228
|
+
}
|
|
229
|
+
const info = await plugins.fs.lstat(this.runtimeDirectory!);
|
|
230
|
+
if (!info.isDirectory() || info.isSymbolicLink() || info.uid !== uid ||
|
|
231
|
+
(info.mode & 0o077) !== 0) throw new SystemdUnitError('invalid_options');
|
|
232
|
+
} catch {
|
|
233
|
+
throw new SystemdUnitError('invalid_options');
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
private async command(argsArg: string[]): Promise<string> {
|
|
238
|
+
await this.validateUserRuntime();
|
|
153
239
|
return new Promise((resolve, reject) => {
|
|
154
240
|
plugins.childProcess.execFile(
|
|
155
241
|
this.executable,
|
|
156
|
-
['--system', '--no-ask-password', '--no-pager', ...argsArg],
|
|
242
|
+
[this.scope === 'user' ? '--user' : '--system', '--no-ask-password', '--no-pager', ...argsArg],
|
|
157
243
|
{
|
|
158
244
|
encoding: 'utf8',
|
|
159
245
|
timeout: this.timeout,
|
|
160
246
|
killSignal: 'SIGKILL',
|
|
161
247
|
maxBuffer: 16384,
|
|
162
248
|
windowsHide: true,
|
|
163
|
-
env:
|
|
249
|
+
env: this.scope === 'user'
|
|
250
|
+
? { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C',
|
|
251
|
+
HOME: this.homeDirectory!, XDG_RUNTIME_DIR: this.runtimeDirectory!,
|
|
252
|
+
...(this.configDirectory ? { XDG_CONFIG_HOME: this.configDirectory } : {}),
|
|
253
|
+
...(this.dataDirectory ? { XDG_DATA_HOME: this.dataDirectory } : {}) }
|
|
254
|
+
: { PATH: '/usr/bin:/bin', LANG: 'C', LC_ALL: 'C' },
|
|
164
255
|
},
|
|
165
256
|
(error, stdout) => {
|
|
166
257
|
// execFile settles after the client closes. A timed-out client's remote job may continue.
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
export interface ISystemdUnitFileOptions extends ISystemdUnitOptions {
|
|
11
11
|
/** Local vendor definitions can be installed without removing an administrator's mask. */
|
|
12
12
|
unitDirectory?: string;
|
|
13
|
-
/** Trusted owning-code qualification only. Defaults to root. */
|
|
13
|
+
/** Trusted owning-code qualification only. Defaults to root for system, current uid for user. */
|
|
14
14
|
expectedUid?: number;
|
|
15
15
|
}
|
|
16
16
|
export interface ISystemdUnitFileRecord {
|
|
@@ -56,6 +56,9 @@ export class SystemdUnitFile {
|
|
|
56
56
|
public readonly path: string;
|
|
57
57
|
private readonly directory: string;
|
|
58
58
|
private readonly uid: number;
|
|
59
|
+
private readonly scope: 'system' | 'user';
|
|
60
|
+
private readonly configDirectory?: string;
|
|
61
|
+
private readonly runtimeDirectory?: string;
|
|
59
62
|
private readonly unit: SystemdUnit;
|
|
60
63
|
private readonly name: string;
|
|
61
64
|
private busy = false;
|
|
@@ -63,14 +66,27 @@ export class SystemdUnitFile {
|
|
|
63
66
|
constructor(options: ISystemdUnitFileOptions) {
|
|
64
67
|
this.unit = new SystemdUnit(options);
|
|
65
68
|
this.name = options.unitName;
|
|
66
|
-
this.
|
|
67
|
-
this.
|
|
69
|
+
this.scope = options.scope ?? 'system';
|
|
70
|
+
const home = this.scope === 'user' ? plugins.os.userInfo().homedir : undefined;
|
|
71
|
+
const dataDirectory = this.scope === 'user'
|
|
72
|
+
? process.env.XDG_DATA_HOME || plugins.path.join(home!, '.local/share') : undefined;
|
|
73
|
+
this.configDirectory = this.scope === 'user'
|
|
74
|
+
? process.env.XDG_CONFIG_HOME || plugins.path.join(home!, '.config') : undefined;
|
|
75
|
+
this.runtimeDirectory = this.scope === 'user'
|
|
76
|
+
? options.runtimeDirectory ?? process.env.XDG_RUNTIME_DIR : undefined;
|
|
77
|
+
this.directory = options.unitDirectory ?? (this.scope === 'user'
|
|
78
|
+
? plugins.path.join(dataDirectory!, 'systemd/user') : '/usr/local/lib/systemd/system');
|
|
79
|
+
this.uid = options.expectedUid ?? (this.scope === 'user' ? process.getuid?.() ?? -1 : 0);
|
|
80
|
+
const validDirectory = (directory: unknown): directory is string =>
|
|
81
|
+
typeof directory === 'string' && directory !== '/' &&
|
|
82
|
+
plugins.path.isAbsolute(directory) && plugins.path.normalize(directory) === directory &&
|
|
83
|
+
!directory.endsWith('/') && !/[\x00-\x1f\x7f]/.test(directory) &&
|
|
84
|
+
directory.length <= 4000;
|
|
68
85
|
requireValue(
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
this.directory.length <= 4000 && Number.isSafeInteger(this.uid) && this.uid >= 0,
|
|
86
|
+
validDirectory(this.directory) && Number.isSafeInteger(this.uid) && this.uid >= 0 &&
|
|
87
|
+
(this.scope === 'system' ||
|
|
88
|
+
this.uid === process.getuid?.() && validDirectory(this.configDirectory) &&
|
|
89
|
+
validDirectory(this.runtimeDirectory)),
|
|
74
90
|
'invalid_options',
|
|
75
91
|
);
|
|
76
92
|
this.path = plugins.path.join(this.directory, this.name);
|
|
@@ -93,6 +109,7 @@ export class SystemdUnitFile {
|
|
|
93
109
|
): Promise<Readonly<{ changed: boolean; record: ISystemdUnitFileRecord; masked: boolean }>> {
|
|
94
110
|
requireValue(
|
|
95
111
|
definition instanceof SystemdServiceDefinition && definition.unitName === this.name &&
|
|
112
|
+
definition.scope === this.scope &&
|
|
96
113
|
(expectedSha256 === null ||
|
|
97
114
|
typeof expectedSha256 === 'string' && /^[a-f0-9]{64}$/.test(expectedSha256)),
|
|
98
115
|
'invalid_options',
|
|
@@ -196,15 +213,19 @@ export class SystemdUnitFile {
|
|
|
196
213
|
'unsafe_unit',
|
|
197
214
|
);
|
|
198
215
|
const configuration = await this.unit.inspectConfiguration();
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
216
|
+
const maskPaths = this.scope === 'system'
|
|
217
|
+
? [plugins.path.join(
|
|
218
|
+
state.unitFileState === 'masked-runtime' ? '/run/systemd/system' : '/etc/systemd/system',
|
|
219
|
+
this.name,
|
|
220
|
+
)]
|
|
221
|
+
: (state.unitFileState === 'masked-runtime'
|
|
222
|
+
? [this.runtimeDirectory!, '/run'].map(root => plugins.path.join(root, 'systemd/user', this.name))
|
|
223
|
+
: [this.configDirectory!, '/etc'].map(root => plugins.path.join(root, 'systemd/user', this.name)));
|
|
203
224
|
requireValue(
|
|
204
225
|
!configuration.needsReload && configuration.dropInPaths === '' &&
|
|
205
226
|
(masked(state)
|
|
206
227
|
? configuration.fragmentPath !== this.path &&
|
|
207
|
-
['/dev/null',
|
|
228
|
+
['/dev/null', ...maskPaths].includes(configuration.fragmentPath)
|
|
208
229
|
: configuration.fragmentPath === (state.loadState === 'not-found' ? '' : this.path)),
|
|
209
230
|
'unsafe_unit',
|
|
210
231
|
);
|
|
@@ -5,9 +5,10 @@ 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
7
|
import * as util from 'node:util';
|
|
8
|
+
import * as os from 'node:os';
|
|
8
9
|
export type { Stats } from 'node:fs';
|
|
9
10
|
|
|
10
|
-
export { path, childProcess, fs, fsConstants, crypto, util };
|
|
11
|
+
export { path, childProcess, fs, fsConstants, crypto, util, os };
|
|
11
12
|
|
|
12
13
|
// @pushrocks scope
|
|
13
14
|
import * as lik from '@push.rocks/lik';
|
package/ts/systemd.definition.ts
CHANGED
|
@@ -6,7 +6,7 @@ export interface ISystemdServiceStartup {
|
|
|
6
6
|
timeoutStartSeconds: number;
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
-
/** Complete literal relations. After=local-fs.target
|
|
9
|
+
/** Complete literal relations. System services always retain After=local-fs.target. */
|
|
10
10
|
export interface ISystemdServiceDependencies {
|
|
11
11
|
defaultDependencies: boolean;
|
|
12
12
|
after: readonly string[];
|
|
@@ -27,7 +27,7 @@ export const renderServiceRelations = (options: {
|
|
|
27
27
|
startup?: ISystemdServiceStartup;
|
|
28
28
|
dependencies?: ISystemdServiceDependencies;
|
|
29
29
|
install?: ISystemdServiceInstallTargets;
|
|
30
|
-
}, unitName: string, restart: string, fail: () => never): {
|
|
30
|
+
}, unitName: string, restart: string, scope: 'system' | 'user', fail: () => never): {
|
|
31
31
|
unit: string[]; service: string[]; install: string[];
|
|
32
32
|
} => {
|
|
33
33
|
const requireValue = (value: unknown): void => { if (!value) fail(); };
|
|
@@ -55,7 +55,11 @@ export const renderServiceRelations = (options: {
|
|
|
55
55
|
return result.sort();
|
|
56
56
|
};
|
|
57
57
|
const line = (key: string, value: readonly string[]): string[] => value.length ? [`${key}=${value.join(' ')}`] : [];
|
|
58
|
-
const result = {
|
|
58
|
+
const result = {
|
|
59
|
+
unit: scope === 'system' ? ['After=local-fs.target'] : [] as string[],
|
|
60
|
+
service: ['Type=exec'],
|
|
61
|
+
install: [scope === 'system' ? 'WantedBy=multi-user.target' : 'WantedBy=default.target'],
|
|
62
|
+
};
|
|
59
63
|
if (options.startup !== undefined) {
|
|
60
64
|
const value = options.startup;
|
|
61
65
|
record(value, ['type', 'remainAfterExit', 'timeoutStartSeconds']);
|
|
@@ -67,7 +71,7 @@ export const renderServiceRelations = (options: {
|
|
|
67
71
|
const value = options.dependencies;
|
|
68
72
|
record(value, ['defaultDependencies', 'after', 'before', 'requires', 'wants', 'conflicts']);
|
|
69
73
|
requireValue(typeof value.defaultDependencies === 'boolean');
|
|
70
|
-
const after = [...new Set(['local-fs.target', ...units(value.after)])].sort();
|
|
74
|
+
const after = [...new Set([...(scope === 'system' ? ['local-fs.target'] : []), ...units(value.after)])].sort();
|
|
71
75
|
const before = units(value.before), requires = units(value.requires), wants = units(value.wants), conflicts = units(value.conflicts);
|
|
72
76
|
requireValue(before.every(item => !after.includes(item)) && conflicts.every(item => !requires.includes(item) && !wants.includes(item)));
|
|
73
77
|
result.unit = [`DefaultDependencies=${value.defaultDependencies ? 'yes' : 'no'}`, ...line('After', after),
|