nodecommons-esm-process 0.1.0 → 1.1.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/classes/commons-ipc-unix-socket-auto-reconnect-client.d.mts +2 -1
- package/dist/classes/commons-ipc-unix-socket-auto-reconnect-client.mjs +2 -1
- package/dist/classes/commons-ipc-unix-socket-auto-reconnect-client.mjs.map +1 -1
- package/dist/classes/commons-resource-queue.d.mts +3 -2
- package/dist/classes/commons-resource-queue.mjs +3 -3
- package/dist/classes/commons-resource-queue.mjs.map +1 -1
- package/dist/helpers/commons-exec.d.mts +4 -4
- package/dist/helpers/commons-exec.mjs +3 -3
- package/dist/helpers/commons-exec.mjs.map +1 -1
- package/package.json +8 -8
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CommonsFixedDuration } from 'tscommons-esm-core';
|
|
1
2
|
import { CommonsIpcUnixSocketClient } from './commons-ipc-unix-socket-client.mjs';
|
|
2
3
|
export declare class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcUnixSocketClient {
|
|
3
4
|
private maxTtl;
|
|
@@ -9,7 +10,7 @@ export declare class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcU
|
|
|
9
10
|
private requireInitialConnection;
|
|
10
11
|
private connected;
|
|
11
12
|
private intervalName;
|
|
12
|
-
constructor(name: string, maxTtl: number, reconnectDelay?:
|
|
13
|
+
constructor(name: string, maxTtl: number, reconnectDelay?: CommonsFixedDuration, noopInterval?: CommonsFixedDuration, noopCommand?: string, failureCallback?: (() => void) | undefined, connectedCallback?: ((state: boolean) => void) | undefined, requireInitialConnection?: boolean);
|
|
13
14
|
get isConnected(): boolean;
|
|
14
15
|
private setConnected;
|
|
15
16
|
private reconnect;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CommonsFixedDuration } from 'tscommons-esm-core';
|
|
1
2
|
import { commonsAsyncTimeout, commonsAsyncInterval, commonsAsyncAbortInterval, ECommonsInvocation } from 'tscommons-esm-async';
|
|
2
3
|
import { commonsLogDebug } from 'nodecommons-esm-log';
|
|
3
4
|
import { CommonsIpcUnixSocketClient } from './commons-ipc-unix-socket-client.mjs';
|
|
@@ -11,7 +12,7 @@ export class CommonsIpcUnixSocketAutoReconnectClient extends CommonsIpcUnixSocke
|
|
|
11
12
|
requireInitialConnection;
|
|
12
13
|
connected = false;
|
|
13
14
|
intervalName;
|
|
14
|
-
constructor(name, maxTtl, reconnectDelay = 1000, noopInterval = 1000, noopCommand = '_noop', failureCallback, connectedCallback, requireInitialConnection = true) {
|
|
15
|
+
constructor(name, maxTtl, reconnectDelay = CommonsFixedDuration.fromMillis(1000), noopInterval = CommonsFixedDuration.fromMillis(1000), noopCommand = '_noop', failureCallback, connectedCallback, requireInitialConnection = true) {
|
|
15
16
|
super(name);
|
|
16
17
|
this.maxTtl = maxTtl;
|
|
17
18
|
this.reconnectDelay = reconnectDelay;
|
|
@@ -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,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF,MAAM,OAAO,uCAAwC,SAAQ,0BAA0B;IAM5E;IACA;IACA;IACA;IACA;IACA;IACA;IAXF,SAAS,GAAY,KAAK,CAAC;IAC3B,YAAY,CAAS;IAE7B,YACE,IAAY,EACJ,MAAc,EACd,
|
|
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,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF,MAAM,OAAO,uCAAwC,SAAQ,0BAA0B;IAM5E;IACA;IACA;IACA;IACA;IACA;IACA;IAXF,SAAS,GAAY,KAAK,CAAC;IAC3B,YAAY,CAAS;IAE7B,YACE,IAAY,EACJ,MAAc,EACd,iBAAuC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,EAC5E,eAAqC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,EAC1E,cAAsB,OAAO,EAC7B,eAA4B,EAC5B,iBAA4C,EAC5C,2BAAoC,IAAI;QAEjD,KAAK,CAAC,IAAI,CAAC,CAAC;QARH,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAA8D;QAC5E,iBAAY,GAAZ,YAAY,CAA8D;QAC1E,gBAAW,GAAX,WAAW,CAAkB;QAC7B,oBAAe,GAAf,eAAe,CAAa;QAC5B,sBAAiB,GAAjB,iBAAiB,CAA2B;QAC5C,6BAAwB,GAAxB,wBAAwB,CAAgB;QAIjD,IAAI,CAAC,YAAY,GAAG,iDAAiD,IAAI,EAAE,CAAC;IAC7E,CAAC;IAED,IAAW,WAAW;QACrB,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAEO,YAAY,CAAC,KAAc;QAClC,MAAM,QAAQ,GAAY,IAAI,CAAC,SAAS,CAAC;QAEzC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QAEvB,IAAI,IAAI,CAAC,iBAAiB,IAAI,KAAK,KAAK,QAAQ;YAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,SAAS,CACrB,QAAgC,EAChC,MAAc,CAAC,CAAC;QAEjB,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,2CAA2C;YAC3D,eAAe,CAAC,6BAA6B,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC;QACd,CAAC;QAED,eAAe,CAAC,yDAAyD,GAAG,EAAE,CAAC,CAAC;QAEhF,IAAI,CAAC;YACJ,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE7B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,eAAe,CAAC,wBAAwB,CAAC,CAAC;YAE1C,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,IAAI,GAAG,GAAG,CAAC;gBAAE,MAAM,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5D,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;IAEe,KAAK,CAAC,MAAM,CAC1B,QAAgC;QAEjC,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACnC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAChF,CAAC;QAED,oBAAoB,CAClB,IAAI,CAAC,YAAY,EACjB,kBAAkB,CAAC,EAAE,EACrB,KAAK,IAAmB,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACrB,eAAe,CAAC,+CAA+C,CAAC,CAAC;gBAEjE,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;oBACpD,eAAe,CAAC,iCAAiC,CAAC,CAAC;oBAEnD,yBAAyB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAE7C,IAAI,IAAI,CAAC,eAAe;wBAAE,IAAI,CAAC,eAAe,EAAE,CAAC;gBAClD,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC;oBACJ,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBACzB,CAAC;gBAAC,OAAO,EAAE,EAAE,CAAC;oBACb,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBAEzB,eAAe,CAAC,mDAAmD,CAAC,CAAC;oBAErE,IAAI,CAAC;wBACJ,KAAK,CAAC,OAAO,EAAE,CAAC;oBACjB,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACd,aAAa;oBACd,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC,EACD,IAAI,CAAC,YAAY,CAClB,CAAC;IACH,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAY;QACtC,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;QAEtD,IAAI,CAAC;YACJ,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACzB,eAAe,CAAC,mDAAmD,CAAC,CAAC;YAErE,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAEe,KAAK;QACpB,yBAAyB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE7C,KAAK,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAEe,OAAO;QACtB,yBAAyB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE7C,KAAK,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;CACD"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CommonsFixedDuration } from 'tscommons-esm-core';
|
|
1
2
|
export declare abstract class CommonsResourceQueue<ResourceT, ParamsT> {
|
|
2
3
|
private id;
|
|
3
4
|
private maxActive;
|
|
@@ -6,7 +7,7 @@ export declare abstract class CommonsResourceQueue<ResourceT, ParamsT> {
|
|
|
6
7
|
private spinInterval;
|
|
7
8
|
private queuedEntries;
|
|
8
9
|
private activeEntries;
|
|
9
|
-
constructor(id: string, maxActive: number, dispatchTimeout:
|
|
10
|
+
constructor(id: string, maxActive: number, dispatchTimeout: CommonsFixedDuration, executionTimeout: CommonsFixedDuration, spinInterval?: CommonsFixedDuration);
|
|
10
11
|
get queueLength(): number;
|
|
11
12
|
get activeLength(): number;
|
|
12
13
|
get lineLength(): number;
|
|
@@ -18,7 +19,7 @@ export declare abstract class CommonsResourceQueue<ResourceT, ParamsT> {
|
|
|
18
19
|
protected abstract getResource(params: ParamsT): Promise<ResourceT>;
|
|
19
20
|
protected abstract freeResource(resource: ResourceT): Promise<void>;
|
|
20
21
|
private considerTimeout;
|
|
21
|
-
protected abstract go(resource: ResourceT, ticket: string, params: ParamsT, executionTimeout:
|
|
22
|
+
protected abstract go(resource: ResourceT, ticket: string, params: ParamsT, executionTimeout: CommonsFixedDuration): Promise<void>;
|
|
22
23
|
private dispatch;
|
|
23
24
|
private considerDispatch;
|
|
24
25
|
queue(params: ParamsT): string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { commonsArrayRemove, commonsBase62GenerateLongRandomId } from 'tscommons-esm-core';
|
|
1
|
+
import { commonsArrayRemove, commonsBase62GenerateLongRandomId, CommonsFixedDuration } from 'tscommons-esm-core';
|
|
2
2
|
import { ECommonsInvocation, commonsAsyncAbortInterval, commonsAsyncInterval } from 'tscommons-esm-async';
|
|
3
3
|
export class CommonsResourceQueue {
|
|
4
4
|
id;
|
|
@@ -8,7 +8,7 @@ export class CommonsResourceQueue {
|
|
|
8
8
|
spinInterval;
|
|
9
9
|
queuedEntries = [];
|
|
10
10
|
activeEntries = [];
|
|
11
|
-
constructor(id, maxActive, dispatchTimeout, executionTimeout, spinInterval = 500) {
|
|
11
|
+
constructor(id, maxActive, dispatchTimeout, executionTimeout, spinInterval = CommonsFixedDuration.fromMillis(500)) {
|
|
12
12
|
this.id = id;
|
|
13
13
|
this.maxActive = maxActive;
|
|
14
14
|
this.dispatchTimeout = dispatchTimeout;
|
|
@@ -36,7 +36,7 @@ export class CommonsResourceQueue {
|
|
|
36
36
|
considerTimeout() {
|
|
37
37
|
if (this.queuedEntries.length === 0)
|
|
38
38
|
return;
|
|
39
|
-
const expiration = new Date().getTime() - this.dispatchTimeout;
|
|
39
|
+
const expiration = new Date().getTime() - this.dispatchTimeout.millis;
|
|
40
40
|
const expireds = this.queuedEntries
|
|
41
41
|
.filter((entry) => entry.queued < expiration);
|
|
42
42
|
for (const expired of expireds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-resource-queue.mjs","sourceRoot":"","sources":["../../src/classes/commons-resource-queue.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAAiC,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"commons-resource-queue.mjs","sourceRoot":"","sources":["../../src/classes/commons-resource-queue.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import * as child_process from 'child_process';
|
|
2
2
|
import { Observable } from 'rxjs';
|
|
3
|
-
import { TPropertyObject } from 'tscommons-esm-core';
|
|
3
|
+
import { CommonsFixedDuration, TPropertyObject } from 'tscommons-esm-core';
|
|
4
4
|
export type TStdOutErr<T> = {
|
|
5
5
|
stdout: T;
|
|
6
6
|
stderr: T;
|
|
7
7
|
};
|
|
8
|
-
export declare function commonsExecAsString(command: string, params: string[], timeout?:
|
|
9
|
-
export declare function commonsExecAsBuffer(command: string, params: string[], timeout?:
|
|
10
|
-
export declare function commonsExecAsObservables(command: string, params: string[], timeout?:
|
|
8
|
+
export declare function commonsExecAsString(command: string, params: string[], timeout?: CommonsFixedDuration, cwd?: string, env?: TPropertyObject<string>): Promise<TStdOutErr<string>>;
|
|
9
|
+
export declare function commonsExecAsBuffer(command: string, params: string[], timeout?: CommonsFixedDuration, cwd?: string, env?: TPropertyObject<string>): Promise<TStdOutErr<Buffer>>;
|
|
10
|
+
export declare function commonsExecAsObservables(command: string, params: string[], timeout?: CommonsFixedDuration, cwd?: string, env?: TPropertyObject<string>): [Promise<[number, NodeJS.Signals]>, TStdOutErr<Observable<Buffer>>, child_process.ChildProcess];
|
|
@@ -3,7 +3,7 @@ import { Subject } from 'rxjs';
|
|
|
3
3
|
export function commonsExecAsString(command, params, timeout, cwd, env) {
|
|
4
4
|
return new Promise((resolve, reject) => {
|
|
5
5
|
child_process.exec([command, ...params].join(' '), {
|
|
6
|
-
timeout: timeout,
|
|
6
|
+
timeout: timeout?.millis,
|
|
7
7
|
cwd: cwd,
|
|
8
8
|
env: env
|
|
9
9
|
}, (error, stdout, stderr) => {
|
|
@@ -20,7 +20,7 @@ export function commonsExecAsBuffer(command, params, timeout, cwd, env) {
|
|
|
20
20
|
return new Promise((resolve, reject) => {
|
|
21
21
|
child_process.exec([command, ...params].join(' '), {
|
|
22
22
|
encoding: 'buffer',
|
|
23
|
-
timeout: timeout,
|
|
23
|
+
timeout: timeout?.millis,
|
|
24
24
|
cwd: cwd,
|
|
25
25
|
env: env
|
|
26
26
|
}, (error, stdout, stderr) => {
|
|
@@ -38,7 +38,7 @@ export function commonsExecAsObservables(command, params, timeout, cwd, env) {
|
|
|
38
38
|
const stdErrSubject = new Subject();
|
|
39
39
|
const running = child_process.spawn(command, params, {
|
|
40
40
|
cwd: cwd,
|
|
41
|
-
timeout: timeout,
|
|
41
|
+
timeout: timeout?.millis,
|
|
42
42
|
env: env
|
|
43
43
|
});
|
|
44
44
|
running.stdout.on('data', (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commons-exec.mjs","sourceRoot":"","sources":["../../src/helpers/commons-exec.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,eAAe,CAAC;AAE/C,OAAO,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAS3C,MAAM,UAAU,mBAAmB,CACjC,OAAe,EACf,MAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"commons-exec.mjs","sourceRoot":"","sources":["../../src/helpers/commons-exec.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": "
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"tsc": "./node_modules/typescript/bin/tsc",
|
|
@@ -26,13 +26,13 @@
|
|
|
26
26
|
"dist/**/*"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"nodecommons-esm-cli": "^0.0.
|
|
30
|
-
"nodecommons-esm-config": "^0.0.
|
|
31
|
-
"nodecommons-esm-file": "^0.
|
|
32
|
-
"nodecommons-esm-log": "^0.0
|
|
29
|
+
"nodecommons-esm-cli": "^0.0.11",
|
|
30
|
+
"nodecommons-esm-config": "^0.0.10",
|
|
31
|
+
"nodecommons-esm-file": "^0.1.3",
|
|
32
|
+
"nodecommons-esm-log": "^1.0.0",
|
|
33
33
|
"rxjs": "^7.8.1",
|
|
34
|
-
"tscommons-esm-async": "^
|
|
35
|
-
"tscommons-esm-config": "^0.0.
|
|
36
|
-
"tscommons-esm-core": "^0.0.
|
|
34
|
+
"tscommons-esm-async": "^1.0.1",
|
|
35
|
+
"tscommons-esm-config": "^0.0.7",
|
|
36
|
+
"tscommons-esm-core": "^0.0.7"
|
|
37
37
|
}
|
|
38
38
|
}
|