@start9labs/start-sdk 0.4.0-beta.2 → 0.4.0-beta.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/base/lib/Effects.d.ts +3 -0
- package/base/lib/actions/setupActions.js +7 -7
- package/base/lib/actions/setupActions.js.map +1 -1
- package/base/lib/dependencies/setupDependencies.js +5 -7
- package/base/lib/dependencies/setupDependencies.js.map +1 -1
- package/base/lib/interfaces/setupInterfaces.js +7 -9
- package/base/lib/interfaces/setupInterfaces.js.map +1 -1
- package/base/lib/util/GetSystemSmtp.js +7 -2
- package/base/lib/util/GetSystemSmtp.js.map +1 -1
- package/base/lib/util/getServiceInterface.d.ts +10 -0
- package/base/lib/util/getServiceInterface.js +41 -1
- package/base/lib/util/getServiceInterface.js.map +1 -1
- package/base/lib/util/getServiceInterfaces.js +6 -1
- package/base/lib/util/getServiceInterfaces.js.map +1 -1
- package/package/lib/StartSdk.d.ts +21 -10
- package/package/lib/StartSdk.js +23 -4
- package/package/lib/StartSdk.js.map +1 -1
- package/package/lib/backup/Backups.d.ts +8 -2
- package/package/lib/backup/Backups.js +33 -3
- package/package/lib/backup/Backups.js.map +1 -1
- package/package/lib/backup/setupBackups.js +2 -2
- package/package/lib/backup/setupBackups.js.map +1 -1
- package/package/lib/health/checkFns/runHealthScript.d.ts +2 -1
- package/package/lib/health/checkFns/runHealthScript.js.map +1 -1
- package/package/lib/mainFn/CommandController.d.ts +7 -9
- package/package/lib/mainFn/CommandController.js +14 -26
- package/package/lib/mainFn/CommandController.js.map +1 -1
- package/package/lib/mainFn/Daemon.d.ts +7 -9
- package/package/lib/mainFn/Daemon.js.map +1 -1
- package/package/lib/mainFn/Daemons.d.ts +8 -11
- package/package/lib/mainFn/Daemons.js +0 -1
- package/package/lib/mainFn/Daemons.js.map +1 -1
- package/package/lib/mainFn/HealthDaemon.d.ts +3 -3
- package/package/lib/mainFn/HealthDaemon.js.map +1 -1
- package/package/lib/mainFn/Mounts.d.ts +13 -5
- package/package/lib/mainFn/Mounts.js +35 -22
- package/package/lib/mainFn/Mounts.js.map +1 -1
- package/package/lib/store/getStore.js +7 -2
- package/package/lib/store/getStore.js.map +1 -1
- package/package/lib/test/output.sdk.d.ts +128 -8
- package/package/lib/util/Drop.js +3 -1
- package/package/lib/util/Drop.js.map +1 -1
- package/package/lib/util/GetSslCertificate.js +7 -2
- package/package/lib/util/GetSslCertificate.js.map +1 -1
- package/package/lib/util/SubContainer.d.ts +38 -13
- package/package/lib/util/SubContainer.js +88 -78
- package/package/lib/util/SubContainer.js.map +1 -1
- package/package/lib/util/fileHelper.d.ts +5 -2
- package/package/lib/util/fileHelper.js +20 -7
- package/package/lib/util/fileHelper.js.map +1 -1
- package/package.json +9 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Backups.js","sourceRoot":"","sources":["../../../../package/lib/backup/Backups.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6DAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"Backups.js","sourceRoot":"","sources":["../../../../package/lib/backup/Backups.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,12 @@ function setupBackups(options) {
|
|
|
13
13
|
const answer = {
|
|
14
14
|
get createBackup() {
|
|
15
15
|
return (async (options) => {
|
|
16
|
-
return (await backupsFactory(options)).createBackup();
|
|
16
|
+
return (await backupsFactory(options)).createBackup(options.effects);
|
|
17
17
|
});
|
|
18
18
|
},
|
|
19
19
|
get restoreBackup() {
|
|
20
20
|
return (async (options) => {
|
|
21
|
-
return (await backupsFactory(options)).restoreBackup();
|
|
21
|
+
return (await backupsFactory(options)).restoreBackup(options.effects);
|
|
22
22
|
});
|
|
23
23
|
},
|
|
24
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupBackups.js","sourceRoot":"","sources":["../../../../package/lib/backup/setupBackups.ts"],"names":[],"mappings":";;AAaA,oCAyBC;AAtCD,uCAAmC;AAanC,SAAgB,YAAY,CAC1B,OAA8B;IAE9B,IAAI,cAAkE,CAAA;IACtE,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;QAChC,cAAc,GAAG,OAAO,CAAA;IAC1B,CAAC;SAAM,CAAC;QACN,cAAc,GAAG,KAAK,IAAI,EAAE,CAAC,iBAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAA;IAC9D,CAAC;IACD,MAAM,MAAM,GAGR;QACF,IAAI,YAAY;YACd,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"setupBackups.js","sourceRoot":"","sources":["../../../../package/lib/backup/setupBackups.ts"],"names":[],"mappings":";;AAaA,oCAyBC;AAtCD,uCAAmC;AAanC,SAAgB,YAAY,CAC1B,OAA8B;IAE9B,IAAI,cAAkE,CAAA;IACtE,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;QAChC,cAAc,GAAG,OAAO,CAAA;IAC1B,CAAC;SAAM,CAAC;QACN,cAAc,GAAG,KAAK,IAAI,EAAE,CAAC,iBAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAA;IAC9D,CAAC;IACD,MAAM,MAAM,GAGR;QACF,IAAI,YAAY;YACd,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACtE,CAAC,CAAmC,CAAA;QACtC,CAAC;QACD,IAAI,aAAa;YACf,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,OAAO,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACvE,CAAC,CAAoC,CAAA;QACvC,CAAC;KACF,CAAA;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { HealthCheckResult } from "./HealthCheckResult";
|
|
2
2
|
import { SubContainer } from "../../util/SubContainer";
|
|
3
|
+
import { SDKManifest } from "../../types";
|
|
3
4
|
/**
|
|
4
5
|
* Running a health script, is used when we want to have a simple
|
|
5
6
|
* script in bash or something like that. It should return something that is useful
|
|
@@ -7,7 +8,7 @@ import { SubContainer } from "../../util/SubContainer";
|
|
|
7
8
|
* @param param0
|
|
8
9
|
* @returns
|
|
9
10
|
*/
|
|
10
|
-
export declare const runHealthScript: (runCommand: string[], subcontainer: SubContainer
|
|
11
|
+
export declare const runHealthScript: <Manifest extends SDKManifest>(runCommand: string[], subcontainer: SubContainer<Manifest>, { timeout, errorMessage, message, }?: {
|
|
11
12
|
timeout?: number | undefined;
|
|
12
13
|
errorMessage?: string | undefined;
|
|
13
14
|
message?: ((res: string) => string) | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runHealthScript.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/runHealthScript.ts"],"names":[],"mappings":";;;AACA,mCAAwC;
|
|
1
|
+
{"version":3,"file":"runHealthScript.js","sourceRoot":"","sources":["../../../../../package/lib/health/checkFns/runHealthScript.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAIxC;;;;;;GAMG;AACI,MAAM,eAAe,GAAG,KAAK,EAClC,UAAoB,EACpB,YAAoC,EACpC,EACE,OAAO,GAAG,KAAK,EACf,YAAY,GAAG,gCAAgC,UAAU,EAAE,EAC3D,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE,CACxB,mBAAmB,UAAU,oBAAoB,GAAG,EAAE,MACtD,EAAE,EACsB,EAAE;IAC9B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;QAC7B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC;QAC7B,IAAA,sBAAc,EAAC,OAAO,CAAC;KACxB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACb,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC1B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAuB,CAAA;IACzE,CAAC,CAAC,CAAA;IACF,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;KACnB,CAAA;AACxB,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B"}
|
|
@@ -1,23 +1,21 @@
|
|
|
1
1
|
import * as T from "../../../base/lib/types";
|
|
2
|
-
import {
|
|
2
|
+
import { SubContainerHandle, SubContainer } from "../util/SubContainer";
|
|
3
3
|
import { Drop } from "../util";
|
|
4
|
-
|
|
4
|
+
import { Mounts } from "./Mounts";
|
|
5
|
+
export declare class CommandController<Manifest extends T.SDKManifest> extends Drop {
|
|
5
6
|
readonly runningAnswer: Promise<unknown>;
|
|
6
7
|
private state;
|
|
7
8
|
private readonly subcontainer;
|
|
8
9
|
private process;
|
|
9
10
|
readonly sigtermTimeout: number;
|
|
10
11
|
private constructor();
|
|
11
|
-
static of<Manifest extends T.SDKManifest>():
|
|
12
|
+
static of<Manifest extends T.SDKManifest>(): (effects: T.Effects, subcontainer: {
|
|
12
13
|
imageId: keyof Manifest["images"] & T.ImageId;
|
|
13
14
|
sharedRun?: boolean;
|
|
14
|
-
} | SubContainer
|
|
15
|
+
} | SubContainer<Manifest>, command: T.CommandType, options: {
|
|
15
16
|
subcontainerName?: string;
|
|
16
17
|
sigtermTimeout?: number;
|
|
17
|
-
mounts
|
|
18
|
-
mountpoint: string;
|
|
19
|
-
options: MountOptions;
|
|
20
|
-
}[];
|
|
18
|
+
mounts: Mounts<Manifest> | null;
|
|
21
19
|
runAsInit?: boolean;
|
|
22
20
|
env?: {
|
|
23
21
|
[variable: string]: string;
|
|
@@ -26,7 +24,7 @@ export declare class CommandController extends Drop {
|
|
|
26
24
|
user?: string | undefined;
|
|
27
25
|
onStdout?: (chunk: Buffer | string | any) => void;
|
|
28
26
|
onStderr?: (chunk: Buffer | string | any) => void;
|
|
29
|
-
}) => Promise<CommandController
|
|
27
|
+
}) => Promise<CommandController<Manifest>>;
|
|
30
28
|
get subContainerHandle(): SubContainerHandle;
|
|
31
29
|
wait({ timeout }?: {
|
|
32
30
|
timeout?: number | undefined;
|
|
@@ -66,20 +66,10 @@ class CommandController extends util_1.Drop {
|
|
|
66
66
|
commands = (0, util_1.splitCommand)(command);
|
|
67
67
|
const subc = subcontainer instanceof SubContainer_1.SubContainer
|
|
68
68
|
? subcontainer
|
|
69
|
-
: await (
|
|
70
|
-
const subc = await SubContainer_1.SubContainer.of(effects, subcontainer, options?.subcontainerName || commands.join(" "));
|
|
71
|
-
try {
|
|
72
|
-
for (let mount of options.mounts || []) {
|
|
73
|
-
await subc.mount(mount.options, mount.mountpoint);
|
|
74
|
-
}
|
|
75
|
-
return subc;
|
|
76
|
-
}
|
|
77
|
-
catch (e) {
|
|
78
|
-
await subc.destroy();
|
|
79
|
-
throw e;
|
|
80
|
-
}
|
|
81
|
-
})();
|
|
69
|
+
: await SubContainer_1.SubContainer.of(effects, subcontainer, null, options?.subcontainerName || commands.join(" "));
|
|
82
70
|
try {
|
|
71
|
+
if (options.mounts)
|
|
72
|
+
await subc.mount(options.mounts);
|
|
83
73
|
let childProcess;
|
|
84
74
|
if (options.runAsInit) {
|
|
85
75
|
childProcess = await subc.launch(commands, {
|
|
@@ -125,39 +115,37 @@ class CommandController extends util_1.Drop {
|
|
|
125
115
|
return new SubContainer_1.SubContainerHandle(this.subcontainer);
|
|
126
116
|
}
|
|
127
117
|
async wait({ timeout = types_1.NO_TIMEOUT } = {}) {
|
|
128
|
-
const self = this.weak();
|
|
129
118
|
if (timeout > 0)
|
|
130
119
|
setTimeout(() => {
|
|
131
|
-
|
|
120
|
+
this.term();
|
|
132
121
|
}, timeout);
|
|
133
122
|
try {
|
|
134
|
-
return await
|
|
123
|
+
return await this.runningAnswer;
|
|
135
124
|
}
|
|
136
125
|
finally {
|
|
137
|
-
if (!
|
|
138
|
-
|
|
126
|
+
if (!this.state.exited) {
|
|
127
|
+
this.process.kill("SIGKILL");
|
|
139
128
|
}
|
|
140
|
-
await
|
|
129
|
+
await this.subcontainer.destroy().catch((_) => { });
|
|
141
130
|
}
|
|
142
131
|
}
|
|
143
132
|
async term({ signal = types_1.SIGTERM, timeout = this.sigtermTimeout } = {}) {
|
|
144
|
-
const self = this.weak();
|
|
145
133
|
try {
|
|
146
|
-
if (!
|
|
134
|
+
if (!this.state.exited) {
|
|
147
135
|
if (signal !== "SIGKILL") {
|
|
148
136
|
setTimeout(() => {
|
|
149
|
-
if (!
|
|
150
|
-
|
|
137
|
+
if (!this.state.exited)
|
|
138
|
+
this.process.kill("SIGKILL");
|
|
151
139
|
}, timeout);
|
|
152
140
|
}
|
|
153
|
-
if (!
|
|
141
|
+
if (!this.process.kill(signal)) {
|
|
154
142
|
console.error(`failed to send signal ${signal} to pid ${this.process.pid}`);
|
|
155
143
|
}
|
|
156
144
|
}
|
|
157
|
-
await
|
|
145
|
+
await this.runningAnswer;
|
|
158
146
|
}
|
|
159
147
|
finally {
|
|
160
|
-
await
|
|
148
|
+
await this.subcontainer.destroy();
|
|
161
149
|
}
|
|
162
150
|
}
|
|
163
151
|
onDrop() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/CommandController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAA2C;AAC3C,mDAA6D;AAE7D,2DAA4C;AAC5C,uDAI6B;AAC7B,kCAA4C;AAE5C,qDAAsC;
|
|
1
|
+
{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,23 @@
|
|
|
1
1
|
import * as T from "../../../base/lib/types";
|
|
2
|
-
import { ExecSpawnable,
|
|
2
|
+
import { ExecSpawnable, SubContainer } from "../util/SubContainer";
|
|
3
3
|
import { CommandController } from "./CommandController";
|
|
4
|
+
import { Mounts } from "./Mounts";
|
|
4
5
|
/**
|
|
5
6
|
* This is a wrapper around CommandController that has a state of off, where the command shouldn't be running
|
|
6
7
|
* and the others state of running, where it will keep a living running command
|
|
7
8
|
*/
|
|
8
|
-
export declare class Daemon {
|
|
9
|
+
export declare class Daemon<Manifest extends T.SDKManifest> {
|
|
9
10
|
private startCommand;
|
|
10
11
|
private commandController;
|
|
11
12
|
private shouldBeRunning;
|
|
12
|
-
constructor(startCommand: () => Promise<CommandController
|
|
13
|
+
constructor(startCommand: () => Promise<CommandController<Manifest>>);
|
|
13
14
|
get subContainerHandle(): undefined | ExecSpawnable;
|
|
14
15
|
static of<Manifest extends T.SDKManifest>(): <A extends string>(effects: T.Effects, subcontainer: {
|
|
15
16
|
imageId: keyof Manifest["images"] & T.ImageId;
|
|
16
17
|
sharedRun?: boolean;
|
|
17
|
-
} | SubContainer
|
|
18
|
+
} | SubContainer<Manifest>, command: T.CommandType, options: {
|
|
18
19
|
subcontainerName?: string;
|
|
19
|
-
mounts
|
|
20
|
-
mountpoint: string;
|
|
21
|
-
options: MountOptions;
|
|
22
|
-
}[];
|
|
20
|
+
mounts: Mounts<Manifest> | null;
|
|
23
21
|
env?: {
|
|
24
22
|
[variable: string]: string;
|
|
25
23
|
} | undefined;
|
|
@@ -28,7 +26,7 @@ export declare class Daemon {
|
|
|
28
26
|
onStdout?: (chunk: Buffer | string | any) => void;
|
|
29
27
|
onStderr?: (chunk: Buffer | string | any) => void;
|
|
30
28
|
sigtermTimeout?: number;
|
|
31
|
-
}) => Promise<Daemon
|
|
29
|
+
}) => Promise<Daemon<Manifest>>;
|
|
32
30
|
start(): Promise<void>;
|
|
33
31
|
term(termOptions?: {
|
|
34
32
|
signal?: NodeJS.Signals | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AAExD,2DAAuD;
|
|
1
|
+
{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AAExD,2DAAuD;AAGvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAa,MAAM;IAGjB,YACU,YAAwD;QAAxD,iBAAY,GAAZ,YAAY,CAA4C;QAH1D,sBAAiB,GAAuC,IAAI,CAAA;QAC5D,oBAAe,GAAG,KAAK,CAAA;IAG5B,CAAC;IACJ,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,iBAAiB,EAAE,kBAAkB,CAAA;IACnD,CAAC;IACD,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,YAK0B,EAC1B,OAAsB,EACtB,OAaC,EACD,EAAE;YACF,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,qCAAiB,CAAC,EAAE,EAAY,CAC9B,OAAO,EACP,YAAY,EACZ,OAAO,EACP,OAAO,CACR,CAAA;YACH,OAAO,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;QACjC,CAAC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,OAAM;QACR,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;QAC3B,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE;YACrB,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC5B,IAAI,IAAI,CAAC,iBAAiB;oBACxB,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBACxE,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;gBAClD,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBACtE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;gBACnE,cAAc,IAAI,oBAAoB,CAAA;gBACtC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,GAAG,CAAC,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC/B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;QAC5B,MAAM,IAAI,CAAC,iBAAiB;YAC1B,EAAE,IAAI,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC;aACzB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF;AAhFD,wBAgFC"}
|
|
@@ -2,7 +2,7 @@ import { HealthCheckResult } from "../health/checkFns";
|
|
|
2
2
|
import { Trigger } from "../trigger";
|
|
3
3
|
import * as T from "../../../base/lib/types";
|
|
4
4
|
import { Mounts } from "./Mounts";
|
|
5
|
-
import { ExecSpawnable,
|
|
5
|
+
import { ExecSpawnable, SubContainer } from "../util/SubContainer";
|
|
6
6
|
import * as CP from "node:child_process";
|
|
7
7
|
export { Daemon } from "./Daemon";
|
|
8
8
|
export { CommandController } from "./CommandController";
|
|
@@ -50,7 +50,7 @@ type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command e
|
|
|
50
50
|
* This is useful if you are trying to connect to a service that exposes a unix domain socket or auth cookie via the `/run` directory
|
|
51
51
|
*/
|
|
52
52
|
sharedRun?: boolean;
|
|
53
|
-
} | SubContainer
|
|
53
|
+
} | SubContainer<Manifest>;
|
|
54
54
|
/** For mounting the necessary volumes. Syntax: sdk.Mounts.of().addVolume() */
|
|
55
55
|
mounts: Mounts<Manifest>;
|
|
56
56
|
env?: Record<string, string>;
|
|
@@ -62,16 +62,13 @@ type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command e
|
|
|
62
62
|
onStderr?: (chunk: Buffer | string | any) => void;
|
|
63
63
|
};
|
|
64
64
|
type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`;
|
|
65
|
-
export declare const runCommand: <Manifest extends T.SDKManifest>() =>
|
|
65
|
+
export declare const runCommand: <Manifest extends T.SDKManifest>() => (effects: T.Effects, subcontainer: {
|
|
66
66
|
imageId: keyof Manifest["images"] & string;
|
|
67
67
|
sharedRun?: boolean;
|
|
68
|
-
}, command: T.CommandType, options: {
|
|
68
|
+
} | SubContainer<Manifest, T.Effects>, command: T.CommandType, options: {
|
|
69
69
|
subcontainerName?: string;
|
|
70
70
|
sigtermTimeout?: number;
|
|
71
|
-
mounts
|
|
72
|
-
mountpoint: string;
|
|
73
|
-
options: MountOptions;
|
|
74
|
-
}[] | undefined;
|
|
71
|
+
mounts: Mounts<Manifest, never> | null;
|
|
75
72
|
runAsInit?: boolean;
|
|
76
73
|
env?: {
|
|
77
74
|
[variable: string]: string;
|
|
@@ -80,7 +77,7 @@ export declare const runCommand: <Manifest extends T.SDKManifest>() => <A extend
|
|
|
80
77
|
user?: string | undefined;
|
|
81
78
|
onStdout?: ((chunk: Buffer | string | any) => void) | undefined;
|
|
82
79
|
onStderr?: ((chunk: Buffer | string | any) => void) | undefined;
|
|
83
|
-
}) => Promise<CommandController
|
|
80
|
+
}) => Promise<CommandController<Manifest>>;
|
|
84
81
|
/**
|
|
85
82
|
* A class for defining and controlling the service daemons
|
|
86
83
|
```ts
|
|
@@ -107,9 +104,9 @@ Daemons.of({
|
|
|
107
104
|
export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string> implements T.DaemonBuildable {
|
|
108
105
|
readonly effects: T.Effects;
|
|
109
106
|
readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>;
|
|
110
|
-
readonly daemons: Promise<Daemon
|
|
107
|
+
readonly daemons: Promise<Daemon<Manifest>>[];
|
|
111
108
|
readonly ids: Ids[];
|
|
112
|
-
readonly healthDaemons: HealthDaemon[];
|
|
109
|
+
readonly healthDaemons: HealthDaemon<Manifest>[];
|
|
113
110
|
readonly healthChecks: HealthCheck[];
|
|
114
111
|
private constructor();
|
|
115
112
|
/**
|
|
@@ -104,7 +104,6 @@ class Daemons {
|
|
|
104
104
|
const daemonIndex = this.daemons.length;
|
|
105
105
|
const daemon = Daemon_2.Daemon.of()(this.effects, options.subcontainer, options.command, {
|
|
106
106
|
...options,
|
|
107
|
-
mounts: options.mounts.build(),
|
|
108
107
|
subcontainerName: id,
|
|
109
108
|
});
|
|
110
109
|
const healthDaemon = new HealthDaemon_1.HealthDaemon(daemon, daemonIndex, options.requires
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemons.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,yCAAqC;AACrC,uDAAwC;AAExC,mCAAiC;AAAxB,gGAAA,MAAM,OAAA;AACf,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,iDAA6C;AAC7C,qCAAiC;AACjC,2DAAuD;AAG1C,QAAA,MAAM,GAAG,IAAA,qBAAS,EAAC,EAAE,CAAC,IAAI,CAAC,CAAA;AAC3B,QAAA,UAAU,GAAG,IAAA,qBAAS,EAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;AA+DzC,MAAM,UAAU,GAAG,GAAmC,EAAE,CAC7D,qCAAiB,CAAC,EAAE,EAAY,CAAA;AADrB,QAAA,UAAU,cACW;AAElC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,OAAO;IAGlB,YACW,OAAkB,EAClB,OAA+D,EAC/D,
|
|
1
|
+
{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemons.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { HealthCheckResult } from "../health/checkFns";
|
|
2
2
|
import { Ready } from "./Daemons";
|
|
3
3
|
import { Daemon } from "./Daemon";
|
|
4
|
-
import { Effects } from "../../../base/lib/types";
|
|
4
|
+
import { Effects, SDKManifest } from "../../../base/lib/types";
|
|
5
5
|
/**
|
|
6
6
|
* Wanted a structure that deals with controlling daemons by their health status
|
|
7
7
|
* States:
|
|
@@ -9,7 +9,7 @@ import { Effects } from "../../../base/lib/types";
|
|
|
9
9
|
* -- Running: Daemon is running and the status is in the health
|
|
10
10
|
*
|
|
11
11
|
*/
|
|
12
|
-
export declare class HealthDaemon {
|
|
12
|
+
export declare class HealthDaemon<Manifest extends SDKManifest> {
|
|
13
13
|
private readonly daemon;
|
|
14
14
|
readonly daemonIndex: number;
|
|
15
15
|
private readonly dependencies;
|
|
@@ -24,7 +24,7 @@ export declare class HealthDaemon {
|
|
|
24
24
|
private started?;
|
|
25
25
|
private resolveReady;
|
|
26
26
|
private readyPromise;
|
|
27
|
-
constructor(daemon: Promise<Daemon
|
|
27
|
+
constructor(daemon: Promise<Daemon<Manifest>>, daemonIndex: number, dependencies: HealthDaemon<Manifest>[], id: string, ids: string[], ready: Ready, effects: Effects, sigtermTimeout?: number);
|
|
28
28
|
/** Run after we want to do cleanup */
|
|
29
29
|
term(termOptions?: {
|
|
30
30
|
signal?: NodeJS.Signals | undefined;
|
|
@@ -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;IAOvB,YACmB,
|
|
1
|
+
{"version":3,"file":"HealthDaemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/HealthDaemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,10 @@ type MountArray = {
|
|
|
4
4
|
mountpoint: string;
|
|
5
5
|
options: MountOptions;
|
|
6
6
|
}[];
|
|
7
|
-
export declare class Mounts<Manifest extends T.SDKManifest
|
|
7
|
+
export declare class Mounts<Manifest extends T.SDKManifest, Backups extends {
|
|
8
|
+
subpath: string | null;
|
|
9
|
+
mountpoint: string;
|
|
10
|
+
} = never> {
|
|
8
11
|
readonly volumes: {
|
|
9
12
|
id: Manifest["volumes"][number];
|
|
10
13
|
subpath: string | null;
|
|
@@ -22,8 +25,9 @@ export declare class Mounts<Manifest extends T.SDKManifest> {
|
|
|
22
25
|
mountpoint: string;
|
|
23
26
|
readonly: boolean;
|
|
24
27
|
}[];
|
|
28
|
+
readonly backups: Backups[];
|
|
25
29
|
private constructor();
|
|
26
|
-
static of<Manifest extends T.SDKManifest>(): Mounts<Manifest>;
|
|
30
|
+
static of<Manifest extends T.SDKManifest>(): Mounts<Manifest, never>;
|
|
27
31
|
addVolume(
|
|
28
32
|
/** The ID of the volume to mount. Must be one of the volume IDs defined in the manifest */
|
|
29
33
|
id: Manifest["volumes"][number],
|
|
@@ -32,12 +36,12 @@ export declare class Mounts<Manifest extends T.SDKManifest> {
|
|
|
32
36
|
/** Where to mount the volume. e.g. /data */
|
|
33
37
|
mountpoint: string,
|
|
34
38
|
/** Whether or not the volume should be readonly for this daemon */
|
|
35
|
-
readonly: boolean):
|
|
39
|
+
readonly: boolean): Mounts<Manifest, Backups>;
|
|
36
40
|
addAssets(
|
|
37
41
|
/** The path within the asset directory to mount. Use `null` to mount the entire volume */
|
|
38
42
|
subpath: string | null,
|
|
39
43
|
/** Where to mount the asset. e.g. /asset */
|
|
40
|
-
mountpoint: string):
|
|
44
|
+
mountpoint: string): Mounts<Manifest, Backups>;
|
|
41
45
|
addDependency<DependencyManifest extends T.SDKManifest>(
|
|
42
46
|
/** The ID of the dependency service */
|
|
43
47
|
dependencyId: keyof Manifest["dependencies"] & string,
|
|
@@ -48,7 +52,11 @@ export declare class Mounts<Manifest extends T.SDKManifest> {
|
|
|
48
52
|
/** Where to mount the dependency's volume. e.g. /service-id */
|
|
49
53
|
mountpoint: string,
|
|
50
54
|
/** Whether or not the volume should be readonly for this daemon */
|
|
51
|
-
readonly: boolean):
|
|
55
|
+
readonly: boolean): Mounts<Manifest, Backups>;
|
|
56
|
+
addBackups(subpath: string | null, mountpoint: string): Mounts<Manifest, {
|
|
57
|
+
subpath: string | null;
|
|
58
|
+
mountpoint: string;
|
|
59
|
+
}>;
|
|
52
60
|
build(): MountArray;
|
|
53
61
|
}
|
|
54
62
|
export {};
|
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Mounts = void 0;
|
|
4
4
|
class Mounts {
|
|
5
|
-
constructor(volumes, assets, dependencies) {
|
|
5
|
+
constructor(volumes, assets, dependencies, backups) {
|
|
6
6
|
this.volumes = volumes;
|
|
7
7
|
this.assets = assets;
|
|
8
8
|
this.dependencies = dependencies;
|
|
9
|
+
this.backups = backups;
|
|
9
10
|
}
|
|
10
11
|
static of() {
|
|
11
|
-
return new Mounts([], [], []);
|
|
12
|
+
return new Mounts([], [], [], []);
|
|
12
13
|
}
|
|
13
14
|
addVolume(
|
|
14
15
|
/** The ID of the volume to mount. Must be one of the volume IDs defined in the manifest */
|
|
@@ -19,24 +20,28 @@ class Mounts {
|
|
|
19
20
|
mountpoint,
|
|
20
21
|
/** Whether or not the volume should be readonly for this daemon */
|
|
21
22
|
readonly) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
return new Mounts([
|
|
24
|
+
...this.volumes,
|
|
25
|
+
{
|
|
26
|
+
id,
|
|
27
|
+
subpath,
|
|
28
|
+
mountpoint,
|
|
29
|
+
readonly,
|
|
30
|
+
},
|
|
31
|
+
], [...this.assets], [...this.dependencies], [...this.backups]);
|
|
29
32
|
}
|
|
30
33
|
addAssets(
|
|
31
34
|
/** The path within the asset directory to mount. Use `null` to mount the entire volume */
|
|
32
35
|
subpath,
|
|
33
36
|
/** Where to mount the asset. e.g. /asset */
|
|
34
37
|
mountpoint) {
|
|
35
|
-
this.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
return new Mounts([...this.volumes], [
|
|
39
|
+
...this.assets,
|
|
40
|
+
{
|
|
41
|
+
subpath,
|
|
42
|
+
mountpoint,
|
|
43
|
+
},
|
|
44
|
+
], [...this.dependencies], [...this.backups]);
|
|
40
45
|
}
|
|
41
46
|
addDependency(
|
|
42
47
|
/** The ID of the dependency service */
|
|
@@ -49,14 +54,19 @@ class Mounts {
|
|
|
49
54
|
mountpoint,
|
|
50
55
|
/** Whether or not the volume should be readonly for this daemon */
|
|
51
56
|
readonly) {
|
|
52
|
-
this.
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
return new Mounts([...this.volumes], [...this.assets], [
|
|
58
|
+
...this.dependencies,
|
|
59
|
+
{
|
|
60
|
+
dependencyId,
|
|
61
|
+
volumeId,
|
|
62
|
+
subpath,
|
|
63
|
+
mountpoint,
|
|
64
|
+
readonly,
|
|
65
|
+
},
|
|
66
|
+
], [...this.backups]);
|
|
67
|
+
}
|
|
68
|
+
addBackups(subpath, mountpoint) {
|
|
69
|
+
return new Mounts([...this.volumes], [...this.assets], [...this.dependencies], [...this.backups, { subpath, mountpoint }]);
|
|
60
70
|
}
|
|
61
71
|
build() {
|
|
62
72
|
const mountpoints = new Set();
|
|
@@ -99,4 +109,7 @@ class Mounts {
|
|
|
99
109
|
}
|
|
100
110
|
}
|
|
101
111
|
exports.Mounts = Mounts;
|
|
112
|
+
const a = Mounts.of().addBackups(null, "");
|
|
113
|
+
// @ts-expect-error
|
|
114
|
+
const m = a;
|
|
102
115
|
//# sourceMappingURL=Mounts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mounts.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Mounts.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"Mounts.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Mounts.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,10 +33,15 @@ class GetStore {
|
|
|
33
33
|
* Watches the value of Store at the provided path. Returns an async iterator that yields whenever the value changes
|
|
34
34
|
*/
|
|
35
35
|
async *watch() {
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
const resolveCell = { resolve: () => { } };
|
|
37
|
+
this.effects.onLeaveContext(() => {
|
|
38
|
+
resolveCell.resolve();
|
|
39
|
+
});
|
|
40
|
+
while (this.effects.isInContext) {
|
|
41
|
+
let callback = () => { };
|
|
38
42
|
const waitForNext = new Promise((resolve) => {
|
|
39
43
|
callback = resolve;
|
|
44
|
+
resolveCell.resolve = resolve;
|
|
40
45
|
});
|
|
41
46
|
yield await this.effects.store.get({
|
|
42
47
|
...this.options,
|
|
@@ -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":";;;AAqFA,4BASC;AA7FD,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,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAA;QACzC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE;YAC/B,WAAW,CAAC,OAAO,EAAE,CAAA;QACvB,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAChC,IAAI,QAAQ,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;YACnC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;gBAClB,WAAW,CAAC,OAAO,GAAG,OAAO,CAAA;YAC/B,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;AAjFD,4BAiFC;AACD,SAAgB,QAAQ,CACtB,OAAgB,EAChB,IAAoC,EACpC,UAGI,EAAE;IAEN,OAAO,IAAI,QAAQ,CAAoB,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;AAChE,CAAC"}
|