@start9labs/start-sdk 0.3.6-alpha.11 → 0.3.6-alpha.13
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 +6 -1
- package/base/lib/actions/setupActions.js +1 -1
- package/base/lib/actions/setupActions.js.map +1 -1
- package/base/lib/dependencies/setupDependencies.d.ts +1 -8
- package/base/lib/dependencies/setupDependencies.js +1 -9
- package/base/lib/dependencies/setupDependencies.js.map +1 -1
- package/base/lib/osBindings/ActionResultMember.d.ts +13 -0
- package/base/lib/osBindings/ActionResultMember.js +4 -0
- package/base/lib/osBindings/ActionResultMember.js.map +1 -0
- package/base/lib/osBindings/ActionResultV1.d.ts +4 -12
- package/base/lib/osBindings/ActionResultV1.js +0 -1
- package/base/lib/osBindings/ActionResultV1.js.map +1 -1
- package/base/lib/osBindings/ActionResultValue.d.ts +11 -0
- package/base/lib/osBindings/ActionResultValue.js +3 -0
- package/base/lib/osBindings/ActionResultValue.js.map +1 -0
- package/base/lib/osBindings/BuildArg.d.ts +3 -0
- package/base/lib/osBindings/BuildArg.js +4 -0
- package/base/lib/osBindings/BuildArg.js.map +1 -0
- package/base/lib/osBindings/DeviceFilter.d.ts +5 -0
- package/base/lib/osBindings/DeviceFilter.js +4 -0
- package/base/lib/osBindings/DeviceFilter.js.map +1 -0
- package/base/lib/osBindings/GetStatusParams.d.ts +6 -0
- package/base/lib/osBindings/GetStatusParams.js +3 -0
- package/base/lib/osBindings/GetStatusParams.js.map +1 -0
- package/base/lib/osBindings/HardwareRequirements.d.ts +2 -4
- package/base/lib/osBindings/HardwareRequirements.js +0 -1
- package/base/lib/osBindings/HardwareRequirements.js.map +1 -1
- package/base/lib/osBindings/ImageSource.d.ts +4 -0
- package/base/lib/osBindings/ImageSource.js +0 -1
- package/base/lib/osBindings/ImageSource.js.map +1 -1
- package/base/lib/osBindings/LshwDevice.d.ts +7 -0
- package/base/lib/osBindings/LshwDevice.js +3 -0
- package/base/lib/osBindings/LshwDevice.js.map +1 -0
- package/base/lib/osBindings/LshwDisplay.d.ts +3 -0
- package/base/lib/osBindings/LshwDisplay.js +4 -0
- package/base/lib/osBindings/LshwDisplay.js.map +1 -0
- package/base/lib/osBindings/LshwProcessor.d.ts +3 -0
- package/base/lib/osBindings/LshwProcessor.js +4 -0
- package/base/lib/osBindings/LshwProcessor.js.map +1 -0
- package/base/lib/osBindings/ServerInfo.d.ts +5 -1
- package/base/lib/osBindings/SetupResult.d.ts +1 -0
- package/base/lib/osBindings/index.d.ts +8 -0
- package/base/lib/types/ManifestTypes.d.ts +1 -4
- package/package/lib/StartSdk.d.ts +12 -21
- package/package/lib/StartSdk.js +6 -16
- package/package/lib/StartSdk.js.map +1 -1
- package/package/lib/mainFn/CommandController.d.ts +2 -2
- package/package/lib/mainFn/CommandController.js +6 -0
- package/package/lib/mainFn/CommandController.js.map +1 -1
- package/package/lib/mainFn/Daemon.d.ts +2 -2
- package/package/lib/mainFn/Daemons.d.ts +4 -2
- package/package/lib/mainFn/Daemons.js.map +1 -1
- package/package/lib/manifest/setupManifest.d.ts +2 -4
- package/package/lib/manifest/setupManifest.js +1 -1
- package/package/lib/manifest/setupManifest.js.map +1 -1
- package/package/lib/test/output.sdk.d.ts +22 -35
- package/package/lib/util/SubContainer.d.ts +6 -3
- package/package/lib/util/SubContainer.js +6 -12
- package/package/lib/util/SubContainer.js.map +1 -1
- package/package/lib/util/fileHelper.d.ts +12 -3
- package/package/lib/util/fileHelper.js +22 -4
- package/package/lib/util/fileHelper.js.map +1 -1
- package/package.json +2 -2
package/base/lib/Effects.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ActionId, ActionInput, ActionMetadata, SetMainStatus, DependencyRequirement, CheckDependenciesResult, SetHealth, BindParams, HostId, LanInfo, Host, ExportServiceInterfaceParams, ServiceInterface, RequestActionParams } from "./osBindings";
|
|
1
|
+
import { ActionId, ActionInput, ActionMetadata, SetMainStatus, DependencyRequirement, CheckDependenciesResult, SetHealth, BindParams, HostId, LanInfo, Host, ExportServiceInterfaceParams, ServiceInterface, RequestActionParams, MainStatus } from "./osBindings";
|
|
2
2
|
import { StorePath } from "./util/PathBuilder";
|
|
3
3
|
import { PackageId, Dependencies, ServiceInterfaceId, SmtpValue, ActionResult } from "./types";
|
|
4
4
|
import { UrlString } from "./util/getServiceInterface";
|
|
@@ -40,6 +40,11 @@ export type Effects = {
|
|
|
40
40
|
restart(): Promise<null>;
|
|
41
41
|
/** stop this service's main function */
|
|
42
42
|
shutdown(): Promise<null>;
|
|
43
|
+
/** ask the host os what the service's current status is */
|
|
44
|
+
getStatus(options: {
|
|
45
|
+
packageId?: PackageId;
|
|
46
|
+
callback?: () => void;
|
|
47
|
+
}): Promise<MainStatus>;
|
|
43
48
|
/** indicate to the host os what runstate the service is in */
|
|
44
49
|
setMainStatus(options: SetMainStatus): Promise<null>;
|
|
45
50
|
/** Set the dependencies of what the service needs, usually run during the inputSpec action as a best practice */
|
|
@@ -30,7 +30,7 @@ class Action {
|
|
|
30
30
|
return new Action(id, mapMaybeFn(metadata, (m) => ({ ...m, hasInput: true })), inputSpec, getInput, run);
|
|
31
31
|
}
|
|
32
32
|
static withoutInput(id, metadata, run) {
|
|
33
|
-
return new Action(id, mapMaybeFn(metadata, (m) => ({ ...m, hasInput:
|
|
33
|
+
return new Action(id, mapMaybeFn(metadata, (m) => ({ ...m, hasInput: false })), {}, async () => null, run);
|
|
34
34
|
}
|
|
35
35
|
async exportMetadata(options) {
|
|
36
36
|
const metadata = await callMaybeFn(this.metadataFn, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupActions.js","sourceRoot":"","sources":["../../../../base/lib/actions/setupActions.ts"],"names":[],"mappings":";;;AAGA,kCAA8B;AAuB9B,SAAS,WAAW,CAClB,OAAmB,EACnB,OAA+B;IAE/B,IAAI,OAAO,YAAY,QAAQ,EAAE;QAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,CAAA;KACxB;SAAM;QACL,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KAChC;AACH,CAAC;AACD,SAAS,UAAU,CACjB,OAAmB,EACnB,GAAoB;IAEpB,IAAI,OAAO,YAAY,QAAQ,EAAE;QAC/B,OAAO,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;KACtD;SAAM;QACL,OAAO,GAAG,CAAC,OAAO,CAAC,CAAA;KACpB;AACH,CAAC;AAED,MAAa,MAAM;IAUjB,YACW,EAAM,EACE,UAAqC,EACrC,SAAwB,EACxB,UAA0B,EAC1B,KAAgB;QAJxB,OAAE,GAAF,EAAE,CAAI;QACE,eAAU,GAAV,UAAU,CAA2B;QACrC,cAAS,GAAT,SAAS,CAAe;QACxB,eAAU,GAAV,UAAU,CAAgB;QAC1B,UAAK,GAAL,KAAK,CAAW;IAChC,CAAC;IACJ,MAAM,CAAC,SAAS,CAUd,EAAM,EACN,QAAqD,EACrD,SAAwB,EACxB,QAAwB,EACxB,GAAc;QAEd,OAAO,IAAI,MAAM,CACf,EAAE,EACF,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EACvD,SAAS,EACT,QAAQ,EACR,GAAG,CACJ,CAAA;IACH,CAAC;IACD,MAAM,CAAC,YAAY,CACjB,EAAM,EACN,QAAqD,EACrD,GAAY;QAEZ,OAAO,IAAI,MAAM,CACf,EAAE,EACF,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"setupActions.js","sourceRoot":"","sources":["../../../../base/lib/actions/setupActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
import * as T from "../types";
|
|
2
|
-
import { Dependency } from "./Dependency";
|
|
3
2
|
type DependencyType<Manifest extends T.SDKManifest> = {
|
|
4
|
-
[K in keyof
|
|
5
|
-
[K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false ? K : never;
|
|
6
|
-
}]: Dependency;
|
|
7
|
-
} & {
|
|
8
|
-
[K in keyof {
|
|
9
|
-
[K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends true ? K : never;
|
|
10
|
-
}]?: Dependency;
|
|
3
|
+
[K in keyof Manifest["dependencies"]]: Omit<T.DependencyRequirement, "id">;
|
|
11
4
|
};
|
|
12
5
|
export declare function setupDependencies<Manifest extends T.SDKManifest>(fn: (options: {
|
|
13
6
|
effects: T.Effects;
|
|
@@ -13,17 +13,9 @@ function setupDependencies(fn) {
|
|
|
13
13
|
};
|
|
14
14
|
const dependencyType = await fn(options);
|
|
15
15
|
return await options.effects.setDependencies({
|
|
16
|
-
dependencies: Object.entries(dependencyType).map(([id, {
|
|
16
|
+
dependencies: Object.entries(dependencyType).map(([id, { versionRange, ...x }, ,]) => ({
|
|
17
17
|
id,
|
|
18
18
|
...x,
|
|
19
|
-
...(x.type === "running"
|
|
20
|
-
? {
|
|
21
|
-
kind: "running",
|
|
22
|
-
healthChecks: x.healthChecks,
|
|
23
|
-
}
|
|
24
|
-
: {
|
|
25
|
-
kind: "exists",
|
|
26
|
-
}),
|
|
27
19
|
versionRange: versionRange.toString(),
|
|
28
20
|
})),
|
|
29
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;;AACA,kCAA8B;
|
|
1
|
+
{"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;;AACA,kCAA8B;AAM9B,SAAgB,iBAAiB,CAC/B,EAA0E;IAE1E,MAAM,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAyB,EAAE,EAAE,CAAC,IAAI,EAAE,CAAA;IACnE,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE,OAA+B,EAAE,EAAE;QACvD,OAAO,CAAC,OAAO,GAAG;YAChB,GAAG,OAAO,CAAC,OAAO;YAClB,UAAU,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACvB,CAAC,CAAC;SACH,CAAA;QACD,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,CAAA;QACxC,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;YAC3C,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAC9C,CAAC,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE,AAAD,EAAG,EAAE,EAAE,CAClC,CAAC;gBACC,EAAE;gBACF,GAAG,CAAC;gBACJ,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;aACtC,CAA4B,CAChC;SACF,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,OAAO,IAAI,CAAC,OAAO,CAAA;AACrB,CAAC;AAxBD,8CAwBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ActionResultMember.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/ActionResultMember.ts"],"names":[],"mappings":";AAAA,4GAA4G"}
|
|
@@ -1,14 +1,6 @@
|
|
|
1
|
+
import type { ActionResultValue } from "./ActionResultValue";
|
|
1
2
|
export type ActionResultV1 = {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
description: string | null;
|
|
6
|
-
copyable: boolean;
|
|
7
|
-
qr: boolean;
|
|
8
|
-
masked: boolean;
|
|
9
|
-
} | {
|
|
10
|
-
type: "object";
|
|
11
|
-
name: string;
|
|
12
|
-
value: Array<ActionResultV1>;
|
|
13
|
-
description?: string;
|
|
3
|
+
title: string;
|
|
4
|
+
message: string | null;
|
|
5
|
+
result: ActionResultValue | null;
|
|
14
6
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActionResultV1.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/ActionResultV1.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ActionResultV1.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/ActionResultV1.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ActionResultValue.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/ActionResultValue.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BuildArg.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/BuildArg.ts"],"names":[],"mappings":";AAAA,4GAA4G"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DeviceFilter.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/DeviceFilter.ts"],"names":[],"mappings":";AAAA,4GAA4G"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GetStatusParams.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/GetStatusParams.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HardwareRequirements.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/HardwareRequirements.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HardwareRequirements.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/HardwareRequirements.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageSource.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/ImageSource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ImageSource.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/ImageSource.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LshwDevice.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/LshwDevice.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LshwDisplay.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/LshwDisplay.ts"],"names":[],"mappings":";AAAA,4GAA4G"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LshwProcessor.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/LshwProcessor.ts"],"names":[],"mappings":";AAAA,4GAA4G"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Governor } from "./Governor";
|
|
2
2
|
import type { IpInfo } from "./IpInfo";
|
|
3
|
+
import type { LshwDevice } from "./LshwDevice";
|
|
3
4
|
import type { ServerStatus } from "./ServerStatus";
|
|
4
5
|
import type { SmtpValue } from "./SmtpValue";
|
|
5
6
|
import type { WifiInfo } from "./WifiInfo";
|
|
@@ -9,8 +10,9 @@ export type ServerInfo = {
|
|
|
9
10
|
id: string;
|
|
10
11
|
hostname: string;
|
|
11
12
|
version: string;
|
|
13
|
+
packageVersionCompat: string;
|
|
14
|
+
postInitMigrationTodos: string[];
|
|
12
15
|
lastBackup: string | null;
|
|
13
|
-
eosVersionCompat: string;
|
|
14
16
|
lanAddress: string;
|
|
15
17
|
onionAddress: string;
|
|
16
18
|
/**
|
|
@@ -30,4 +32,6 @@ export type ServerInfo = {
|
|
|
30
32
|
zram: boolean;
|
|
31
33
|
governor: Governor | null;
|
|
32
34
|
smtp: SmtpValue | null;
|
|
35
|
+
ram: number;
|
|
36
|
+
devices: Array<LshwDevice>;
|
|
33
37
|
};
|
|
@@ -7,9 +7,11 @@ export { ActionRequestEntry } from "./ActionRequestEntry";
|
|
|
7
7
|
export { ActionRequestInput } from "./ActionRequestInput";
|
|
8
8
|
export { ActionRequestTrigger } from "./ActionRequestTrigger";
|
|
9
9
|
export { ActionRequest } from "./ActionRequest";
|
|
10
|
+
export { ActionResultMember } from "./ActionResultMember";
|
|
10
11
|
export { ActionResult } from "./ActionResult";
|
|
11
12
|
export { ActionResultV0 } from "./ActionResultV0";
|
|
12
13
|
export { ActionResultV1 } from "./ActionResultV1";
|
|
14
|
+
export { ActionResultValue } from "./ActionResultValue";
|
|
13
15
|
export { ActionSeverity } from "./ActionSeverity";
|
|
14
16
|
export { ActionVisibility } from "./ActionVisibility";
|
|
15
17
|
export { AddAdminParams } from "./AddAdminParams";
|
|
@@ -37,6 +39,7 @@ export { BindOptions } from "./BindOptions";
|
|
|
37
39
|
export { BindParams } from "./BindParams";
|
|
38
40
|
export { Blake3Commitment } from "./Blake3Commitment";
|
|
39
41
|
export { BlockDev } from "./BlockDev";
|
|
42
|
+
export { BuildArg } from "./BuildArg";
|
|
40
43
|
export { CallbackId } from "./CallbackId";
|
|
41
44
|
export { Category } from "./Category";
|
|
42
45
|
export { CheckDependenciesParam } from "./CheckDependenciesParam";
|
|
@@ -59,6 +62,7 @@ export { DependencyRequirement } from "./DependencyRequirement";
|
|
|
59
62
|
export { DepInfo } from "./DepInfo";
|
|
60
63
|
export { Description } from "./Description";
|
|
61
64
|
export { DestroySubcontainerFsParams } from "./DestroySubcontainerFsParams";
|
|
65
|
+
export { DeviceFilter } from "./DeviceFilter";
|
|
62
66
|
export { Duration } from "./Duration";
|
|
63
67
|
export { EchoParams } from "./EchoParams";
|
|
64
68
|
export { EncryptedWire } from "./EncryptedWire";
|
|
@@ -79,6 +83,7 @@ export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams";
|
|
|
79
83
|
export { GetServicePortForwardParams } from "./GetServicePortForwardParams";
|
|
80
84
|
export { GetSslCertificateParams } from "./GetSslCertificateParams";
|
|
81
85
|
export { GetSslKeyParams } from "./GetSslKeyParams";
|
|
86
|
+
export { GetStatusParams } from "./GetStatusParams";
|
|
82
87
|
export { GetStoreParams } from "./GetStoreParams";
|
|
83
88
|
export { GetSystemSmtpParams } from "./GetSystemSmtpParams";
|
|
84
89
|
export { Governor } from "./Governor";
|
|
@@ -107,6 +112,9 @@ export { LanInfo } from "./LanInfo";
|
|
|
107
112
|
export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams";
|
|
108
113
|
export { ListVersionSignersParams } from "./ListVersionSignersParams";
|
|
109
114
|
export { LoginParams } from "./LoginParams";
|
|
115
|
+
export { LshwDevice } from "./LshwDevice";
|
|
116
|
+
export { LshwDisplay } from "./LshwDisplay";
|
|
117
|
+
export { LshwProcessor } from "./LshwProcessor";
|
|
110
118
|
export { MainStatus } from "./MainStatus";
|
|
111
119
|
export { Manifest } from "./Manifest";
|
|
112
120
|
export { MaybeUtf8String } from "./MaybeUtf8String";
|
|
@@ -142,10 +142,7 @@ export type SDKManifest = {
|
|
|
142
142
|
* ```
|
|
143
143
|
*/
|
|
144
144
|
readonly hardwareRequirements?: {
|
|
145
|
-
readonly device?:
|
|
146
|
-
display?: RegExp;
|
|
147
|
-
processor?: RegExp;
|
|
148
|
-
};
|
|
145
|
+
readonly device?: T.DeviceFilter[];
|
|
149
146
|
readonly ram?: number | null;
|
|
150
147
|
readonly arch?: string[] | null;
|
|
151
148
|
};
|
|
@@ -22,7 +22,6 @@ import { GetSystemSmtp } from "./util";
|
|
|
22
22
|
import { nullIfEmpty } from "./util";
|
|
23
23
|
import { CommandOptions, MountOptions, SubContainer } from "./util/SubContainer";
|
|
24
24
|
import { Mounts } from "./mainFn/Mounts";
|
|
25
|
-
import { Dependency } from "../../base/lib/dependencies/Dependency";
|
|
26
25
|
import * as T from "../../base/lib/types";
|
|
27
26
|
import { PathBuilder } from "../../base/lib/util/PathBuilder";
|
|
28
27
|
import { CheckDependencies } from "../../base/lib/dependencies/dependencies";
|
|
@@ -223,16 +222,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
223
222
|
getSystemSmtp: <E_7 extends Effects>(effects: E_7) => GetSystemSmtp;
|
|
224
223
|
getSslCerificate: <E_8 extends Effects>(effects: E_8, hostnames: string[], algorithm?: T.Algorithm) => GetSslCertificate;
|
|
225
224
|
HealthCheck: {
|
|
226
|
-
of(o: HealthCheckParams): HealthReceipt;
|
|
227
|
-
};
|
|
228
|
-
Dependency: {
|
|
229
|
-
/**
|
|
230
|
-
* @description Use this function to create a dependency for the service.
|
|
231
|
-
* @property {DependencyType} type
|
|
232
|
-
* @property {VersionRange} versionRange
|
|
233
|
-
* @property {string[]} healthChecks
|
|
234
|
-
*/
|
|
235
|
-
of(data: Dependency["data"]): Dependency;
|
|
225
|
+
of(effects: T.Effects, o: Omit<HealthCheckParams, "effects">): HealthReceipt;
|
|
236
226
|
};
|
|
237
227
|
healthCheck: {
|
|
238
228
|
checkPortListening: typeof checkPortListening;
|
|
@@ -330,7 +320,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
330
320
|
*/
|
|
331
321
|
setupDependencies: (fn: (options: {
|
|
332
322
|
effects: Effects;
|
|
333
|
-
}) => Promise<
|
|
323
|
+
}) => Promise<Manifest["dependencies"] extends infer T_2 ? { [K in keyof T_2]: Omit<T.DependencyRequirement, "id">; } : never>) => (options: {
|
|
334
324
|
effects: Effects;
|
|
335
325
|
}) => Promise<null>;
|
|
336
326
|
setupInit: (versions: VersionGraph<string>, install: Install<Manifest, Store>, uninstall: Uninstall<Manifest, Store>, setServiceInterfaces: UpdateServiceInterfaces<any>, setDependencies: (options: {
|
|
@@ -488,14 +478,10 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
488
478
|
})
|
|
489
479
|
* ```
|
|
490
480
|
*/
|
|
491
|
-
of: <Spec extends Record<string, Value<any, never> | Value<any, Store>>>(spec: Spec) => InputSpec<{ [
|
|
481
|
+
of: <Spec extends Record<string, Value<any, never> | Value<any, Store>>>(spec: Spec) => InputSpec<{ [K_1 in keyof Spec]: Spec[K_1] extends Value<infer T_3, never> | Value<infer T_3, Store> ? T_3 : never; }, Store>;
|
|
492
482
|
};
|
|
493
483
|
Daemons: {
|
|
494
|
-
of(
|
|
495
|
-
effects: Effects;
|
|
496
|
-
started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>;
|
|
497
|
-
healthReceipts: HealthReceipt[];
|
|
498
|
-
}): Daemons<Manifest, never>;
|
|
484
|
+
of(effects: Effects, started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>, healthReceipts: HealthReceipt[]): Daemons<Manifest, never>;
|
|
499
485
|
};
|
|
500
486
|
List: {
|
|
501
487
|
/**
|
|
@@ -881,6 +867,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
881
867
|
* ```
|
|
882
868
|
*/
|
|
883
869
|
list: typeof Value.list;
|
|
870
|
+
hidden: typeof Value.hidden;
|
|
884
871
|
dynamicToggle: (a: LazyBuild<Store, {
|
|
885
872
|
name: string;
|
|
886
873
|
description?: string | null;
|
|
@@ -1121,13 +1108,17 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
1121
1108
|
name: string;
|
|
1122
1109
|
spec: InputSpec<any, Store>;
|
|
1123
1110
|
};
|
|
1124
|
-
}>(a: VariantValues) => Variants<{ [
|
|
1125
|
-
selection:
|
|
1126
|
-
value: VariantValues[
|
|
1111
|
+
}>(a: VariantValues) => Variants<{ [K_2 in keyof VariantValues]: {
|
|
1112
|
+
selection: K_2;
|
|
1113
|
+
value: VariantValues[K_2]["spec"] extends InputSpec<infer B extends Record<string, any>, never> | InputSpec<infer B extends Record<string, any>, Store> ? B : never;
|
|
1127
1114
|
}; }[keyof VariantValues], Store>;
|
|
1128
1115
|
};
|
|
1129
1116
|
restart: (effects: Effects) => Promise<null>;
|
|
1130
1117
|
shutdown: (effects: Effects) => Promise<null>;
|
|
1118
|
+
getStatus: (effects: Effects, options: {
|
|
1119
|
+
packageId?: string | undefined;
|
|
1120
|
+
callback?: (() => void) | undefined;
|
|
1121
|
+
}) => Promise<T.MainStatus>;
|
|
1131
1122
|
setDependencies: (effects: Effects, options: {
|
|
1132
1123
|
dependencies: T.Dependencies;
|
|
1133
1124
|
}) => Promise<null>;
|
package/package/lib/StartSdk.js
CHANGED
|
@@ -53,7 +53,6 @@ const getStore_1 = require("./store/getStore");
|
|
|
53
53
|
const SubContainer_1 = require("./util/SubContainer");
|
|
54
54
|
const util_4 = require("./util");
|
|
55
55
|
const Mounts_1 = require("./mainFn/Mounts");
|
|
56
|
-
const Dependency_1 = require("../../base/lib/dependencies/Dependency");
|
|
57
56
|
const setupDependencies_1 = require("../../base/lib/dependencies/setupDependencies");
|
|
58
57
|
const exver_1 = require("../../base/lib/exver");
|
|
59
58
|
const PathBuilder_1 = require("../../base/lib/util/PathBuilder");
|
|
@@ -91,6 +90,7 @@ class StartSdk {
|
|
|
91
90
|
getDataVersion: (effects, ...args) => effects.getDataVersion(...args),
|
|
92
91
|
shutdown: (effects, ...args) => effects.shutdown(...args),
|
|
93
92
|
getDependencies: (effects, ...args) => effects.getDependencies(...args),
|
|
93
|
+
getStatus: (effects, ...args) => effects.getStatus(...args),
|
|
94
94
|
};
|
|
95
95
|
return {
|
|
96
96
|
...startSdkEffectWrapper,
|
|
@@ -235,19 +235,8 @@ class StartSdk {
|
|
|
235
235
|
getSystemSmtp: (effects) => new util_1.GetSystemSmtp(effects),
|
|
236
236
|
getSslCerificate: (effects, hostnames, algorithm) => new util_5.GetSslCertificate(effects, hostnames, algorithm),
|
|
237
237
|
HealthCheck: {
|
|
238
|
-
of(o) {
|
|
239
|
-
return (0, HealthCheck_1.healthCheck)(o);
|
|
240
|
-
},
|
|
241
|
-
},
|
|
242
|
-
Dependency: {
|
|
243
|
-
/**
|
|
244
|
-
* @description Use this function to create a dependency for the service.
|
|
245
|
-
* @property {DependencyType} type
|
|
246
|
-
* @property {VersionRange} versionRange
|
|
247
|
-
* @property {string[]} healthChecks
|
|
248
|
-
*/
|
|
249
|
-
of(data) {
|
|
250
|
-
return new Dependency_1.Dependency({ ...data });
|
|
238
|
+
of(effects, o) {
|
|
239
|
+
return (0, HealthCheck_1.healthCheck)({ effects, ...o });
|
|
251
240
|
},
|
|
252
241
|
},
|
|
253
242
|
healthCheck: {
|
|
@@ -479,8 +468,8 @@ class StartSdk {
|
|
|
479
468
|
of: (spec) => inputSpec_1.InputSpec.of(spec),
|
|
480
469
|
},
|
|
481
470
|
Daemons: {
|
|
482
|
-
of(
|
|
483
|
-
return Daemons_1.Daemons.of(
|
|
471
|
+
of(effects, started, healthReceipts) {
|
|
472
|
+
return Daemons_1.Daemons.of({ effects, started, healthReceipts });
|
|
484
473
|
},
|
|
485
474
|
},
|
|
486
475
|
List: {
|
|
@@ -784,6 +773,7 @@ class StartSdk {
|
|
|
784
773
|
* ```
|
|
785
774
|
*/
|
|
786
775
|
list: value_1.Value.list,
|
|
776
|
+
hidden: value_1.Value.hidden,
|
|
787
777
|
dynamicToggle: (a) => value_1.Value.dynamicToggle(a),
|
|
788
778
|
dynamicText: (getA) => value_1.Value.dynamicText(getA),
|
|
789
779
|
dynamicTextarea: (getA) => value_1.Value.dynamicTextarea(getA),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAGmD;AACnD,8EAIuD;AAUvD,4EAAwE;AACxE,sEAAqE;AASrE,uEAAwD;AACxD,8CAAsD;AACtD,wFAA+E;AAC/E,8CAA0C;AAC1C,sDAAqE;AACrE,6EAAyE;AACzE,gDAAgE;AAChE,oEAAgE;AAChE,uDAAyD;AACzD,wDAAwE;AACxE,2DAA+E;AAC/E,qCAAoC;AACpC,6DAAyD;AACzD,uCAAiE;AACjE,+EAIkD;AAClD,6DAAyD;AACzD,yDAAkE;AAClE,+FAA2F;AAC3F,iCAAsC;AACtC,iCAAoC;AACpC,iCAAkE;AAClE,+CAA2C;AAC3C,sDAAgF;AAChF,iCAAqC;AACrC,4CAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,8 @@ export declare class CommandController {
|
|
|
25
25
|
} | undefined;
|
|
26
26
|
cwd?: string | undefined;
|
|
27
27
|
user?: string | undefined;
|
|
28
|
-
onStdout?: ((
|
|
29
|
-
onStderr?: ((
|
|
28
|
+
onStdout?: ((chunk: Buffer | string | any) => void) | undefined;
|
|
29
|
+
onStderr?: ((chunk: Buffer | string | any) => void) | undefined;
|
|
30
30
|
}) => Promise<CommandController>;
|
|
31
31
|
get subContainerHandle(): SubContainerHandle;
|
|
32
32
|
wait({ timeout }?: {
|
|
@@ -15,6 +15,7 @@ class CommandController {
|
|
|
15
15
|
}
|
|
16
16
|
static of() {
|
|
17
17
|
return async (effects, subcontainer, command, options) => {
|
|
18
|
+
var _a, _b;
|
|
18
19
|
const commands = (0, util_1.splitCommand)(command);
|
|
19
20
|
const subc = subcontainer instanceof SubContainer_1.SubContainer
|
|
20
21
|
? subcontainer
|
|
@@ -34,8 +35,13 @@ class CommandController {
|
|
|
34
35
|
else {
|
|
35
36
|
childProcess = await subc.spawn(commands, {
|
|
36
37
|
env: options.env,
|
|
38
|
+
stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
|
|
37
39
|
});
|
|
38
40
|
}
|
|
41
|
+
if (options.onStdout)
|
|
42
|
+
(_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", options.onStdout);
|
|
43
|
+
if (options.onStderr)
|
|
44
|
+
(_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", options.onStderr);
|
|
39
45
|
const state = { exited: false };
|
|
40
46
|
const answer = new Promise((resolve, reject) => {
|
|
41
47
|
childProcess.on("exit", (code) => {
|