@start9labs/start-sdk 0.4.0-beta.34 → 0.4.0-beta.36
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/osBindings/Manifest.d.ts +1 -1
- package/base/lib/osBindings/PackageVersionInfo.d.ts +2 -0
- package/base/lib/s9pk/index.js +1 -1
- package/base/lib/s9pk/index.js.map +1 -1
- package/base/lib/util/Drop.d.ts +47 -0
- package/base/lib/util/Drop.js +130 -0
- package/base/lib/util/Drop.js.map +1 -0
- package/base/lib/util/GetSystemSmtp.d.ts +7 -2
- package/base/lib/util/GetSystemSmtp.js +28 -27
- package/base/lib/util/GetSystemSmtp.js.map +1 -1
- package/base/lib/util/getServiceInterface.d.ts +7 -2
- package/base/lib/util/getServiceInterface.js +28 -31
- package/base/lib/util/getServiceInterface.js.map +1 -1
- package/base/lib/util/getServiceInterfaces.d.ts +7 -2
- package/base/lib/util/getServiceInterfaces.js +28 -30
- package/base/lib/util/getServiceInterfaces.js.map +1 -1
- package/package/lib/StartSdk.d.ts +7 -2
- package/package/lib/StartSdk.js +16 -5
- package/package/lib/StartSdk.js.map +1 -1
- package/package/lib/mainFn/CommandController.js +1 -1
- package/package/lib/mainFn/CommandController.js.map +1 -1
- package/package/lib/mainFn/Daemon.js +18 -7
- package/package/lib/mainFn/Daemon.js.map +1 -1
- package/package/lib/mainFn/Daemons.d.ts +1 -1
- package/package/lib/mainFn/Daemons.js +4 -0
- package/package/lib/mainFn/Daemons.js.map +1 -1
- package/package/lib/manifest/setupManifest.js +1 -0
- package/package/lib/manifest/setupManifest.js.map +1 -1
- package/package/lib/test/output.sdk.d.ts +6 -2
- package/package/lib/util/GetSslCertificate.d.ts +7 -2
- package/package/lib/util/GetSslCertificate.js +28 -29
- package/package/lib/util/GetSslCertificate.js.map +1 -1
- package/package/lib/util/SubContainer.d.ts +1 -1
- package/package/lib/util/SubContainer.js +1 -1
- package/package/lib/util/SubContainer.js.map +1 -1
- package/package/lib/util/fileHelper.d.ts +6 -2
- package/package/lib/util/fileHelper.js +89 -47
- package/package/lib/util/fileHelper.js.map +1 -1
- package/package/lib/util/index.d.ts +1 -1
- package/package/lib/util/index.js +1 -1
- package/package/lib/util/index.js.map +1 -1
- package/package/package.json +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GetServiceInterfaces = void 0;
|
|
4
4
|
exports.getServiceInterfaces = getServiceInterfaces;
|
|
5
|
+
const Drop_1 = require("./Drop");
|
|
5
6
|
const getServiceInterface_1 = require("./getServiceInterface");
|
|
6
7
|
const makeManyInterfaceFilled = async ({ effects, packageId, callback, }) => {
|
|
7
8
|
const serviceInterfaceValues = await effects.listServiceInterfaces({
|
|
@@ -56,16 +57,14 @@ class GetServiceInterfaces {
|
|
|
56
57
|
});
|
|
57
58
|
return interfaceFilled;
|
|
58
59
|
}
|
|
59
|
-
|
|
60
|
-
* Watches the service interfaces for the package. Returns an async iterator that yields whenever the value changes
|
|
61
|
-
*/
|
|
62
|
-
async *watch() {
|
|
60
|
+
async *watchGen(abort) {
|
|
63
61
|
const { packageId } = this.opts;
|
|
64
62
|
const resolveCell = { resolve: () => { } };
|
|
65
63
|
this.effects.onLeaveContext(() => {
|
|
66
64
|
resolveCell.resolve();
|
|
67
65
|
});
|
|
68
|
-
|
|
66
|
+
abort?.addEventListener("abort", () => resolveCell.resolve());
|
|
67
|
+
while (this.effects.isInContext && !abort?.aborted) {
|
|
69
68
|
let callback = () => { };
|
|
70
69
|
const waitForNext = new Promise((resolve) => {
|
|
71
70
|
callback = resolve;
|
|
@@ -79,15 +78,28 @@ class GetServiceInterfaces {
|
|
|
79
78
|
await waitForNext;
|
|
80
79
|
}
|
|
81
80
|
}
|
|
81
|
+
/**
|
|
82
|
+
* Watches the service interfaces for the package. Returns an async iterator that yields whenever the value changes
|
|
83
|
+
*/
|
|
84
|
+
watch(abort) {
|
|
85
|
+
const ctrl = new AbortController();
|
|
86
|
+
abort?.addEventListener("abort", () => ctrl.abort());
|
|
87
|
+
return Drop_1.DropGenerator.of(this.watchGen(ctrl.signal), () => ctrl.abort());
|
|
88
|
+
}
|
|
82
89
|
/**
|
|
83
90
|
* Watches the service interfaces for the package. Takes a custom callback function to run whenever the value changes
|
|
84
91
|
*/
|
|
85
92
|
onChange(callback) {
|
|
86
93
|
;
|
|
87
94
|
(async () => {
|
|
88
|
-
|
|
95
|
+
const ctrl = new AbortController();
|
|
96
|
+
for await (const value of this.watch(ctrl.signal)) {
|
|
89
97
|
try {
|
|
90
|
-
await callback(value);
|
|
98
|
+
const res = await callback(value);
|
|
99
|
+
if (res.cancel) {
|
|
100
|
+
ctrl.abort();
|
|
101
|
+
break;
|
|
102
|
+
}
|
|
91
103
|
}
|
|
92
104
|
catch (e) {
|
|
93
105
|
console.error("callback function threw an error @ GetServiceInterfaces.onChange", e);
|
|
@@ -100,30 +112,16 @@ class GetServiceInterfaces {
|
|
|
100
112
|
/**
|
|
101
113
|
* Watches the service interfaces for the package. Returns when the predicate is true
|
|
102
114
|
*/
|
|
103
|
-
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
let callback = () => { };
|
|
111
|
-
const waitForNext = new Promise((resolve) => {
|
|
112
|
-
callback = resolve;
|
|
113
|
-
resolveCell.resolve = resolve;
|
|
114
|
-
});
|
|
115
|
-
const res = await makeManyInterfaceFilled({
|
|
116
|
-
effects: this.effects,
|
|
117
|
-
packageId,
|
|
118
|
-
callback,
|
|
119
|
-
});
|
|
120
|
-
if (pred(res)) {
|
|
121
|
-
resolveCell.resolve();
|
|
122
|
-
return res;
|
|
115
|
+
waitFor(pred) {
|
|
116
|
+
const ctrl = new AbortController();
|
|
117
|
+
return Drop_1.DropPromise.of(Promise.resolve().then(async () => {
|
|
118
|
+
for await (const next of this.watchGen(ctrl.signal)) {
|
|
119
|
+
if (pred(next)) {
|
|
120
|
+
return next;
|
|
121
|
+
}
|
|
123
122
|
}
|
|
124
|
-
|
|
125
|
-
}
|
|
126
|
-
return null;
|
|
123
|
+
return null;
|
|
124
|
+
}), () => ctrl.abort());
|
|
127
125
|
}
|
|
128
126
|
}
|
|
129
127
|
exports.GetServiceInterfaces = GetServiceInterfaces;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServiceInterfaces.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getServiceInterfaces.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ import { MaybeFn } from "../../base/lib/actions/setupActions";
|
|
|
24
24
|
import { Run } from "../../base/lib/actions/setupActions";
|
|
25
25
|
import * as actions from "../../base/lib/actions";
|
|
26
26
|
import { setupInit, setupUninit, setupOnInit, setupOnUninit } from "../../base/lib/inits";
|
|
27
|
+
import { DropGenerator } from "../../base/lib/util/Drop";
|
|
27
28
|
export declare const OSVersion: "0.4.0-alpha.9";
|
|
28
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;
|
|
29
30
|
export declare class StartSdk<Manifest extends T.SDKManifest> {
|
|
@@ -59,8 +60,12 @@ export declare class StartSdk<Manifest extends T.SDKManifest> {
|
|
|
59
60
|
getContainerIp: (effects: T.Effects, options?: Omit<Parameters<T.Effects["getContainerIp"]>[0], "callback">) => {
|
|
60
61
|
const: () => Promise<string>;
|
|
61
62
|
once: () => Promise<string>;
|
|
62
|
-
watch: () =>
|
|
63
|
-
onChange: (callback: (value: string | null, error?: Error) =>
|
|
63
|
+
watch: (abort?: AbortSignal) => DropGenerator<string, void, unknown>;
|
|
64
|
+
onChange: (callback: (value: string | null, error?: Error) => {
|
|
65
|
+
cancel: boolean;
|
|
66
|
+
} | Promise<{
|
|
67
|
+
cancel: boolean;
|
|
68
|
+
}>) => void;
|
|
64
69
|
waitFor: (pred: (value: string | null) => boolean) => Promise<string | null>;
|
|
65
70
|
};
|
|
66
71
|
MultiHost: {
|
package/package/lib/StartSdk.js
CHANGED
|
@@ -69,6 +69,7 @@ const version_1 = require("./version");
|
|
|
69
69
|
const actions = __importStar(require("../../base/lib/actions"));
|
|
70
70
|
const fs = __importStar(require("node:fs/promises"));
|
|
71
71
|
const inits_1 = require("../../base/lib/inits");
|
|
72
|
+
const Drop_1 = require("../../base/lib/util/Drop");
|
|
72
73
|
exports.OSVersion = (0, exver_1.testTypeVersion)("0.4.0-alpha.9");
|
|
73
74
|
class StartSdk {
|
|
74
75
|
constructor(manifest) {
|
|
@@ -129,12 +130,13 @@ class StartSdk {
|
|
|
129
130
|
getAll: (effects, opts) => (0, util_3.getServiceInterfaces)(effects, opts),
|
|
130
131
|
},
|
|
131
132
|
getContainerIp: (effects, options = {}) => {
|
|
132
|
-
async function* watch() {
|
|
133
|
+
async function* watch(abort) {
|
|
133
134
|
const resolveCell = { resolve: () => { } };
|
|
134
135
|
effects.onLeaveContext(() => {
|
|
135
136
|
resolveCell.resolve();
|
|
136
137
|
});
|
|
137
|
-
|
|
138
|
+
abort?.addEventListener("abort", () => resolveCell.resolve());
|
|
139
|
+
while (effects.isInContext && !abort?.aborted) {
|
|
138
140
|
let callback = () => { };
|
|
139
141
|
const waitForNext = new Promise((resolve) => {
|
|
140
142
|
callback = resolve;
|
|
@@ -151,13 +153,22 @@ class StartSdk {
|
|
|
151
153
|
(() => effects.constRetry && effects.constRetry()),
|
|
152
154
|
}),
|
|
153
155
|
once: () => effects.getContainerIp(options),
|
|
154
|
-
watch
|
|
156
|
+
watch: (abort) => {
|
|
157
|
+
const ctrl = new AbortController();
|
|
158
|
+
abort?.addEventListener("abort", () => ctrl.abort());
|
|
159
|
+
return Drop_1.DropGenerator.of(watch(ctrl.signal), () => ctrl.abort());
|
|
160
|
+
},
|
|
155
161
|
onChange: (callback) => {
|
|
156
162
|
;
|
|
157
163
|
(async () => {
|
|
158
|
-
|
|
164
|
+
const ctrl = new AbortController();
|
|
165
|
+
for await (const value of watch(ctrl.signal)) {
|
|
159
166
|
try {
|
|
160
|
-
await callback(value);
|
|
167
|
+
const res = await callback(value);
|
|
168
|
+
if (res.cancel) {
|
|
169
|
+
ctrl.abort();
|
|
170
|
+
break;
|
|
171
|
+
}
|
|
161
172
|
}
|
|
162
173
|
catch (e) {
|
|
163
174
|
console.error("callback function threw an error @ getContainerIp.onChange", e);
|
|
@@ -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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"}
|
|
@@ -54,7 +54,7 @@ class CommandController extends util_1.Drop {
|
|
|
54
54
|
if ("fn" in exec) {
|
|
55
55
|
const abort = new AbortController();
|
|
56
56
|
const cell = {
|
|
57
|
-
ctrl: new CommandController(exec.fn(subcontainer, abort).then(async (command) => {
|
|
57
|
+
ctrl: new CommandController(exec.fn(subcontainer, abort.signal).then(async (command) => {
|
|
58
58
|
if (subcontainer && command && !abort.signal.aborted) {
|
|
59
59
|
const newCtrl = (await CommandController.of()(effects, subcontainer, command)).leak();
|
|
60
60
|
Object.assign(cell.ctrl, newCtrl);
|
|
@@ -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;AAGtC,MAAa,iBAGX,SAAQ,WAAI;IACZ,YACW,aAA4B,EAC7B,KAA0B,EACjB,YAAe,EACxB,OAA0C,EACzC,iBAAyB,0BAAuB;QAEzD,KAAK,EAAE,CAAA;QANE,kBAAa,GAAb,aAAa,CAAe;QAC7B,UAAK,GAAL,KAAK,CAAqB;QACjB,iBAAY,GAAZ,YAAY,CAAG;QACxB,YAAO,GAAP,OAAO,CAAmC;QACzC,mBAAc,GAAd,cAAc,CAAkC;IAG3D,CAAC;IACD,MAAM,CAAC,EAAE;QAIP,OAAO,KAAK,EACV,OAAkB,EAClB,YAAe,EACf,IAAoC,EACpC,EAAE;YACF,IAAI,CAAC;gBACH,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;oBACjB,MAAM,KAAK,GAAG,IAAI,eAAe,EAAE,CAAA;oBACnC,MAAM,IAAI,GAA6C;wBACrD,IAAI,EAAE,IAAI,iBAAiB,CACzB,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,11 @@ class Daemon extends util_1.Drop {
|
|
|
30
30
|
if (subcontainer && subcontainer.isOwned())
|
|
31
31
|
subc = subcontainer.rc();
|
|
32
32
|
const startCommand = () => CommandController_1.CommandController.of()(effects, (subc?.rc() ?? null), exec);
|
|
33
|
-
|
|
33
|
+
const res = new Daemon(subc, startCommand);
|
|
34
|
+
effects.onLeaveContext(() => {
|
|
35
|
+
res.stop().catch((e) => console.error((0, asError_1.asError)(e)));
|
|
36
|
+
});
|
|
37
|
+
return res;
|
|
34
38
|
};
|
|
35
39
|
}
|
|
36
40
|
async start() {
|
|
@@ -47,6 +51,11 @@ class Daemon extends util_1.Drop {
|
|
|
47
51
|
.catch((err) => console.error(err));
|
|
48
52
|
try {
|
|
49
53
|
this.commandController = await this.startCommand();
|
|
54
|
+
if (!this.shouldBeRunning) {
|
|
55
|
+
// handles race condition if stopped while starting
|
|
56
|
+
await this.stop();
|
|
57
|
+
break;
|
|
58
|
+
}
|
|
50
59
|
const success = await this.commandController.wait().then((_) => true, (err) => {
|
|
51
60
|
console.error(err);
|
|
52
61
|
return false;
|
|
@@ -81,12 +90,14 @@ class Daemon extends util_1.Drop {
|
|
|
81
90
|
async stop(termOptions) {
|
|
82
91
|
this.shouldBeRunning = false;
|
|
83
92
|
this.exitedSuccess = false;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
93
|
+
if (this.commandController) {
|
|
94
|
+
await this.commandController
|
|
95
|
+
.term({ ...termOptions })
|
|
96
|
+
.catch((e) => console.error((0, asError_1.asError)(e)));
|
|
97
|
+
this.commandController = null;
|
|
98
|
+
this.onExitFns = [];
|
|
99
|
+
await this.subcontainer?.destroy();
|
|
100
|
+
}
|
|
90
101
|
}
|
|
91
102
|
subcontainerRc() {
|
|
92
103
|
return this.subcontainer?.rc() ?? null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AACxD,kCAA8B;AAM9B,2DAAuD;AAIvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAa,MAGX,SAAQ,WAAI;IAKZ,YACU,YAAe,EACf,YAA2D,EAC1D,UAAmB,KAAK;QAEjC,KAAK,EAAE,CAAA;QAJC,iBAAY,GAAZ,YAAY,CAAG;QACf,iBAAY,GAAZ,YAAY,CAA+C;QAC1D,YAAO,GAAP,OAAO,CAAiB;QAP3B,sBAAiB,GAA0C,IAAI,CAAA;QAC/D,oBAAe,GAAG,KAAK,CAAA;QACrB,kBAAa,GAAG,KAAK,CAAA;QACvB,cAAS,GAAmC,EAAE,CAAA;IAOtD,CAAC;IACD,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IACD,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,YAAe,EACf,IAAoC,EACpC,EAAE;YACF,IAAI,IAAI,GAAkC,YAAY,CAAA;YACtD,IAAI,YAAY,IAAI,YAAY,CAAC,OAAO,EAAE;gBAAE,IAAI,GAAG,YAAY,CAAC,EAAE,EAAE,CAAA;YACpE,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,qCAAiB,CAAC,EAAE,EAAe,CACjC,OAAO,EACP,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,IAAI,CAAM,EACzB,IAAI,CACL,CAAA;YACH,
|
|
1
|
+
{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ export type ExecCommandOptions = {
|
|
|
49
49
|
onStderr?: (chunk: Buffer | string | any) => void;
|
|
50
50
|
};
|
|
51
51
|
export type ExecFnOptions<Manifest extends T.SDKManifest, C extends SubContainer<Manifest> | null> = {
|
|
52
|
-
fn: (subcontainer: C, abort:
|
|
52
|
+
fn: (subcontainer: C, abort: AbortSignal) => Promise<C extends null ? null : ExecCommandOptions | null>;
|
|
53
53
|
sigtermTimeout?: number;
|
|
54
54
|
};
|
|
55
55
|
export type DaemonCommandType<Manifest extends T.SDKManifest, C extends SubContainer<Manifest> | null> = ExecFnOptions<Manifest, C> | (C extends null ? never : ExecCommandOptions);
|
|
@@ -44,6 +44,7 @@ const HealthDaemon_1 = require("./HealthDaemon");
|
|
|
44
44
|
const Daemon_2 = require("./Daemon");
|
|
45
45
|
const CommandController_2 = require("./CommandController");
|
|
46
46
|
const Oneshot_1 = require("./Oneshot");
|
|
47
|
+
const util_1 = require("../util");
|
|
47
48
|
exports.cpExec = (0, node_util_1.promisify)(CP.exec);
|
|
48
49
|
exports.cpExecFile = (0, node_util_1.promisify)(CP.execFile);
|
|
49
50
|
const runCommand = () => CommandController_2.CommandController.of();
|
|
@@ -197,6 +198,9 @@ class Daemons {
|
|
|
197
198
|
}
|
|
198
199
|
}
|
|
199
200
|
async build() {
|
|
201
|
+
this.effects.onLeaveContext(() => {
|
|
202
|
+
this.term().catch((e) => console.error((0, util_1.asError)(e)));
|
|
203
|
+
});
|
|
200
204
|
for (const daemon of this.healthDaemons) {
|
|
201
205
|
await daemon.init();
|
|
202
206
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemons.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,yCAAqC;AACrC,uDAAwC;AAExC,mCAAiC;AAAxB,gGAAA,MAAM,OAAA;AACf,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,iDAA6C;AAC7C,qCAAiC;AACjC,2DAAuD;AAEvD,uCAAmC;
|
|
1
|
+
{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemons.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../package/lib/manifest/setupManifest.ts"],"names":[],"mappings":";;AAeA,sCASC;AAED,
|
|
1
|
+
{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../package/lib/manifest/setupManifest.ts"],"names":[],"mappings":";;AAeA,sCASC;AAED,sCAmEC;AAvFD,0CAAuC;AAEvC,qDAA0D;AAE1D;;;;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,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,oBAAS;QAC1C,UAAU,EAAV,sBAAU;QACV,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"}
|
|
@@ -27,8 +27,12 @@ export declare const sdk: {
|
|
|
27
27
|
getContainerIp: (effects: import("../types").Effects, options?: Omit<Parameters<import("../types").Effects["getContainerIp"]>[0], "callback">) => {
|
|
28
28
|
const: () => Promise<string>;
|
|
29
29
|
once: () => Promise<string>;
|
|
30
|
-
watch: () =>
|
|
31
|
-
onChange: (callback: (value: string | null, error?: Error) =>
|
|
30
|
+
watch: (abort?: AbortSignal) => import("../../../base/lib/util/Drop").DropGenerator<string, void, unknown>;
|
|
31
|
+
onChange: (callback: (value: string | null, error?: Error) => {
|
|
32
|
+
cancel: boolean;
|
|
33
|
+
} | Promise<{
|
|
34
|
+
cancel: boolean;
|
|
35
|
+
}>) => void;
|
|
32
36
|
waitFor: (pred: (value: string | null) => boolean) => Promise<string | null>;
|
|
33
37
|
};
|
|
34
38
|
MultiHost: {
|
|
@@ -13,14 +13,19 @@ export declare class GetSslCertificate {
|
|
|
13
13
|
* Returns the an SSL Certificate for the given hostnames if permitted. Does nothing if it changes
|
|
14
14
|
*/
|
|
15
15
|
once(): Promise<[string, string, string]>;
|
|
16
|
+
private watchGen;
|
|
16
17
|
/**
|
|
17
18
|
* Watches the SSL Certificate for the given hostnames if permitted. Returns an async iterator that yields whenever the value changes
|
|
18
19
|
*/
|
|
19
|
-
watch(): AsyncGenerator<[string, string, string], void, unknown>;
|
|
20
|
+
watch(abort?: AbortSignal): AsyncGenerator<[string, string, string], void, unknown>;
|
|
20
21
|
/**
|
|
21
22
|
* Watches the SSL Certificate for the given hostnames if permitted. Takes a custom callback function to run whenever it changes
|
|
22
23
|
*/
|
|
23
|
-
onChange(callback: (value: [string, string, string] | null, error?: Error) =>
|
|
24
|
+
onChange(callback: (value: [string, string, string] | null, error?: Error) => {
|
|
25
|
+
cancel: boolean;
|
|
26
|
+
} | Promise<{
|
|
27
|
+
cancel: boolean;
|
|
28
|
+
}>): void;
|
|
24
29
|
/**
|
|
25
30
|
* Watches the SSL Certificate for the given hostnames if permitted. Returns when the predicate is true
|
|
26
31
|
*/
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GetSslCertificate = void 0;
|
|
4
|
+
const Drop_1 = require("../../../base/lib/util/Drop");
|
|
4
5
|
class GetSslCertificate {
|
|
5
6
|
constructor(effects, hostnames, algorithm) {
|
|
6
7
|
this.effects = effects;
|
|
@@ -27,15 +28,13 @@ class GetSslCertificate {
|
|
|
27
28
|
algorithm: this.algorithm,
|
|
28
29
|
});
|
|
29
30
|
}
|
|
30
|
-
|
|
31
|
-
* Watches the SSL Certificate for the given hostnames if permitted. Returns an async iterator that yields whenever the value changes
|
|
32
|
-
*/
|
|
33
|
-
async *watch() {
|
|
31
|
+
async *watchGen(abort) {
|
|
34
32
|
const resolveCell = { resolve: () => { } };
|
|
35
33
|
this.effects.onLeaveContext(() => {
|
|
36
34
|
resolveCell.resolve();
|
|
37
35
|
});
|
|
38
|
-
|
|
36
|
+
abort?.addEventListener("abort", () => resolveCell.resolve());
|
|
37
|
+
while (this.effects.isInContext && !abort?.aborted) {
|
|
39
38
|
let callback = () => { };
|
|
40
39
|
const waitForNext = new Promise((resolve) => {
|
|
41
40
|
callback = resolve;
|
|
@@ -49,15 +48,28 @@ class GetSslCertificate {
|
|
|
49
48
|
await waitForNext;
|
|
50
49
|
}
|
|
51
50
|
}
|
|
51
|
+
/**
|
|
52
|
+
* Watches the SSL Certificate for the given hostnames if permitted. Returns an async iterator that yields whenever the value changes
|
|
53
|
+
*/
|
|
54
|
+
watch(abort) {
|
|
55
|
+
const ctrl = new AbortController();
|
|
56
|
+
abort?.addEventListener("abort", () => ctrl.abort());
|
|
57
|
+
return Drop_1.DropGenerator.of(this.watchGen(ctrl.signal), () => ctrl.abort());
|
|
58
|
+
}
|
|
52
59
|
/**
|
|
53
60
|
* Watches the SSL Certificate for the given hostnames if permitted. Takes a custom callback function to run whenever it changes
|
|
54
61
|
*/
|
|
55
62
|
onChange(callback) {
|
|
56
63
|
;
|
|
57
64
|
(async () => {
|
|
58
|
-
|
|
65
|
+
const ctrl = new AbortController();
|
|
66
|
+
for await (const value of this.watch(ctrl.signal)) {
|
|
59
67
|
try {
|
|
60
|
-
await callback(value);
|
|
68
|
+
const res = await callback(value);
|
|
69
|
+
if (res.cancel) {
|
|
70
|
+
ctrl.abort();
|
|
71
|
+
break;
|
|
72
|
+
}
|
|
61
73
|
}
|
|
62
74
|
catch (e) {
|
|
63
75
|
console.error("callback function threw an error @ GetSslCertificate.onChange", e);
|
|
@@ -70,29 +82,16 @@ class GetSslCertificate {
|
|
|
70
82
|
/**
|
|
71
83
|
* Watches the SSL Certificate for the given hostnames if permitted. Returns when the predicate is true
|
|
72
84
|
*/
|
|
73
|
-
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const waitForNext = new Promise((resolve) => {
|
|
81
|
-
callback = resolve;
|
|
82
|
-
resolveCell.resolve = resolve;
|
|
83
|
-
});
|
|
84
|
-
const res = await this.effects.getSslCertificate({
|
|
85
|
-
hostnames: this.hostnames,
|
|
86
|
-
algorithm: this.algorithm,
|
|
87
|
-
callback: () => callback(),
|
|
88
|
-
});
|
|
89
|
-
if (pred(res)) {
|
|
90
|
-
resolveCell.resolve();
|
|
91
|
-
return res;
|
|
85
|
+
waitFor(pred) {
|
|
86
|
+
const ctrl = new AbortController();
|
|
87
|
+
return Drop_1.DropPromise.of(Promise.resolve().then(async () => {
|
|
88
|
+
for await (const next of this.watchGen(ctrl.signal)) {
|
|
89
|
+
if (pred(next)) {
|
|
90
|
+
return next;
|
|
91
|
+
}
|
|
92
92
|
}
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
return null;
|
|
93
|
+
return null;
|
|
94
|
+
}), () => ctrl.abort());
|
|
96
95
|
}
|
|
97
96
|
}
|
|
98
97
|
exports.GetSslCertificate = GetSslCertificate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetSslCertificate.js","sourceRoot":"","sources":["../../../../package/lib/util/GetSslCertificate.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"GetSslCertificate.js","sourceRoot":"","sources":["../../../../package/lib/util/GetSslCertificate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as T from "../../../base/lib/types";
|
|
2
2
|
import * as cp from "child_process";
|
|
3
3
|
import { Buffer } from "node:buffer";
|
|
4
|
-
import { Drop } from "
|
|
4
|
+
import { Drop } from "../../../base/lib/util/Drop";
|
|
5
5
|
import { Mounts } from "../mainFn/Mounts";
|
|
6
6
|
import { BackupEffects } from "../backup/Backups";
|
|
7
7
|
export declare const execFile: typeof cp.execFile.__promisify__;
|
|
@@ -39,7 +39,7 @@ const cp = __importStar(require("child_process"));
|
|
|
39
39
|
const util_1 = require("util");
|
|
40
40
|
const node_buffer_1 = require("node:buffer");
|
|
41
41
|
const once_1 = require("../../../base/lib/util/once");
|
|
42
|
-
const Drop_1 = require("
|
|
42
|
+
const Drop_1 = require("../../../base/lib/util/Drop");
|
|
43
43
|
exports.execFile = (0, util_1.promisify)(cp.execFile);
|
|
44
44
|
const False = () => false;
|
|
45
45
|
const TIMES_TO_WAIT_FOR_PROC = 100;
|