@start9labs/start-sdk 0.3.6-beta.2 → 0.3.6-beta.3
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 +0 -7
- package/base/lib/actions/input/builder/inputSpec.js.map +1 -1
- package/base/lib/actions/input/builder/value.d.ts +3 -0
- package/base/lib/actions/input/builder/value.js +2 -0
- package/base/lib/actions/input/builder/value.js.map +1 -1
- package/base/lib/dependencies/setupDependencies.d.ts +1 -1
- package/base/lib/dependencies/setupDependencies.js +3 -1
- package/base/lib/dependencies/setupDependencies.js.map +1 -1
- package/base/lib/interfaces/Origin.js +1 -2
- package/base/lib/interfaces/Origin.js.map +1 -1
- package/base/lib/interfaces/ServiceInterfaceBuilder.d.ts +0 -2
- package/base/lib/interfaces/ServiceInterfaceBuilder.js.map +1 -1
- package/base/lib/osBindings/ExportServiceInterfaceParams.d.ts +0 -1
- package/base/lib/osBindings/IpHostname.d.ts +1 -0
- package/base/lib/osBindings/IpInfo.d.ts +2 -0
- package/base/lib/osBindings/IpInfo.js +0 -1
- package/base/lib/osBindings/IpInfo.js.map +1 -1
- package/base/lib/osBindings/NetworkInterfaceType.d.ts +1 -0
- package/base/lib/osBindings/NetworkInterfaceType.js +4 -0
- package/base/lib/osBindings/NetworkInterfaceType.js.map +1 -0
- package/base/lib/osBindings/ServiceInterface.d.ts +0 -1
- package/base/lib/osBindings/index.d.ts +1 -1
- package/base/lib/types.d.ts +0 -26
- package/base/lib/util/getServiceInterface.d.ts +0 -6
- package/base/lib/util/getServiceInterface.js +3 -12
- package/base/lib/util/getServiceInterface.js.map +1 -1
- package/base/lib/util/getServiceInterfaces.js +0 -13
- package/base/lib/util/getServiceInterfaces.js.map +1 -1
- package/base/lib/util/patterns.js +11 -11
- package/base/lib/util/patterns.js.map +1 -1
- package/package/lib/StartSdk.d.ts +6 -7
- package/package/lib/StartSdk.js +5 -4
- package/package/lib/StartSdk.js.map +1 -1
- package/package/lib/mainFn/CommandController.js +39 -35
- package/package/lib/mainFn/CommandController.js.map +1 -1
- package/package/lib/mainFn/Daemon.js +2 -0
- package/package/lib/mainFn/Daemon.js.map +1 -1
- package/package/lib/mainFn/Daemons.d.ts +7 -11
- package/package/lib/mainFn/Daemons.js +7 -8
- package/package/lib/mainFn/Daemons.js.map +1 -1
- package/package/lib/mainFn/HealthDaemon.d.ts +3 -0
- package/package/lib/mainFn/HealthDaemon.js +8 -0
- package/package/lib/mainFn/HealthDaemon.js.map +1 -1
- package/package/lib/test/host.test.js +0 -1
- package/package/lib/test/host.test.js.map +1 -1
- package/package/lib/test/output.sdk.d.ts +6 -2
- package/package.json +1 -1
package/base/lib/Effects.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ActionId, ActionInput, ActionMetadata, SetMainStatus, DependencyRequirement, CheckDependenciesResult, SetHealth, BindParams, HostId, NetInfo, 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
|
-
import { UrlString } from "./util/getServiceInterface";
|
|
5
4
|
/** Used to reach out from the pure js runtime */
|
|
6
5
|
export type Effects = {
|
|
7
6
|
constRetry: () => void;
|
|
@@ -107,12 +106,6 @@ export type Effects = {
|
|
|
107
106
|
hostId: HostId;
|
|
108
107
|
callback?: () => void;
|
|
109
108
|
}): Promise<Host | null>;
|
|
110
|
-
/** Returns the primary url that a user has selected for a host, if it exists */
|
|
111
|
-
getPrimaryUrl(options: {
|
|
112
|
-
packageId?: PackageId;
|
|
113
|
-
hostId: HostId;
|
|
114
|
-
callback?: () => void;
|
|
115
|
-
}): Promise<UrlString | null>;
|
|
116
109
|
/** Returns the IP address of the container */
|
|
117
110
|
getContainerIp(): Promise<string>;
|
|
118
111
|
/** Creates an interface bound to a specific host and port to show to the user */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inputSpec.js","sourceRoot":"","sources":["../../../../../../base/lib/actions/input/builder/inputSpec.ts"],"names":[],"mappings":";;;AAIA,2CAA2C;AA6B3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,MAAa,SAAS;IACpB,YACmB,IAEhB,EACM,SAAgC;QAHtB,SAAI,GAAJ,IAAI,CAEpB;QACM,cAAS,GAAT,SAAS,CAAuB;
|
|
1
|
+
{"version":3,"file":"inputSpec.js","sourceRoot":"","sources":["../../../../../../base/lib/actions/input/builder/inputSpec.ts"],"names":[],"mappings":";;;AAIA,2CAA2C;AA6B3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,MAAa,SAAS;IACpB,YACmB,IAEhB,EACM,SAAgC;QAHtB,SAAI,GAAJ,IAAI,CAEpB;QACM,cAAS,GAAT,SAAS,CAAuB;QAElC,UAAK,GAAS,IAAmB,CAAA;QACjC,aAAQ,GAAsB,IAAgC,CAAA;IAFlE,CAAC;IAGJ,KAAK,CAAC,KAAK,CAAC,OAAgC;QAC1C,MAAM,MAAM,GAAG,EAEd,CAAA;QACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;YACzB,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAc,CAAC,CAAA;SACrD;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,EAAE,CAGP,IAAU;QACV,MAAM,YAAY,GAAG,EAEpB,CAAA;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAA;SACxC;QACD,MAAM,SAAS,GAAG,IAAA,mBAAM,EAAC,YAAY,CAAC,CAAA;QACtC,OAAO,IAAI,SAAS,CASlB,IAAI,EAAE,SAAgB,CAAC,CAAA;IAC3B,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,SAAS;QACP,OAAO,IAAwC,CAAA;IACjD,CAAC;CACF;AA3DD,8BA2DC"}
|
|
@@ -4,11 +4,14 @@ import { Variants } from "./variants";
|
|
|
4
4
|
import { Pattern, RandomString, ValueSpec, ValueSpecDatetime, ValueSpecText } from "../inputSpecTypes";
|
|
5
5
|
import { DefaultString } from "../inputSpecTypes";
|
|
6
6
|
import { Parser } from "ts-matches";
|
|
7
|
+
import { DeepPartial } from "../../../types";
|
|
7
8
|
type AsRequired<T, Required extends boolean> = Required extends true ? T : T | null;
|
|
8
9
|
export declare class Value<Type, Store> {
|
|
9
10
|
build: LazyBuild<Store, ValueSpec>;
|
|
10
11
|
validator: Parser<unknown, Type>;
|
|
11
12
|
protected constructor(build: LazyBuild<Store, ValueSpec>, validator: Parser<unknown, Type>);
|
|
13
|
+
_TYPE: Type;
|
|
14
|
+
_PARTIAL: DeepPartial<Type>;
|
|
12
15
|
static toggle(a: {
|
|
13
16
|
name: string;
|
|
14
17
|
description?: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value.js","sourceRoot":"","sources":["../../../../../../base/lib/actions/input/builder/value.ts"],"names":[],"mappings":";;;AAcA,wCAAuC;AACvC,2CAYmB;AAOnB,MAAM,uBAAuB,GAAG,IAAA,WAAI,EAClC,GAAG,EAAE,CAAC,IAAA,mBAAM,EAAC,EAAE,QAAQ,EAAE,IAAA,oBAAO,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAC/C,CAAA;AACD,SAAS,gBAAgB,CAIvB,MAA6B,EAAE,KAAY;IAC3C,IAAI,uBAAuB,EAAE,CAAC,KAAK,CAAC;QAAE,OAAO,MAAa,CAAA;IAC1D,OAAO,MAAM,CAAC,QAAQ,EAAS,CAAA;AACjC,CAAC;AAED,MAAa,KAAK;IAChB,YACS,KAAkC,EAClC,SAAgC;QADhC,UAAK,GAAL,KAAK,CAA6B;QAClC,cAAS,GAAT,SAAS,CAAuB;
|
|
1
|
+
{"version":3,"file":"value.js","sourceRoot":"","sources":["../../../../../../base/lib/actions/input/builder/value.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
|
|
|
15
15
|
[K in RequiredDependenciesOf<Manifest>]: DependencyRequirement;
|
|
16
16
|
} & {
|
|
17
17
|
[K in OptionalDependenciesOf<Manifest>]?: DependencyRequirement;
|
|
18
|
-
}
|
|
18
|
+
};
|
|
19
19
|
export declare function setupDependencies<Manifest extends T.SDKManifest>(fn: (options: {
|
|
20
20
|
effects: T.Effects;
|
|
21
21
|
}) => Promise<CurrentDependenciesResult<Manifest>>): (options: {
|
|
@@ -14,7 +14,9 @@ function setupDependencies(fn) {
|
|
|
14
14
|
};
|
|
15
15
|
const dependencyType = await fn(options);
|
|
16
16
|
return await options.effects.setDependencies({
|
|
17
|
-
dependencies: Object.entries(dependencyType)
|
|
17
|
+
dependencies: Object.entries(dependencyType)
|
|
18
|
+
.map(([k, v]) => [k, v])
|
|
19
|
+
.map(([id, { versionRange, ...x }]) => ({
|
|
18
20
|
id,
|
|
19
21
|
...x,
|
|
20
22
|
versionRange: versionRange.toString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;;AACA,kCAA8B;AAuB9B,MAAM,UAAU,GAGZ,IAAI,CAAA;AAQR,SAAgB,iBAAiB,CAC/B,EAEkD;IAElD,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,
|
|
1
|
+
{"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;;AACA,kCAA8B;AAuB9B,MAAM,UAAU,GAGZ,IAAI,CAAA;AAQR,SAAgB,iBAAiB,CAC/B,EAEkD;IAElD,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;iBACzC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAA0B,CAAU,CAAC;iBACzD,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAC/B,CAAC;gBACC,EAAE;gBACF,GAAG,CAAC;gBACJ,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;aACtC,CAA4B,CAChC;SACJ,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,OAAO,IAAI,CAAC,OAAO,CAAA;AACrB,CAAC;AA5BD,8CA4BC"}
|
|
@@ -33,7 +33,7 @@ class Origin {
|
|
|
33
33
|
async export(serviceInterfaces) {
|
|
34
34
|
const addressesInfo = [];
|
|
35
35
|
for (let serviceInterface of serviceInterfaces) {
|
|
36
|
-
const { name, description,
|
|
36
|
+
const { name, description, id, type, username, path, search, schemeOverride, masked, } = serviceInterface.options;
|
|
37
37
|
const addressInfo = this.build({
|
|
38
38
|
username,
|
|
39
39
|
path,
|
|
@@ -44,7 +44,6 @@ class Origin {
|
|
|
44
44
|
id,
|
|
45
45
|
name,
|
|
46
46
|
description,
|
|
47
|
-
hasPrimary,
|
|
48
47
|
addressInfo,
|
|
49
48
|
type,
|
|
50
49
|
masked,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Origin.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,IAAO,EACP,YAAoB,EACpB,MAAqB,EACrB,SAAwB;QAHxB,SAAI,GAAJ,IAAI,CAAG;QACP,iBAAY,GAAZ,YAAY,CAAQ;QACpB,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAe;IAChC,CAAC;IAEJ,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAgB;QAC5D,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACrC,GAAG,CACF,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CACxE;aACA,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAElD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC3D,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS;YAC/D,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,EAAE;YACtB,QAAQ;SACT,CAAA;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CACV,iBAA4C;QAE5C,MAAM,aAAa,GAAG,EAAE,CAAA;QACxB,KAAK,IAAI,gBAAgB,IAAI,iBAAiB,EAAE;YAC9C,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Origin.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,IAAO,EACP,YAAoB,EACpB,MAAqB,EACrB,SAAwB;QAHxB,SAAI,GAAJ,IAAI,CAAG;QACP,iBAAY,GAAZ,YAAY,CAAQ;QACpB,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAe;IAChC,CAAC;IAEJ,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAgB;QAC5D,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACrC,GAAG,CACF,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CACxE;aACA,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAElD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC3D,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS;YAC/D,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,EAAE;YACtB,QAAQ;SACT,CAAA;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CACV,iBAA4C;QAE5C,MAAM,aAAa,GAAG,EAAE,CAAA;QACxB,KAAK,IAAI,gBAAgB,IAAI,iBAAiB,EAAE;YAC9C,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,cAAc,EACd,MAAM,GACP,GAAG,gBAAgB,CAAC,OAAO,CAAA;YAE5B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC7B,QAAQ;gBACR,IAAI;gBACJ,MAAM;gBACN,cAAc;aACf,CAAC,CAAA;YAEF,MAAM,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC;gBAC5D,EAAE;gBACF,IAAI;gBACJ,WAAW;gBACX,WAAW;gBACX,IAAI;gBACJ,MAAM;aACP,CAAC,CAAA;YAEF,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;SAChC;QAED,OAAO,aAA+C,CAAA;IACxD,CAAC;CACF;AAzED,wBAyEC"}
|
|
@@ -18,7 +18,6 @@ export declare class ServiceInterfaceBuilder {
|
|
|
18
18
|
name: string;
|
|
19
19
|
id: string;
|
|
20
20
|
description: string;
|
|
21
|
-
hasPrimary: boolean;
|
|
22
21
|
type: ServiceInterfaceType;
|
|
23
22
|
username: string | null;
|
|
24
23
|
path: string;
|
|
@@ -34,7 +33,6 @@ export declare class ServiceInterfaceBuilder {
|
|
|
34
33
|
name: string;
|
|
35
34
|
id: string;
|
|
36
35
|
description: string;
|
|
37
|
-
hasPrimary: boolean;
|
|
38
36
|
type: ServiceInterfaceType;
|
|
39
37
|
username: string | null;
|
|
40
38
|
path: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceInterfaceBuilder.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/ServiceInterfaceBuilder.ts"],"names":[],"mappings":";;;AAIA;;;;;;;;;;GAUG;AACH,MAAa,uBAAuB;IAClC,YACW,
|
|
1
|
+
{"version":3,"file":"ServiceInterfaceBuilder.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/ServiceInterfaceBuilder.ts"],"names":[],"mappings":";;;AAIA;;;;;;;;;;GAUG;AACH,MAAa,uBAAuB;IAClC,YACW,OAWR;QAXQ,YAAO,GAAP,OAAO,CAWf;IACA,CAAC;CACL;AAfD,0DAeC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IpInfo.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/IpInfo.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"IpInfo.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/IpInfo.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type NetworkInterfaceType = "ethernet" | "wireless" | "wireguard";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NetworkInterfaceType.js","sourceRoot":"","sources":["../../../../base/lib/osBindings/NetworkInterfaceType.ts"],"names":[],"mappings":";AAAA,4GAA4G"}
|
|
@@ -85,7 +85,6 @@ export { GetOsVersionParams } from "./GetOsVersionParams";
|
|
|
85
85
|
export { GetPackageParams } from "./GetPackageParams";
|
|
86
86
|
export { GetPackageResponseFull } from "./GetPackageResponseFull";
|
|
87
87
|
export { GetPackageResponse } from "./GetPackageResponse";
|
|
88
|
-
export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams";
|
|
89
88
|
export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams";
|
|
90
89
|
export { GetServicePortForwardParams } from "./GetServicePortForwardParams";
|
|
91
90
|
export { GetSslCertificateParams } from "./GetSslCertificateParams";
|
|
@@ -132,6 +131,7 @@ export { NamedHealthCheckResult } from "./NamedHealthCheckResult";
|
|
|
132
131
|
export { NamedProgress } from "./NamedProgress";
|
|
133
132
|
export { NetInfo } from "./NetInfo";
|
|
134
133
|
export { NetworkInterfaceInfo } from "./NetworkInterfaceInfo";
|
|
134
|
+
export { NetworkInterfaceType } from "./NetworkInterfaceType";
|
|
135
135
|
export { OnionHostname } from "./OnionHostname";
|
|
136
136
|
export { OsIndex } from "./OsIndex";
|
|
137
137
|
export { OsVersionInfoMap } from "./OsVersionInfoMap";
|
package/base/lib/types.d.ts
CHANGED
|
@@ -118,32 +118,6 @@ export declare const hostName: unique symbol;
|
|
|
118
118
|
export type Hostname = string & {
|
|
119
119
|
[hostName]: never;
|
|
120
120
|
};
|
|
121
|
-
export type HostnameInfoIp = {
|
|
122
|
-
kind: "ip";
|
|
123
|
-
networkInterfaceId: string;
|
|
124
|
-
public: boolean;
|
|
125
|
-
hostname: {
|
|
126
|
-
kind: "ipv4" | "ipv6" | "local";
|
|
127
|
-
value: string;
|
|
128
|
-
port: number | null;
|
|
129
|
-
sslPort: number | null;
|
|
130
|
-
} | {
|
|
131
|
-
kind: "domain";
|
|
132
|
-
domain: string;
|
|
133
|
-
subdomain: string | null;
|
|
134
|
-
port: number | null;
|
|
135
|
-
sslPort: number | null;
|
|
136
|
-
};
|
|
137
|
-
};
|
|
138
|
-
export type HostnameInfoOnion = {
|
|
139
|
-
kind: "onion";
|
|
140
|
-
hostname: {
|
|
141
|
-
value: string;
|
|
142
|
-
port: number | null;
|
|
143
|
-
sslPort: number | null;
|
|
144
|
-
};
|
|
145
|
-
};
|
|
146
|
-
export type HostnameInfo = HostnameInfoIp | HostnameInfoOnion;
|
|
147
121
|
export type ServiceInterfaceId = string;
|
|
148
122
|
export { ServiceInterface };
|
|
149
123
|
export type ExposeServicePaths<Store = never> = {
|
|
@@ -27,8 +27,6 @@ export type ServiceInterfaceFilled = {
|
|
|
27
27
|
name: string;
|
|
28
28
|
/** Human readable description, used as tooltip usually */
|
|
29
29
|
description: string;
|
|
30
|
-
/** Whether or not the interface has a primary URL */
|
|
31
|
-
hasPrimary: boolean;
|
|
32
30
|
/** Whether or not to mask the URIs for this interface. Useful if the URIs contain sensitive information, such as a password, macaroon, or API key */
|
|
33
31
|
masked: boolean;
|
|
34
32
|
/** Information about the host for this binding */
|
|
@@ -37,10 +35,6 @@ export type ServiceInterfaceFilled = {
|
|
|
37
35
|
addressInfo: FilledAddressInfo | null;
|
|
38
36
|
/** Indicates if we are a ui/p2p/api for the kind of interface that this is representing */
|
|
39
37
|
type: ServiceInterfaceType;
|
|
40
|
-
/** The primary hostname for the service, as chosen by the user */
|
|
41
|
-
primaryHostname: Hostname | null;
|
|
42
|
-
/** The primary URL for the service, as chosen by the user */
|
|
43
|
-
primaryUrl: UrlString | null;
|
|
44
38
|
};
|
|
45
39
|
export declare const addressHostToUrl: ({ scheme, sslScheme, username, suffix }: AddressInfo, host: HostnameInfo) => UrlString[];
|
|
46
40
|
export declare const filledAddress: (host: Host, addressInfo: AddressInfo) => FilledAddressInfo;
|
|
@@ -31,7 +31,9 @@ const addressHostToUrl = ({ scheme, sslScheme, username, suffix }, host) => {
|
|
|
31
31
|
hostname = `${host.hostname.subdomain ? `${host.hostname.subdomain}.` : ""}${host.hostname.domain}`;
|
|
32
32
|
}
|
|
33
33
|
else if (host.hostname.kind === "ipv6") {
|
|
34
|
-
hostname =
|
|
34
|
+
hostname = host.hostname.value.startsWith("fe80::")
|
|
35
|
+
? `[${host.hostname.value}%${host.hostname.scopeId}]`
|
|
36
|
+
: `[${host.hostname.value}]`;
|
|
35
37
|
}
|
|
36
38
|
else {
|
|
37
39
|
hostname = host.hostname.value;
|
|
@@ -114,23 +116,12 @@ const makeInterfaceFilled = async ({ effects, id, packageId, callback, }) => {
|
|
|
114
116
|
hostId,
|
|
115
117
|
callback,
|
|
116
118
|
});
|
|
117
|
-
const primaryUrl = await effects.getPrimaryUrl({
|
|
118
|
-
hostId,
|
|
119
|
-
packageId,
|
|
120
|
-
callback,
|
|
121
|
-
});
|
|
122
119
|
const interfaceFilled = {
|
|
123
120
|
...serviceInterfaceValue,
|
|
124
|
-
primaryUrl: primaryUrl,
|
|
125
121
|
host,
|
|
126
122
|
addressInfo: host
|
|
127
123
|
? (0, exports.filledAddress)(host, serviceInterfaceValue.addressInfo)
|
|
128
124
|
: null,
|
|
129
|
-
get primaryHostname() {
|
|
130
|
-
if (primaryUrl == null)
|
|
131
|
-
return null;
|
|
132
|
-
return (0, exports.getHostname)(primaryUrl);
|
|
133
|
-
},
|
|
134
125
|
};
|
|
135
126
|
return interfaceFilled;
|
|
136
127
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServiceInterface.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterface.ts"],"names":[],"mappings":";;;AACA,6CAAmD;
|
|
1
|
+
{"version":3,"file":"getServiceInterface.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterface.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,23 +17,10 @@ const makeManyInterfaceFilled = async ({ effects, packageId, callback, }) => {
|
|
|
17
17
|
if (!host) {
|
|
18
18
|
throw new Error(`host ${hostId} not found!`);
|
|
19
19
|
}
|
|
20
|
-
const primaryUrl = await effects
|
|
21
|
-
.getPrimaryUrl({
|
|
22
|
-
hostId,
|
|
23
|
-
packageId,
|
|
24
|
-
callback,
|
|
25
|
-
})
|
|
26
|
-
.catch(() => null);
|
|
27
20
|
return {
|
|
28
21
|
...serviceInterfaceValue,
|
|
29
|
-
primaryUrl: primaryUrl,
|
|
30
22
|
host,
|
|
31
23
|
addressInfo: (0, getServiceInterface_1.filledAddress)(host, serviceInterfaceValue.addressInfo),
|
|
32
|
-
get primaryHostname() {
|
|
33
|
-
if (primaryUrl == null)
|
|
34
|
-
return null;
|
|
35
|
-
return (0, getServiceInterface_1.getHostname)(primaryUrl);
|
|
36
|
-
},
|
|
37
24
|
};
|
|
38
25
|
}));
|
|
39
26
|
return serviceInterfacesFilled;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServiceInterfaces.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterfaces.ts"],"names":[],"mappings":";;;AACA,+DAI8B;AAE9B,MAAM,uBAAuB,GAAG,KAAK,EAAE,EACrC,OAAO,EACP,SAAS,EACT,QAAQ,GAKT,EAAE,EAAE;IACH,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC;QACjE,SAAS;QACT,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,uBAAuB,GAA6B,MAAM,OAAO,CAAC,GAAG,CACzE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,qBAAqB,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC,MAAM,CAAA;QACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;YACrC,SAAS;YACT,MAAM;YACN,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,QAAQ,MAAM,aAAa,CAAC,CAAA;SAC7C;QACD,
|
|
1
|
+
{"version":3,"file":"getServiceInterfaces.js","sourceRoot":"","sources":["../../../../base/lib/util/getServiceInterfaces.ts"],"names":[],"mappings":";;;AACA,+DAI8B;AAE9B,MAAM,uBAAuB,GAAG,KAAK,EAAE,EACrC,OAAO,EACP,SAAS,EACT,QAAQ,GAKT,EAAE,EAAE;IACH,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC;QACjE,SAAS;QACT,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,uBAAuB,GAA6B,MAAM,OAAO,CAAC,GAAG,CACzE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,qBAAqB,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,qBAAqB,CAAC,WAAW,CAAC,MAAM,CAAA;QACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;YACrC,SAAS;YACT,MAAM;YACN,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,QAAQ,MAAM,aAAa,CAAC,CAAA;SAC7C;QACD,OAAO;YACL,GAAG,qBAAqB;YACxB,IAAI;YACJ,WAAW,EAAE,IAAA,mCAAa,EAAC,IAAI,EAAE,qBAAqB,CAAC,WAAW,CAAC;SACpE,CAAA;IACH,CAAC,CAAC,CACH,CAAA;IACD,OAAO,uBAAuB,CAAA;AAChC,CAAC,CAAA;AAED,MAAa,oBAAoB;IAC/B,YACW,OAAgB,EAChB,IAA4B;QAD5B,YAAO,GAAP,OAAO,CAAS;QAChB,SAAI,GAAJ,IAAI,CAAwB;IACpC,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAA;QAChD,MAAM,eAAe,GACnB,MAAM,uBAAuB,CAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;YACT,QAAQ;SACT,CAAC,CAAA;QAEJ,OAAO,eAAe,CAAA;IACxB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,MAAM,eAAe,GACnB,MAAM,uBAAuB,CAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;SACV,CAAC,CAAA;QAEJ,OAAO,eAAe,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,CAAC,KAAK;QACV,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,OAAO,IAAI,EAAE;YACX,IAAI,QAAQ,GAAe,GAAG,EAAE,GAAE,CAAC,CAAA;YACnC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAChD,QAAQ,GAAG,OAAO,CAAA;YACpB,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,uBAAuB,CAAC;gBAClC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS;gBACT,QAAQ;aACT,CAAC,CAAA;YACF,MAAM,WAAW,CAAA;SAClB;IACH,CAAC;CACF;AArDD,oDAqDC;AACD,SAAgB,oBAAoB,CAClC,OAAgB,EAChB,IAA4B;IAE5B,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAChD,CAAC;AALD,oDAKC"}
|
|
@@ -26,47 +26,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.base64 = exports.email = exports.ascii = exports.torUrl = exports.localUrl = exports.url = exports.torHostname = exports.localHostname = exports.hostname = exports.ipv4 = exports.ipv6 = void 0;
|
|
27
27
|
const regexes = __importStar(require("./regexes"));
|
|
28
28
|
exports.ipv6 = {
|
|
29
|
-
regex: regexes.ipv6.
|
|
29
|
+
regex: regexes.ipv6.source,
|
|
30
30
|
description: "Must be a valid IPv6 address",
|
|
31
31
|
};
|
|
32
32
|
exports.ipv4 = {
|
|
33
|
-
regex: regexes.ipv4.
|
|
33
|
+
regex: regexes.ipv4.source,
|
|
34
34
|
description: "Must be a valid IPv4 address",
|
|
35
35
|
};
|
|
36
36
|
exports.hostname = {
|
|
37
|
-
regex: regexes.hostname.
|
|
37
|
+
regex: regexes.hostname.source,
|
|
38
38
|
description: "Must be a valid hostname",
|
|
39
39
|
};
|
|
40
40
|
exports.localHostname = {
|
|
41
|
-
regex: regexes.localHostname.
|
|
41
|
+
regex: regexes.localHostname.source,
|
|
42
42
|
description: 'Must be a valid ".local" hostname',
|
|
43
43
|
};
|
|
44
44
|
exports.torHostname = {
|
|
45
|
-
regex: regexes.torHostname.
|
|
45
|
+
regex: regexes.torHostname.source,
|
|
46
46
|
description: 'Must be a valid Tor (".onion") hostname',
|
|
47
47
|
};
|
|
48
48
|
exports.url = {
|
|
49
|
-
regex: regexes.url.
|
|
49
|
+
regex: regexes.url.source,
|
|
50
50
|
description: "Must be a valid URL",
|
|
51
51
|
};
|
|
52
52
|
exports.localUrl = {
|
|
53
|
-
regex: regexes.localUrl.
|
|
53
|
+
regex: regexes.localUrl.source,
|
|
54
54
|
description: 'Must be a valid ".local" URL',
|
|
55
55
|
};
|
|
56
56
|
exports.torUrl = {
|
|
57
|
-
regex: regexes.torUrl.
|
|
57
|
+
regex: regexes.torUrl.source,
|
|
58
58
|
description: 'Must be a valid Tor (".onion") URL',
|
|
59
59
|
};
|
|
60
60
|
exports.ascii = {
|
|
61
|
-
regex: regexes.ascii.
|
|
61
|
+
regex: regexes.ascii.source,
|
|
62
62
|
description: "May only contain ASCII characters. See https://www.w3schools.com/charsets/ref_html_ascii.asp",
|
|
63
63
|
};
|
|
64
64
|
exports.email = {
|
|
65
|
-
regex: regexes.email.
|
|
65
|
+
regex: regexes.email.source,
|
|
66
66
|
description: "Must be a valid email address",
|
|
67
67
|
};
|
|
68
68
|
exports.base64 = {
|
|
69
|
-
regex: regexes.base64.
|
|
69
|
+
regex: regexes.base64.source,
|
|
70
70
|
description: "May only contain base64 characters. See https://base64.guru/learn/base64-characters",
|
|
71
71
|
};
|
|
72
72
|
//# sourceMappingURL=patterns.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../../../base/lib/util/patterns.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mDAAoC;AAEvB,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../../../base/lib/util/patterns.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mDAAoC;AAEvB,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM;IAC1B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,IAAI,GAAY;IAC3B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM;IAC1B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAC9B,WAAW,EAAE,0BAA0B;CACxC,CAAA;AAEY,QAAA,aAAa,GAAY;IACpC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM;IACnC,WAAW,EAAE,mCAAmC;CACjD,CAAA;AAEY,QAAA,WAAW,GAAY;IAClC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM;IACjC,WAAW,EAAE,yCAAyC;CACvD,CAAA;AAEY,QAAA,GAAG,GAAY;IAC1B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;IACzB,WAAW,EAAE,qBAAqB;CACnC,CAAA;AAEY,QAAA,QAAQ,GAAY;IAC/B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAC9B,WAAW,EAAE,8BAA8B;CAC5C,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;IAC5B,WAAW,EAAE,oCAAoC;CAClD,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;IAC3B,WAAW,EACT,8FAA8F;CACjG,CAAA;AAEY,QAAA,KAAK,GAAY;IAC5B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;IAC3B,WAAW,EAAE,+BAA+B;CAC7C,CAAA;AAEY,QAAA,MAAM,GAAY;IAC7B,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM;IAC5B,WAAW,EACT,qFAAqF;CACxF,CAAA"}
|
|
@@ -229,7 +229,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
229
229
|
id: 'ui',
|
|
230
230
|
description: 'The primary web app for this service.',
|
|
231
231
|
type: 'ui',
|
|
232
|
-
hasPrimary: false,
|
|
233
232
|
masked: false,
|
|
234
233
|
schemeOverride: null,
|
|
235
234
|
username: null,
|
|
@@ -245,8 +244,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
245
244
|
id: string;
|
|
246
245
|
/** The human readable description. */
|
|
247
246
|
description: string;
|
|
248
|
-
/** No effect until StartOS v0.4.0. If true, forces the user to select one URL (i.e. .onion, .local, or IP address) as the primary URL. This is needed by some services to function properly. */
|
|
249
|
-
hasPrimary: boolean;
|
|
250
247
|
/** Affects how the interface appears to the user. One of: 'ui', 'api', 'p2p'. If 'ui', the user will see a "Launch UI" button */
|
|
251
248
|
type: ServiceInterfaceType;
|
|
252
249
|
/** (optional) prepends the provided username to all URLs. */
|
|
@@ -428,7 +425,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
428
425
|
id: 'primary-ui',
|
|
429
426
|
description: 'The primary web app for this service.',
|
|
430
427
|
type: 'ui',
|
|
431
|
-
hasPrimary: false,
|
|
432
428
|
masked: false,
|
|
433
429
|
schemeOverride: null,
|
|
434
430
|
username: null,
|
|
@@ -441,7 +437,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
441
437
|
id: 'admin-ui',
|
|
442
438
|
description: 'The admin web app for this service.',
|
|
443
439
|
type: 'ui',
|
|
444
|
-
hasPrimary: false,
|
|
445
440
|
masked: false,
|
|
446
441
|
schemeOverride: null,
|
|
447
442
|
username: null,
|
|
@@ -462,7 +457,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
462
457
|
id: 'api',
|
|
463
458
|
description: 'The advanced API for this service.',
|
|
464
459
|
type: 'api',
|
|
465
|
-
hasPrimary: false,
|
|
466
460
|
masked: false,
|
|
467
461
|
schemeOverride: null,
|
|
468
462
|
username: null,
|
|
@@ -537,6 +531,12 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
537
531
|
Daemons: {
|
|
538
532
|
of(effects: Effects, started: (onTerm: () => PromiseLike<void>) => PromiseLike<null>, healthReceipts: HealthReceipt[]): Daemons<Manifest, never>;
|
|
539
533
|
};
|
|
534
|
+
SubContainer: {
|
|
535
|
+
of(effects: Effects, image: {
|
|
536
|
+
id: T.ImageId & keyof Manifest["images"];
|
|
537
|
+
sharedRun?: boolean;
|
|
538
|
+
}, name: string): Promise<SubContainer>;
|
|
539
|
+
};
|
|
540
540
|
List: {
|
|
541
541
|
/**
|
|
542
542
|
* @description Create a list of text inputs.
|
|
@@ -1077,7 +1077,6 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
|
|
|
1077
1077
|
* @example default: 'radio1'
|
|
1078
1078
|
*/
|
|
1079
1079
|
default: keyof Variants_1 & string;
|
|
1080
|
-
required: boolean;
|
|
1081
1080
|
/**
|
|
1082
1081
|
* @description A mapping of unique radio options to their human readable display format.
|
|
1083
1082
|
* @example
|
package/package/lib/StartSdk.js
CHANGED
|
@@ -266,7 +266,6 @@ class StartSdk {
|
|
|
266
266
|
id: 'ui',
|
|
267
267
|
description: 'The primary web app for this service.',
|
|
268
268
|
type: 'ui',
|
|
269
|
-
hasPrimary: false,
|
|
270
269
|
masked: false,
|
|
271
270
|
schemeOverride: null,
|
|
272
271
|
username: null,
|
|
@@ -416,7 +415,6 @@ class StartSdk {
|
|
|
416
415
|
id: 'primary-ui',
|
|
417
416
|
description: 'The primary web app for this service.',
|
|
418
417
|
type: 'ui',
|
|
419
|
-
hasPrimary: false,
|
|
420
418
|
masked: false,
|
|
421
419
|
schemeOverride: null,
|
|
422
420
|
username: null,
|
|
@@ -429,7 +427,6 @@ class StartSdk {
|
|
|
429
427
|
id: 'admin-ui',
|
|
430
428
|
description: 'The admin web app for this service.',
|
|
431
429
|
type: 'ui',
|
|
432
|
-
hasPrimary: false,
|
|
433
430
|
masked: false,
|
|
434
431
|
schemeOverride: null,
|
|
435
432
|
username: null,
|
|
@@ -450,7 +447,6 @@ class StartSdk {
|
|
|
450
447
|
id: 'api',
|
|
451
448
|
description: 'The advanced API for this service.',
|
|
452
449
|
type: 'api',
|
|
453
|
-
hasPrimary: false,
|
|
454
450
|
masked: false,
|
|
455
451
|
schemeOverride: null,
|
|
456
452
|
username: null,
|
|
@@ -523,6 +519,11 @@ class StartSdk {
|
|
|
523
519
|
return Daemons_1.Daemons.of({ effects, started, healthReceipts });
|
|
524
520
|
},
|
|
525
521
|
},
|
|
522
|
+
SubContainer: {
|
|
523
|
+
of(effects, image, name) {
|
|
524
|
+
return SubContainer_1.SubContainer.of(effects, image, name);
|
|
525
|
+
},
|
|
526
|
+
},
|
|
526
527
|
List: {
|
|
527
528
|
/**
|
|
528
529
|
* @description Create a list of text inputs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAkE;AAClE,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,2DAAoE;AACpE,qCAAoC;AACpC,6DAAyD;AACzD,uCAAiE;AACjE,+EAGkD;AAClD,6DAAyD;AACzD,yDAAkE;AAClE,+FAA2F;AAC3F,iCAAsC;AACtC,iCAAoC;AACpC,iCAAkE;AAClE,+CAA2C;AAC3C,sDAAgF;AAChF,iCAAqC;AACrC,4CAAwC;AACxC,qFAAiF;AAEjF,gDAAsD;AAEtD,iEAIwC;AACxC,2EAGiD;AACjD,iCAA0C;AAK1C,gEAAiD;AACjD,iDAA6C;AAEhC,QAAA,UAAU,GAAG,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAA;AASlD,MAAa,QAAQ;IACnB,YAA6B,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IACnD,MAAM,CAAC,EAAE;QACP,OAAO,IAAI,QAAQ,CAAe,IAAa,CAAC,CAAA;IAClD,CAAC;IACD,YAAY,CAAyC,QAAkB;QACrE,OAAO,IAAI,QAAQ,CAAkB,QAAQ,CAAC,CAAA;IAChD,CAAC;IACD,SAAS;QACP,OAAO,IAAI,QAAQ,CAAkB,IAAI,CAAC,QAAQ,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,OAAiE;
|
|
1
|
+
{"version":3,"file":"StartSdk.js","sourceRoot":"","sources":["../../../package/lib/StartSdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,47 +26,52 @@ class CommandController {
|
|
|
26
26
|
}
|
|
27
27
|
return subc;
|
|
28
28
|
})();
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
29
|
+
try {
|
|
30
|
+
let childProcess;
|
|
31
|
+
if (options.runAsInit) {
|
|
32
|
+
childProcess = await subc.launch(commands, {
|
|
33
|
+
env: options.env,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
childProcess = await subc.spawn(commands, {
|
|
38
|
+
env: options.env,
|
|
39
|
+
stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
if (options.onStdout)
|
|
43
|
+
(_a = childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", options.onStdout);
|
|
44
|
+
if (options.onStderr)
|
|
45
|
+
(_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", options.onStderr);
|
|
46
|
+
const state = { exited: false };
|
|
47
|
+
const answer = new Promise((resolve, reject) => {
|
|
48
|
+
childProcess.on("exit", (code) => {
|
|
49
|
+
state.exited = true;
|
|
50
|
+
if (code === 0 ||
|
|
51
|
+
code === 143 ||
|
|
52
|
+
(code === null && childProcess.signalCode == "SIGTERM")) {
|
|
53
|
+
return resolve(null);
|
|
54
|
+
}
|
|
55
|
+
if (code) {
|
|
56
|
+
return reject(new Error(`${commands[0]} exited with code ${code}`));
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
return reject(new Error(`${commands[0]} exited with signal ${childProcess.signalCode}`));
|
|
60
|
+
}
|
|
61
|
+
});
|
|
33
62
|
});
|
|
63
|
+
return new CommandController(answer, state, subc, childProcess, options.sigtermTimeout);
|
|
34
64
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
stdio: options.onStdout || options.onStderr ? "pipe" : "inherit",
|
|
39
|
-
});
|
|
65
|
+
catch (e) {
|
|
66
|
+
await subc.destroy();
|
|
67
|
+
throw e;
|
|
40
68
|
}
|
|
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);
|
|
45
|
-
const state = { exited: false };
|
|
46
|
-
const answer = new Promise((resolve, reject) => {
|
|
47
|
-
childProcess.on("exit", (code) => {
|
|
48
|
-
state.exited = true;
|
|
49
|
-
if (code === 0 ||
|
|
50
|
-
code === 143 ||
|
|
51
|
-
(code === null && childProcess.signalCode == "SIGTERM")) {
|
|
52
|
-
return resolve(null);
|
|
53
|
-
}
|
|
54
|
-
if (code) {
|
|
55
|
-
return reject(new Error(`${commands[0]} exited with code ${code}`));
|
|
56
|
-
}
|
|
57
|
-
else {
|
|
58
|
-
return reject(new Error(`${commands[0]} exited with signal ${childProcess.signalCode}`));
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
|
-
});
|
|
62
|
-
return new CommandController(answer, state, subc, childProcess, options.sigtermTimeout);
|
|
63
69
|
};
|
|
64
70
|
}
|
|
65
71
|
get subContainerHandle() {
|
|
66
72
|
return new SubContainer_1.SubContainerHandle(this.subcontainer);
|
|
67
73
|
}
|
|
68
74
|
async wait({ timeout = types_1.NO_TIMEOUT } = {}) {
|
|
69
|
-
var _a, _b;
|
|
70
75
|
if (timeout > 0)
|
|
71
76
|
setTimeout(() => {
|
|
72
77
|
this.term();
|
|
@@ -78,11 +83,10 @@ class CommandController {
|
|
|
78
83
|
if (!this.state.exited) {
|
|
79
84
|
this.process.kill("SIGKILL");
|
|
80
85
|
}
|
|
81
|
-
await
|
|
86
|
+
await this.subcontainer.destroy().catch((_) => { });
|
|
82
87
|
}
|
|
83
88
|
}
|
|
84
89
|
async term({ signal = types_1.SIGTERM, timeout = this.sigtermTimeout } = {}) {
|
|
85
|
-
var _a, _b;
|
|
86
90
|
try {
|
|
87
91
|
if (!this.state.exited) {
|
|
88
92
|
if (signal !== "SIGKILL") {
|
|
@@ -98,7 +102,7 @@ class CommandController {
|
|
|
98
102
|
await this.runningAnswer;
|
|
99
103
|
}
|
|
100
104
|
finally {
|
|
101
|
-
await
|
|
105
|
+
await this.subcontainer.destroy();
|
|
102
106
|
}
|
|
103
107
|
}
|
|
104
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/CommandController.ts"],"names":[],"mappings":";;;AAAA,wBAA2C;AAC3C,mDAA6D;AAG7D,uDAI6B;AAC7B,kCAAsC;AAGtC,MAAa,iBAAiB;IAC5B,YACW,aAA+B,EAChC,KAA0B,EACjB,YAA0B,EACnC,OAAwB,EACvB,iBAAyB,0BAAuB;QAJhD,kBAAa,GAAb,aAAa,CAAkB;QAChC,UAAK,GAAL,KAAK,CAAqB;QACjB,iBAAY,GAAZ,YAAY,CAAc;QACnC,YAAO,GAAP,OAAO,CAAiB;QACvB,mBAAc,GAAd,cAAc,CAAkC;IACxD,CAAC;IACJ,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,YAKgB,EAChB,OAAsB,EACtB,OAeC,EACD,EAAE;;YACF,MAAM,QAAQ,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAA;YACtC,MAAM,IAAI,GACR,YAAY,YAAY,2BAAY;gBAClC,CAAC,CAAC,YAAY;gBACd,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;oBAChB,MAAM,IAAI,GAAG,MAAM,2BAAY,CAAC,EAAE,CAChC,OAAO,EACP,YAAY,EACZ,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,KAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAChD,CAAA;oBACD,KAAK,IAAI,KAAK,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE;wBACtC,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;qBAC5C;oBACD,OAAO,IAAI,CAAA;gBACb,CAAC,CAAC,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,8 @@ class Daemon {
|
|
|
33
33
|
let timeoutCounter = 0;
|
|
34
34
|
new Promise(async () => {
|
|
35
35
|
while (this.shouldBeRunning) {
|
|
36
|
+
if (this.commandController)
|
|
37
|
+
await this.commandController.term().catch((err) => console.error(err));
|
|
36
38
|
this.commandController = await this.startCommand();
|
|
37
39
|
await this.commandController.wait().catch((err) => console.error(err));
|
|
38
40
|
await new Promise((resolve) => setTimeout(resolve, timeoutCounter));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AAExD,2DAAuD;AAEvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAa,MAAM;IAGjB,YAAoB,YAA8C;QAA9C,iBAAY,GAAZ,YAAY,CAAkC;QAF1D,sBAAiB,GAA6B,IAAI,CAAA;QAClD,oBAAe,GAAG,KAAK,CAAA;IACsC,CAAC;IACtE,IAAI,kBAAkB;;QACpB,OAAO,MAAA,IAAI,CAAC,iBAAiB,0CAAE,kBAAkB,CAAA;IACnD,CAAC;IACD,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,YAKgB,EAChB,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;YAC1B,OAAM;SACP;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;gBAC3B,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;aAC1D;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,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CACxB,IAAI,CAAC,EAAE,GAAG,WAAW,EAAE,EACxB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAA;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemon.ts"],"names":[],"mappings":";;;AACA,4DAAwD;AAExD,2DAAuD;AAEvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAa,MAAM;IAGjB,YAAoB,YAA8C;QAA9C,iBAAY,GAAZ,YAAY,CAAkC;QAF1D,sBAAiB,GAA6B,IAAI,CAAA;QAClD,oBAAe,GAAG,KAAK,CAAA;IACsC,CAAC;IACtE,IAAI,kBAAkB;;QACpB,OAAO,MAAA,IAAI,CAAC,iBAAiB,0CAAE,kBAAkB,CAAA;IACnD,CAAC;IACD,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,YAKgB,EAChB,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;YAC1B,OAAM;SACP;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;gBAC3B,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;aAC1D;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,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CACxB,IAAI,CAAC,EAAE,GAAG,WAAW,EAAE,EACxB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,iBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAA;QAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF;AA9ED,wBA8EC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import { HealthReceipt
|
|
3
|
+
import { HealthReceipt } from "../../../base/lib/types";
|
|
4
4
|
import { HealthCheckResult } from "../health/checkFns";
|
|
5
5
|
import { Trigger } from "../trigger";
|
|
6
6
|
import * as T from "../../../base/lib/types";
|
|
7
7
|
import { Mounts } from "./Mounts";
|
|
8
|
-
import { ExecSpawnable, MountOptions } from "../util/SubContainer";
|
|
8
|
+
import { ExecSpawnable, MountOptions, SubContainer } from "../util/SubContainer";
|
|
9
9
|
import * as CP from "node:child_process";
|
|
10
10
|
export { Daemon } from "./Daemon";
|
|
11
11
|
export { CommandController } from "./CommandController";
|
|
@@ -37,8 +37,8 @@ export type Ready = {
|
|
|
37
37
|
type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command extends string, Id extends string> = {
|
|
38
38
|
/** The command line command to start the daemon */
|
|
39
39
|
command: T.CommandType;
|
|
40
|
-
/** Information about the
|
|
41
|
-
|
|
40
|
+
/** Information about the subcontainer in which the daemon runs */
|
|
41
|
+
subcontainer: {
|
|
42
42
|
/** The ID of the image. Must be one of the image IDs declared in the manifest */
|
|
43
43
|
id: keyof Manifest["images"] & T.ImageId;
|
|
44
44
|
/**
|
|
@@ -46,7 +46,7 @@ type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command e
|
|
|
46
46
|
* 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
|
|
47
47
|
*/
|
|
48
48
|
sharedRun?: boolean;
|
|
49
|
-
};
|
|
49
|
+
} | SubContainer;
|
|
50
50
|
/** For mounting the necessary volumes. Syntax: sdk.Mounts.of().addVolume() */
|
|
51
51
|
mounts: Mounts<Manifest>;
|
|
52
52
|
env?: Record<string, string>;
|
|
@@ -58,7 +58,7 @@ type DaemonsParams<Manifest extends T.SDKManifest, Ids extends string, Command e
|
|
|
58
58
|
onStderr?: (chunk: Buffer | string | any) => void;
|
|
59
59
|
};
|
|
60
60
|
type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`;
|
|
61
|
-
export declare const runCommand: <Manifest extends T.SDKManifest>() => <A extends string>(effects: T.Effects, subcontainer:
|
|
61
|
+
export declare const runCommand: <Manifest extends T.SDKManifest>() => <A extends string>(effects: T.Effects, subcontainer: SubContainer | {
|
|
62
62
|
id: keyof Manifest["images"] & string;
|
|
63
63
|
sharedRun?: boolean | undefined;
|
|
64
64
|
}, command: T.CommandType, options: {
|
|
@@ -130,10 +130,6 @@ export declare class Daemons<Manifest extends T.SDKManifest, Ids extends string>
|
|
|
130
130
|
*/
|
|
131
131
|
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
132
|
build(): Promise<{
|
|
133
|
-
term: (
|
|
134
|
-
signal?: Signals;
|
|
135
|
-
timeout?: number;
|
|
136
|
-
}) => Promise<void>;
|
|
133
|
+
term: () => Promise<void>;
|
|
137
134
|
}>;
|
|
138
|
-
private updateMainHealth;
|
|
139
135
|
}
|
|
@@ -91,7 +91,7 @@ class Daemons {
|
|
|
91
91
|
// prettier-ignore
|
|
92
92
|
id, options) {
|
|
93
93
|
const daemonIndex = this.daemons.length;
|
|
94
|
-
const daemon = Daemon_2.Daemon.of()(this.effects, options.
|
|
94
|
+
const daemon = Daemon_2.Daemon.of()(this.effects, options.subcontainer, options.command, {
|
|
95
95
|
...options,
|
|
96
96
|
mounts: options.mounts.build(),
|
|
97
97
|
subcontainerName: id,
|
|
@@ -106,12 +106,14 @@ class Daemons {
|
|
|
106
106
|
return new Daemons(this.effects, this.started, daemons, ids, healthDaemons);
|
|
107
107
|
}
|
|
108
108
|
async build() {
|
|
109
|
-
this.updateMainHealth();
|
|
110
|
-
this.healthDaemons.forEach((x) => x.addWatcher(() => this.updateMainHealth()));
|
|
111
109
|
const built = {
|
|
112
|
-
term: async (
|
|
110
|
+
term: async () => {
|
|
113
111
|
try {
|
|
114
|
-
await Promise.
|
|
112
|
+
for (let result of await Promise.allSettled(this.healthDaemons.map((x) => x.term({ timeout: x.sigtermTimeout })))) {
|
|
113
|
+
if (result.status === "rejected") {
|
|
114
|
+
console.error(result.reason);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
115
117
|
}
|
|
116
118
|
finally {
|
|
117
119
|
this.effects.setMainStatus({ status: "stopped" });
|
|
@@ -121,9 +123,6 @@ class Daemons {
|
|
|
121
123
|
this.started(() => built.term());
|
|
122
124
|
return built;
|
|
123
125
|
}
|
|
124
|
-
updateMainHealth() {
|
|
125
|
-
this.effects.setMainStatus({ status: "running" });
|
|
126
|
-
}
|
|
127
126
|
}
|
|
128
127
|
exports.Daemons = Daemons;
|
|
129
128
|
//# sourceMappingURL=Daemons.js.map
|
|
@@ -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;AAE1C,QAAA,MAAM,GAAG,IAAA,qBAAS,EAAC,EAAE,CAAC,IAAI,CAAC,CAAA;AAC3B,QAAA,UAAU,GAAG,IAAA,qBAAS,EAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../package/lib/mainFn/Daemons.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,8 @@ export declare class HealthDaemon {
|
|
|
22
22
|
private _health;
|
|
23
23
|
private healthWatchers;
|
|
24
24
|
private running;
|
|
25
|
+
private resolveReady;
|
|
26
|
+
private readyPromise;
|
|
25
27
|
constructor(daemon: Promise<Daemon>, daemonIndex: number, dependencies: HealthDaemon[], id: string, ids: string[], ready: Ready, effects: Effects, sigtermTimeout?: number);
|
|
26
28
|
/** Run after we want to do cleanup */
|
|
27
29
|
term(termOptions?: {
|
|
@@ -35,6 +37,7 @@ export declare class HealthDaemon {
|
|
|
35
37
|
private healthCheckCleanup;
|
|
36
38
|
private turnOffHealthCheck;
|
|
37
39
|
private setupHealthCheck;
|
|
40
|
+
onReady(): Promise<void>;
|
|
38
41
|
private setHealth;
|
|
39
42
|
private updateStatus;
|
|
40
43
|
}
|
|
@@ -32,6 +32,7 @@ class HealthDaemon {
|
|
|
32
32
|
this.healthWatchers = [];
|
|
33
33
|
this.running = false;
|
|
34
34
|
this.healthCheckCleanup = null;
|
|
35
|
+
this.readyPromise = new Promise((resolve) => (this.resolveReady = resolve));
|
|
35
36
|
this.updateStatus();
|
|
36
37
|
this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()));
|
|
37
38
|
}
|
|
@@ -92,6 +93,10 @@ class HealthDaemon {
|
|
|
92
93
|
message: "message" in err ? err.message : String(err),
|
|
93
94
|
};
|
|
94
95
|
});
|
|
96
|
+
if (this.resolveReady &&
|
|
97
|
+
(response.result === "success" || response.result === "disabled")) {
|
|
98
|
+
this.resolveReady();
|
|
99
|
+
}
|
|
95
100
|
await this.setHealth(response);
|
|
96
101
|
}
|
|
97
102
|
else {
|
|
@@ -108,6 +113,9 @@ class HealthDaemon {
|
|
|
108
113
|
return null;
|
|
109
114
|
};
|
|
110
115
|
}
|
|
116
|
+
onReady() {
|
|
117
|
+
return this.readyPromise;
|
|
118
|
+
}
|
|
111
119
|
async setHealth(health) {
|
|
112
120
|
this._health = health;
|
|
113
121
|
this.healthWatchers.forEach((watcher) => watcher());
|
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.test.js","sourceRoot":"","sources":["../../../../package/lib/test/host.test.ts"],"names":[],"mappings":";;AAAA,kGAA8F;AAE9F,mDAAwC;AAExC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACvC,KAAK,UAAU,IAAI,CAAC,OAAgB;YAClC,MAAM,GAAG,GAAG,gBAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;YAC1C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACvC,QAAQ,EAAE,MAAe;gBACzB,qBAAqB,EAAE,EAAE;aAC1B,CAAC,CAAA;YACF,MAAM,YAAY,GAAG,IAAI,iDAAuB,CAAC;gBAC/C,OAAO;gBACP,IAAI,EAAE,KAAK;gBACX,EAAE,EAAE,KAAK;gBACT,WAAW,EAAE,OAAO;gBACpB,
|
|
1
|
+
{"version":3,"file":"host.test.js","sourceRoot":"","sources":["../../../../package/lib/test/host.test.ts"],"names":[],"mappings":";;AAAA,kGAA8F;AAE9F,mDAAwC;AAExC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACvC,KAAK,UAAU,IAAI,CAAC,OAAgB;YAClC,MAAM,GAAG,GAAG,gBAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;YAC1C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACvC,QAAQ,EAAE,MAAe;gBACzB,qBAAqB,EAAE,EAAE;aAC1B,CAAC,CAAA;YACF,MAAM,YAAY,GAAG,IAAI,iDAAuB,CAAC;gBAC/C,OAAO;gBACP,IAAI,EAAE,KAAK;gBACX,EAAE,EAAE,KAAK;gBACT,WAAW,EAAE,OAAO;gBACpB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;gBACtB,cAAc,EAAE,IAAI;gBACpB,MAAM,EAAE,KAAK;aACd,CAAC,CAAA;YAEF,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAA;QACxC,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -106,7 +106,6 @@ export declare const sdk: {
|
|
|
106
106
|
name: string;
|
|
107
107
|
id: string;
|
|
108
108
|
description: string;
|
|
109
|
-
hasPrimary: boolean;
|
|
110
109
|
type: import("../../../base/lib/types").ServiceInterfaceType;
|
|
111
110
|
username: string | null;
|
|
112
111
|
path: string;
|
|
@@ -804,6 +803,12 @@ export declare const sdk: {
|
|
|
804
803
|
};
|
|
805
804
|
}, never>;
|
|
806
805
|
};
|
|
806
|
+
SubContainer: {
|
|
807
|
+
of(effects: import("../../../base/lib/Effects").Effects, image: {
|
|
808
|
+
id: "main";
|
|
809
|
+
sharedRun?: boolean | undefined;
|
|
810
|
+
}, name: string): Promise<import("..").SubContainer>;
|
|
811
|
+
};
|
|
807
812
|
List: {
|
|
808
813
|
text: typeof import("../../../base/lib/actions/input/builder").List.text;
|
|
809
814
|
obj: <Type_1 extends Record<string, any>>(a: {
|
|
@@ -997,7 +1002,6 @@ export declare const sdk: {
|
|
|
997
1002
|
description?: string | null | undefined;
|
|
998
1003
|
warning?: string | null | undefined;
|
|
999
1004
|
default: keyof Variants & string;
|
|
1000
|
-
required: boolean;
|
|
1001
1005
|
values: Variants;
|
|
1002
1006
|
disabled?: string | false | string[] | undefined;
|
|
1003
1007
|
}>) => import("../../../base/lib/actions/input/builder").Value<string, {
|
package/package.json
CHANGED