@start9labs/start-sdk 0.3.6-beta.0 → 0.3.6-beta.1

package/base/lib/Effects.d.ts

@@ -1,4 +1,4 @@
-import { ActionId, ActionInput, ActionMetadata, SetMainStatus, DependencyRequirement, CheckDependenciesResult, SetHealth, BindParams, HostId, LanInfo, Host, ExportServiceInterfaceParams, ServiceInterface, RequestActionParams, MainStatus } from "./osBindings";
+import { ActionId, ActionInput, ActionMetadata, SetMainStatus, DependencyRequirement, CheckDependenciesResult, SetHealth, BindParams, HostId, NetInfo, Host, ExportServiceInterfaceParams, ServiceInterface, RequestActionParams, MainStatus } from "./osBindings";
 import { StorePath } from "./util/PathBuilder";
 import { PackageId, Dependencies, ServiceInterfaceId, SmtpValue, ActionResult } from "./types";
 import { UrlString } from "./util/getServiceInterface";
@@ -93,7 +93,7 @@ export type Effects = {
         packageId?: PackageId;
         hostId: HostId;
         internalPort: number;
-    }): Promise<LanInfo>;
+    }): Promise<NetInfo>;
     /** Removes all network bindings, called in the setupInputSpec */
     clearBindings(options: {
         except: {

package/base/lib/osBindings/BindInfo.d.ts

@@ -1,7 +1,7 @@
 import type { BindOptions } from "./BindOptions";
-import type { LanInfo } from "./LanInfo";
+import type { NetInfo } from "./NetInfo";
 export type BindInfo = {
     enabled: boolean;
     options: BindOptions;
-    lan: LanInfo;
+    net: NetInfo;
 };

package/base/lib/osBindings/IpInfo.d.ts

@@ -1,6 +1,5 @@
 export type IpInfo = {
-    ipv4Range: string | null;
-    ipv4: string | null;
-    ipv6Range: string | null;
-    ipv6: string | null;
+    scopeId: number;
+    subnets: string[];
+    wanIp: string | null;
 };

package/base/lib/osBindings/Manifest.d.ts

@@ -1,6 +1,7 @@
 import type { Alerts } from "./Alerts";
 import type { Dependencies } from "./Dependencies";
 import type { Description } from "./Description";
+import type { GitHash } from "./GitHash";
 import type { HardwareRequirements } from "./HardwareRequirements";
 import type { ImageConfig } from "./ImageConfig";
 import type { ImageId } from "./ImageId";
@@ -30,6 +31,6 @@ export type Manifest = {
     alerts: Alerts;
     dependencies: Dependencies;
     hardwareRequirements: HardwareRequirements;
-    gitHash: string | null;
+    gitHash?: GitHash;
     osVersion: string;
 };

package/base/lib/osBindings/NetworkInterfaceInfo.d.ts

@@ -1,6 +1,5 @@
 import type { IpInfo } from "./IpInfo";
 export type NetworkInterfaceInfo = {
     public: boolean | null;
-    scopeId: number | null;
-    ipInfo: IpInfo;
+    ipInfo: IpInfo | null;
 };

package/base/lib/osBindings/PackageVersionInfo.d.ts

@@ -2,6 +2,7 @@ import type { Alerts } from "./Alerts";
 import type { DataUrl } from "./DataUrl";
 import type { DependencyMetadata } from "./DependencyMetadata";
 import type { Description } from "./Description";
+import type { GitHash } from "./GitHash";
 import type { HardwareRequirements } from "./HardwareRequirements";
 import type { MerkleArchiveCommitment } from "./MerkleArchiveCommitment";
 import type { PackageId } from "./PackageId";
@@ -11,7 +12,7 @@ export type PackageVersionInfo = {
     icon: DataUrl;
     description: Description;
     releaseNotes: string;
-    gitHash: string;
+    gitHash: GitHash;
     license: string;
     wrapperRepo: string;
     upstreamRepo: string;

package/base/lib/osBindings/ServerInfo.d.ts

@@ -1,7 +1,7 @@
 import type { AcmeSettings } from "./AcmeSettings";
 import type { Governor } from "./Governor";
-import type { IpInfo } from "./IpInfo";
 import type { LshwDevice } from "./LshwDevice";
+import type { NetworkInterfaceInfo } from "./NetworkInterfaceInfo";
 import type { ServerStatus } from "./ServerStatus";
 import type { SmtpValue } from "./SmtpValue";
 import type { WifiInfo } from "./WifiInfo";
@@ -20,8 +20,8 @@ export type ServerInfo = {
      * for backwards compatibility
      */
     torAddress: string;
-    ipInfo: {
-        [key: string]: IpInfo;
+    networkInterfaces: {
+        [key: string]: NetworkInterfaceInfo;
     };
     acme: AcmeSettings | null;
     statusInfo: ServerStatus;

package/base/lib/osBindings/index.d.ts

@@ -90,6 +90,7 @@ export { GetSslKeyParams } from "./GetSslKeyParams";
 export { GetStatusParams } from "./GetStatusParams";
 export { GetStoreParams } from "./GetStoreParams";
 export { GetSystemSmtpParams } from "./GetSystemSmtpParams";
+export { GitHash } from "./GitHash";
 export { Governor } from "./Governor";
 export { Guid } from "./Guid";
 export { HardwareRequirements } from "./HardwareRequirements";
@@ -112,7 +113,6 @@ export { InstallingState } from "./InstallingState";
 export { InstallParams } from "./InstallParams";
 export { IpHostname } from "./IpHostname";
 export { IpInfo } from "./IpInfo";
-export { LanInfo } from "./LanInfo";
 export { ListPackageSignersParams } from "./ListPackageSignersParams";
 export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams";
 export { ListVersionSignersParams } from "./ListVersionSignersParams";
@@ -128,6 +128,8 @@ export { MountParams } from "./MountParams";
 export { MountTarget } from "./MountTarget";
 export { NamedHealthCheckResult } from "./NamedHealthCheckResult";
 export { NamedProgress } from "./NamedProgress";
+export { NetInfo } from "./NetInfo";
+export { NetworkInterfaceInfo } from "./NetworkInterfaceInfo";
 export { OnionHostname } from "./OnionHostname";
 export { OsIndex } from "./OsIndex";
 export { OsVersionInfoMap } from "./OsVersionInfoMap";
@@ -172,6 +174,7 @@ export { SetIconParams } from "./SetIconParams";
 export { SetMainStatusStatus } from "./SetMainStatusStatus";
 export { SetMainStatus } from "./SetMainStatus";
 export { SetNameParams } from "./SetNameParams";
+export { SetPublicParams } from "./SetPublicParams";
 export { SetStoreParams } from "./SetStoreParams";
 export { SetupExecuteParams } from "./SetupExecuteParams";
 export { SetupProgress } from "./SetupProgress";
@@ -181,6 +184,7 @@ export { SignAssetParams } from "./SignAssetParams";
 export { SignerInfo } from "./SignerInfo";
 export { SmtpValue } from "./SmtpValue";
 export { StartStop } from "./StartStop";
+export { UnsetPublicParams } from "./UnsetPublicParams";
 export { UpdatingState } from "./UpdatingState";
 export { VerifyCifsParams } from "./VerifyCifsParams";
 export { VersionSignerParams } from "./VersionSignerParams";

package/package/lib/StartSdk.d.ts

@@ -1204,7 +1204,7 @@ export declare class StartSdk<Manifest extends T.SDKManifest, Store> {
             packageId?: string | undefined;
             hostId: string;
             internalPort: number;
-        }) => Promise<T.LanInfo>;
+        }) => Promise<T.NetInfo>;
         clearBindings: (effects: Effects, options: {
             except: {
                 id: string;

package/package/lib/manifest/setupManifest.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildManifest = exports.setupManifest = void 0;
 const StartSdk_1 = require("../StartSdk");
-const child_process_1 = require("child_process");
 /**
  * @description Use this function to define critical information about your package
  *
@@ -12,16 +11,6 @@ function setupManifest(manifest) {
     return manifest;
 }
 exports.setupManifest = setupManifest;
-function gitHash() {
-    const hash = (0, child_process_1.execSync)("git rev-parse HEAD").toString().trim();
-    try {
-        (0, child_process_1.execSync)("git diff-index --quiet HEAD --");
-        return hash;
-    }
-    catch (e) {
-        return hash + "-modified";
-    }
-}
 function buildManifest(versions, manifest) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const images = Object.entries(manifest.images).reduce((images, [k, v]) => {
@@ -35,7 +24,6 @@ function buildManifest(versions, manifest) {
     }, {});
     return {
         ...manifest,
-        gitHash: gitHash(),
         osVersion: StartSdk_1.SDKVersion,
         version: versions.current.options.version,
         releaseNotes: versions.current.options.releaseNotes,

package/package/lib/manifest/setupManifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../package/lib/manifest/setupManifest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setupManifest.js","sourceRoot":"","sources":["../../../../package/lib/manifest/setupManifest.ts"],"names":[],"mappings":";;;AAMA,0CAAwC;AAIxC;;;;GAIG;AACH,SAAgB,aAAa,CAS3B,QAAgC;IAChC,OAAO,QAAQ,CAAA;AACjB,CAAC;AAXD,sCAWC;AAED,SAAgB,aAAa,CAe3B,QAA+B,EAC/B,QAAgC;;IAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CACnD,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACjB,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACxC,IAAI,CAAC,CAAC,gBAAgB,KAAK,SAAS;YAClC,CAAC,CAAC,gBAAgB,GAAI,CAAC,CAAC,IAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC3D,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;QACvB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAgB,CAAA;QAC5B,OAAO,MAAM,CAAA;IACf,CAAC,EACD,EAAkC,CACnC,CAAA;IACD,OAAO;QACL,GAAG,QAAQ;QACX,SAAS,EAAE,qBAAU;QACrB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;QACzC,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY;QACnD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE;QACnD,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE;QAChD,cAAc,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE;QACpD,MAAM;QACN,MAAM,EAAE;YACN,OAAO,EAAE,CAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,OAAO,KAAI,IAAI;YACzC,MAAM,EAAE,CAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,MAAM,KAAI,IAAI;YACvC,SAAS,EAAE,CAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,SAAS,KAAI,IAAI;YAC7C,OAAO,EAAE,CAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,OAAO,KAAI,IAAI;YACzC,KAAK,EAAE,CAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,KAAK,KAAI,IAAI;YACrC,IAAI,EAAE,CAAA,MAAA,QAAQ,CAAC,MAAM,0CAAE,IAAI,KAAI,IAAI;SACpC;QACD,oBAAoB,EAAE;YACpB,MAAM,EAAE,CAAA,MAAA,QAAQ,CAAC,oBAAoB,0CAAE,MAAM,KAAI,EAAE;YACnD,GAAG,EAAE,CAAA,MAAA,QAAQ,CAAC,oBAAoB,0CAAE,GAAG,KAAI,IAAI;YAC/C,IAAI,EACF,CAAA,MAAA,QAAQ,CAAC,oBAAoB,0CAAE,IAAI,MAAK,SAAS;gBAC/C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAC1B,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;oBAClB,IAAI,SAAS,CAAC,gBAAgB,EAAE;wBAC9B,OAAO,IAAI,CAAA;qBACZ;oBACD,IAAI,IAAI,KAAK,IAAI,EAAE;wBACjB,OAAO,SAAS,CAAC,IAAI,CAAA;qBACtB;oBACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;gBACvD,CAAC,EACD,IAAuB,CACxB;gBACH,CAAC,CAAC,MAAA,QAAQ,CAAC,oBAAoB,0CAAE,IAAI;SAC1C;KACF,CAAA;AACH,CAAC;AAnED,sCAmEC"}

package/package/lib/test/output.sdk.d.ts

@@ -1131,7 +1131,7 @@ export declare const sdk: {
         packageId?: string | undefined;
         hostId: string;
         internalPort: number;
-    }) => Promise<import("../../../base/lib/osBindings").LanInfo>;
+    }) => Promise<import("../../../base/lib/osBindings").NetInfo>;
     clearBindings: (effects: import("../../../base/lib/Effects").Effects, options: {
         except: {
             id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-beta.0",
+  "version": "0.3.6-beta.1",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",
@@ -33,7 +33,7 @@
     "isomorphic-fetch": "^3.0.0",
     "lodash.merge": "^4.6.2",
     "mime-types": "^2.1.35",
-    "ts-matches": "^6.1.0",
+    "ts-matches": "^6.2.1",
     "yaml": "^2.2.2",
     "@iarna/toml": "^2.2.5",
     "@noble/curves": "^1.4.0",