@start9labs/start-sdk 0.3.6-alpha4 → 0.3.6-alpha6

package/mjs/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,gBAAgB,MAAM,gBAAgB,CAAA;AAClD,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,SAAS,MAAM,mBAAmB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAC/B,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEhE,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,gBAAgB,MAAM,gBAAgB,CAAA;AAClD,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,SAAS,MAAM,mBAAmB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAC/B,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA"}

package/mjs/lib/inits/migrations/Migration.d.ts

@@ -1,37 +1,37 @@
-import { ManifestVersion, SDKManifest } from "../../manifest/ManifestTypes";
-import { Effects } from "../../types";
-export declare class Migration<Manifest extends SDKManifest, Store, Version extends ManifestVersion> {
+import { ValidateExVer } from "../../exver";
+import * as T from "../../types";
+export declare class Migration<Manifest extends T.Manifest, Store, Version extends string> {
     readonly options: {
-        version: Version;
+        version: Version & ValidateExVer<Version>;
         up: (opts: {
-            effects: Effects;
+            effects: T.Effects;
         }) => Promise<void>;
         down: (opts: {
-            effects: Effects;
+            effects: T.Effects;
         }) => Promise<void>;
     };
     constructor(options: {
-        version: Version;
+        version: Version & ValidateExVer<Version>;
         up: (opts: {
-            effects: Effects;
+            effects: T.Effects;
         }) => Promise<void>;
         down: (opts: {
-            effects: Effects;
+            effects: T.Effects;
         }) => Promise<void>;
     });
-    static of<Manifest extends SDKManifest, Store, Version extends ManifestVersion>(options: {
-        version: Version;
+    static of<Manifest extends T.Manifest, Store, Version extends string>(options: {
+        version: Version & ValidateExVer<Version>;
         up: (opts: {
-            effects: Effects;
+            effects: T.Effects;
         }) => Promise<void>;
         down: (opts: {
-            effects: Effects;
+            effects: T.Effects;
         }) => Promise<void>;
     }): Migration<Manifest, Store, Version>;
     up(opts: {
-        effects: Effects;
+        effects: T.Effects;
     }): Promise<void>;
     down(opts: {
-        effects: Effects;
+        effects: T.Effects;
     }): Promise<void>;
 }

package/mjs/lib/inits/migrations/Migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/Migration.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,SAAS;IAMT;IADX,YACW,OAIR;QAJQ,YAAO,GAAP,OAAO,CAIf;IACA,CAAC;IACJ,MAAM,CAAC,EAAE,CAIP,OAID;QACC,OAAO,IAAI,SAAS,CAA2B,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,EAAE,CAAC,IAA0B;QACjC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAA0B;QACnC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;CACF"}
+{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/Migration.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,SAAS;IAMT;IADX,YACW,OAIR;QAJQ,YAAO,GAAP,OAAO,CAIf;IACA,CAAC;IACJ,MAAM,CAAC,EAAE,CAIP,OAID;QACC,OAAO,IAAI,SAAS,CAA2B,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,EAAE,CAAC,IAA4B;QACnC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAA4B;QACrC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;CACF"}

package/mjs/lib/inits/migrations/setupMigrations.d.ts

@@ -1,15 +1,14 @@
-import { SDKManifest } from "../../manifest/ManifestTypes";
-import { ExpectedExports } from "../../types";
+import * as T from "../../types";
 import { Migration } from "./Migration";
-export declare class Migrations<Manifest extends SDKManifest, Store> {
-    readonly manifest: SDKManifest;
+export declare class Migrations<Manifest extends T.Manifest, Store> {
+    readonly manifest: T.Manifest;
     readonly migrations: Array<Migration<Manifest, Store, any>>;
     private constructor();
     private sortedMigrations;
     private currentVersion;
-    static of<Manifest extends SDKManifest, Store, Migrations extends Array<Migration<Manifest, Store, any>>>(manifest: SDKManifest, ...migrations: EnsureUniqueId<Migrations>): import("./setupMigrations").Migrations<Manifest, Store>;
-    init({ effects, previousVersion, }: Parameters<ExpectedExports.init>[0]): Promise<void>;
-    uninit({ effects, nextVersion, }: Parameters<ExpectedExports.uninit>[0]): Promise<void>;
+    static of<Manifest extends T.Manifest, Store, Migrations extends Array<Migration<Manifest, Store, any>>>(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>): import("./setupMigrations").Migrations<Manifest, Store>;
+    init({ effects, previousVersion, }: Parameters<T.ExpectedExports.init>[0]): Promise<void>;
+    uninit({ effects, nextVersion, }: Parameters<T.ExpectedExports.uninit>[0]): Promise<void>;
 }
-export declare function setupMigrations<Manifest extends SDKManifest, Store, Migrations extends Array<Migration<Manifest, Store, any>>>(manifest: SDKManifest, ...migrations: EnsureUniqueId<Migrations>): import("./setupMigrations").Migrations<Manifest, Store>;
+export declare function setupMigrations<Manifest extends T.Manifest, Store, Migrations extends Array<Migration<Manifest, Store, any>>>(manifest: T.Manifest, ...migrations: EnsureUniqueId<Migrations>): import("./setupMigrations").Migrations<Manifest, Store>;
 export type EnsureUniqueId<A, B = A, ids = never> = B extends [] ? A : B extends [Migration<any, any, infer id>, ...infer Rest] ? (id extends ids ? "One of the ids are not unique"[] : EnsureUniqueId<A, Rest, id | ids>) : "There exists a migration that is not a Migration"[];

package/mjs/lib/inits/migrations/setupMigrations.js

@@ -1,4 +1,4 @@
-import { EmVer } from "../../emverLite/mod";
+import { ExtendedVersion } from "../../exver";
 import { once } from "../../util/once";
 export class Migrations {
     manifest;
@@ -8,19 +8,21 @@ export class Migrations {
         this.migrations = migrations;
     }
     sortedMigrations = once(() => {
-        const migrationsAsVersions = this.migrations.map((x) => [EmVer.parse(x.options.version), x]);
+        const migrationsAsVersions = this.migrations
+            .map((x) => [ExtendedVersion.parse(x.options.version), x])
+            .filter(([v, _]) => v.flavor === this.currentVersion().flavor);
         migrationsAsVersions.sort((a, b) => a[0].compareForSort(b[0]));
         return migrationsAsVersions;
     });
-    currentVersion = once(() => EmVer.parse(this.manifest.version));
+    currentVersion = once(() => ExtendedVersion.parse(this.manifest.version));
     static of(manifest, ...migrations) {
         return new Migrations(manifest, migrations);
     }
     async init({ effects, previousVersion, }) {
         if (!!previousVersion) {
-            const previousVersionEmVer = EmVer.parse(previousVersion);
+            const previousVersionExVer = ExtendedVersion.parse(previousVersion);
             for (const [_, migration] of this.sortedMigrations()
-                .filter((x) => x[0].greaterThan(previousVersionEmVer))
+                .filter((x) => x[0].greaterThan(previousVersionExVer))
                 .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
                 await migration.up({ effects });
             }
@@ -28,10 +30,10 @@ export class Migrations {
     }
     async uninit({ effects, nextVersion, }) {
         if (!!nextVersion) {
-            const nextVersionEmVer = EmVer.parse(nextVersion);
+            const nextVersionExVer = ExtendedVersion.parse(nextVersion);
             const reversed = [...this.sortedMigrations()].reverse();
             for (const [_, migration] of reversed
-                .filter((x) => x[0].greaterThan(nextVersionEmVer))
+                .filter((x) => x[0].greaterThan(nextVersionExVer))
                 .filter((x) => x[0].lessThanOrEqual(this.currentVersion()))) {
                 await migration.down({ effects });
             }

package/mjs/lib/inits/migrations/setupMigrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupMigrations.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/setupMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAG3C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,MAAM,OAAO,UAAU;IAEV;IACA;IAFX,YACW,QAAqB,EACrB,UAAkD;QADlD,aAAQ,GAAR,QAAQ,CAAa;QACrB,eAAU,GAAV,UAAU,CAAwC;IAC1D,CAAC;IACI,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE;QACnC,MAAM,oBAAoB,GACxB,IAAI,CAAC,UACN,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAU,CAAC,CAAA;QAC1D,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9D,OAAO,oBAAoB,CAAA;IAC7B,CAAC,CAAC,CAAA;IACM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;IACvE,MAAM,CAAC,EAAE,CAIP,QAAqB,EAAE,GAAG,UAAsC;QAChE,OAAO,IAAI,UAAU,CACnB,QAAQ,EACR,UAAoD,CACrD,CAAA;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EACT,OAAO,EACP,eAAe,GACqB;QACpC,IAAI,CAAC,CAAC,eAAe,EAAE;YACrB,MAAM,oBAAoB,GAAG,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;YACzD,KAAK,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,gBAAgB,EAAE;iBACjD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;iBACrD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE;gBAC7D,MAAM,SAAS,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;aAChC;SACF;IACH,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EACX,OAAO,EACP,WAAW,GAC2B;QACtC,IAAI,CAAC,CAAC,WAAW,EAAE;YACjB,MAAM,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YACjD,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;YACvD,KAAK,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,IAAI,QAAQ;iBAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;iBACjD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE;gBAC7D,MAAM,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;aAClC;SACF;IACH,CAAC;CACF;AAED,MAAM,UAAU,eAAe,CAI7B,QAAqB,EAAE,GAAG,UAAsC;IAChE,OAAO,UAAU,CAAC,EAAE,CAA8B,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAA;AAC5E,CAAC"}
+{"version":3,"file":"setupMigrations.js","sourceRoot":"","sources":["../../../../../lib/inits/migrations/setupMigrations.ts"],"names":[],"mappings":"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"}

package/mjs/lib/inits/setupInit.d.ts

@@ -1,15 +1,14 @@
 import { DependenciesReceipt } from "../config/setupConfig";
 import { SetInterfaces } from "../interfaces/setupInterfaces";
-import { SDKManifest } from "../manifest/ManifestTypes";
 import { ExposedStorePaths } from "../store/setupExposeStore";
-import { Effects, ExpectedExports } from "../types";
+import * as T from "../types";
 import { Migrations } from "./migrations/setupMigrations";
 import { Install } from "./setupInstall";
 import { Uninstall } from "./setupUninstall";
-export declare function setupInit<Manifest extends SDKManifest, Store>(migrations: Migrations<Manifest, Store>, install: Install<Manifest, Store>, uninstall: Uninstall<Manifest, Store>, setInterfaces: SetInterfaces<Manifest, Store, any, any>, setDependencies: (options: {
-    effects: Effects;
+export declare function setupInit<Manifest extends T.Manifest, Store>(migrations: Migrations<Manifest, Store>, install: Install<Manifest, Store>, uninstall: Uninstall<Manifest, Store>, setInterfaces: SetInterfaces<Manifest, Store, any, any>, setDependencies: (options: {
+    effects: T.Effects;
     input: any;
 }) => Promise<DependenciesReceipt>, exposedStore: ExposedStorePaths): {
-    init: ExpectedExports.init;
-    uninit: ExpectedExports.uninit;
+    init: T.ExpectedExports.init;
+    uninit: T.ExpectedExports.uninit;
 };

package/mjs/lib/inits/setupInstall.d.ts

@@ -1,12 +1,11 @@
-import { SDKManifest } from "../manifest/ManifestTypes";
-import { Effects, ExpectedExports } from "../types";
-export type InstallFn<Manifest extends SDKManifest, Store> = (opts: {
-    effects: Effects;
+import * as T from "../types";
+export type InstallFn<Manifest extends T.Manifest, Store> = (opts: {
+    effects: T.Effects;
 }) => Promise<void>;
-export declare class Install<Manifest extends SDKManifest, Store> {
+export declare class Install<Manifest extends T.Manifest, Store> {
     readonly fn: InstallFn<Manifest, Store>;
     private constructor();
-    static of<Manifest extends SDKManifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;
-    init({ effects, previousVersion, }: Parameters<ExpectedExports.init>[0]): Promise<void>;
+    static of<Manifest extends T.Manifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;
+    init({ effects, previousVersion, }: Parameters<T.ExpectedExports.init>[0]): Promise<void>;
 }
-export declare function setupInstall<Manifest extends SDKManifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;
+export declare function setupInstall<Manifest extends T.Manifest, Store>(fn: InstallFn<Manifest, Store>): Install<Manifest, Store>;

package/mjs/lib/inits/setupInstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupInstall.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,OAAO;IACW;IAA7B,YAA6B,EAA8B;QAA9B,OAAE,GAAF,EAAE,CAA4B;IAAG,CAAC;IAC/D,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,OAAO,EACP,eAAe,GACqB;QACpC,IAAI,CAAC,eAAe;YAClB,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAED,MAAM,UAAU,YAAY,CAC1B,EAA8B;IAE9B,OAAO,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACvB,CAAC"}
+{"version":3,"file":"setupInstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupInstall.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,OAAO;IACW;IAA7B,YAA6B,EAA8B;QAA9B,OAAE,GAAF,EAAE,CAA4B;IAAG,CAAC;IAC/D,MAAM,CAAC,EAAE,CACP,EAA8B;QAE9B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,OAAO,EACP,eAAe,GACuB;QACtC,IAAI,CAAC,eAAe;YAClB,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAED,MAAM,UAAU,YAAY,CAC1B,EAA8B;IAE9B,OAAO,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACvB,CAAC"}

package/mjs/lib/inits/setupUninstall.d.ts

@@ -1,12 +1,11 @@
-import { SDKManifest } from "../manifest/ManifestTypes";
-import { Effects, ExpectedExports } from "../types";
-export type UninstallFn<Manifest extends SDKManifest, Store> = (opts: {
-    effects: Effects;
+import * as T from "../types";
+export type UninstallFn<Manifest extends T.Manifest, Store> = (opts: {
+    effects: T.Effects;
 }) => Promise<void>;
-export declare class Uninstall<Manifest extends SDKManifest, Store> {
+export declare class Uninstall<Manifest extends T.Manifest, Store> {
     readonly fn: UninstallFn<Manifest, Store>;
     private constructor();
-    static of<Manifest extends SDKManifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;
-    uninit({ effects, nextVersion, }: Parameters<ExpectedExports.uninit>[0]): Promise<void>;
+    static of<Manifest extends T.Manifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;
+    uninit({ effects, nextVersion, }: Parameters<T.ExpectedExports.uninit>[0]): Promise<void>;
 }
-export declare function setupUninstall<Manifest extends SDKManifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;
+export declare function setupUninstall<Manifest extends T.Manifest, Store>(fn: UninstallFn<Manifest, Store>): Uninstall<Manifest, Store>;

package/mjs/lib/inits/setupUninstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupUninstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupUninstall.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,SAAS;IACS;IAA7B,YAA6B,EAAgC;QAAhC,OAAE,GAAF,EAAE,CAA8B;IAAG,CAAC;IACjE,MAAM,CAAC,EAAE,CACP,EAAgC;QAEhC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EACX,OAAO,EACP,WAAW,GAC2B;QACtC,IAAI,CAAC,WAAW;YACd,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAC5B,EAAgC;IAEhC,OAAO,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACzB,CAAC"}
+{"version":3,"file":"setupUninstall.js","sourceRoot":"","sources":["../../../../lib/inits/setupUninstall.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,SAAS;IACS;IAA7B,YAA6B,EAAgC;QAAhC,OAAE,GAAF,EAAE,CAA8B;IAAG,CAAC;IACjE,MAAM,CAAC,EAAE,CACP,EAAgC;QAEhC,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EACX,OAAO,EACP,WAAW,GAC6B;QACxC,IAAI,CAAC,WAAW;YACd,MAAM,IAAI,CAAC,EAAE,CAAC;gBACZ,OAAO;aACR,CAAC,CAAA;IACN,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAC5B,EAAgC;IAEhC,OAAO,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;AACzB,CAAC"}

package/mjs/lib/interfaces/setupInterfaces.d.ts

@@ -1,12 +1,11 @@
 import { Config } from "../config/builder/config";
-import { SDKManifest } from "../manifest/ManifestTypes";
-import { AddressInfo, Effects } from "../types";
+import * as T from "../types";
 import { AddressReceipt } from "./AddressReceipt";
-export type InterfacesReceipt = Array<AddressInfo[] & AddressReceipt>;
-export type SetInterfaces<Manifest extends SDKManifest, Store, ConfigInput extends Record<string, any>, Output extends InterfacesReceipt> = (opts: {
-    effects: Effects;
+export type InterfacesReceipt = Array<T.AddressInfo[] & AddressReceipt>;
+export type SetInterfaces<Manifest extends T.Manifest, Store, ConfigInput extends Record<string, any>, Output extends InterfacesReceipt> = (opts: {
+    effects: T.Effects;
     input: null | ConfigInput;
 }) => Promise<Output>;
-export type SetupInterfaces = <Manifest extends SDKManifest, Store, ConfigInput extends Record<string, any>, Output extends InterfacesReceipt>(config: Config<ConfigInput, Store>, fn: SetInterfaces<Manifest, Store, ConfigInput, Output>) => SetInterfaces<Manifest, Store, ConfigInput, Output>;
+export type SetupInterfaces = <Manifest extends T.Manifest, Store, ConfigInput extends Record<string, any>, Output extends InterfacesReceipt>(config: Config<ConfigInput, Store>, fn: SetInterfaces<Manifest, Store, ConfigInput, Output>) => SetInterfaces<Manifest, Store, ConfigInput, Output>;
 export declare const NO_INTERFACE_CHANGES: InterfacesReceipt;
 export declare const setupInterfaces: SetupInterfaces;

package/mjs/lib/mainFn/CommandController.d.ts

@@ -1,17 +1,18 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { SDKManifest } from "../manifest/ManifestTypes";
-import { Effects, ImageId, ValidIfNoStupidEscape } from "../types";
+import * as T from "../types";
 import { MountOptions, Overlay } from "../util/Overlay";
 export declare class CommandController {
     readonly runningAnswer: Promise<unknown>;
     readonly overlay: Overlay;
     readonly pid: number | undefined;
+    readonly sigtermTimeout: number;
     private constructor();
-    static of<Manifest extends SDKManifest>(): <A extends string>(effects: Effects, imageId: {
-        id: keyof Manifest["images"] & ImageId;
+    static of<Manifest extends T.Manifest>(): <A extends string>(effects: T.Effects, imageId: {
+        id: keyof Manifest["images"] & T.ImageId;
         sharedRun?: boolean;
-    }, command: [string, ...string[]] | ValidIfNoStupidEscape<A>, options: {
+    }, command: T.CommandType, options: {
+        sigtermTimeout?: number | undefined;
         mounts?: {
             path: string;
             options: MountOptions;
@@ -25,7 +26,7 @@ export declare class CommandController {
         onStdout?: ((x: Buffer) => void) | undefined;
         onStderr?: ((x: Buffer) => void) | undefined;
     }) => Promise<CommandController>;
-    wait(): Promise<unknown>;
+    wait(timeout?: number): Promise<unknown>;
     term({ signal, timeout }?: {
         signal?: NodeJS.Signals | undefined;
         timeout?: number | undefined;

package/mjs/lib/mainFn/CommandController.js

@@ -1,3 +1,4 @@
+import { DEFAULT_SIGTERM_TIMEOUT } from ".";
 import { NO_TIMEOUT, SIGTERM } from "../StartSdk";
 import { Overlay } from "../util/Overlay";
 import { splitCommand } from "../util/splitCommand";
@@ -6,10 +7,12 @@ export class CommandController {
     runningAnswer;
     overlay;
     pid;
-    constructor(runningAnswer, overlay, pid) {
+    sigtermTimeout;
+    constructor(runningAnswer, overlay, pid, sigtermTimeout = DEFAULT_SIGTERM_TIMEOUT) {
         this.runningAnswer = runningAnswer;
         this.overlay = overlay;
         this.pid = pid;
+        this.sigtermTimeout = sigtermTimeout;
     }
     static of() {
         return async (effects, imageId, command, options) => {
@@ -38,10 +41,14 @@ export class CommandController {
                 });
             });
             const pid = childProcess.pid;
-            return new CommandController(answer, overlay, pid);
+            return new CommandController(answer, overlay, pid, options.sigtermTimeout);
         };
     }
-    async wait() {
+    async wait(timeout = NO_TIMEOUT) {
+        if (timeout > 0)
+            setTimeout(() => {
+                this.term();
+            }, timeout);
         try {
             return await this.runningAnswer;
         }
@@ -52,7 +59,7 @@ export class CommandController {
             await this.overlay.destroy().catch((_) => { });
         }
     }
-    async term({ signal = SIGTERM, timeout = NO_TIMEOUT } = {}) {
+    async term({ signal = SIGTERM, timeout = this.sigtermTimeout } = {}) {
         if (this.pid === undefined)
             return;
         try {

package/mjs/lib/mainFn/CommandController.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../lib/mainFn/CommandController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommandController.js","sourceRoot":"","sources":["../../../../lib/mainFn/CommandController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAW,OAAO,EAAE,MAAM,aAAa,CAAA;AAG1D,OAAO,EAAgB,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAU,MAAM,WAAW,CAAA;AAE9C,MAAM,OAAO,iBAAiB;IAEjB;IACA;IACA;IACA;IAJX,YACW,aAA+B,EAC/B,OAAgB,EAChB,GAAuB,EACvB,iBAAyB,uBAAuB;QAHhD,kBAAa,GAAb,aAAa,CAAkB;QAC/B,YAAO,GAAP,OAAO,CAAS;QAChB,QAAG,GAAH,GAAG,CAAoB;QACvB,mBAAc,GAAd,cAAc,CAAkC;IACxD,CAAC;IACJ,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,OAGC,EACD,OAAsB,EACtB,OAcC,EACD,EAAE;YACF,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YACtC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;YACvE,KAAK,IAAI,KAAK,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE;gBACtC,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;aAC/C;YACD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACjD,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnD,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,OAAO,CAAC,QAAQ;oBACd,CAAC,CAAC,IAAS,EAAE,EAAE;wBACb,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;oBAC9B,CAAC,CAAC,CACL,CAAA;gBACD,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,OAAO,CAAC,QAAQ;oBACd,CAAC,CAAC,IAAS,EAAE,EAAE;wBACb,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;oBAChC,CAAC,CAAC,CACL,CAAA;gBAED,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAS,EAAE,EAAE;oBACpC,IAAI,IAAI,KAAK,CAAC,EAAE;wBACd,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;qBACrB;oBACD,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAA;gBACrE,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAA;YAE5B,OAAO,IAAI,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5E,CAAC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,UAAkB,UAAU;QACrC,IAAI,OAAO,GAAG,CAAC;YACb,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC,IAAI,EAAE,CAAA;YACb,CAAC,EAAE,OAAO,CAAC,CAAA;QACb,IAAI;YACF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAA;SAChC;gBAAS;YACR,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE;gBAC1B,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7D,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CACV,CAAA;aACF;YACD,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CAAC,CAAA;SAC9C;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;QACjE,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS;YAAE,OAAM;QAClC,IAAI;YACF,MAAM,UAAU,CAAC,OAAO,EAAE;gBACxB,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE;gBAC/B,IAAI;gBACJ,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aACjB,CAAC,CAAA;YAEF,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YACvD,IAAI,UAAU,EAAE;gBACd,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAC7D,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CACV,CAAA;aACF;SACF;gBAAS;YACR,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;SAC7B;IACH,CAAC;CACF;AAED,SAAS,WAAW,CAClB,GAAW,EACX,OAAO,GAAG,UAAU,EACpB,QAAQ,GAAG,GAAG;IAEd,IAAI,YAAY,GAAG,QAAQ,GAAG,CAAC,CAAA;IAC/B,IAAI,OAAO,IAAI,CAAC,IAAI,OAAO,GAAG,YAAY,EAAE;QAC1C,YAAY,GAAG,OAAO,CAAA;KACvB;IACD,IAAI,WAAW,GAAG,OAAO,CAAA;IACzB,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,IAAI,OAAO,IAAI,QAAQ,EAAE;YACvB,WAAW,IAAI,QAAQ,CAAA;SACxB;aAAM;YACL,WAAW,GAAG,CAAC,CAAA;SAChB;KACF;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,IAAI,GAA0B,IAAI,CAAA;QACtC,IAAI,OAAO,KAAK,CAAC,EAAE;YACjB,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE;gBACrB,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YACnE,CAAC,EAAE,QAAQ,CAAC,CAAA;SACb;QACD,UAAU,CAAC,IAAI,EAAE,CAAC,SAAS,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CACrD,CAAC,CAAC,EAAE,EAAE;YACJ,IAAI,OAAO,KAAK,CAAC,EAAE;gBACjB,OAAO,CAAC,IAAI,CAAC,CAAA;aACd;QACH,CAAC,EACD,CAAC,CAAC,EAAE,EAAE;YACJ,IAAI,IAAI,EAAE;gBACR,YAAY,CAAC,IAAI,CAAC,CAAA;aACnB;YACD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE;gBACvD,OAAO,CAAC,KAAK,CAAC,CAAA;aACf;iBAAM;gBACL,MAAM,CAAC,CAAC,CAAC,CAAA;aACV;QACH,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/mjs/lib/mainFn/Daemon.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { SDKManifest } from "../manifest/ManifestTypes";
-import { Effects, ImageId, ValidIfNoStupidEscape } from "../types";
+import * as T from "../types";
 import { MountOptions, Overlay } from "../util/Overlay";
 /**
  * This is a wrapper around CommandController that has a state of off, where the command shouldn't be running
@@ -12,10 +11,10 @@ export declare class Daemon {
     private commandController;
     private shouldBeRunning;
     private constructor();
-    static of<Manifest extends SDKManifest>(): <A extends string>(effects: Effects, imageId: {
-        id: keyof Manifest["images"] & ImageId;
+    static of<Manifest extends T.Manifest>(): <A extends string>(effects: T.Effects, imageId: {
+        id: keyof Manifest["images"] & T.ImageId;
         sharedRun?: boolean;
-    }, command: [string, ...string[]] | ValidIfNoStupidEscape<A>, options: {
+    }, command: T.CommandType, options: {
         mounts?: {
             path: string;
             options: MountOptions;
@@ -28,6 +27,7 @@ export declare class Daemon {
         user?: string | undefined;
         onStdout?: ((x: Buffer) => void) | undefined;
         onStderr?: ((x: Buffer) => void) | undefined;
+        sigtermTimeout?: number | undefined;
     }) => Promise<Daemon>;
     start(): Promise<void>;
     term(termOptions?: {

package/mjs/lib/mainFn/Daemon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemon.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAM,OAAO,MAAM;IAGW;IAFpB,iBAAiB,GAA6B,IAAI,CAAA;IAClD,eAAe,GAAG,KAAK,CAAA;IAC/B,YAA4B,YAA8C;QAA9C,iBAAY,GAAZ,YAAY,CAAkC;IAAG,CAAC;IAC9E,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAgB,EAChB,OAGC,EACD,OAAyD,EACzD,OAYC,EACD,EAAE;YACF,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,iBAAiB,CAAC,EAAE,EAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;QACjC,CAAC,CAAA;IACH,CAAC;IAED,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,GAAG,CAAC,CAAA;QACpB,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC/B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;QAC5B,MAAM,IAAI,CAAC,iBAAiB;YAC1B,EAAE,IAAI,CAAC,WAAW,CAAC;aAClB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACjC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF"}
+{"version":3,"file":"Daemon.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemon.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACjC,MAAM,cAAc,GAAG,KAAK,CAAA;AAC5B;;;GAGG;AAEH,MAAM,OAAO,MAAM;IAGW;IAFpB,iBAAiB,GAA6B,IAAI,CAAA;IAClD,eAAe,GAAG,KAAK,CAAA;IAC/B,YAA4B,YAA8C;QAA9C,iBAAY,GAAZ,YAAY,CAAkC;IAAG,CAAC;IAC9E,MAAM,CAAC,EAAE;QACP,OAAO,KAAK,EACV,OAAkB,EAClB,OAGC,EACD,OAAsB,EACtB,OAaC,EACD,EAAE;YACF,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,iBAAiB,CAAC,EAAE,EAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,MAAM,CAAC,YAAY,CAAC,CAAA;QACjC,CAAC,CAAA;IACH,CAAC;IAED,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,GAAG,CAAC,CAAA;QACpB,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC/B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAGV;QACC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;QAC5B,MAAM,IAAI,CAAC,iBAAiB;YAC1B,EAAE,IAAI,CAAC,WAAW,CAAC;aAClB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACjC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAA;IAC/B,CAAC;CACF"}

package/mjs/lib/mainFn/Daemons.d.ts

@@ -3,9 +3,8 @@
 import { Signals } from "../StartSdk";
 import { HealthReceipt } from "../health/HealthReceipt";
 import { CheckResult } from "../health/checkFns";
-import { SDKManifest } from "../manifest/ManifestTypes";
 import { Trigger } from "../trigger";
-import { Effects, ImageId, ValidIfNoStupidEscape } from "../types";
+import * as T from "../types";
 import { Mounts } from "./Mounts";
 import { MountOptions, Overlay } from "../util/Overlay";
 import * as CP from "node:child_process";
@@ -21,22 +20,24 @@ export type Ready = {
     fn: () => Promise<CheckResult> | CheckResult;
     trigger?: Trigger;
 };
-type DaemonsParams<Manifest extends SDKManifest, Ids extends string, Command extends string, Id extends string> = {
-    command: ValidIfNoStupidEscape<Command> | [string, ...string[]];
+type DaemonsParams<Manifest extends T.Manifest, Ids extends string, Command extends string, Id extends string> = {
+    command: T.CommandType;
     image: {
-        id: keyof Manifest["images"] & ImageId;
+        id: keyof Manifest["images"] & T.ImageId;
         sharedRun?: boolean;
     };
     mounts: Mounts<Manifest>;
     env?: Record<string, string>;
     ready: Ready;
     requires: Exclude<Ids, Id>[];
+    sigtermTimeout?: number;
 };
 type ErrorDuplicateId<Id extends string> = `The id '${Id}' is already used`;
-export declare const runCommand: <Manifest extends SDKManifest>() => <A extends string>(effects: Effects, imageId: {
+export declare const runCommand: <Manifest extends T.Manifest>() => <A extends string>(effects: T.Effects, imageId: {
     id: keyof Manifest["images"] & string;
     sharedRun?: boolean | undefined;
-}, command: [string, ...string[]] | ValidIfNoStupidEscape<A>, options: {
+}, command: T.CommandType, options: {
+    sigtermTimeout?: number | undefined;
     mounts?: {
         path: string;
         options: MountOptions;
@@ -73,8 +74,8 @@ Daemons.of({
 })
 ```
  */
-export declare class Daemons<Manifest extends SDKManifest, Ids extends string> {
-    readonly effects: Effects;
+export declare class Daemons<Manifest extends T.Manifest, Ids extends string> {
+    readonly effects: T.Effects;
     readonly started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>;
     readonly daemons: Promise<Daemon>[];
     readonly ids: Ids[];
@@ -90,8 +91,8 @@ export declare class Daemons<Manifest extends SDKManifest, Ids extends string> {
      * @param config
      * @returns
      */
-    static of<Manifest extends SDKManifest>(config: {
-        effects: Effects;
+    static of<Manifest extends T.Manifest>(config: {
+        effects: T.Effects;
         started: (onTerm: () => PromiseLike<void>) => PromiseLike<void>;
         healthReceipts: HealthReceipt[];
     }): Daemons<Manifest, never>;

package/mjs/lib/mainFn/Daemons.js

@@ -74,7 +74,7 @@ export class Daemons {
         const healthDaemon = new HealthDaemon(daemon, daemonIndex, options.requires
             .map((x) => this.ids.indexOf(id))
             .filter((x) => x >= 0)
-            .map((id) => this.healthDaemons[id]), id, this.ids, options.ready, this.effects);
+            .map((id) => this.healthDaemons[id]), id, this.ids, options.ready, this.effects, options.sigtermTimeout);
         const daemons = this.daemons.concat(daemon);
         const ids = [...this.ids, id];
         const healthDaemons = [...this.healthDaemons, healthDaemon];
@@ -83,7 +83,7 @@ export class Daemons {
     async build() {
         this.updateMainHealth();
         this.healthDaemons.forEach((x) => x.addWatcher(() => this.updateMainHealth()));
-        return {
+        const built = {
             term: async (options) => {
                 try {
                     await Promise.all(this.healthDaemons.map((x) => x.term(options)));
@@ -93,14 +93,11 @@ export class Daemons {
                 }
             },
         };
+        this.started(() => built.term());
+        return built;
     }
     updateMainHealth() {
-        if (this.healthDaemons.every((x) => x.health.status === "success")) {
-            this.effects.setMainStatus({ status: "running" });
-        }
-        else {
-            this.effects.setMainStatus({ status: "starting" });
-        }
+        this.effects.setMainStatus({ status: "running" });
     }
 }
 //# sourceMappingURL=Daemons.js.map

package/mjs/lib/mainFn/Daemons.js.map

@@ -1 +1 @@
-{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemons.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Daemons.js","sourceRoot":"","sources":["../../../../lib/mainFn/Daemons.ts"],"names":[],"mappings":"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"}

package/mjs/lib/mainFn/HealthDaemon.d.ts

@@ -19,7 +19,8 @@ export declare class HealthDaemon {
     readonly ids: string[];
     readonly ready: Ready;
     readonly effects: Effects;
-    constructor(daemon: Promise<Daemon>, daemonIndex: number, dependencies: HealthDaemon[], id: string, ids: string[], ready: Ready, effects: Effects);
+    readonly sigtermTimeout: number;
+    constructor(daemon: Promise<Daemon>, daemonIndex: number, dependencies: HealthDaemon[], id: string, ids: string[], ready: Ready, effects: Effects, sigtermTimeout?: number);
     /** Run after we want to do cleanup */
     term(termOptions?: {
         signal?: NodeJS.Signals | undefined;

package/mjs/lib/mainFn/HealthDaemon.js

@@ -1,4 +1,5 @@
 import { defaultTrigger } from "../trigger/defaultTrigger";
+import { DEFAULT_SIGTERM_TIMEOUT } from ".";
 const oncePromise = () => {
     let resolve;
     const promise = new Promise((res) => {
@@ -21,11 +22,12 @@ export class HealthDaemon {
     ids;
     ready;
     effects;
+    sigtermTimeout;
     #health = { status: "starting", message: null };
     #healthWatchers = [];
     #running = false;
     #hadSuccess = false;
-    constructor(daemon, daemonIndex, dependencies, id, ids, ready, effects) {
+    constructor(daemon, daemonIndex, dependencies, id, ids, ready, effects, sigtermTimeout = DEFAULT_SIGTERM_TIMEOUT) {
         this.daemon = daemon;
         this.daemonIndex = daemonIndex;
         this.dependencies = dependencies;
@@ -33,6 +35,7 @@ export class HealthDaemon {
         this.ids = ids;
         this.ready = ready;
         this.effects = effects;
+        this.sigtermTimeout = sigtermTimeout;
         this.updateStatus();
         this.dependencies.forEach((d) => d.addWatcher(() => this.updateStatus()));
     }
@@ -41,7 +44,10 @@ export class HealthDaemon {
         this.#healthWatchers = [];
         this.#running = false;
         this.#healthCheckCleanup?.();
-        await this.daemon.then((d) => d.stop(termOptions));
+        await this.daemon.then((d) => d.stop({
+            timeout: this.sigtermTimeout,
+            ...termOptions,
+        }));
     }
     /** Want to add another notifier that the health might have changed */
     addWatcher(watcher) {
@@ -112,7 +118,7 @@ export class HealthDaemon {
             this.effects.setHealth({
                 result: status,
                 message: health.message,
-                id: display,
+                id: this.id,
                 name: display,
             });
         }
@@ -120,7 +126,7 @@ export class HealthDaemon {
             this.effects.setHealth({
                 result: health.status,
                 message: health.message || "",
-                id: display,
+                id: this.id,
                 name: display,
             });
         }

package/mjs/lib/mainFn/HealthDaemon.js.map

@@ -1 +1 @@
-{"version":3,"file":"HealthDaemon.js","sourceRoot":"","sources":["../../../../lib/mainFn/HealthDaemon.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HealthDaemon.js","sourceRoot":"","sources":["../../../../lib/mainFn/HealthDaemon.ts"],"names":[],"mappings":"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"}