nodecommons-esm-process 0.0.2 → 0.0.4
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/classes/commons-forever.mjs +7 -7
- package/dist/classes/commons-forever.mjs.map +1 -1
- package/dist/classes/commons-ipc-unix-socket-auto-reconnect-client.mjs +8 -8
- package/dist/classes/commons-ipc-unix-socket-auto-reconnect-client.mjs.map +1 -1
- package/dist/classes/commons-ipc-unix-socket-client.mjs +2 -2
- package/dist/classes/commons-ipc-unix-socket-client.mjs.map +1 -1
- package/dist/classes/commons-ipc-unix-socket-host.mjs +7 -7
- package/dist/classes/commons-ipc-unix-socket-host.mjs.map +1 -1
- package/dist/classes/commons-shm.mjs.map +1 -1
- package/dist/helpers/commons-systemd.mjs +3 -3
- package/dist/helpers/commons-systemd.mjs.map +1 -1
- package/package.json +4 -3
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as child_process from 'child_process';
|
|
2
|
-
import { commonsOutputInfo, commonsOutputDebug, commonsOutputError } from 'nodecommons-esm-cli';
|
|
3
2
|
import { commonsFileDistRelativePath } from 'nodecommons-esm-file';
|
|
3
|
+
import { commonsLogDebug, commonsLogError, commonsLogInfo } from 'nodecommons-esm-log';
|
|
4
4
|
import { ECommonsExitCode } from '../enums/ecommons-exit-code.mjs';
|
|
5
5
|
export class CommonsForever {
|
|
6
6
|
script;
|
|
@@ -42,7 +42,7 @@ export class CommonsForever {
|
|
|
42
42
|
this.options.execArgv = '-r ./tsconfig-paths-bootstrap.js'.split(' ');
|
|
43
43
|
}
|
|
44
44
|
start() {
|
|
45
|
-
|
|
45
|
+
commonsLogInfo('CommonsForever process running');
|
|
46
46
|
this.firstStarted = true;
|
|
47
47
|
this.fork();
|
|
48
48
|
}
|
|
@@ -52,7 +52,7 @@ export class CommonsForever {
|
|
|
52
52
|
fork() {
|
|
53
53
|
if (this.child !== undefined)
|
|
54
54
|
throw new Error('Child process already exists');
|
|
55
|
-
|
|
55
|
+
commonsLogInfo('Forking child process');
|
|
56
56
|
this.startTime = new Date().getTime();
|
|
57
57
|
this.child = child_process.fork(this.command, this.args, this.options);
|
|
58
58
|
this.child.on('error', (_) => {
|
|
@@ -70,7 +70,7 @@ export class CommonsForever {
|
|
|
70
70
|
});
|
|
71
71
|
this.child.on('exit', (code, signal) => {
|
|
72
72
|
this.child = undefined;
|
|
73
|
-
|
|
73
|
+
commonsLogDebug(`Child process exited with exit code ${code || 'null'} and signal ${signal || 'null'}`);
|
|
74
74
|
if (code !== null && this.permittedExitCodes.includes(code)) {
|
|
75
75
|
void this.shutdown(code);
|
|
76
76
|
return;
|
|
@@ -82,11 +82,11 @@ export class CommonsForever {
|
|
|
82
82
|
const endTime = new Date().getTime();
|
|
83
83
|
const delta = endTime - this.startTime;
|
|
84
84
|
if (delta < this.minUptime) {
|
|
85
|
-
|
|
85
|
+
commonsLogError('Minimum uptime not reached. Aborting');
|
|
86
86
|
void this.shutdown(ECommonsExitCode.ERROR);
|
|
87
87
|
return;
|
|
88
88
|
}
|
|
89
|
-
|
|
89
|
+
commonsLogInfo('Non-permitted exit code. Restarting');
|
|
90
90
|
process.nextTick(() => {
|
|
91
91
|
this.fork();
|
|
92
92
|
});
|
|
@@ -122,7 +122,7 @@ export class CommonsForever {
|
|
|
122
122
|
}
|
|
123
123
|
async shutdown(code) {
|
|
124
124
|
process.exitCode = code;
|
|
125
|
-
|
|
125
|
+
commonsLogInfo('Stopping CommonsForever process');
|
|
126
126
|
this.terminateChild();
|
|
127
127
|
}
|
|
128
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-forever.mjs","sourceRoot":"","sources":["../../src/classes/commons-forever.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,eAAe,CAAC;AAE/C,OAAO,
|
|
1
|
+
{"version":3,"file":"commons-forever.mjs","sourceRoot":"","sources":["../../src/classes/commons-forever.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { commonsAsyncTimeout, commonsAsyncInterval, commonsAsyncAbortInterval, ECommonsInvocation } from 'tscommons-esm-async';
|
|
2
|
-
import {
|
|
2
|
+
import { commonsLogDebug } from 'nodecommons-esm-log';
|
|
3
3
|
import { CommonsIpcUnixSocketClient } from './commons-ipc-unix-socket-client.mjs';
|
|
4
4
|
export class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcUnixSocketClient {
|
|
5
5
|
maxTtl;
|
|
@@ -33,14 +33,14 @@ export class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcUnixSocke
|
|
|
33
33
|
}
|
|
34
34
|
async reconnect(callback, ttl = -1) {
|
|
35
35
|
if (ttl === 0) { // allows -1 to start an infinite reconnect
|
|
36
|
-
|
|
36
|
+
commonsLogDebug('TTL on reconnection expired');
|
|
37
37
|
return false;
|
|
38
38
|
}
|
|
39
|
-
|
|
39
|
+
commonsLogDebug(`Attempting reconnection to unix domain socket. TTL is ${ttl}`);
|
|
40
40
|
try {
|
|
41
41
|
await super.listen(callback);
|
|
42
42
|
this.setConnected(true);
|
|
43
|
-
|
|
43
|
+
commonsLogDebug('Connected successfully');
|
|
44
44
|
return true;
|
|
45
45
|
}
|
|
46
46
|
catch (_e) {
|
|
@@ -56,9 +56,9 @@ export class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcUnixSocke
|
|
|
56
56
|
}
|
|
57
57
|
commonsAsyncInterval(this.noopInterval, ECommonsInvocation.IF, async () => {
|
|
58
58
|
if (!this.connected) {
|
|
59
|
-
|
|
59
|
+
commonsLogDebug('Attempting reconnection to unix domain socket');
|
|
60
60
|
if (!(await this.reconnect(callback, this.maxTtl))) {
|
|
61
|
-
|
|
61
|
+
commonsLogDebug('Timed out attempting to connect');
|
|
62
62
|
commonsAsyncAbortInterval(this.intervalName);
|
|
63
63
|
if (this.failureCallback)
|
|
64
64
|
this.failureCallback();
|
|
@@ -71,7 +71,7 @@ export class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcUnixSocke
|
|
|
71
71
|
}
|
|
72
72
|
catch (_e) {
|
|
73
73
|
this.setConnected(false);
|
|
74
|
-
|
|
74
|
+
commonsLogDebug('Lost connection to unix domain socket during noop');
|
|
75
75
|
try {
|
|
76
76
|
super.destroy();
|
|
77
77
|
}
|
|
@@ -90,7 +90,7 @@ export class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcUnixSocke
|
|
|
90
90
|
}
|
|
91
91
|
catch (e) {
|
|
92
92
|
this.setConnected(false);
|
|
93
|
-
|
|
93
|
+
commonsLogDebug('Lost connection to unix domain socket during send');
|
|
94
94
|
throw e;
|
|
95
95
|
}
|
|
96
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-ipc-unix-socket-auto-reconnect-client.mjs","sourceRoot":"","sources":["../../src/classes/commons-ipc-unix-socket-auto-reconnect-client.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"commons-ipc-unix-socket-auto-reconnect-client.mjs","sourceRoot":"","sources":["../../src/classes/commons-ipc-unix-socket-auto-reconnect-client.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as net from 'net';
|
|
2
|
-
import {
|
|
2
|
+
import { commonsLogDebug } from 'nodecommons-esm-log';
|
|
3
3
|
import { CommonsIpcUnixSocket } from './commons-ipc-unix-socket.mjs';
|
|
4
4
|
export class CommonsIpcUnixSocketClient extends CommonsIpcUnixSocket {
|
|
5
5
|
socket = undefined;
|
|
@@ -28,7 +28,7 @@ export class CommonsIpcUnixSocketClient extends CommonsIpcUnixSocket {
|
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
send(data) {
|
|
31
|
-
|
|
31
|
+
commonsLogDebug(`Sending data: ${data}`);
|
|
32
32
|
return new Promise((resolve, reject) => {
|
|
33
33
|
if (this.socket === undefined) {
|
|
34
34
|
reject(new Error('Unix IPC socket is not open yet'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-ipc-unix-socket-client.mjs","sourceRoot":"","sources":["../../src/classes/commons-ipc-unix-socket-client.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"commons-ipc-unix-socket-client.mjs","sourceRoot":"","sources":["../../src/classes/commons-ipc-unix-socket-client.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAIrE,MAAM,OAAO,0BAA2B,SAAQ,oBAAoB;IAC3D,MAAM,GAAqB,SAAS,CAAC;IACrC,oBAAoB,CAAwB;IAEpD,YACE,IAAY;QAEb,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,gEAAgE;QAChE,IAAI,CAAC,oBAAoB,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,QAAgC;QAEjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAmB,EAAE,MAA8B,EAAQ,EAAE;YAChF,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,gBAAgB,CAChC,IAAI,CAAC,OAAO,EAAE,EACd,GAAS,EAAE;gBACV,OAAO,EAAE,CAAC;YACX,CAAC,CACF,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAEhC,IAAI,CAAC,MAAM,CAAC,EAAE,CACZ,OAAO,EACP,CAAC,KAA4B,EAAQ,EAAE;gBACtC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC5B,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC5B,OAAO;gBACR,CAAC;gBAED,MAAM,CAAC,KAAK,CAAC,CAAC;YACf,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CACZ,MAAM,EACN,CAAC,IAAY,EAAQ,EAAE;gBACtB,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CACF,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAEM,IAAI,CAAC,IAAY;QACvB,eAAe,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAmB,EAAE,MAA8B,EAAQ,EAAE;YAChF,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC,CAAC;gBACrD,OAAO;YACR,CAAC;YAED,IAAI,CAAC;gBACJ,IAAI,CAAC,oBAAoB,GAAG,GAAS,EAAE;oBACtC,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAC;gBAC1D,CAAC,CAAC;gBAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,IAAI,EACJ,GAAS,EAAE;oBACV,OAAO,EAAE,CAAC;gBACX,CAAC,CACF,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,CAAC,CAAU,CAAC,CAAC;YACpB,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK;QACX,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO;QACtC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC;IAEM,OAAO;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO;QACtC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as fs from 'fs';
|
|
2
2
|
import * as net from 'net';
|
|
3
|
-
import {
|
|
3
|
+
import { commonsLogDebug } from 'nodecommons-esm-log';
|
|
4
4
|
import { CommonsIpcUnixSocket } from './commons-ipc-unix-socket.mjs';
|
|
5
5
|
import { CommonsIpcUnixSocketClient } from './commons-ipc-unix-socket-client.mjs';
|
|
6
6
|
export class CommonsIpcUnixSocketHost extends CommonsIpcUnixSocket {
|
|
@@ -31,7 +31,7 @@ export class CommonsIpcUnixSocketHost extends CommonsIpcUnixSocket {
|
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
async listen(callback) {
|
|
34
|
-
|
|
34
|
+
commonsLogDebug('Setting up listen for IPC server');
|
|
35
35
|
return new Promise((resolve, reject) => {
|
|
36
36
|
this.server.listen(this.getPath(), () => {
|
|
37
37
|
if (this.chmodPermissions)
|
|
@@ -40,8 +40,8 @@ export class CommonsIpcUnixSocketHost extends CommonsIpcUnixSocket {
|
|
|
40
40
|
});
|
|
41
41
|
this.server.on('error', (error) => {
|
|
42
42
|
if (error.code === 'EADDRINUSE') {
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
commonsLogDebug('Unix socket is already in use!');
|
|
44
|
+
commonsLogDebug('Attempting removal and recreation');
|
|
45
45
|
const test = new CommonsIpcUnixSocketClient(this.getName());
|
|
46
46
|
void (async () => {
|
|
47
47
|
try {
|
|
@@ -54,12 +54,12 @@ export class CommonsIpcUnixSocketHost extends CommonsIpcUnixSocket {
|
|
|
54
54
|
catch (e) {
|
|
55
55
|
test.destroy();
|
|
56
56
|
if (e.code === 'ECONNREFUSED') { // eslint-disable-line @typescript-eslint/no-unsafe-member-access
|
|
57
|
-
|
|
57
|
+
commonsLogDebug(`Unlinking existing IPC socket path at ${this.getPath()}`);
|
|
58
58
|
fs.unlinkSync(this.getPath());
|
|
59
59
|
try {
|
|
60
|
-
|
|
60
|
+
commonsLogDebug('Reattempting to listen');
|
|
61
61
|
this.server.listen(this.getPath(), () => {
|
|
62
|
-
|
|
62
|
+
commonsLogDebug('Recreation succeeded');
|
|
63
63
|
resolve();
|
|
64
64
|
});
|
|
65
65
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-ipc-unix-socket-host.mjs","sourceRoot":"","sources":["../../src/classes/commons-ipc-unix-socket-host.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"commons-ipc-unix-socket-host.mjs","sourceRoot":"","sources":["../../src/classes/commons-ipc-unix-socket-host.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-shm.mjs","sourceRoot":"","sources":["../../src/classes/commons-shm.mts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,sCAAsC;AAEtC,OAAO,
|
|
1
|
+
{"version":3,"file":"commons-shm.mjs","sourceRoot":"","sources":["../../src/classes/commons-shm.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import * as child_process from 'child_process';
|
|
2
|
-
import {
|
|
2
|
+
import { commonsLogDebug } from 'nodecommons-esm-log';
|
|
3
3
|
import { commonsFileMkdirRecursive, commonsFileWriteTextFile, commonsFileRm } from 'nodecommons-esm-file';
|
|
4
4
|
import { CommonsConfigFile } from 'nodecommons-esm-config';
|
|
5
5
|
export function commonsSystemdInstall(name, command, description, config, configPath, configFilename, group, autoJoinGroup = false, restart = 'always', restartSec = 5, autoEnable = true, autoStart = false) {
|
|
6
6
|
if (config) {
|
|
7
7
|
if (config instanceof CommonsConfigFile) {
|
|
8
8
|
if (config.getFilepath() !== undefined) {
|
|
9
|
-
|
|
9
|
+
commonsLogDebug(`Saving config into file: ${config.getFilepath()}`);
|
|
10
10
|
const paths = config.getFilepath().split('/');
|
|
11
11
|
paths.pop(); // filename
|
|
12
12
|
commonsFileMkdirRecursive(paths.join('/'));
|
|
@@ -18,7 +18,7 @@ export function commonsSystemdInstall(name, command, description, config, config
|
|
|
18
18
|
if (!configFilename)
|
|
19
19
|
configFilename = `${name}.json`;
|
|
20
20
|
const configFilePath = `${configPath}/${configFilename}`;
|
|
21
|
-
|
|
21
|
+
commonsLogDebug(`Saving config into file: ${configFilePath}`);
|
|
22
22
|
const paths = configFilePath.split('/');
|
|
23
23
|
paths.pop();
|
|
24
24
|
commonsFileMkdirRecursive(paths.join('/'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-systemd.mjs","sourceRoot":"","sources":["../../src/helpers/commons-systemd.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,eAAe,CAAC;AAI/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"commons-systemd.mjs","sourceRoot":"","sources":["../../src/helpers/commons-systemd.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nodecommons-esm-process",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"tsc": "./node_modules/typescript/bin/tsc",
|
|
@@ -26,9 +26,10 @@
|
|
|
26
26
|
"dist/**/*"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"nodecommons-esm-cli": "^0.0.
|
|
30
|
-
"nodecommons-esm-config": "^0.0.
|
|
29
|
+
"nodecommons-esm-cli": "^0.0.4",
|
|
30
|
+
"nodecommons-esm-config": "^0.0.4",
|
|
31
31
|
"nodecommons-esm-file": "^0.0.2",
|
|
32
|
+
"nodecommons-esm-log": "^0.0.3",
|
|
32
33
|
"rxjs": "^7.8.1",
|
|
33
34
|
"tscommons-esm-async": "^0.0.2",
|
|
34
35
|
"tscommons-esm-config": "^0.0.2",
|