@start9labs/start-sdk 0.4.0-beta.62 → 0.4.0-beta.63
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/CHANGELOG.md +12 -0
- package/base/lib/util/asError.js +1 -1
- package/base/lib/util/asError.js.map +1 -1
- package/base/lib/util/index.d.ts +1 -0
- package/base/lib/util/index.js +3 -1
- package/base/lib/util/index.js.map +1 -1
- package/base/lib/util/logErrorOnce.d.ts +1 -0
- package/base/lib/util/logErrorOnce.js +13 -0
- package/base/lib/util/logErrorOnce.js.map +1 -0
- package/package/lib/StartSdk.d.ts +21 -27
- package/package/lib/StartSdk.js +31 -35
- package/package/lib/StartSdk.js.map +1 -1
- package/package/lib/backup/Backups.js +11 -7
- package/package/lib/backup/Backups.js.map +1 -1
- package/package/lib/mainFn/CommandController.js +2 -1
- package/package/lib/mainFn/CommandController.js.map +1 -1
- package/package/lib/mainFn/Daemon.d.ts +11 -3
- package/package/lib/mainFn/Daemon.js +64 -33
- package/package/lib/mainFn/Daemon.js.map +1 -1
- package/package/lib/mainFn/Daemons.d.ts +2 -0
- package/package/lib/mainFn/Daemons.js +11 -0
- package/package/lib/mainFn/Daemons.js.map +1 -1
- package/package/lib/mainFn/HealthDaemon.d.ts +5 -3
- package/package/lib/mainFn/HealthDaemon.js +38 -31
- package/package/lib/mainFn/HealthDaemon.js.map +1 -1
- package/package/package.json +1 -1
- package/package.json +1 -1
- package/base/lib/osBindings/Hostname.d.ts +0 -1
- package/base/lib/osBindings/Hostname.js +0 -4
- package/base/lib/osBindings/Hostname.js.map +0 -1
- package/package/lib/test/output.d.ts +0 -158
- package/package/lib/test/output.js +0 -446
- package/package/lib/test/output.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.4.0-beta.63 — StartOS v0.4.0-alpha.22 (2026-03-22)
|
|
4
|
+
|
|
5
|
+
### Fixed
|
|
6
|
+
|
|
7
|
+
- Fixed `createTask` failing when input values are undefined
|
|
8
|
+
- Fixed daemon lifecycle cleanup and error logging improvements
|
|
9
|
+
- Replaced fire-and-forget restart loop in `Daemon` with tracked `AbortController`
|
|
10
|
+
- Fixed graceful shutdown for subcontainer daemons
|
|
11
|
+
- Fixed rsync progress regex never matching, spamming logs during backup
|
|
12
|
+
- Fixed rsync backup bugs and optimized flags for encrypted CIFS targets
|
|
13
|
+
- Fixed types in `inputSpecConstants`, `StartSdk`, and exports
|
|
14
|
+
|
|
3
15
|
## 0.4.0-beta.62 (2026-03-19)
|
|
4
16
|
|
|
5
17
|
### Fixed
|
package/base/lib/util/asError.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asError.js","sourceRoot":"","sources":["../../../../base/lib/util/asError.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACI,MAAM,OAAO,GAAG,CAAC,CAAU,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"asError.js","sourceRoot":"","sources":["../../../../base/lib/util/asError.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACI,MAAM,OAAO,GAAG,CAAC,CAAU,EAAE,EAAE;IACpC,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,CAAC,CAAA;IACV,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAC1C,CAAC,CAAA;AARY,QAAA,OAAO,WAQnB"}
|
package/base/lib/util/index.d.ts
CHANGED
package/base/lib/util/index.js
CHANGED
|
@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
36
36
|
};
|
|
37
37
|
})();
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.stringFromStdErrOut = exports.regexes = exports.AbortedError = exports.deepEqual = exports.partialDiff = exports.deepMerge = exports.nullIfEmpty = exports.splitCommand = exports.inMs = exports.Graph = exports.GetSystemSmtp = exports.GetStatus = exports.GetSslCertificate = exports.getServiceManifest = exports.GetServiceManifest = exports.GetOutboundGateway = exports.GetHostInfo = exports.GetContainerIp = exports.Watchable = exports.Patterns = exports.asError = exports.once = exports.getServiceInterfaces = exports.filterNonLocal = exports.filledAddress = exports.getServiceInterface = exports.GetServiceInterface = exports.getDefaultString = exports.addressHostToUrl = void 0;
|
|
39
|
+
exports.logErrorOnce = exports.stringFromStdErrOut = exports.regexes = exports.AbortedError = exports.deepEqual = exports.partialDiff = exports.deepMerge = exports.nullIfEmpty = exports.splitCommand = exports.inMs = exports.Graph = exports.GetSystemSmtp = exports.GetStatus = exports.GetSslCertificate = exports.getServiceManifest = exports.GetServiceManifest = exports.GetOutboundGateway = exports.GetHostInfo = exports.GetContainerIp = exports.Watchable = exports.Patterns = exports.asError = exports.once = exports.getServiceInterfaces = exports.filterNonLocal = exports.filledAddress = exports.getServiceInterface = exports.GetServiceInterface = exports.getDefaultString = exports.addressHostToUrl = void 0;
|
|
40
40
|
/// Currently being used
|
|
41
41
|
var getServiceInterface_1 = require("./getServiceInterface");
|
|
42
42
|
Object.defineProperty(exports, "addressHostToUrl", { enumerable: true, get: function () { return getServiceInterface_1.addressHostToUrl; } });
|
|
@@ -92,4 +92,6 @@ Object.defineProperty(exports, "AbortedError", { enumerable: true, get: function
|
|
|
92
92
|
exports.regexes = __importStar(require("./regexes"));
|
|
93
93
|
var stringFromStdErrOut_1 = require("./stringFromStdErrOut");
|
|
94
94
|
Object.defineProperty(exports, "stringFromStdErrOut", { enumerable: true, get: function () { return stringFromStdErrOut_1.stringFromStdErrOut; } });
|
|
95
|
+
var logErrorOnce_1 = require("./logErrorOnce");
|
|
96
|
+
Object.defineProperty(exports, "logErrorOnce", { enumerable: true, get: function () { return logErrorOnce_1.logErrorOnce; } });
|
|
95
97
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../base/lib/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAAwB;AACxB,6DAAwD;AAA/C,uHAAA,gBAAgB,OAAA;AACzB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,uCAAoB;AAEpB,sDAAsD;AACtD,6DAK8B;AAJ5B,0HAAA,mBAAmB,OAAA;AACnB,0HAAA,mBAAmB,OAAA;AACnB,oHAAA,aAAa,OAAA;AACb,qHAAA,cAAc,OAAA;AAEhB,+DAA6D;AAApD,4HAAA,oBAAoB,OAAA;AAC7B,+BAA6B;AAApB,4FAAA,IAAI,OAAA;AACb,qCAAmC;AAA1B,kGAAA,OAAO,OAAA;AAChB,uDAAsC;AACtC,gDAA6B;AAC7B,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,mDAAiD;AAAxC,gHAAA,cAAc,OAAA;AACvB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,2DAAyD;AAAhD,wHAAA,kBAAkB,OAAA;AAC3B,2DAA6E;AAApE,wHAAA,kBAAkB,OAAA;AAAE,wHAAA,kBAAkB,OAAA;AAC/C,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,iDAA+C;AAAtC,8GAAA,aAAa,OAAA;AACtB,iCAAuC;AAA9B,8FAAA,KAAK,OAAA;AACd,+BAA6B;AAApB,4FAAA,IAAI,OAAA;AACb,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,yCAAoD;AAA3C,sGAAA,SAAS,OAAA;AAAE,wGAAA,WAAW,OAAA;AAC/B,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,qDAAoC;AACpC,6DAA2D;AAAlD,0HAAA,mBAAmB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../base/lib/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAAwB;AACxB,6DAAwD;AAA/C,uHAAA,gBAAgB,OAAA;AACzB,uDAAqD;AAA5C,oHAAA,gBAAgB,OAAA;AACzB,uCAAoB;AAEpB,sDAAsD;AACtD,6DAK8B;AAJ5B,0HAAA,mBAAmB,OAAA;AACnB,0HAAA,mBAAmB,OAAA;AACnB,oHAAA,aAAa,OAAA;AACb,qHAAA,cAAc,OAAA;AAEhB,+DAA6D;AAApD,4HAAA,oBAAoB,OAAA;AAC7B,+BAA6B;AAApB,4FAAA,IAAI,OAAA;AACb,qCAAmC;AAA1B,kGAAA,OAAO,OAAA;AAChB,uDAAsC;AACtC,gDAA6B;AAC7B,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,mDAAiD;AAAxC,gHAAA,cAAc,OAAA;AACvB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,2DAAyD;AAAhD,wHAAA,kBAAkB,OAAA;AAC3B,2DAA6E;AAApE,wHAAA,kBAAkB,OAAA;AAAE,wHAAA,kBAAkB,OAAA;AAC/C,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,iDAA+C;AAAtC,8GAAA,aAAa,OAAA;AACtB,iCAAuC;AAA9B,8FAAA,KAAK,OAAA;AACd,+BAA6B;AAApB,4FAAA,IAAI,OAAA;AACb,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,6CAA2C;AAAlC,0GAAA,WAAW,OAAA;AACpB,yCAAoD;AAA3C,sGAAA,SAAS,OAAA;AAAE,wGAAA,WAAW,OAAA;AAC/B,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,qDAAoC;AACpC,6DAA2D;AAAlD,0HAAA,mBAAmB,OAAA;AAC5B,+CAA6C;AAApC,4GAAA,YAAY,OAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function logErrorOnce(err: unknown): void;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.logErrorOnce = logErrorOnce;
|
|
4
|
+
const loggedErrors = new WeakSet();
|
|
5
|
+
function logErrorOnce(err) {
|
|
6
|
+
if (typeof err === 'object' && err !== null) {
|
|
7
|
+
if (loggedErrors.has(err))
|
|
8
|
+
return;
|
|
9
|
+
loggedErrors.add(err);
|
|
10
|
+
}
|
|
11
|
+
console.error(err);
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=logErrorOnce.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logErrorOnce.js","sourceRoot":"","sources":["../../../../base/lib/util/logErrorOnce.ts"],"names":[],"mappings":";;AAEA,oCAMC;AARD,MAAM,YAAY,GAAG,IAAI,OAAO,EAAU,CAAA;AAE1C,SAAgB,YAAY,CAAC,GAAY;IACvC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC5C,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAM;QACjC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;AACpB,CAAC"}
|
|
@@ -1,37 +1,31 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as actions from '../../base/lib/actions';
|
|
2
2
|
import { InputSpec } from '../../base/lib/actions/input/builder/inputSpec';
|
|
3
|
-
import { Variants } from '../../base/lib/actions/input/builder/variants';
|
|
4
|
-
import { Action, ActionInfo, Actions } from '../../base/lib/actions/setupActions';
|
|
5
|
-
import { ServiceInterfaceType, Effects } from '../../base/lib/types';
|
|
6
|
-
import * as patterns from '../../base/lib/util/patterns';
|
|
7
|
-
import { Backups } from './backup/Backups';
|
|
8
|
-
import { Daemon, Daemons } from './mainFn/Daemons';
|
|
9
|
-
import { checkPortListening } from './health/checkFns/checkPortListening';
|
|
10
3
|
import { List } from '../../base/lib/actions/input/builder/list';
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
4
|
+
import { Value } from '../../base/lib/actions/input/builder/value';
|
|
5
|
+
import { Variants } from '../../base/lib/actions/input/builder/variants';
|
|
6
|
+
import { Action, ActionInfo, Actions, MaybeFn, Run } from '../../base/lib/actions/setupActions';
|
|
7
|
+
import { CheckDependencies } from '../../base/lib/dependencies/dependencies';
|
|
8
|
+
import { setupInit, setupOnInit, setupOnUninit, setupUninit } from '../../base/lib/inits';
|
|
13
9
|
import { MultiHost, Scheme } from '../../base/lib/interfaces/Host';
|
|
14
10
|
import { ServiceInterfaceBuilder } from '../../base/lib/interfaces/ServiceInterfaceBuilder';
|
|
15
|
-
import { GetOutboundGateway, GetSystemSmtp } from './util';
|
|
16
|
-
import { nullIfEmpty } from './util';
|
|
17
|
-
import { getServiceInterface, getServiceInterfaces } from './util';
|
|
18
|
-
import { CommandOptions, SubContainer } from './util/SubContainer';
|
|
19
|
-
import { Mounts } from './mainFn/Mounts';
|
|
20
11
|
import * as T from '../../base/lib/types';
|
|
21
|
-
import {
|
|
22
|
-
import { GetSslCertificate, getServiceManifest } from './util';
|
|
23
|
-
import { getDataVersion, setDataVersion } from './version';
|
|
24
|
-
import { MaybeFn } from '../../base/lib/actions/setupActions';
|
|
25
|
-
import { Run } from '../../base/lib/actions/setupActions';
|
|
26
|
-
import * as actions from '../../base/lib/actions';
|
|
27
|
-
import { setupInit, setupUninit, setupOnInit, setupOnUninit } from '../../base/lib/inits';
|
|
12
|
+
import { Effects, ServiceInterfaceType } from '../../base/lib/types';
|
|
28
13
|
import { GetContainerIp } from '../../base/lib/util/GetContainerIp';
|
|
29
14
|
import { GetStatus } from '../../base/lib/util/GetStatus';
|
|
30
15
|
import { getOwnServiceInterface } from '../../base/lib/util/getServiceInterface';
|
|
31
16
|
import { getOwnServiceInterfaces } from '../../base/lib/util/getServiceInterfaces';
|
|
32
|
-
import
|
|
17
|
+
import * as patterns from '../../base/lib/util/patterns';
|
|
18
|
+
import { Backups } from './backup/Backups';
|
|
19
|
+
import { SetupBackupsParams } from './backup/setupBackups';
|
|
20
|
+
import { checkPortListening } from './health/checkFns/checkPortListening';
|
|
21
|
+
import { Daemon, Daemons } from './mainFn/Daemons';
|
|
22
|
+
import { Mounts } from './mainFn/Mounts';
|
|
23
|
+
import { changeOnFirstSuccess, cooldownTrigger } from './trigger';
|
|
24
|
+
import { GetOutboundGateway, GetSslCertificate, GetSystemSmtp, getServiceInterface, getServiceInterfaces, getServiceManifest, nullIfEmpty } from './util';
|
|
25
|
+
import { CommandOptions, SubContainer } from './util/SubContainer';
|
|
26
|
+
import { getDataVersion, setDataVersion } from './version';
|
|
33
27
|
/** The minimum StartOS version required by this SDK release */
|
|
34
|
-
export declare const OSVersion: "0.4.0-alpha.
|
|
28
|
+
export declare const OSVersion: "0.4.0-alpha.22";
|
|
35
29
|
type AnyNeverCond<T extends any[], Then, Else> = T extends [] ? Else : T extends [never, ...Array<any>] ? Then : T extends [any, ...infer U] ? AnyNeverCond<U, Then, Else> : never;
|
|
36
30
|
/**
|
|
37
31
|
* The top-level SDK facade for building StartOS service packages.
|
|
@@ -2805,7 +2799,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest> {
|
|
|
2805
2799
|
* Create a single Daemon that wraps a long-running process with automatic restart logic.
|
|
2806
2800
|
* Returns a curried function: call with `(effects, subcontainer, exec)`.
|
|
2807
2801
|
*/
|
|
2808
|
-
readonly of: <C extends SubContainer<Manifest, Effects> | null>(effects: T.Effects, subcontainer: C, exec: import("./mainFn/Daemons").DaemonCommandType<Manifest, C>) => Daemon<Manifest, SubContainer<Manifest, Effects> | null>;
|
|
2802
|
+
readonly of: <C extends SubContainer<Manifest, T.Effects> | null>(effects: T.Effects, subcontainer: C, exec: import("./mainFn/Daemons").DaemonCommandType<Manifest, C>) => Daemon<Manifest, SubContainer<Manifest, T.Effects> | null>;
|
|
2809
2803
|
};
|
|
2810
2804
|
Daemons: {
|
|
2811
2805
|
/**
|
|
@@ -2826,7 +2820,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest> {
|
|
|
2826
2820
|
of(effects: Effects, image: {
|
|
2827
2821
|
imageId: T.ImageId & keyof Manifest["images"];
|
|
2828
2822
|
sharedRun?: boolean;
|
|
2829
|
-
}, mounts: Mounts<Manifest> | null, name: string): Promise<import("./util/SubContainer").SubContainerRc<Manifest, Effects>>;
|
|
2823
|
+
}, mounts: Mounts<Manifest> | null, name: string): Promise<import("./util/SubContainer").SubContainerRc<Manifest, T.Effects>>;
|
|
2830
2824
|
/**
|
|
2831
2825
|
* @description Run a function with a temporary SubContainer
|
|
2832
2826
|
* @param effects
|
|
@@ -2900,7 +2894,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest> {
|
|
|
2900
2894
|
/** The bound service manifest */
|
|
2901
2895
|
manifest: Manifest;
|
|
2902
2896
|
/** Volume path helpers derived from the manifest volume definitions */
|
|
2903
|
-
volumes: Volumes<Manifest>;
|
|
2897
|
+
volumes: import("./util").Volumes<Manifest>;
|
|
2904
2898
|
};
|
|
2905
2899
|
}
|
|
2906
2900
|
/**
|
package/package/lib/StartSdk.js
CHANGED
|
@@ -35,48 +35,44 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.StartSdk = exports.OSVersion = void 0;
|
|
37
37
|
exports.runCommand = runCommand;
|
|
38
|
-
const
|
|
38
|
+
const fs = __importStar(require("node:fs/promises"));
|
|
39
|
+
const actions = __importStar(require("../../base/lib/actions"));
|
|
39
40
|
const inputSpec_1 = require("../../base/lib/actions/input/builder/inputSpec");
|
|
41
|
+
const list_1 = require("../../base/lib/actions/input/builder/list");
|
|
42
|
+
const value_1 = require("../../base/lib/actions/input/builder/value");
|
|
40
43
|
const variants_1 = require("../../base/lib/actions/input/builder/variants");
|
|
44
|
+
const inputSpecConstants_1 = require("../../base/lib/actions/input/inputSpecConstants");
|
|
41
45
|
const setupActions_1 = require("../../base/lib/actions/setupActions");
|
|
46
|
+
const dependencies_1 = require("../../base/lib/dependencies/dependencies");
|
|
47
|
+
const setupDependencies_1 = require("../../base/lib/dependencies/setupDependencies");
|
|
48
|
+
const exver_1 = require("../../base/lib/exver");
|
|
49
|
+
const inits_1 = require("../../base/lib/inits");
|
|
50
|
+
const Host_1 = require("../../base/lib/interfaces/Host");
|
|
51
|
+
const ServiceInterfaceBuilder_1 = require("../../base/lib/interfaces/ServiceInterfaceBuilder");
|
|
52
|
+
const setupExportedUrls_1 = require("../../base/lib/interfaces/setupExportedUrls");
|
|
53
|
+
const setupInterfaces_1 = require("../../base/lib/interfaces/setupInterfaces");
|
|
54
|
+
const T = __importStar(require("../../base/lib/types"));
|
|
55
|
+
const GetContainerIp_1 = require("../../base/lib/util/GetContainerIp");
|
|
56
|
+
const GetStatus_1 = require("../../base/lib/util/GetStatus");
|
|
57
|
+
const getServiceInterface_1 = require("../../base/lib/util/getServiceInterface");
|
|
58
|
+
const getServiceInterfaces_1 = require("../../base/lib/util/getServiceInterfaces");
|
|
42
59
|
const patterns = __importStar(require("../../base/lib/util/patterns"));
|
|
43
60
|
const Backups_1 = require("./backup/Backups");
|
|
44
|
-
const inputSpecConstants_1 = require("../../base/lib/actions/input/inputSpecConstants");
|
|
45
|
-
const Daemons_1 = require("./mainFn/Daemons");
|
|
46
|
-
const checkPortListening_1 = require("./health/checkFns/checkPortListening");
|
|
47
|
-
const checkFns_1 = require("./health/checkFns");
|
|
48
|
-
const list_1 = require("../../base/lib/actions/input/builder/list");
|
|
49
61
|
const setupBackups_1 = require("./backup/setupBackups");
|
|
62
|
+
const checkFns_1 = require("./health/checkFns");
|
|
63
|
+
const checkPortListening_1 = require("./health/checkFns/checkPortListening");
|
|
50
64
|
const mainFn_1 = require("./mainFn");
|
|
51
|
-
const
|
|
65
|
+
const Daemons_1 = require("./mainFn/Daemons");
|
|
66
|
+
const Mounts_1 = require("./mainFn/Mounts");
|
|
52
67
|
const trigger_1 = require("./trigger");
|
|
53
|
-
const
|
|
54
|
-
const setupExportedUrls_1 = require("../../base/lib/interfaces/setupExportedUrls");
|
|
68
|
+
const defaultTrigger_1 = require("./trigger/defaultTrigger");
|
|
55
69
|
const successFailure_1 = require("./trigger/successFailure");
|
|
56
|
-
const Host_1 = require("../../base/lib/interfaces/Host");
|
|
57
|
-
const ServiceInterfaceBuilder_1 = require("../../base/lib/interfaces/ServiceInterfaceBuilder");
|
|
58
70
|
const util_1 = require("./util");
|
|
59
|
-
const util_2 = require("./util");
|
|
60
|
-
const util_3 = require("./util");
|
|
61
71
|
const SubContainer_1 = require("./util/SubContainer");
|
|
62
|
-
const util_4 = require("./util");
|
|
63
|
-
const Mounts_1 = require("./mainFn/Mounts");
|
|
64
|
-
const setupDependencies_1 = require("../../base/lib/dependencies/setupDependencies");
|
|
65
|
-
const T = __importStar(require("../../base/lib/types"));
|
|
66
|
-
const exver_1 = require("../../base/lib/exver");
|
|
67
|
-
const dependencies_1 = require("../../base/lib/dependencies/dependencies");
|
|
68
|
-
const util_5 = require("./util");
|
|
69
|
-
const version_1 = require("./version");
|
|
70
|
-
const actions = __importStar(require("../../base/lib/actions"));
|
|
71
|
-
const fs = __importStar(require("node:fs/promises"));
|
|
72
|
-
const inits_1 = require("../../base/lib/inits");
|
|
73
|
-
const GetContainerIp_1 = require("../../base/lib/util/GetContainerIp");
|
|
74
|
-
const GetStatus_1 = require("../../base/lib/util/GetStatus");
|
|
75
|
-
const getServiceInterface_1 = require("../../base/lib/util/getServiceInterface");
|
|
76
|
-
const getServiceInterfaces_1 = require("../../base/lib/util/getServiceInterfaces");
|
|
77
72
|
const Volume_1 = require("./util/Volume");
|
|
73
|
+
const version_1 = require("./version");
|
|
78
74
|
/** The minimum StartOS version required by this SDK release */
|
|
79
|
-
exports.OSVersion = (0, exver_1.testTypeVersion)('0.4.0-alpha.
|
|
75
|
+
exports.OSVersion = (0, exver_1.testTypeVersion)('0.4.0-alpha.22');
|
|
80
76
|
/**
|
|
81
77
|
* The top-level SDK facade for building StartOS service packages.
|
|
82
78
|
*
|
|
@@ -180,11 +176,11 @@ class StartSdk {
|
|
|
180
176
|
/** Retrieve a single service interface belonging to this package by its ID */
|
|
181
177
|
getOwn: getServiceInterface_1.getOwnServiceInterface,
|
|
182
178
|
/** Retrieve a single service interface from any package */
|
|
183
|
-
get:
|
|
179
|
+
get: util_1.getServiceInterface,
|
|
184
180
|
/** Retrieve all service interfaces belonging to this package */
|
|
185
181
|
getAllOwn: getServiceInterfaces_1.getOwnServiceInterfaces,
|
|
186
182
|
/** Retrieve all service interfaces, optionally filtering by package */
|
|
187
|
-
getAll:
|
|
183
|
+
getAll: util_1.getServiceInterfaces,
|
|
188
184
|
},
|
|
189
185
|
/**
|
|
190
186
|
* Get the container IP address with reactive subscription support.
|
|
@@ -220,7 +216,7 @@ class StartSdk {
|
|
|
220
216
|
* Return `null` if the given string is empty, otherwise return the string unchanged.
|
|
221
217
|
* Useful for converting empty user input into explicit null values.
|
|
222
218
|
*/
|
|
223
|
-
nullIfEmpty:
|
|
219
|
+
nullIfEmpty: util_1.nullIfEmpty,
|
|
224
220
|
/**
|
|
225
221
|
* Indicate that a daemon should use the container image's configured entrypoint.
|
|
226
222
|
* @param overrideCmd - Optional command arguments to append after the entrypoint
|
|
@@ -378,9 +374,9 @@ class StartSdk {
|
|
|
378
374
|
* @param hostnames - The hostnames to obtain a certificate for
|
|
379
375
|
* @param algorithm - Optional algorithm preference (e.g. Ed25519)
|
|
380
376
|
*/
|
|
381
|
-
getSslCertificate: (effects, hostnames, algorithm) => new
|
|
377
|
+
getSslCertificate: (effects, hostnames, algorithm) => new util_1.GetSslCertificate(effects, { hostnames, algorithm }),
|
|
382
378
|
/** Retrieve the manifest of any installed service package by its ID */
|
|
383
|
-
getServiceManifest:
|
|
379
|
+
getServiceManifest: util_1.getServiceManifest,
|
|
384
380
|
healthCheck: {
|
|
385
381
|
checkPortListening: checkPortListening_1.checkPortListening,
|
|
386
382
|
checkWebUrl: checkFns_1.checkWebUrl,
|
|
@@ -723,7 +719,7 @@ async function runCommand(effects, image, command, options, name) {
|
|
|
723
719
|
commands = commands.concat(...(command.overridCmd ?? imageMeta.cmd ?? []));
|
|
724
720
|
}
|
|
725
721
|
else
|
|
726
|
-
commands = (0,
|
|
722
|
+
commands = (0, util_1.splitCommand)(command);
|
|
727
723
|
return SubContainer_1.SubContainerOwned.withTemp(effects, image, options.mounts, name ||
|
|
728
724
|
commands
|
|
729
725
|
.map((c) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -210,16 +210,16 @@ class Backups {
|
|
|
210
210
|
* @param effects - The effects context
|
|
211
211
|
*/
|
|
212
212
|
async restoreBackup(effects) {
|
|
213
|
-
this.preRestore(effects);
|
|
213
|
+
await this.preRestore(effects);
|
|
214
214
|
for (const item of this.backupSet) {
|
|
215
215
|
const rsyncResults = await runRsync({
|
|
216
216
|
srcPath: item.backupPath,
|
|
217
217
|
dstPath: item.dataPath,
|
|
218
218
|
options: {
|
|
219
219
|
...this.options,
|
|
220
|
-
...this.
|
|
220
|
+
...this.restoreOptions,
|
|
221
221
|
...item.options,
|
|
222
|
-
...item.
|
|
222
|
+
...item.restoreOptions,
|
|
223
223
|
},
|
|
224
224
|
});
|
|
225
225
|
await rsyncResults.wait();
|
|
@@ -231,7 +231,7 @@ class Backups {
|
|
|
231
231
|
.catch((_) => null);
|
|
232
232
|
if (dataVersion)
|
|
233
233
|
await effects.setDataVersion({ version: dataVersion });
|
|
234
|
-
this.postRestore(effects);
|
|
234
|
+
await this.postRestore(effects);
|
|
235
235
|
return;
|
|
236
236
|
}
|
|
237
237
|
}
|
|
@@ -247,7 +247,10 @@ async function runRsync(rsyncOptions) {
|
|
|
247
247
|
for (const exclude of options.exclude) {
|
|
248
248
|
args.push(`--exclude=${exclude}`);
|
|
249
249
|
}
|
|
250
|
-
args.push('-
|
|
250
|
+
args.push('-rlptgoAXH');
|
|
251
|
+
args.push('--partial');
|
|
252
|
+
args.push('--inplace');
|
|
253
|
+
args.push('--timeout=300');
|
|
251
254
|
args.push('--info=progress2');
|
|
252
255
|
args.push('--no-inc-recursive');
|
|
253
256
|
args.push(srcPath);
|
|
@@ -257,9 +260,10 @@ async function runRsync(rsyncOptions) {
|
|
|
257
260
|
spawned.stdout.on('data', (data) => {
|
|
258
261
|
const lines = String(data).replace(/\r/g, '\n').split('\n');
|
|
259
262
|
for (const line of lines) {
|
|
260
|
-
const parsed =
|
|
263
|
+
const parsed = /([0-9.]+)%/.exec(line)?.[1];
|
|
261
264
|
if (!parsed) {
|
|
262
|
-
|
|
265
|
+
if (line)
|
|
266
|
+
console.log(line);
|
|
263
267
|
continue;
|
|
264
268
|
}
|
|
265
269
|
percentage = Number.parseFloat(parsed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Backups.js","sourceRoot":"","sources":["../../../../package/lib/backup/Backups.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6DAA8C;AAC9C,gDAAiC;AACjC,kCAAyC;
|
|
1
|
+
{"version":3,"file":"Backups.js","sourceRoot":"","sources":["../../../../package/lib/backup/Backups.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6DAA8C;AAC9C,gDAAiC;AACjC,kCAAyC;AAGzC,mEAAmE;AACtD,QAAA,eAAe,GAAkB;IAC5C,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,EAAE;CACZ,CAAA;AAaD;;;;;;;;GAQG;AACH,MAAa,OAAO;IAClB,YACU,UAAU,uBAAe,EACzB,iBAAyC,EAAE,EAC3C,gBAAwC,EAAE,EAC1C,YAAY,EAAwC,EACpD,YAAY,KAAK,EAAE,OAAsB,EAAE,EAAE,GAAE,CAAC,EAChD,aAAa,KAAK,EAAE,OAAsB,EAAE,EAAE,GAAE,CAAC,EACjD,aAAa,KAAK,EAAE,OAAsB,EAAE,EAAE,GAAE,CAAC,EACjD,cAAc,KAAK,EAAE,OAAsB,EAAE,EAAE,GAAE,CAAC;QAPlD,YAAO,GAAP,OAAO,CAAkB;QACzB,mBAAc,GAAd,cAAc,CAA6B;QAC3C,kBAAa,GAAb,aAAa,CAA6B;QAC1C,cAAS,GAAT,SAAS,CAA2C;QACpD,cAAS,GAAT,SAAS,CAAuC;QAChD,eAAU,GAAV,UAAU,CAAuC;QACjD,eAAU,GAAV,UAAU,CAAuC;QACjD,gBAAW,GAAX,WAAW,CAAuC;IACzD,CAAC;IAEJ;;;;OAIG;IACH,MAAM,CAAC,SAAS,CACd,GAAG,WAAwC;QAE3C,OAAO,OAAO,CAAC,OAAO,CACpB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACjC,QAAQ,EAAE,0BAA0B,SAAS,GAAY;YACzD,UAAU,EAAE,iCAAiC,SAAS,GAAY;SACnE,CAAC,CAAC,CACJ,CAAA;IACH,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,CACZ,GAAG,KAAyC;QAE5C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,OAAO,EAAK,CAAC,CAAA;IACnE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAChB,OAAgC;QAEhC,OAAO,IAAI,OAAO,CAAI,EAAE,GAAG,uBAAe,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;IAC3D,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,OAAgC;QACzC,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;YACf,GAAG,OAAO;SACX,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,OAAgC;QAC/C,IAAI,CAAC,aAAa,GAAG;YACnB,GAAG,IAAI,CAAC,aAAa;YACrB,GAAG,OAAO;SACX,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,OAAgC;QAChD,IAAI,CAAC,cAAc,GAAG;YACpB,GAAG,IAAI,CAAC,cAAc;YACtB,GAAG,OAAO;SACX,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,EAA6C;QACxD,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,EAA6C;QACzD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,EAA6C;QACzD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;QACpB,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,EAA6C;QAC1D,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACH,SAAS,CACP,MAA4B,EAC5B,OAIE;QAEF,OAAO,IAAI,CAAC,OAAO,CAAC;YAClB,QAAQ,EAAE,0BAA0B,MAAM,GAAY;YACtD,UAAU,EAAE,iCAAiC,MAAM,GAAY;YAC/D,GAAG,OAAO;SACX,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,IAAiC;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY,CAAC,OAAkB;QACnC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAwB,CAAC,CAAA;QAC9C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAClC,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC;gBAClC,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,OAAO,EAAE,IAAI,CAAC,UAAU;gBACxB,OAAO,EAAE;oBACP,GAAG,IAAI,CAAC,OAAO;oBACf,GAAG,IAAI,CAAC,aAAa;oBACrB,GAAG,IAAI,CAAC,OAAO;oBACf,GAAG,IAAI,CAAC,aAAa;iBACtB;aACF,CAAC,CAAA;YACF,MAAM,YAAY,CAAC,IAAI,EAAE,CAAA;QAC3B,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,EAAE,CAAA;QAClD,IAAI,WAAW;YACb,MAAM,EAAE,CAAC,SAAS,CAAC,uCAAuC,EAAE,WAAW,EAAE;gBACvE,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAA;QACJ,MAAM,IAAI,CAAC,UAAU,CAAC,OAAwB,CAAC,CAAA;QAC/C,OAAM;IACR,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAkB,EAAE,IAAc;QAC3C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QACnC,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa,CAAC,OAAkB;QACpC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAwB,CAAC,CAAA;QAE/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAClC,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC;gBAClC,OAAO,EAAE,IAAI,CAAC,UAAU;gBACxB,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,OAAO,EAAE;oBACP,GAAG,IAAI,CAAC,OAAO;oBACf,GAAG,IAAI,CAAC,cAAc;oBACtB,GAAG,IAAI,CAAC,OAAO;oBACf,GAAG,IAAI,CAAC,cAAc;iBACvB;aACF,CAAC,CAAA;YACF,MAAM,YAAY,CAAC,IAAI,EAAE,CAAA;QAC3B,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,EAAE;aACzB,QAAQ,CAAC,uCAAuC,EAAE;YACjD,QAAQ,EAAE,OAAO;SAClB,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;QACrB,IAAI,WAAW;YAAE,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAA;QACvE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAwB,CAAC,CAAA;QAChD,OAAM;IACR,CAAC;CACF;AAtND,0BAsNC;AAED,KAAK,UAAU,QAAQ,CAAC,YAIvB;IAKC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,CAAA;IAElD,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAE5C,MAAM,OAAO,GAAG,OAAO,CAAA;IACvB,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACvB,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,aAAa,OAAO,EAAE,CAAC,CAAA;IACnC,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACtB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACtB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC1B,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;IAC7B,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAClB,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACtE,IAAI,UAAU,GAAG,GAAG,CAAA;IACpB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC3D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,IAAI,IAAI;oBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBAC3B,SAAQ;YACV,CAAC;YACD,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACxC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAqB,EAAE,EAAE;QAClD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACxC,MAAM,IAAI,SAAS,CAAA;QACnB,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC,CAAA;IACvD,CAAC,CAAC,CAAA;IAEF,MAAM,EAAE,GAAG,KAAK,IAAI,EAAE;QACpB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACvB,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC7C,CAAC;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;IACpB,CAAC,CAAA;IACD,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACxD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAS,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,CAAA;YACf,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,IAAI,KAAK,MAAM,EAAE,CAAC,CAAC,CAAA;YAChE,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,WAAW,CAAA;IAC9B,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAClD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;AAC/B,CAAC"}
|
|
@@ -39,6 +39,7 @@ const types_1 = require("../../../base/lib/types");
|
|
|
39
39
|
const T = __importStar(require("../../../base/lib/types"));
|
|
40
40
|
const util_1 = require("../util");
|
|
41
41
|
const fs = __importStar(require("node:fs/promises"));
|
|
42
|
+
const logErrorOnce_1 = require("../../../base/lib/util/logErrorOnce");
|
|
42
43
|
/**
|
|
43
44
|
* Low-level controller for a single running process inside a subcontainer (or as a JS function).
|
|
44
45
|
*
|
|
@@ -209,7 +210,7 @@ class CommandController extends util_1.Drop {
|
|
|
209
210
|
}
|
|
210
211
|
}
|
|
211
212
|
onDrop() {
|
|
212
|
-
this.term().catch(
|
|
213
|
+
this.term().catch(logErrorOnce_1.logErrorOnce);
|
|
213
214
|
}
|
|
214
215
|
}
|
|
215
216
|
exports.CommandController = CommandController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/CommandController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAA2C;AAC3C,mDAA6D;AAE7D,2DAA4C;AAE5C,kCAA4C;AAE5C,qDAAsC;
|
|
1
|
+
{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,10 +19,10 @@ export declare class Daemon<Manifest extends T.SDKManifest, C extends SubContain
|
|
|
19
19
|
private startCommand;
|
|
20
20
|
readonly oneshot: boolean;
|
|
21
21
|
private commandController;
|
|
22
|
-
private shouldBeRunning;
|
|
23
22
|
protected exitedSuccess: boolean;
|
|
24
|
-
private exiting;
|
|
25
23
|
private onExitFns;
|
|
24
|
+
private loop;
|
|
25
|
+
private _managed;
|
|
26
26
|
protected constructor(subcontainer: C, startCommand: () => Promise<CommandController<Manifest, C>>, oneshot?: boolean);
|
|
27
27
|
/** Returns true if this daemon is a one-shot process (exits after success) */
|
|
28
28
|
isOneshot(): this is Oneshot<Manifest>;
|
|
@@ -30,7 +30,8 @@ export declare class Daemon<Manifest extends T.SDKManifest, C extends SubContain
|
|
|
30
30
|
* Factory method to create a new Daemon.
|
|
31
31
|
*
|
|
32
32
|
* Returns a curried function: `(effects, subcontainer, exec) => Daemon`.
|
|
33
|
-
*
|
|
33
|
+
* Registers an `onLeaveContext` callback that terminates the daemon when the
|
|
34
|
+
* effects context is left.
|
|
34
35
|
*/
|
|
35
36
|
static of<Manifest extends T.SDKManifest>(): <C extends SubContainer<Manifest> | null>(effects: T.Effects, subcontainer: C, exec: DaemonCommandType<Manifest, C>) => Daemon<Manifest, SubContainer<Manifest, T.Effects> | null>;
|
|
36
37
|
/**
|
|
@@ -40,6 +41,7 @@ export declare class Daemon<Manifest extends T.SDKManifest, C extends SubContain
|
|
|
40
41
|
* until {@link term} is called.
|
|
41
42
|
*/
|
|
42
43
|
start(): Promise<void>;
|
|
44
|
+
private runLoop;
|
|
43
45
|
/**
|
|
44
46
|
* Terminate the daemon, stopping its underlying command.
|
|
45
47
|
*
|
|
@@ -56,6 +58,12 @@ export declare class Daemon<Manifest extends T.SDKManifest, C extends SubContain
|
|
|
56
58
|
timeout?: number | undefined;
|
|
57
59
|
destroySubcontainer?: boolean;
|
|
58
60
|
}): Promise<void>;
|
|
61
|
+
/**
|
|
62
|
+
* Mark this daemon as managed by a {@link Daemons} instance.
|
|
63
|
+
* Suppresses the individual `onLeaveContext` termination since the
|
|
64
|
+
* `Daemons` instance handles ordered shutdown.
|
|
65
|
+
*/
|
|
66
|
+
markManaged(): void;
|
|
59
67
|
/** Get a reference-counted handle to the daemon's subcontainer, or null if there is none */
|
|
60
68
|
subcontainerRc(): SubContainerRc<Manifest> | null;
|
|
61
69
|
/** Check whether this daemon shares the same subcontainer as another daemon */
|