@start9labs/start-sdk 0.3.6-beta.9 → 0.4.0-beta.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/base/lib/Effects.d.ts +7 -2
- package/base/lib/actions/index.d.ts +4 -4
- package/base/lib/actions/index.js.map +1 -1
- package/base/lib/actions/input/builder/inputSpec.js.map +1 -1
- package/base/lib/actions/input/builder/value.js +85 -111
- package/base/lib/actions/input/builder/value.js.map +1 -1
- package/base/lib/actions/input/builder/variants.js.map +1 -1
- package/base/lib/actions/input/index.js +17 -7
- package/base/lib/actions/input/index.js.map +1 -1
- package/base/lib/actions/input/inputSpecTypes.js +1 -2
- package/base/lib/actions/input/inputSpecTypes.js.map +1 -1
- package/base/lib/actions/setupActions.js.map +1 -1
- package/base/lib/dependencies/dependencies.js +1 -2
- package/base/lib/dependencies/dependencies.js.map +1 -1
- package/base/lib/dependencies/setupDependencies.js +1 -2
- package/base/lib/dependencies/setupDependencies.js.map +1 -1
- package/base/lib/exver/exver.d.ts +31 -5
- package/base/lib/exver/exver.js +513 -113
- package/base/lib/exver/exver.js.map +1 -1
- package/base/lib/exver/index.d.ts +77 -3
- package/base/lib/exver/index.js +487 -16
- package/base/lib/exver/index.js.map +1 -1
- package/base/lib/index.js +17 -7
- package/base/lib/index.js.map +1 -1
- package/base/lib/interfaces/Host.d.ts +0 -18
- package/base/lib/interfaces/Host.js +0 -12
- package/base/lib/interfaces/Host.js.map +1 -1
- package/base/lib/interfaces/Origin.js.map +1 -1
- package/base/lib/osBindings/Celsius.d.ts +1 -0
- package/base/lib/osBindings/Celsius.js +4 -0
- package/base/lib/osBindings/Celsius.js.map +1 -0
- package/base/lib/osBindings/GetContainerIpParams.d.ts +6 -0
- package/base/lib/osBindings/GetContainerIpParams.js +3 -0
- package/base/lib/osBindings/GetContainerIpParams.js.map +1 -0
- package/base/lib/osBindings/GigaBytes.d.ts +1 -0
- package/base/lib/osBindings/GigaBytes.js +4 -0
- package/base/lib/osBindings/GigaBytes.js.map +1 -0
- package/base/lib/osBindings/ImageMetadata.d.ts +2 -0
- package/base/lib/osBindings/IpInfo.d.ts +1 -0
- package/base/lib/osBindings/LoginParams.d.ts +0 -1
- package/base/lib/osBindings/Manifest.d.ts +0 -1
- package/base/lib/osBindings/MebiBytes.d.ts +1 -0
- package/base/lib/osBindings/MebiBytes.js +4 -0
- package/base/lib/osBindings/MebiBytes.js.map +1 -0
- package/base/lib/osBindings/Metrics.d.ts +10 -0
- package/base/lib/osBindings/Metrics.js +3 -0
- package/base/lib/osBindings/Metrics.js.map +1 -0
- package/base/lib/osBindings/MetricsCpu.d.ts +8 -0
- package/base/lib/osBindings/MetricsCpu.js +3 -0
- package/base/lib/osBindings/MetricsCpu.js.map +1 -0
- package/base/lib/osBindings/MetricsDisk.d.ts +8 -0
- package/base/lib/osBindings/MetricsDisk.js +3 -0
- package/base/lib/osBindings/MetricsDisk.js.map +1 -0
- package/base/lib/osBindings/MetricsGeneral.d.ts +4 -0
- package/base/lib/osBindings/MetricsGeneral.js +3 -0
- package/base/lib/osBindings/MetricsGeneral.js.map +1 -0
- package/base/lib/osBindings/MetricsMemory.d.ts +11 -0
- package/base/lib/osBindings/MetricsMemory.js +3 -0
- package/base/lib/osBindings/MetricsMemory.js.map +1 -0
- package/base/lib/osBindings/NetworkInfo.d.ts +15 -0
- package/base/lib/osBindings/NetworkInfo.js +3 -0
- package/base/lib/osBindings/NetworkInfo.js.map +1 -0
- package/base/lib/osBindings/NetworkInterfaceInfo.d.ts +2 -1
- package/base/lib/osBindings/NetworkInterfaceSetInboundParams.d.ts +4 -0
- package/base/lib/osBindings/NetworkInterfaceSetInboundParams.js +4 -0
- package/base/lib/osBindings/NetworkInterfaceSetInboundParams.js.map +1 -0
- package/base/lib/osBindings/PackageVersionInfo.d.ts +1 -1
- package/base/lib/osBindings/Percentage.d.ts +1 -0
- package/base/lib/osBindings/Percentage.js +4 -0
- package/base/lib/osBindings/Percentage.js.map +1 -0
- package/base/lib/osBindings/ServerInfo.d.ts +2 -13
- package/base/lib/osBindings/Session.d.ts +1 -1
- package/base/lib/osBindings/Sessions.d.ts +1 -1
- package/base/lib/osBindings/UnsetInboundParams.d.ts +3 -0
- package/base/lib/osBindings/UnsetInboundParams.js +4 -0
- package/base/lib/osBindings/UnsetInboundParams.js.map +1 -0
- package/base/lib/osBindings/WifiInfo.d.ts +1 -0
- package/base/lib/osBindings/index.d.ts +13 -2
- package/base/lib/s9pk/index.d.ts +8 -1
- package/base/lib/s9pk/index.js +54 -11
- package/base/lib/s9pk/index.js.map +1 -1
- package/base/lib/s9pk/merkleArchive/directoryContents.js +1 -1
- package/base/lib/s9pk/merkleArchive/directoryContents.js.map +1 -1
- package/base/lib/s9pk/merkleArchive/fileContents.js.map +1 -1
- package/base/lib/s9pk/merkleArchive/index.js +1 -1
- package/base/lib/s9pk/merkleArchive/index.js.map +1 -1
- package/base/lib/s9pk/merkleArchive/varint.js +2 -2
- package/base/lib/s9pk/merkleArchive/varint.js.map +1 -1
- package/base/lib/types/ManifestTypes.d.ts +5 -8
- package/base/lib/types.d.ts +5 -6
- package/base/lib/types.js +25 -9
- package/base/lib/types.js.map +1 -1
- package/base/lib/util/GetSystemSmtp.js +2 -1
- package/base/lib/util/GetSystemSmtp.js.map +1 -1
- package/base/lib/util/Hostname.js +1 -2
- package/base/lib/util/Hostname.js.map +1 -1
- package/base/lib/util/PathBuilder.d.ts +1 -1
- package/base/lib/util/PathBuilder.js.map +1 -1
- package/base/lib/util/asError.js.map +1 -1
- package/base/lib/util/deepEqual.js +1 -2
- package/base/lib/util/deepEqual.js.map +1 -1
- package/base/lib/util/deepMerge.js +3 -7
- package/base/lib/util/deepMerge.js.map +1 -1
- package/base/lib/util/getDefaultString.js +1 -2
- package/base/lib/util/getDefaultString.js.map +1 -1
- package/base/lib/util/getRandomCharInSet.js +1 -2
- package/base/lib/util/getRandomCharInSet.js.map +1 -1
- package/base/lib/util/getRandomString.js +1 -2
- package/base/lib/util/getRandomString.js.map +1 -1
- package/base/lib/util/getServiceInterface.d.ts +2 -0
- package/base/lib/util/getServiceInterface.js +11 -5
- package/base/lib/util/getServiceInterface.js.map +1 -1
- package/base/lib/util/getServiceInterfaces.js +4 -3
- package/base/lib/util/getServiceInterfaces.js.map +1 -1
- package/base/lib/util/graph.js.map +1 -1
- package/base/lib/util/index.js +17 -7
- package/base/lib/util/index.js.map +1 -1
- package/base/lib/util/nullIfEmpty.js +1 -2
- package/base/lib/util/nullIfEmpty.js.map +1 -1
- package/base/lib/util/once.js +1 -2
- package/base/lib/util/once.js.map +1 -1
- package/base/lib/util/patterns.js +17 -7
- package/base/lib/util/patterns.js.map +1 -1
- package/base/lib/util/regexes.js.map +1 -1
- package/base/lib/util/stringFromStdErrOut.js +2 -3
- package/base/lib/util/stringFromStdErrOut.js.map +1 -1
- package/package/lib/StartSdk.d.ts +136 -196
- package/package/lib/StartSdk.js +111 -24
- package/package/lib/StartSdk.js.map +1 -1
- package/package/lib/backup/Backups.js +18 -9
- package/package/lib/backup/Backups.js.map +1 -1
- package/package/lib/backup/setupBackups.js +1 -2
- package/package/lib/backup/setupBackups.js.map +1 -1
- package/package/lib/health/HealthCheck.d.ts +16 -3
- package/package/lib/health/HealthCheck.js +98 -36
- package/package/lib/health/HealthCheck.js.map +1 -1
- package/package/lib/health/checkFns/checkPortListening.js +22 -14
- package/package/lib/health/checkFns/checkPortListening.js.map +1 -1
- package/package/lib/health/checkFns/index.js +2 -2
- package/package/lib/health/checkFns/index.js.map +1 -1
- package/package/lib/health/index.d.ts +1 -0
- package/package/lib/health/index.js +3 -0
- package/package/lib/health/index.js.map +1 -1
- package/package/lib/index.d.ts +3 -2
- package/package/lib/index.js +19 -9
- package/package/lib/index.js.map +1 -1
- package/package/lib/inits/setupInit.d.ts +3 -3
- package/package/lib/inits/setupInit.js +11 -4
- package/package/lib/inits/setupInit.js.map +1 -1
- package/package/lib/inits/setupInstall.d.ts +12 -3
- package/package/lib/inits/setupInstall.js +31 -7
- package/package/lib/inits/setupInstall.js.map +1 -1
- package/package/lib/inits/setupUninstall.js +2 -2
- package/package/lib/inits/setupUninstall.js.map +1 -1
- package/package/lib/mainFn/CommandController.d.ts +10 -10
- package/package/lib/mainFn/CommandController.js +78 -20
- package/package/lib/mainFn/CommandController.js.map +1 -1
- package/package/lib/mainFn/Daemon.d.ts +6 -8
- package/package/lib/mainFn/Daemon.js +4 -4
- package/package/lib/mainFn/Daemon.js.map +1 -1
- package/package/lib/mainFn/Daemons.d.ts +18 -14
- package/package/lib/mainFn/Daemons.js +43 -27
- package/package/lib/mainFn/Daemons.js.map +1 -1
- package/package/lib/mainFn/HealthDaemon.d.ts +2 -2
- package/package/lib/mainFn/HealthDaemon.js +12 -10
- package/package/lib/mainFn/HealthDaemon.js.map +1 -1
- package/package/lib/mainFn/Mounts.d.ts +1 -4
- package/package/lib/mainFn/Mounts.js +3 -7
- package/package/lib/mainFn/Mounts.js.map +1 -1
- package/package/lib/mainFn/index.js +1 -1
- package/package/lib/mainFn/index.js.map +1 -1
- package/package/lib/manifest/setupManifest.d.ts +2 -4
- package/package/lib/manifest/setupManifest.js +13 -15
- package/package/lib/manifest/setupManifest.js.map +1 -1
- package/package/lib/store/getStore.js +4 -3
- package/package/lib/store/getStore.js.map +1 -1
- package/package/lib/test/output.js +386 -297
- package/package/lib/test/output.js.map +1 -1
- package/package/lib/test/output.sdk.d.ts +349 -167
- package/package/lib/test/output.test.js +1 -2
- package/package/lib/test/output.test.js.map +1 -1
- package/package/lib/trigger/changeOnFirstSuccess.js +2 -3
- package/package/lib/trigger/changeOnFirstSuccess.js.map +1 -1
- package/package/lib/trigger/cooldownTrigger.js +1 -2
- package/package/lib/trigger/cooldownTrigger.js.map +1 -1
- package/package/lib/trigger/lastStatus.js +2 -4
- package/package/lib/trigger/lastStatus.js.map +1 -1
- package/package/lib/types.d.ts +2 -0
- package/package/lib/types.js +21 -0
- package/package/lib/types.js.map +1 -0
- package/package/lib/util/Drop.d.ts +11 -0
- package/package/lib/util/Drop.js +28 -0
- package/package/lib/util/Drop.js.map +1 -0
- package/package/lib/util/GetSslCertificate.js +2 -1
- package/package/lib/util/GetSslCertificate.js.map +1 -1
- package/package/lib/util/SubContainer.d.ts +18 -5
- package/package/lib/util/SubContainer.js +91 -28
- package/package/lib/util/SubContainer.js.map +1 -1
- package/package/lib/util/fileHelper.d.ts +5 -2
- package/package/lib/util/fileHelper.js +68 -21
- package/package/lib/util/fileHelper.js.map +1 -1
- package/package/lib/util/index.d.ts +1 -0
- package/package/lib/util/index.js +3 -1
- package/package/lib/util/index.js.map +1 -1
- package/package/lib/version/VersionGraph.js +8 -4
- package/package/lib/version/VersionGraph.js.map +1 -1
- package/package/scripts/oldSpecToBuilder.js +49 -45
- package/package/scripts/oldSpecToBuilder.js.map +1 -1
- package/package.json +6 -2
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
|
-
import { HealthReceipt } from "../../../base/lib/types";
|
|
4
1
|
import { HealthCheckResult } from "../health/checkFns";
|
|
5
2
|
import { Trigger } from "../trigger";
|
|
6
3
|
import * as T from "../../../base/lib/types";
|
|
@@ -12,6 +9,7 @@ export { CommandController } from "./CommandController";
|
|
|
12
9
|
import { HealthDaemon } from "./HealthDaemon";
|
|
13
10
|
import { Daemon } from "./Daemon";
|
|
14
11
|
import { CommandController } from "./CommandController";
|
|
12
|
+
import { HealthCheck } from "../health/HealthCheck";
|
|
15
13
|
export declare const cpExec: typeof CP.exec.__promisify__;
|
|
16
14
|
export declare const cpExecFile: typeof CP.execFile.__promisify__;
|
|
17
15
|
export type Ready = {
|
|
@@ -32,6 +30,12 @@ export type Ready = {
|
|
|
32
30
|
* ```
|
|
33
31
|
*/
|
|
34
32
|
fn: (spawnable: ExecSpawnable) => Promise<HealthCheckResult> | HealthCheckResult;
|
|
33
|
+
/**
|
|
34
|
+
* A duration in milliseconds to treat a failing health check as "starting"
|
|
35
|
+
*
|
|
36
|
+
* defaults to 5000
|
|
37
|
+
*/
|
|
38
|
+
gracePeriod?: number;
|
|
35
39
|
trigger?: Trigger;
|
|
36
40
|
};
|
|
37
41
|
type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command extends string, Id extends string> = {
|
|
@@ -60,22 +64,22 @@ type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command e
|
|
|
60
64
|
type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`;
|
|
61
65
|
export declare const runCommand: <Manifest extends T.SDKManifest>() => <A extends string>(effects: T.Effects, subcontainer: SubContainer | {
|
|
62
66
|
imageId: keyof Manifest["images"] & string;
|
|
63
|
-
sharedRun?: boolean
|
|
67
|
+
sharedRun?: boolean;
|
|
64
68
|
}, command: T.CommandType, options: {
|
|
65
|
-
subcontainerName?: string
|
|
66
|
-
sigtermTimeout?: number
|
|
69
|
+
subcontainerName?: string;
|
|
70
|
+
sigtermTimeout?: number;
|
|
67
71
|
mounts?: {
|
|
68
|
-
|
|
72
|
+
mountpoint: string;
|
|
69
73
|
options: MountOptions;
|
|
70
74
|
}[] | undefined;
|
|
71
|
-
runAsInit?: boolean
|
|
75
|
+
runAsInit?: boolean;
|
|
72
76
|
env?: {
|
|
73
77
|
[variable: string]: string;
|
|
74
78
|
} | undefined;
|
|
75
79
|
cwd?: string | undefined;
|
|
76
80
|
user?: string | undefined;
|
|
77
|
-
onStdout?: ((chunk: any) => void) | undefined;
|
|
78
|
-
onStderr?: ((chunk: any) => void) | undefined;
|
|
81
|
+
onStdout?: ((chunk: Buffer | string | any) => void) | undefined;
|
|
82
|
+
onStderr?: ((chunk: Buffer | string | any) => void) | undefined;
|
|
79
83
|
}) => Promise<CommandController>;
|
|
80
84
|
/**
|
|
81
85
|
* A class for defining and controlling the service daemons
|
|
@@ -106,6 +110,7 @@ export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string>
|
|
|
106
110
|
readonly daemons: Promise<Daemon>[];
|
|
107
111
|
readonly ids: Ids[];
|
|
108
112
|
readonly healthDaemons: HealthDaemon[];
|
|
113
|
+
readonly healthChecks: HealthCheck[];
|
|
109
114
|
private constructor();
|
|
110
115
|
/**
|
|
111
116
|
* Returns an empty new Daemons class with the provided inputSpec.
|
|
@@ -120,7 +125,7 @@ export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string>
|
|
|
120
125
|
static of<Manifest extends T.SDKManifest>(options: {
|
|
121
126
|
effects: T.Effects;
|
|
122
127
|
started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>;
|
|
123
|
-
|
|
128
|
+
healthChecks: HealthCheck[];
|
|
124
129
|
}): Daemons<Manifest, never>;
|
|
125
130
|
/**
|
|
126
131
|
* Returns the complete list of daemons, including the one defined here
|
|
@@ -129,7 +134,6 @@ export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string>
|
|
|
129
134
|
* @returns
|
|
130
135
|
*/
|
|
131
136
|
addDaemon<Id extends string, Command extends string>(id: "" extends Id ? never : ErrorDuplicateId<Id> extends Id ? never : Id extends Ids ? ErrorDuplicateId<Id> : Id, options: DaemonsParams<Manifest, Ids, Command, Id>): Daemons<Manifest, Ids | Id>;
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
}>;
|
|
137
|
+
term(): Promise<void>;
|
|
138
|
+
build(): Promise<this>;
|
|
135
139
|
}
|
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
36
|
exports.Daemons = exports.runCommand = exports.cpExecFile = exports.cpExec = exports.CommandController = exports.Daemon = void 0;
|
|
27
37
|
const node_util_1 = require("node:util");
|
|
@@ -61,12 +71,13 @@ Daemons.of({
|
|
|
61
71
|
```
|
|
62
72
|
*/
|
|
63
73
|
class Daemons {
|
|
64
|
-
constructor(effects, started, daemons, ids, healthDaemons) {
|
|
74
|
+
constructor(effects, started, daemons, ids, healthDaemons, healthChecks) {
|
|
65
75
|
this.effects = effects;
|
|
66
76
|
this.started = started;
|
|
67
77
|
this.daemons = daemons;
|
|
68
78
|
this.ids = ids;
|
|
69
79
|
this.healthDaemons = healthDaemons;
|
|
80
|
+
this.healthChecks = healthChecks;
|
|
70
81
|
}
|
|
71
82
|
/**
|
|
72
83
|
* Returns an empty new Daemons class with the provided inputSpec.
|
|
@@ -79,7 +90,7 @@ class Daemons {
|
|
|
79
90
|
* @returns
|
|
80
91
|
*/
|
|
81
92
|
static of(options) {
|
|
82
|
-
return new Daemons(options.effects, options.started, [], [], []);
|
|
93
|
+
return new Daemons(options.effects, options.started, [], [], [], options.healthChecks);
|
|
83
94
|
}
|
|
84
95
|
/**
|
|
85
96
|
* Returns the complete list of daemons, including the one defined here
|
|
@@ -97,31 +108,36 @@ class Daemons {
|
|
|
97
108
|
subcontainerName: id,
|
|
98
109
|
});
|
|
99
110
|
const healthDaemon = new HealthDaemon_1.HealthDaemon(daemon, daemonIndex, options.requires
|
|
100
|
-
.map((x) => this.ids.indexOf(
|
|
111
|
+
.map((x) => this.ids.indexOf(x))
|
|
101
112
|
.filter((x) => x >= 0)
|
|
102
113
|
.map((id) => this.healthDaemons[id]), id, this.ids, options.ready, this.effects, options.sigtermTimeout);
|
|
103
114
|
const daemons = this.daemons.concat(daemon);
|
|
104
115
|
const ids = [...this.ids, id];
|
|
105
116
|
const healthDaemons = [...this.healthDaemons, healthDaemon];
|
|
106
|
-
return new Daemons(this.effects, this.started, daemons, ids, healthDaemons);
|
|
117
|
+
return new Daemons(this.effects, this.started, daemons, ids, healthDaemons, this.healthChecks);
|
|
107
118
|
}
|
|
108
|
-
async
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
console.error(result.reason);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
finally {
|
|
119
|
-
this.effects.setMainStatus({ status: "stopped" });
|
|
119
|
+
async term() {
|
|
120
|
+
try {
|
|
121
|
+
this.healthChecks.forEach((health) => health.stop());
|
|
122
|
+
for (let result of await Promise.allSettled(this.healthDaemons.map((x) => x.term({ timeout: x.sigtermTimeout })))) {
|
|
123
|
+
if (result.status === "rejected") {
|
|
124
|
+
console.error(result.reason);
|
|
120
125
|
}
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
finally {
|
|
129
|
+
this.effects.setMainStatus({ status: "stopped" });
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
async build() {
|
|
133
|
+
for (const daemon of this.healthDaemons) {
|
|
134
|
+
await daemon.updateStatus();
|
|
135
|
+
}
|
|
136
|
+
for (const health of this.healthChecks) {
|
|
137
|
+
health.start();
|
|
138
|
+
}
|
|
139
|
+
this.started(() => this.term());
|
|
140
|
+
return this;
|
|
125
141
|
}
|
|
126
142
|
}
|
|
127
143
|
exports.Daemons = Daemons;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemons.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemons.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { HealthCheckResult } from "../health/checkFns";
|
|
3
2
|
import { Ready } from "./Daemons";
|
|
4
3
|
import { Daemon } from "./Daemon";
|
|
@@ -22,6 +21,7 @@ export declare class HealthDaemon {
|
|
|
22
21
|
private _health;
|
|
23
22
|
private healthWatchers;
|
|
24
23
|
private running;
|
|
24
|
+
private started?;
|
|
25
25
|
private resolveReady;
|
|
26
26
|
private readyPromise;
|
|
27
27
|
constructor(daemon: Promise<Daemon>, daemonIndex: number, dependencies: HealthDaemon[], id: string, ids: string[], ready: Ready, effects: Effects, sigtermTimeout?: number);
|
|
@@ -39,5 +39,5 @@ export declare class HealthDaemon {
|
|
|
39
39
|
private setupHealthCheck;
|
|
40
40
|
onReady(): Promise<void>;
|
|
41
41
|
private setHealth;
|
|
42
|
-
|
|
42
|
+
updateStatus(): Promise<void>;
|
|
43
43
|
}
|
|
@@ -33,15 +33,13 @@ class HealthDaemon {
|
|
|
33
33
|
this.running = false;
|
|
34
34
|
this.healthCheckCleanup = null;
|
|
35
35
|
this.readyPromise = new Promise((resolve) => (this.resolveReady = resolve));
|
|
36
|
-
this.updateStatus();
|
|
37
36
|
this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()));
|
|
38
37
|
}
|
|
39
38
|
/** Run after we want to do cleanup */
|
|
40
39
|
async term(termOptions) {
|
|
41
|
-
var _a;
|
|
42
40
|
this.healthWatchers = [];
|
|
43
41
|
this.running = false;
|
|
44
|
-
|
|
42
|
+
this.healthCheckCleanup?.();
|
|
45
43
|
await this.daemon.then((d) => d.term({
|
|
46
44
|
timeout: this.sigtermTimeout,
|
|
47
45
|
...termOptions,
|
|
@@ -61,6 +59,7 @@ class HealthDaemon {
|
|
|
61
59
|
if (newStatus) {
|
|
62
60
|
;
|
|
63
61
|
(await this.daemon).start();
|
|
62
|
+
this.started = performance.now();
|
|
64
63
|
this.setupHealthCheck();
|
|
65
64
|
}
|
|
66
65
|
else {
|
|
@@ -71,14 +70,12 @@ class HealthDaemon {
|
|
|
71
70
|
}
|
|
72
71
|
}
|
|
73
72
|
turnOffHealthCheck() {
|
|
74
|
-
|
|
75
|
-
(_a = this.healthCheckCleanup) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
73
|
+
this.healthCheckCleanup?.();
|
|
76
74
|
}
|
|
77
75
|
async setupHealthCheck() {
|
|
78
|
-
var _a;
|
|
79
76
|
if (this.healthCheckCleanup)
|
|
80
77
|
return;
|
|
81
|
-
const trigger = (
|
|
78
|
+
const trigger = (this.ready.trigger ?? defaultTrigger_1.defaultTrigger)(() => ({
|
|
82
79
|
lastResult: this._health.result,
|
|
83
80
|
}));
|
|
84
81
|
const { promise: status, resolve: setStatus } = oncePromise();
|
|
@@ -120,19 +117,24 @@ class HealthDaemon {
|
|
|
120
117
|
this._health = health;
|
|
121
118
|
this.healthWatchers.forEach((watcher) => watcher());
|
|
122
119
|
const display = this.ready.display;
|
|
123
|
-
const result = health.result;
|
|
124
120
|
if (!display) {
|
|
125
121
|
return;
|
|
126
122
|
}
|
|
123
|
+
let result = health.result;
|
|
124
|
+
if (result === "failure" &&
|
|
125
|
+
this.started &&
|
|
126
|
+
performance.now() - this.started <= (this.ready.gracePeriod ?? 5000))
|
|
127
|
+
result = "starting";
|
|
127
128
|
await this.effects.setHealth({
|
|
128
129
|
...health,
|
|
129
130
|
id: this.id,
|
|
130
131
|
name: display,
|
|
132
|
+
result,
|
|
131
133
|
});
|
|
132
134
|
}
|
|
133
135
|
async updateStatus() {
|
|
134
|
-
const healths = this.dependencies.map((d) => d._health);
|
|
135
|
-
this.changeRunning(healths.every((x) => x.result === "success"));
|
|
136
|
+
const healths = this.dependencies.map((d) => d.running && d._health);
|
|
137
|
+
this.changeRunning(healths.every((x) => x && x.result === "success"));
|
|
136
138
|
}
|
|
137
139
|
}
|
|
138
140
|
exports.HealthDaemon = HealthDaemon;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HealthDaemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/HealthDaemon.ts"],"names":[],"mappings":";;;AACA,8DAA0D;AAI1D,wBAA2C;AAC3C,4DAAwD;AAExD,MAAM,WAAW,GAAG,GAAM,EAAE;IAC1B,IAAI,OAA2B,CAAA;IAC/B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,GAAG,EAAE,EAAE;QACrC,OAAO,GAAG,GAAG,CAAA;IACf,CAAC,CAAC,CAAA;IACF,OAAO,EAAE,OAAO,EAAE,OAAQ,EAAE,OAAO,EAAE,CAAA;AACvC,CAAC,CAAA;AAED;;;;;;GAMG;AACH,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"HealthDaemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/HealthDaemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as T from "../../../base/lib/types";
|
|
2
2
|
import { MountOptions } from "../util/SubContainer";
|
|
3
3
|
type MountArray = {
|
|
4
|
-
|
|
4
|
+
mountpoint: string;
|
|
5
5
|
options: MountOptions;
|
|
6
6
|
}[];
|
|
7
7
|
export declare class Mounts<Manifest extends T.SDKManifest> {
|
|
@@ -12,7 +12,6 @@ export declare class Mounts<Manifest extends T.SDKManifest> {
|
|
|
12
12
|
readonly: boolean;
|
|
13
13
|
}[];
|
|
14
14
|
readonly assets: {
|
|
15
|
-
id: Manifest["assets"][number];
|
|
16
15
|
subpath: string | null;
|
|
17
16
|
mountpoint: string;
|
|
18
17
|
}[];
|
|
@@ -35,8 +34,6 @@ export declare class Mounts<Manifest extends T.SDKManifest> {
|
|
|
35
34
|
/** Whether or not the volume should be readonly for this daemon */
|
|
36
35
|
readonly: boolean): this;
|
|
37
36
|
addAssets(
|
|
38
|
-
/** The ID of the asset directory to mount. This is typically the same as the folder name in your assets directory */
|
|
39
|
-
id: Manifest["assets"][number],
|
|
40
37
|
/** The path within the asset directory to mount. Use `null` to mount the entire volume */
|
|
41
38
|
subpath: string | null,
|
|
42
39
|
/** Where to mount the asset. e.g. /asset */
|
|
@@ -28,14 +28,11 @@ class Mounts {
|
|
|
28
28
|
return this;
|
|
29
29
|
}
|
|
30
30
|
addAssets(
|
|
31
|
-
/** The ID of the asset directory to mount. This is typically the same as the folder name in your assets directory */
|
|
32
|
-
id,
|
|
33
31
|
/** The path within the asset directory to mount. Use `null` to mount the entire volume */
|
|
34
32
|
subpath,
|
|
35
33
|
/** Where to mount the asset. e.g. /asset */
|
|
36
34
|
mountpoint) {
|
|
37
35
|
this.assets.push({
|
|
38
|
-
id,
|
|
39
36
|
subpath,
|
|
40
37
|
mountpoint,
|
|
41
38
|
});
|
|
@@ -74,7 +71,7 @@ class Mounts {
|
|
|
74
71
|
}
|
|
75
72
|
return []
|
|
76
73
|
.concat(this.volumes.map((v) => ({
|
|
77
|
-
|
|
74
|
+
mountpoint: v.mountpoint,
|
|
78
75
|
options: {
|
|
79
76
|
type: "volume",
|
|
80
77
|
id: v.id,
|
|
@@ -83,15 +80,14 @@ class Mounts {
|
|
|
83
80
|
},
|
|
84
81
|
})))
|
|
85
82
|
.concat(this.assets.map((a) => ({
|
|
86
|
-
|
|
83
|
+
mountpoint: a.mountpoint,
|
|
87
84
|
options: {
|
|
88
85
|
type: "assets",
|
|
89
|
-
id: a.id,
|
|
90
86
|
subpath: a.subpath,
|
|
91
87
|
},
|
|
92
88
|
})))
|
|
93
89
|
.concat(this.dependencies.map((d) => ({
|
|
94
|
-
|
|
90
|
+
mountpoint: d.mountpoint,
|
|
95
91
|
options: {
|
|
96
92
|
type: "pointer",
|
|
97
93
|
packageId: d.dependencyId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mounts.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Mounts.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,OAKN,EACM,
|
|
1
|
+
{"version":3,"file":"Mounts.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Mounts.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,OAKN,EACM,MAGN,EACM,YAMN;QAhBM,YAAO,GAAP,OAAO,CAKb;QACM,WAAM,GAAN,MAAM,CAGZ;QACM,iBAAY,GAAZ,YAAY,CAMlB;IACF,CAAC;IAEJ,MAAM,CAAC,EAAE;QACP,OAAO,IAAI,MAAM,CAAW,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IACzC,CAAC;IAED,SAAS;IACP,2FAA2F;IAC3F,EAA+B;IAC/B,iFAAiF;IACjF,OAAsB;IACtB,4CAA4C;IAC5C,UAAkB;IAClB,mEAAmE;IACnE,QAAiB;QAEjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAChB,EAAE;YACF,OAAO;YACP,UAAU;YACV,QAAQ;SACT,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS;IACP,0FAA0F;IAC1F,OAAsB;IACtB,4CAA4C;IAC5C,UAAkB;QAElB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACf,OAAO;YACP,UAAU;SACX,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,aAAa;IACX,uCAAuC;IACvC,YAAqD;IACrD,wEAAwE;IACxE,QAA+C;IAC/C,8FAA8F;IAC9F,OAAsB;IACtB,+DAA+D;IAC/D,UAAkB;IAClB,mEAAmE;IACnE,QAAiB;QAEjB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;YACrB,YAAY;YACZ,QAAQ;YACR,OAAO;YACP,UAAU;YACV,QAAQ;SACT,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,MAAM,WAAW,GAAG,IAAI,GAAG,EAAE,CAAA;QAC7B,KAAK,IAAI,UAAU,IAAI,IAAI,CAAC,OAAO;aAChC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;aAC5C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YACtD,IAAI,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CACb,6CAA6C,UAAU,EAAE,CAC1D,CAAA;YACH,CAAC;YACD,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC7B,CAAC;QACD,OAAQ,EAAiB;aACtB,MAAM,CACL,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACvB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,CAAC,CAAC,EAAE;gBACR,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB;SACF,CAAC,CAAC,CACJ;aACA,MAAM,CACL,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACtB,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB;SACF,CAAC,CAAC,CACJ;aACA,MAAM,CACL,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,OAAO,EAAE;gBACP,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,CAAC,CAAC,YAAY;gBACzB,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB;SACF,CAAC,CAAC,CACJ,CAAA;IACL,CAAC;CACF;AA9HD,wBA8HC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupMain = exports.DEFAULT_SIGTERM_TIMEOUT = void 0;
|
|
4
4
|
require("../../../base/lib/interfaces/ServiceInterfaceBuilder");
|
|
5
5
|
require("../../../base/lib/interfaces/Origin");
|
|
6
|
-
exports.DEFAULT_SIGTERM_TIMEOUT =
|
|
6
|
+
exports.DEFAULT_SIGTERM_TIMEOUT = 30_000;
|
|
7
7
|
/**
|
|
8
8
|
* Used to ensure that the main function is running with the valid proofs.
|
|
9
9
|
* We first do the folowing order of things
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/index.ts"],"names":[],"mappings":";;;AAEA,gEAA6D;AAC7D,+CAA4C;AAE/B,QAAA,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/index.ts"],"names":[],"mappings":";;;AAEA,gEAA6D;AAC7D,+CAA4C;AAE/B,QAAA,uBAAuB,GAAG,MAAM,CAAA;AAC7C;;;;;;;;;GASG;AACI,MAAM,SAAS,GAAG,CACvB,EAGqC,EACb,EAAE;IAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB"}
|
|
@@ -7,15 +7,13 @@ import { VersionGraph } from "../version/VersionGraph";
|
|
|
7
7
|
*
|
|
8
8
|
* @param manifest Static properties of the package
|
|
9
9
|
*/
|
|
10
|
-
export declare function setupManifest<Id extends string, VolumesTypes extends VolumeId,
|
|
10
|
+
export declare function setupManifest<Id extends string, VolumesTypes extends VolumeId, Manifest extends {
|
|
11
11
|
id: Id;
|
|
12
|
-
assets: AssetTypes[];
|
|
13
12
|
volumes: VolumesTypes[];
|
|
14
13
|
} & SDKManifest>(manifest: Manifest & SDKManifest): Manifest;
|
|
15
|
-
export declare function buildManifest<Id extends string, Version extends string, Dependencies extends Record<string, unknown>, VolumesTypes extends VolumeId,
|
|
14
|
+
export declare function buildManifest<Id extends string, Version extends string, Dependencies extends Record<string, unknown>, VolumesTypes extends VolumeId, ImagesTypes extends ImageId, Manifest extends {
|
|
16
15
|
dependencies: Dependencies;
|
|
17
16
|
id: Id;
|
|
18
|
-
assets: AssetTypes[];
|
|
19
17
|
images: Record<ImagesTypes, SDKImageInputSpec>;
|
|
20
18
|
volumes: VolumesTypes[];
|
|
21
19
|
}>(versions: VersionGraph<Version>, manifest: SDKManifest & Manifest): Manifest & T.Manifest;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.setupManifest = setupManifest;
|
|
4
|
+
exports.buildManifest = buildManifest;
|
|
4
5
|
const StartSdk_1 = require("../StartSdk");
|
|
5
6
|
/**
|
|
6
7
|
* @description Use this function to define critical information about your package
|
|
@@ -10,9 +11,7 @@ const StartSdk_1 = require("../StartSdk");
|
|
|
10
11
|
function setupManifest(manifest) {
|
|
11
12
|
return manifest;
|
|
12
13
|
}
|
|
13
|
-
exports.setupManifest = setupManifest;
|
|
14
14
|
function buildManifest(versions, manifest) {
|
|
15
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
16
15
|
const images = Object.entries(manifest.images).reduce((images, [k, v]) => {
|
|
17
16
|
v.arch = v.arch || ["aarch64", "x86_64"];
|
|
18
17
|
if (v.emulateMissingAs === undefined)
|
|
@@ -24,7 +23,7 @@ function buildManifest(versions, manifest) {
|
|
|
24
23
|
}, {});
|
|
25
24
|
return {
|
|
26
25
|
...manifest,
|
|
27
|
-
osVersion: StartSdk_1.
|
|
26
|
+
osVersion: manifest.osVersion ?? StartSdk_1.OSVersion,
|
|
28
27
|
version: versions.current.options.version,
|
|
29
28
|
releaseNotes: versions.current.options.releaseNotes,
|
|
30
29
|
satisfies: versions.current.options.satisfies || [],
|
|
@@ -32,17 +31,17 @@ function buildManifest(versions, manifest) {
|
|
|
32
31
|
canMigrateFrom: versions.canMigrateFrom().toString(),
|
|
33
32
|
images,
|
|
34
33
|
alerts: {
|
|
35
|
-
install:
|
|
36
|
-
update:
|
|
37
|
-
uninstall:
|
|
38
|
-
restore:
|
|
39
|
-
start:
|
|
40
|
-
stop:
|
|
34
|
+
install: manifest.alerts?.install || null,
|
|
35
|
+
update: manifest.alerts?.update || null,
|
|
36
|
+
uninstall: manifest.alerts?.uninstall || null,
|
|
37
|
+
restore: manifest.alerts?.restore || null,
|
|
38
|
+
start: manifest.alerts?.start || null,
|
|
39
|
+
stop: manifest.alerts?.stop || null,
|
|
41
40
|
},
|
|
42
41
|
hardwareRequirements: {
|
|
43
|
-
device:
|
|
44
|
-
ram:
|
|
45
|
-
arch:
|
|
42
|
+
device: manifest.hardwareRequirements?.device || [],
|
|
43
|
+
ram: manifest.hardwareRequirements?.ram || null,
|
|
44
|
+
arch: manifest.hardwareRequirements?.arch === undefined
|
|
46
45
|
? Object.values(images).reduce((arch, inputSpec) => {
|
|
47
46
|
if (inputSpec.emulateMissingAs) {
|
|
48
47
|
return arch;
|
|
@@ -52,9 +51,8 @@ function buildManifest(versions, manifest) {
|
|
|
52
51
|
}
|
|
53
52
|
return arch.filter((a) => inputSpec.arch.includes(a));
|
|
54
53
|
}, null)
|
|
55
|
-
:
|
|
54
|
+
: manifest.hardwareRequirements?.arch,
|
|
56
55
|
},
|
|
57
56
|
};
|
|
58
57
|
}
|
|
59
|
-
exports.buildManifest = buildManifest;
|
|
60
58
|
//# sourceMappingURL=setupManifest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../package/lib/manifest/setupManifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../package/lib/manifest/setupManifest.ts"],"names":[],"mappings":";;AAeA,sCASC;AAED,sCAiEC;AArFD,0CAAuC;AAIvC;;;;GAIG;AACH,SAAgB,aAAa,CAO3B,QAAgC;IAChC,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,SAAgB,aAAa,CAa3B,QAA+B,EAC/B,QAAgC;IAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CACnD,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACjB,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACxC,IAAI,CAAC,CAAC,gBAAgB,KAAK,SAAS;YAClC,CAAC,CAAC,gBAAgB,GAAI,CAAC,CAAC,IAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC3D,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;QACvB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAgB,CAAA;QAC5B,OAAO,MAAM,CAAA;IACf,CAAC,EACD,EAAkC,CACnC,CAAA;IACD,OAAO;QACL,GAAG,QAAQ;QACX,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,oBAAS;QAC1C,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;QACzC,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY;QACnD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE;QACnD,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE;QAChD,cAAc,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE;QACpD,MAAM;QACN,MAAM,EAAE;YACN,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,IAAI,IAAI;YACzC,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI;YACvC,SAAS,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,IAAI,IAAI;YAC7C,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,IAAI,IAAI;YACzC,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,IAAI,IAAI;YACrC,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,IAAI,IAAI;SACpC;QACD,oBAAoB,EAAE;YACpB,MAAM,EAAE,QAAQ,CAAC,oBAAoB,EAAE,MAAM,IAAI,EAAE;YACnD,GAAG,EAAE,QAAQ,CAAC,oBAAoB,EAAE,GAAG,IAAI,IAAI;YAC/C,IAAI,EACF,QAAQ,CAAC,oBAAoB,EAAE,IAAI,KAAK,SAAS;gBAC/C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAC1B,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;oBAClB,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;wBAC/B,OAAO,IAAI,CAAA;oBACb,CAAC;oBACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;wBAClB,OAAO,SAAS,CAAC,IAAI,CAAA;oBACvB,CAAC;oBACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;gBACvD,CAAC,EACD,IAAuB,CACxB;gBACH,CAAC,CAAC,QAAQ,CAAC,oBAAoB,EAAE,IAAI;SAC1C;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.GetStore = void 0;
|
|
4
|
+
exports.getStore = getStore;
|
|
4
5
|
const util_1 = require("../util");
|
|
5
6
|
class GetStore {
|
|
6
7
|
constructor(effects, path, options = {}) {
|
|
@@ -15,7 +16,8 @@ class GetStore {
|
|
|
15
16
|
return this.effects.store.get({
|
|
16
17
|
...this.options,
|
|
17
18
|
path: (0, util_1.extractJsonPath)(this.path),
|
|
18
|
-
callback:
|
|
19
|
+
callback: this.effects.constRetry &&
|
|
20
|
+
(() => this.effects.constRetry && this.effects.constRetry()),
|
|
19
21
|
});
|
|
20
22
|
}
|
|
21
23
|
/**
|
|
@@ -67,5 +69,4 @@ exports.GetStore = GetStore;
|
|
|
67
69
|
function getStore(effects, path, options = {}) {
|
|
68
70
|
return new GetStore(effects, path, options);
|
|
69
71
|
}
|
|
70
|
-
exports.getStore = getStore;
|
|
71
72
|
//# sourceMappingURL=getStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStore.js","sourceRoot":"","sources":["../../../../package/lib/store/getStore.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getStore.js","sourceRoot":"","sources":["../../../../package/lib/store/getStore.ts"],"names":[],"mappings":";;;AAgFA,4BASC;AAxFD,kCAAsD;AAEtD,MAAa,QAAQ;IACnB,YACW,OAAgB,EAChB,IAAoC,EACpC,UAGL,EAAE;QALG,YAAO,GAAP,OAAO,CAAS;QAChB,SAAI,GAAJ,IAAI,CAAgC;QACpC,YAAO,GAAP,OAAO,CAGV;IACL,CAAC;IAEJ;;OAEG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAoB;YAC/C,GAAG,IAAI,CAAC,OAAO;YACf,IAAI,EAAE,IAAA,sBAAe,EAAC,IAAI,CAAC,IAAI,CAAC;YAChC,QAAQ,EACN,IAAI,CAAC,OAAO,CAAC,UAAU;gBACvB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;SAC/D,CAAC,CAAA;IACJ,CAAC;IACD;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAoB;YAC/C,GAAG,IAAI,CAAC,OAAO;YACf,IAAI,EAAE,IAAA,sBAAe,EAAC,IAAI,CAAC,IAAI,CAAC;SACjC,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,QAAoB,CAAA;YACxB,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;YACpB,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAoB;gBACpD,GAAG,IAAI,CAAC,OAAO;gBACf,IAAI,EAAE,IAAA,sBAAe,EAAC,IAAI,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;aAC3B,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,QAA2E;QAE3E,CAAC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;gBACvC,IAAI,CAAC;oBACH,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACvB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,KAAK,CACX,sDAAsD,EACtD,CAAC,CACF,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,EAAE;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aAC/B,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACX,OAAO,CAAC,KAAK,CACX,sDAAsD,EACtD,CAAC,CACF,CACF,CAAA;IACL,CAAC;CACF;AA5ED,4BA4EC;AACD,SAAgB,QAAQ,CACtB,OAAgB,EAChB,IAAoC,EACpC,UAGI,EAAE;IAEN,OAAO,IAAI,QAAQ,CAAoB,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;AAChE,CAAC"}
|