@start9labs/start-sdk 0.4.0-beta.3 → 0.4.0-beta.30

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.
Files changed (206) hide show
  1. package/base/lib/Effects.d.ts +8 -34
  2. package/base/lib/actions/index.d.ts +13 -13
  3. package/base/lib/actions/index.js +4 -4
  4. package/base/lib/actions/index.js.map +1 -1
  5. package/base/lib/actions/input/builder/inputSpec.d.ts +10 -25
  6. package/base/lib/actions/input/builder/inputSpec.js +0 -17
  7. package/base/lib/actions/input/builder/inputSpec.js.map +1 -1
  8. package/base/lib/actions/input/builder/list.d.ts +8 -23
  9. package/base/lib/actions/input/builder/list.js +0 -17
  10. package/base/lib/actions/input/builder/list.js.map +1 -1
  11. package/base/lib/actions/input/builder/value.d.ts +315 -61
  12. package/base/lib/actions/input/builder/value.js +280 -28
  13. package/base/lib/actions/input/builder/value.js.map +1 -1
  14. package/base/lib/actions/input/builder/variants.d.ts +8 -23
  15. package/base/lib/actions/input/builder/variants.js +0 -17
  16. package/base/lib/actions/input/builder/variants.js.map +1 -1
  17. package/base/lib/actions/input/inputSpecConstants.d.ts +6 -6
  18. package/base/lib/actions/input/inputSpecConstants.js +8 -6
  19. package/base/lib/actions/input/inputSpecConstants.js.map +1 -1
  20. package/base/lib/actions/setupActions.d.ts +15 -11
  21. package/base/lib/actions/setupActions.js +25 -11
  22. package/base/lib/actions/setupActions.js.map +1 -1
  23. package/base/lib/dependencies/dependencies.d.ts +2 -2
  24. package/base/lib/dependencies/dependencies.js +23 -15
  25. package/base/lib/dependencies/dependencies.js.map +1 -1
  26. package/base/lib/dependencies/setupDependencies.d.ts +1 -3
  27. package/base/lib/dependencies/setupDependencies.js +3 -12
  28. package/base/lib/dependencies/setupDependencies.js.map +1 -1
  29. package/base/lib/index.d.ts +1 -0
  30. package/base/lib/index.js +2 -1
  31. package/base/lib/index.js.map +1 -1
  32. package/base/lib/inits/index.d.ts +2 -0
  33. package/base/lib/inits/index.js +19 -0
  34. package/base/lib/inits/index.js.map +1 -0
  35. package/base/lib/inits/setupInit.d.ts +9 -0
  36. package/base/lib/inits/setupInit.js +40 -0
  37. package/base/lib/inits/setupInit.js.map +1 -0
  38. package/base/lib/inits/setupUninit.d.ts +25 -0
  39. package/base/lib/inits/setupUninit.js +24 -0
  40. package/base/lib/inits/setupUninit.js.map +1 -0
  41. package/base/lib/interfaces/Host.js +18 -6
  42. package/base/lib/interfaces/Host.js.map +1 -1
  43. package/base/lib/interfaces/Origin.d.ts +2 -2
  44. package/base/lib/interfaces/Origin.js +3 -3
  45. package/base/lib/interfaces/Origin.js.map +1 -1
  46. package/base/lib/interfaces/ServiceInterfaceBuilder.d.ts +2 -2
  47. package/base/lib/interfaces/setupInterfaces.d.ts +2 -4
  48. package/base/lib/interfaces/setupInterfaces.js +8 -19
  49. package/base/lib/interfaces/setupInterfaces.js.map +1 -1
  50. package/base/lib/osBindings/AddCategoryParams.d.ts +0 -2
  51. package/base/lib/osBindings/AddPackageToCategoryParams.d.ts +5 -0
  52. package/base/lib/osBindings/AddPackageToCategoryParams.js +3 -0
  53. package/base/lib/osBindings/AddPackageToCategoryParams.js.map +1 -0
  54. package/base/lib/osBindings/AttachParams.d.ts +1 -0
  55. package/base/lib/osBindings/Category.d.ts +0 -2
  56. package/base/lib/osBindings/Category.js +1 -0
  57. package/base/lib/osBindings/Category.js.map +1 -1
  58. package/base/lib/osBindings/CheckDependenciesResult.d.ts +3 -3
  59. package/base/lib/osBindings/ClearTasksParams.d.ts +5 -0
  60. package/base/lib/osBindings/{UnsetPublicParams.js → ClearTasksParams.js} +1 -1
  61. package/base/lib/osBindings/ClearTasksParams.js.map +1 -0
  62. package/base/lib/osBindings/CreateTaskParams.d.ts +15 -0
  63. package/base/lib/osBindings/CreateTaskParams.js +3 -0
  64. package/base/lib/osBindings/CreateTaskParams.js.map +1 -0
  65. package/base/lib/osBindings/FileType.d.ts +1 -0
  66. package/base/lib/osBindings/{NetworkInterfaceSetPublicParams.js → FileType.js} +1 -1
  67. package/base/lib/osBindings/FileType.js.map +1 -0
  68. package/base/lib/osBindings/GetOsVersionParams.d.ts +3 -3
  69. package/base/lib/osBindings/GetPackageParams.d.ts +1 -1
  70. package/base/lib/osBindings/MainStatus.d.ts +0 -2
  71. package/base/lib/osBindings/Manifest.d.ts +1 -0
  72. package/base/lib/osBindings/MountTarget.d.ts +2 -0
  73. package/base/lib/osBindings/PackageDataEntry.d.ts +4 -5
  74. package/base/lib/osBindings/RemoveAdminParams.d.ts +4 -0
  75. package/base/lib/osBindings/RemoveAdminParams.js +3 -0
  76. package/base/lib/osBindings/RemoveAdminParams.js.map +1 -0
  77. package/base/lib/osBindings/RemoveAssetParams.d.ts +4 -0
  78. package/base/lib/osBindings/RemoveAssetParams.js +4 -0
  79. package/base/lib/osBindings/RemoveAssetParams.js.map +1 -0
  80. package/base/lib/osBindings/RemovePackageFromCategoryParams.d.ts +5 -0
  81. package/base/lib/osBindings/RemovePackageFromCategoryParams.js +3 -0
  82. package/base/lib/osBindings/RemovePackageFromCategoryParams.js.map +1 -0
  83. package/base/lib/osBindings/RemovePackageParams.d.ts +6 -0
  84. package/base/lib/osBindings/RemovePackageParams.js +3 -0
  85. package/base/lib/osBindings/RemovePackageParams.js.map +1 -0
  86. package/base/lib/osBindings/ServerInfo.d.ts +1 -0
  87. package/base/lib/osBindings/SetupExecuteParams.d.ts +1 -0
  88. package/base/lib/osBindings/Task.d.ts +13 -0
  89. package/base/lib/osBindings/Task.js +3 -0
  90. package/base/lib/osBindings/Task.js.map +1 -0
  91. package/base/lib/osBindings/TaskCondition.d.ts +1 -0
  92. package/base/lib/osBindings/TaskCondition.js +4 -0
  93. package/base/lib/osBindings/TaskCondition.js.map +1 -0
  94. package/base/lib/osBindings/TaskEntry.d.ts +5 -0
  95. package/base/lib/osBindings/TaskEntry.js +3 -0
  96. package/base/lib/osBindings/TaskEntry.js.map +1 -0
  97. package/base/lib/osBindings/TaskInput.d.ts +4 -0
  98. package/base/lib/osBindings/TaskInput.js +4 -0
  99. package/base/lib/osBindings/TaskInput.js.map +1 -0
  100. package/base/lib/osBindings/TaskSeverity.d.ts +1 -0
  101. package/base/lib/osBindings/TaskSeverity.js +4 -0
  102. package/base/lib/osBindings/TaskSeverity.js.map +1 -0
  103. package/base/lib/osBindings/TaskTrigger.d.ts +5 -0
  104. package/base/lib/osBindings/TaskTrigger.js +3 -0
  105. package/base/lib/osBindings/TaskTrigger.js.map +1 -0
  106. package/base/lib/osBindings/index.d.ts +14 -11
  107. package/base/lib/s9pk/index.js +5 -7
  108. package/base/lib/s9pk/index.js.map +1 -1
  109. package/base/lib/types.d.ts +22 -33
  110. package/base/lib/types.js +13 -0
  111. package/base/lib/types.js.map +1 -1
  112. package/base/lib/util/GetSystemSmtp.d.ts +4 -0
  113. package/base/lib/util/GetSystemSmtp.js +32 -2
  114. package/base/lib/util/GetSystemSmtp.js.map +1 -1
  115. package/base/lib/util/getServiceInterface.d.ts +14 -0
  116. package/base/lib/util/getServiceInterface.js +70 -1
  117. package/base/lib/util/getServiceInterface.js.map +1 -1
  118. package/base/lib/util/getServiceInterfaces.d.ts +4 -0
  119. package/base/lib/util/getServiceInterfaces.js +34 -1
  120. package/base/lib/util/getServiceInterfaces.js.map +1 -1
  121. package/base/lib/util/index.d.ts +0 -1
  122. package/base/lib/util/index.js +1 -3
  123. package/base/lib/util/index.js.map +1 -1
  124. package/package/lib/StartSdk.d.ts +108 -570
  125. package/package/lib/StartSdk.js +112 -428
  126. package/package/lib/StartSdk.js.map +1 -1
  127. package/package/lib/backup/Backups.d.ts +15 -3
  128. package/package/lib/backup/Backups.js +44 -28
  129. package/package/lib/backup/Backups.js.map +1 -1
  130. package/package/lib/backup/setupBackups.d.ts +5 -2
  131. package/package/lib/backup/setupBackups.js +7 -5
  132. package/package/lib/backup/setupBackups.js.map +1 -1
  133. package/package/lib/health/HealthCheck.d.ts +0 -1
  134. package/package/lib/health/HealthCheck.js +1 -7
  135. package/package/lib/health/HealthCheck.js.map +1 -1
  136. package/package/lib/health/checkFns/runHealthScript.d.ts +2 -1
  137. package/package/lib/health/checkFns/runHealthScript.js +1 -1
  138. package/package/lib/health/checkFns/runHealthScript.js.map +1 -1
  139. package/package/lib/index.d.ts +0 -3
  140. package/package/lib/index.js +1 -8
  141. package/package/lib/index.js.map +1 -1
  142. package/package/lib/inits/index.d.ts +2 -3
  143. package/package/lib/inits/index.js +16 -3
  144. package/package/lib/inits/index.js.map +1 -1
  145. package/package/lib/inits/setupInit.d.ts +7 -13
  146. package/package/lib/inits/setupInit.js +22 -48
  147. package/package/lib/inits/setupInit.js.map +1 -1
  148. package/package/lib/inits/setupInstall.d.ts +10 -10
  149. package/package/lib/inits/setupInstall.js.map +1 -1
  150. package/package/lib/inits/setupUninit.d.ts +7 -0
  151. package/package/lib/inits/setupUninit.js +14 -0
  152. package/package/lib/inits/setupUninit.js.map +1 -0
  153. package/package/lib/inits/setupUninstall.d.ts +5 -5
  154. package/package/lib/inits/setupUninstall.js.map +1 -1
  155. package/package/lib/mainFn/CommandController.d.ts +6 -24
  156. package/package/lib/mainFn/CommandController.js +72 -48
  157. package/package/lib/mainFn/CommandController.js.map +1 -1
  158. package/package/lib/mainFn/Daemon.d.ts +15 -22
  159. package/package/lib/mainFn/Daemon.js +56 -13
  160. package/package/lib/mainFn/Daemon.js.map +1 -1
  161. package/package/lib/mainFn/Daemons.d.ts +72 -49
  162. package/package/lib/mainFn/Daemons.js +87 -23
  163. package/package/lib/mainFn/Daemons.js.map +1 -1
  164. package/package/lib/mainFn/HealthDaemon.d.ts +8 -7
  165. package/package/lib/mainFn/HealthDaemon.js +79 -38
  166. package/package/lib/mainFn/HealthDaemon.js.map +1 -1
  167. package/package/lib/mainFn/Mounts.d.ts +38 -43
  168. package/package/lib/mainFn/Mounts.js +19 -48
  169. package/package/lib/mainFn/Mounts.js.map +1 -1
  170. package/package/lib/mainFn/Oneshot.d.ts +12 -0
  171. package/package/lib/mainFn/Oneshot.js +23 -0
  172. package/package/lib/mainFn/Oneshot.js.map +1 -0
  173. package/package/lib/mainFn/index.d.ts +1 -1
  174. package/package/lib/manifest/setupManifest.js +2 -0
  175. package/package/lib/manifest/setupManifest.js.map +1 -1
  176. package/package/lib/store/getStore.js +7 -2
  177. package/package/lib/store/getStore.js.map +1 -1
  178. package/package/lib/test/host.test.js +1 -1
  179. package/package/lib/test/host.test.js.map +1 -1
  180. package/package/lib/test/inputSpecBuilder.test.js +3 -10
  181. package/package/lib/test/inputSpecBuilder.test.js.map +1 -1
  182. package/package/lib/test/output.d.ts +2 -38
  183. package/package/lib/test/output.sdk.d.ts +235 -901
  184. package/package/lib/test/output.sdk.js +0 -1
  185. package/package/lib/test/output.sdk.js.map +1 -1
  186. package/package/lib/util/Drop.d.ts +4 -2
  187. package/package/lib/util/Drop.js +32 -8
  188. package/package/lib/util/Drop.js.map +1 -1
  189. package/package/lib/util/GetSslCertificate.d.ts +4 -0
  190. package/package/lib/util/GetSslCertificate.js +34 -2
  191. package/package/lib/util/GetSslCertificate.js.map +1 -1
  192. package/package/lib/util/SubContainer.d.ts +164 -45
  193. package/package/lib/util/SubContainer.js +223 -100
  194. package/package/lib/util/SubContainer.js.map +1 -1
  195. package/package/lib/util/fileHelper.d.ts +46 -17
  196. package/package/lib/util/fileHelper.js +112 -41
  197. package/package/lib/util/fileHelper.js.map +1 -1
  198. package/package/lib/version/VersionGraph.d.ts +26 -5
  199. package/package/lib/version/VersionGraph.js +88 -22
  200. package/package/lib/version/VersionGraph.js.map +1 -1
  201. package/package/package.json +63 -0
  202. package/package.json +7 -8
  203. package/base/lib/osBindings/NetworkInterfaceSetPublicParams.d.ts +0 -4
  204. package/base/lib/osBindings/NetworkInterfaceSetPublicParams.js.map +0 -1
  205. package/base/lib/osBindings/UnsetPublicParams.d.ts +0 -3
  206. package/base/lib/osBindings/UnsetPublicParams.js.map +0 -1
@@ -25,6 +25,7 @@ class Action {
25
25
  this.inputSpec = inputSpec;
26
26
  this.getInputFn = getInputFn;
27
27
  this.runFn = runFn;
28
+ this._INPUT = null;
28
29
  }
29
30
  static withInput(id, metadata, inputSpec, getInput, run) {
30
31
  return new Action(id, mapMaybeFn(metadata, (m) => ({ ...m, hasInput: true })), inputSpec, getInput, run);
@@ -33,7 +34,13 @@ class Action {
33
34
  return new Action(id, mapMaybeFn(metadata, (m) => ({ ...m, hasInput: false })), {}, async () => null, run);
34
35
  }
35
36
  async exportMetadata(options) {
36
- const metadata = await callMaybeFn(this.metadataFn, options);
37
+ const childEffects = options.effects.child(`setupActions/${this.id}`);
38
+ childEffects.constRetry = (0, util_1.once)(() => {
39
+ this.exportMetadata(options);
40
+ });
41
+ const metadata = await callMaybeFn(this.metadataFn, {
42
+ effects: childEffects,
43
+ });
37
44
  await options.effects.action.export({ id: this.id, metadata });
38
45
  return metadata;
39
46
  }
@@ -58,18 +65,25 @@ class Actions {
58
65
  addAction(action) {
59
66
  return new Actions({ ...this.actions, [action.id]: action });
60
67
  }
61
- async update(options) {
62
- options.effects = {
63
- ...options.effects,
64
- constRetry: (0, util_1.once)(() => {
65
- this.update(options); // yes, this reuses the options object, but the const retry function will be overwritten each time, so the once-ness is not a problem
66
- }),
67
- };
68
+ async init(effects) {
68
69
  for (let action of Object.values(this.actions)) {
69
- await action.exportMetadata(options);
70
+ const fn = async () => {
71
+ let res = () => { };
72
+ const complete = new Promise((resolve) => {
73
+ res = resolve;
74
+ });
75
+ const e = effects.child(action.id);
76
+ e.constRetry = (0, util_1.once)(() => complete.then(() => fn()).catch(console.error));
77
+ try {
78
+ await action.exportMetadata({ effects: e });
79
+ }
80
+ finally {
81
+ res();
82
+ }
83
+ };
84
+ await fn();
70
85
  }
71
- await options.effects.action.clear({ except: Object.keys(this.actions) });
72
- return null;
86
+ await effects.action.clear({ except: Object.keys(this.actions) });
73
87
  }
74
88
  get(actionId) {
75
89
  return this.actions[actionId];
@@ -1 +1 @@
1
- {"version":3,"file":"setupActions.js","sourceRoot":"","sources":["../../../../base/lib/actions/setupActions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setupActions.js","sourceRoot":"","sources":["../../../../base/lib/actions/setupActions.ts"],"names":[],"mappings":";;;AAMA,kCAA8B;AAgB9B,SAAS,WAAW,CAClB,OAAmB,EACnB,OAA+B;IAE/B,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;AACH,CAAC;AACD,SAAS,UAAU,CACjB,OAAmB,EACnB,GAAoB;IAEpB,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;QAChC,OAAO,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,CAAC,OAAO,CAAC,CAAA;IACrB,CAAC;AACH,CAAC;AAUD,MAAa,MAAM;IAMjB,YACW,EAAM,EACE,UAAqC,EACrC,SAAwB,EACxB,UAAmC,EACnC,KAAyB;QAJjC,OAAE,GAAF,EAAE,CAAI;QACE,eAAU,GAAV,UAAU,CAA2B;QACrC,cAAS,GAAT,SAAS,CAAe;QACxB,eAAU,GAAV,UAAU,CAAyB;QACnC,UAAK,GAAL,KAAK,CAAoB;QANnC,WAAM,GAAkB,IAA4B,CAAA;IAO1D,CAAC;IACJ,MAAM,CAAC,SAAS,CAId,EAAM,EACN,QAAqD,EACrD,SAAwB,EACxB,QAAiC,EACjC,GAAuB;QAEvB,OAAO,IAAI,MAAM,CACf,EAAE,EACF,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EACvD,SAAS,EACT,QAAQ,EACR,GAAG,CACJ,CAAA;IACH,CAAC;IACD,MAAM,CAAC,YAAY,CACjB,EAAM,EACN,QAAqD,EACrD,GAAY;QAEZ,OAAO,IAAI,MAAM,CACf,EAAE,EACF,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,EACxD,EAAE,EACF,KAAK,IAAI,EAAE,CAAC,IAAI,EAChB,GAAG,CACJ,CAAA;IACH,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,OAEpB;QACC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;QACrE,YAAY,CAAC,UAAU,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE;YAClC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QAC9B,CAAC,CAAC,CAAA;QACF,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE;YAClD,OAAO,EAAE,YAAY;SACtB,CAAC,CAAA;QACF,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC9D,OAAO,QAAQ,CAAA;IACjB,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,OAA+B;QAC5C,OAAO;YACL,IAAI,EAAE,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC;YACzC,KAAK,EAAE,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI;SAChD,CAAA;IACH,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAGT;QACC,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,CAAA;IAC5C,CAAC;CACF;AArED,wBAqEC;AAED,MAAa,OAAO;IAIlB,YAAqC,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;IAAG,CAAC;IAC5D,MAAM,CAAC,EAAE;QACP,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;IACxB,CAAC;IACD,SAAS,CACP,MAAS;QAET,OAAO,IAAI,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAC9D,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,OAAkB;QAC3B,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,MAAM,EAAE,GAAG,KAAK,IAAI,EAAE;gBACpB,IAAI,GAAG,GAAgC,GAAG,EAAE,GAAE,CAAC,CAAA;gBAC/C,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBACvC,GAAG,GAAG,OAAO,CAAA;gBACf,CAAC,CAAC,CAAA;gBACF,MAAM,CAAC,GAAc,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBAC7C,CAAC,CAAC,UAAU,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,CACvB,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAC/C,CAAA;gBACD,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;gBAC7C,CAAC;wBAAS,CAAC;oBACT,GAAG,EAAE,CAAA;gBACP,CAAC;YACH,CAAC,CAAA;YACD,MAAM,EAAE,EAAE,CAAA;QACZ,CAAC;QACD,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACnE,CAAC;IACD,GAAG,CAAwB,QAAY;QACrC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC/B,CAAC;CACF;AArCD,0BAqCC"}
@@ -4,13 +4,13 @@ export type CheckDependencies<DependencyId extends PackageId = PackageId> = {
4
4
  installedSatisfied: (packageId: DependencyId) => boolean;
5
5
  installedVersionSatisfied: (packageId: DependencyId) => boolean;
6
6
  runningSatisfied: (packageId: DependencyId) => boolean;
7
- actionsSatisfied: (packageId: DependencyId) => boolean;
7
+ tasksSatisfied: (packageId: DependencyId) => boolean;
8
8
  healthCheckSatisfied: (packageId: DependencyId, healthCheckId: HealthCheckId) => boolean;
9
9
  satisfied: () => boolean;
10
10
  throwIfInstalledNotSatisfied: (packageId: DependencyId) => null;
11
11
  throwIfInstalledVersionNotSatisfied: (packageId: DependencyId) => null;
12
12
  throwIfRunningNotSatisfied: (packageId: DependencyId) => null;
13
- throwIfActionsNotSatisfied: (packageId: DependencyId) => null;
13
+ throwIfTasksNotSatisfied: (packageId: DependencyId) => null;
14
14
  throwIfHealthNotSatisfied: (packageId: DependencyId, healthCheckId?: HealthCheckId) => null;
15
15
  throwIfNotSatisfied: (packageId?: DependencyId) => null;
16
16
  };
@@ -30,7 +30,7 @@ async function checkDependencies(effects, packageIds) {
30
30
  const dep = find(packageId);
31
31
  return dep.requirement.kind !== "running" || dep.result.isRunning;
32
32
  };
33
- const actionsSatisfied = (packageId) => Object.entries(find(packageId).result.requestedActions).filter(([_, req]) => req.active && req.request.severity === "critical").length === 0;
33
+ const tasksSatisfied = (packageId) => Object.entries(find(packageId).result.tasks).filter(([_, t]) => t.active && t.task.severity === "critical").length === 0;
34
34
  const healthCheckSatisfied = (packageId, healthCheckId) => {
35
35
  const dep = find(packageId);
36
36
  if (healthCheckId &&
@@ -38,15 +38,18 @@ async function checkDependencies(effects, packageIds) {
38
38
  !dep.requirement.healthChecks.includes(healthCheckId))) {
39
39
  throw new Error(`Unknown HealthCheckId ${healthCheckId}`);
40
40
  }
41
- const errors = Object.entries(dep.result.healthChecks)
42
- .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
43
- .filter(([_, res]) => res.result !== "success");
41
+ const errors = dep.requirement.kind === "running"
42
+ ? dep.requirement.healthChecks
43
+ .map((id) => [id, dep.result.healthChecks[id] ?? null])
44
+ .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
45
+ .filter(([_, res]) => res?.result !== "success")
46
+ : [];
44
47
  return errors.length === 0;
45
48
  };
46
49
  const pkgSatisfied = (packageId) => installedSatisfied(packageId) &&
47
50
  installedVersionSatisfied(packageId) &&
48
51
  runningSatisfied(packageId) &&
49
- actionsSatisfied(packageId) &&
52
+ tasksSatisfied(packageId) &&
50
53
  healthCheckSatisfied(packageId);
51
54
  const satisfied = (packageId) => packageId
52
55
  ? pkgSatisfied(packageId)
@@ -75,10 +78,10 @@ async function checkDependencies(effects, packageIds) {
75
78
  }
76
79
  return null;
77
80
  };
78
- const throwIfActionsNotSatisfied = (packageId) => {
81
+ const throwIfTasksNotSatisfied = (packageId) => {
79
82
  const dep = find(packageId);
80
- const reqs = Object.entries(dep.result.requestedActions)
81
- .filter(([_, req]) => req.active && req.request.severity === "critical")
83
+ const reqs = Object.entries(dep.result.tasks)
84
+ .filter(([_, t]) => t.active && t.task.severity === "critical")
82
85
  .map(([id, _]) => id);
83
86
  if (reqs.length) {
84
87
  throw new Error(`The following action requests have not been fulfilled: ${reqs.join(", ")}`);
@@ -92,12 +95,17 @@ async function checkDependencies(effects, packageIds) {
92
95
  !dep.requirement.healthChecks.includes(healthCheckId))) {
93
96
  throw new Error(`Unknown HealthCheckId ${healthCheckId}`);
94
97
  }
95
- const errors = Object.entries(dep.result.healthChecks)
96
- .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
97
- .filter(([_, res]) => res.result !== "success");
98
+ const errors = dep.requirement.kind === "running"
99
+ ? dep.requirement.healthChecks
100
+ .map((id) => [id, dep.result.healthChecks[id] ?? null])
101
+ .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
102
+ .filter(([_, res]) => res?.result !== "success")
103
+ : [];
98
104
  if (errors.length) {
99
105
  throw new Error(errors
100
- .map(([_, e]) => `Health Check ${e.name} of ${dep.result.title || packageId} failed with status ${e.result}${e.message ? `: ${e.message}` : ""}`)
106
+ .map(([id, e]) => e
107
+ ? `Health Check ${e.name} of ${dep.result.title || packageId} failed with status ${e.result}${e.message ? `: ${e.message}` : ""}`
108
+ : `Health Check ${id} of ${dep.result.title} does not exist`)
101
109
  .join("; "));
102
110
  }
103
111
  return null;
@@ -106,7 +114,7 @@ async function checkDependencies(effects, packageIds) {
106
114
  throwIfInstalledNotSatisfied(packageId);
107
115
  throwIfInstalledVersionNotSatisfied(packageId);
108
116
  throwIfRunningNotSatisfied(packageId);
109
- throwIfActionsNotSatisfied(packageId);
117
+ throwIfTasksNotSatisfied(packageId);
110
118
  throwIfHealthNotSatisfied(packageId);
111
119
  return null;
112
120
  };
@@ -133,13 +141,13 @@ async function checkDependencies(effects, packageIds) {
133
141
  installedSatisfied,
134
142
  installedVersionSatisfied,
135
143
  runningSatisfied,
136
- actionsSatisfied,
144
+ tasksSatisfied,
137
145
  healthCheckSatisfied,
138
146
  satisfied,
139
147
  throwIfInstalledNotSatisfied,
140
148
  throwIfInstalledVersionNotSatisfied,
141
149
  throwIfRunningNotSatisfied,
142
- throwIfActionsNotSatisfied,
150
+ throwIfTasksNotSatisfied,
143
151
  throwIfHealthNotSatisfied,
144
152
  throwIfNotSatisfied,
145
153
  };
@@ -1 +1 @@
1
- {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/dependencies.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/dependencies.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,5 @@ export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
18
18
  };
19
19
  export declare function setupDependencies<Manifest extends T.SDKManifest>(fn: (options: {
20
20
  effects: T.Effects;
21
- }) => Promise<CurrentDependenciesResult<Manifest>>): (options: {
22
- effects: T.Effects;
23
- }) => Promise<null>;
21
+ }) => Promise<CurrentDependenciesResult<Manifest>>): (effects: T.Effects) => Promise<null>;
24
22
  export {};
@@ -1,19 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setupDependencies = setupDependencies;
4
- const util_1 = require("../util");
5
4
  const _checkType = null;
6
5
  function setupDependencies(fn) {
7
- const cell = { updater: async (_) => null };
8
- cell.updater = async (options) => {
9
- options.effects = {
10
- ...options.effects,
11
- constRetry: (0, util_1.once)(() => {
12
- cell.updater(options);
13
- }),
14
- };
15
- const dependencyType = await fn(options);
16
- return await options.effects.setDependencies({
6
+ return async (effects) => {
7
+ const dependencyType = await fn({ effects });
8
+ return await effects.setDependencies({
17
9
  dependencies: Object.entries(dependencyType)
18
10
  .map(([k, v]) => [k, v])
19
11
  .map(([id, { versionRange, ...x }]) => ({
@@ -23,6 +15,5 @@ function setupDependencies(fn) {
23
15
  })),
24
16
  });
25
17
  };
26
- return cell.updater;
27
18
  }
28
19
  //# sourceMappingURL=setupDependencies.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;AAmCA,8CA4BC;AA9DD,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"}
1
+ {"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;AAmCA,8CAoBC;AA/BD,MAAM,UAAU,GAGZ,IAAI,CAAA;AAQR,SAAgB,iBAAiB,CAC/B,EAEkD;IAElD,OAAO,KAAK,EAAE,OAAkB,EAAE,EAAE;QAClC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAC5C,OAAO,MAAM,OAAO,CAAC,eAAe,CAAC;YACnC,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;AACH,CAAC"}
@@ -6,5 +6,6 @@ export * as IST from "./actions/input/inputSpecTypes";
6
6
  export * as types from "./types";
7
7
  export * as T from "./types";
8
8
  export * as yaml from "yaml";
9
+ export * as inits from "./inits";
9
10
  export * as matches from "ts-matches";
10
11
  export * as utils from "./util";
package/base/lib/index.js CHANGED
@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
33
33
  };
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
- exports.utils = exports.matches = exports.yaml = exports.T = exports.types = exports.IST = exports.ISB = exports.inputSpec = exports.Version = exports.ExtendedVersion = exports.VersionRange = exports.S9pk = void 0;
36
+ exports.utils = exports.matches = exports.inits = exports.yaml = exports.T = exports.types = exports.IST = exports.ISB = exports.inputSpec = exports.Version = exports.ExtendedVersion = exports.VersionRange = exports.S9pk = void 0;
37
37
  var s9pk_1 = require("./s9pk");
38
38
  Object.defineProperty(exports, "S9pk", { enumerable: true, get: function () { return s9pk_1.S9pk; } });
39
39
  var exver_1 = require("./exver");
@@ -46,6 +46,7 @@ exports.IST = __importStar(require("./actions/input/inputSpecTypes"));
46
46
  exports.types = __importStar(require("./types"));
47
47
  exports.T = __importStar(require("./types"));
48
48
  exports.yaml = __importStar(require("yaml"));
49
+ exports.inits = __importStar(require("./inits"));
49
50
  exports.matches = __importStar(require("ts-matches"));
50
51
  exports.utils = __importStar(require("./util"));
51
52
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../base/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA6B;AAApB,4FAAA,IAAI,OAAA;AACb,iCAAgE;AAAvD,qGAAA,YAAY,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,gGAAA,OAAO,OAAA;AAE/C,6DAA4C;AAC5C,+DAA8C;AAC9C,sEAAqD;AACrD,iDAAgC;AAChC,6CAA4B;AAC5B,6CAA4B;AAC5B,sDAAqC;AAErC,gDAA+B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../base/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA6B;AAApB,4FAAA,IAAI,OAAA;AACb,iCAAgE;AAAvD,qGAAA,YAAY,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,gGAAA,OAAO,OAAA;AAE/C,6DAA4C;AAC5C,+DAA8C;AAC9C,sEAAqD;AACrD,iDAAgC;AAChC,6CAA4B;AAC5B,6CAA4B;AAC5B,iDAAgC;AAChC,sDAAqC;AAErC,gDAA+B"}
@@ -0,0 +1,2 @@
1
+ export * from "./setupInit";
2
+ export * from "./setupUninit";
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./setupInit"), exports);
18
+ __exportStar(require("./setupUninit"), exports);
19
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../base/lib/inits/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA2B;AAC3B,gDAA6B"}
@@ -0,0 +1,9 @@
1
+ import * as T from "../../../base/lib/types";
2
+ export type InitKind = "install" | "update" | "restore" | null;
3
+ export type InitFn<Kind extends InitKind = InitKind> = (effects: T.Effects, kind: Kind) => Promise<void | null | undefined>;
4
+ export interface InitScript<Kind extends InitKind = InitKind> {
5
+ init(effects: T.Effects, kind: Kind): Promise<void>;
6
+ }
7
+ export type InitScriptOrFn<Kind extends InitKind = InitKind> = InitScript<Kind> | InitFn<Kind>;
8
+ export declare function setupInit(...inits: InitScriptOrFn[]): T.ExpectedExports.init;
9
+ export declare function setupOnInit(onInit: InitScriptOrFn): InitScript;
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.setupInit = setupInit;
4
+ exports.setupOnInit = setupOnInit;
5
+ const util_1 = require("../util");
6
+ function setupInit(...inits) {
7
+ return async (opts) => {
8
+ for (const idx in inits) {
9
+ const init = inits[idx];
10
+ const fn = async () => {
11
+ let res = () => { };
12
+ const complete = new Promise((resolve) => {
13
+ res = resolve;
14
+ });
15
+ const e = opts.effects.child(`init_${idx}`);
16
+ e.constRetry = (0, util_1.once)(() => complete.then(() => fn()).catch(console.error));
17
+ try {
18
+ if ("init" in init)
19
+ await init.init(e, opts.kind);
20
+ else
21
+ await init(e, opts.kind);
22
+ }
23
+ finally {
24
+ res();
25
+ }
26
+ };
27
+ await fn();
28
+ }
29
+ };
30
+ }
31
+ function setupOnInit(onInit) {
32
+ return "init" in onInit
33
+ ? onInit
34
+ : {
35
+ init: async (effects, kind) => {
36
+ await onInit(effects, kind);
37
+ },
38
+ };
39
+ }
40
+ //# sourceMappingURL=setupInit.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"setupInit.js","sourceRoot":"","sources":["../../../../base/lib/inits/setupInit.ts"],"names":[],"mappings":";;AAmBA,8BAuBC;AAED,kCAQC;AAlDD,kCAA8B;AAiB9B,SAAgB,SAAS,CAAC,GAAG,KAAuB;IAClD,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;YACvB,MAAM,EAAE,GAAG,KAAK,IAAI,EAAE;gBACpB,IAAI,GAAG,GAAgC,GAAG,EAAE,GAAE,CAAC,CAAA;gBAC/C,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBACvC,GAAG,GAAG,OAAO,CAAA;gBACf,CAAC,CAAC,CAAA;gBACF,MAAM,CAAC,GAAc,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAA;gBACtD,CAAC,CAAC,UAAU,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,CACvB,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAC/C,CAAA;gBACD,IAAI,CAAC;oBACH,IAAI,MAAM,IAAI,IAAI;wBAAE,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;;wBAC5C,MAAM,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC/B,CAAC;wBAAS,CAAC;oBACT,GAAG,EAAE,CAAA;gBACP,CAAC;YACH,CAAC,CAAA;YACD,MAAM,EAAE,EAAE,CAAA;QACZ,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,MAAsB;IAChD,OAAO,MAAM,IAAI,MAAM;QACrB,CAAC,CAAC,MAAM;QACR,CAAC,CAAC;YACE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;gBAC5B,MAAM,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;YAC7B,CAAC;SACF,CAAA;AACP,CAAC"}
@@ -0,0 +1,25 @@
1
+ import { ExtendedVersion, VersionRange } from "../../../base/lib/exver";
2
+ import * as T from "../../../base/lib/types";
3
+ export type UninitFn = (effects: T.Effects,
4
+ /**
5
+ * @description the target version to prepare for
6
+ *
7
+ * on update: the canMigrateFrom of the new package
8
+ * on uninstall: null
9
+ * on shutdown: the current version
10
+ */
11
+ target: VersionRange | ExtendedVersion | null) => Promise<void | null | undefined>;
12
+ export interface UninitScript {
13
+ uninit(effects: T.Effects,
14
+ /**
15
+ * @description the target version to prepare for
16
+ *
17
+ * on update: the canMigrateFrom of the new package
18
+ * on uninstall: null
19
+ * on shutdown: the current version
20
+ */
21
+ target: VersionRange | ExtendedVersion | null): Promise<void>;
22
+ }
23
+ export type UninitScriptOrFn = UninitScript | UninitFn;
24
+ export declare function setupUninit(...uninits: UninitScriptOrFn[]): T.ExpectedExports.uninit;
25
+ export declare function setupOnUninit(onUninit: UninitScriptOrFn): UninitScript;
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.setupUninit = setupUninit;
4
+ exports.setupOnUninit = setupOnUninit;
5
+ function setupUninit(...uninits) {
6
+ return async (opts) => {
7
+ for (const uninit of uninits) {
8
+ if ("uninit" in uninit)
9
+ await uninit.uninit(opts.effects, opts.target);
10
+ else
11
+ await uninit(opts.effects, opts.target);
12
+ }
13
+ };
14
+ }
15
+ function setupOnUninit(onUninit) {
16
+ return "uninit" in onUninit
17
+ ? onUninit
18
+ : {
19
+ uninit: async (effects, target) => {
20
+ await onUninit(effects, target);
21
+ },
22
+ };
23
+ }
24
+ //# sourceMappingURL=setupUninit.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"setupUninit.js","sourceRoot":"","sources":["../../../../base/lib/inits/setupUninit.ts"],"names":[],"mappings":";;AA+BA,kCASC;AAED,sCAQC;AAnBD,SAAgB,WAAW,CACzB,GAAG,OAA2B;IAE9B,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,QAAQ,IAAI,MAAM;gBAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;;gBACjE,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9C,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED,SAAgB,aAAa,CAAC,QAA0B;IACtD,OAAO,QAAQ,IAAI,QAAQ;QACzB,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC;YACE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YACjC,CAAC;SACF,CAAA;AACP,CAAC"}
@@ -77,17 +77,25 @@ class MultiHost {
77
77
  const protoInfo = exports.knownProtocols[options.protocol];
78
78
  const preferredExternalPort = options.preferredExternalPort ||
79
79
  exports.knownProtocols[options.protocol].defaultPort;
80
- const sslProto = this.getSslProto(options, protoInfo);
81
- const addSsl = sslProto && "alpn" in protoInfo
80
+ const sslProto = this.getSslProto(options);
81
+ const addSsl = sslProto
82
82
  ? {
83
83
  // addXForwardedHeaders: null,
84
84
  preferredExternalPort: exports.knownProtocols[sslProto].defaultPort,
85
85
  scheme: sslProto,
86
- alpn: protoInfo.alpn,
86
+ alpn: "alpn" in protoInfo ? protoInfo.alpn : null,
87
87
  ...("addSsl" in options ? options.addSsl : null),
88
88
  }
89
- : null;
90
- const secure = !protoInfo.secure ? null : { ssl: false };
89
+ : options.addSsl
90
+ ? {
91
+ // addXForwardedHeaders: null,
92
+ preferredExternalPort: 443,
93
+ scheme: sslProto,
94
+ alpn: null,
95
+ ...("addSsl" in options ? options.addSsl : null),
96
+ }
97
+ : null;
98
+ const secure = protoInfo.secure ?? null;
91
99
  await this.options.effects.bind({
92
100
  id: this.options.id,
93
101
  internalPort,
@@ -97,11 +105,15 @@ class MultiHost {
97
105
  });
98
106
  return new Origin_1.Origin(this, internalPort, options.protocol, sslProto);
99
107
  }
100
- getSslProto(options, protoInfo) {
108
+ getSslProto(options) {
109
+ const proto = options.protocol;
110
+ const protoInfo = exports.knownProtocols[proto];
101
111
  if (inObject("noAddSsl", options) && options.noAddSsl)
102
112
  return null;
103
113
  if ("withSsl" in protoInfo && protoInfo.withSsl)
104
114
  return protoInfo.withSsl;
115
+ if (protoInfo.secure?.ssl)
116
+ return proto;
105
117
  return null;
106
118
  }
107
119
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Host.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Host.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Host.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Host.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ export declare class Origin {
8
8
  readonly scheme: string | null;
9
9
  readonly sslScheme: string | null;
10
10
  constructor(host: MultiHost, internalPort: number, scheme: string | null, sslScheme: string | null);
11
- build({ username, path, search, schemeOverride }: BuildOptions): AddressInfo;
11
+ build({ username, path, query: search, schemeOverride, }: BuildOptions): AddressInfo;
12
12
  /**
13
13
  * @description A function to register a group of origins (<PROTOCOL> :// <HOSTNAME> : <PORT>) with StartOS
14
14
  *
@@ -26,6 +26,6 @@ type BuildOptions = {
26
26
  } | null;
27
27
  username: string | null;
28
28
  path: string;
29
- search: Record<string, string>;
29
+ query: Record<string, string>;
30
30
  };
31
31
  export {};
@@ -8,7 +8,7 @@ class Origin {
8
8
  this.scheme = scheme;
9
9
  this.sslScheme = sslScheme;
10
10
  }
11
- build({ username, path, search, schemeOverride }) {
11
+ build({ username, path, query: search, schemeOverride, }) {
12
12
  const qpEntries = Object.entries(search)
13
13
  .map(([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`)
14
14
  .join("&");
@@ -33,11 +33,11 @@ class Origin {
33
33
  async export(serviceInterfaces) {
34
34
  const addressesInfo = [];
35
35
  for (let serviceInterface of serviceInterfaces) {
36
- const { name, description, id, type, username, path, search, schemeOverride, masked, } = serviceInterface.options;
36
+ const { name, description, id, type, username, path, query: search, schemeOverride, masked, } = serviceInterface.options;
37
37
  const addressInfo = this.build({
38
38
  username,
39
39
  path,
40
- search,
40
+ query: search,
41
41
  schemeOverride,
42
42
  });
43
43
  await serviceInterface.options.effects.exportServiceInterface({
@@ -1 +1 @@
1
- {"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Origin.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,IAAe,EACf,YAAoB,EACpB,MAAqB,EACrB,SAAwB;QAHxB,SAAI,GAAJ,IAAI,CAAW;QACf,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,CAAC;YAC/C,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;QACjC,CAAC;QAED,OAAO,aAA+C,CAAA;IACxD,CAAC;CACF;AAzED,wBAyEC"}
1
+ {"version":3,"file":"Origin.js","sourceRoot":"","sources":["../../../../base/lib/interfaces/Origin.ts"],"names":[],"mappings":";;;AAKA,MAAa,MAAM;IACjB,YACW,IAAe,EACf,YAAoB,EACpB,MAAqB,EACrB,SAAwB;QAHxB,SAAI,GAAJ,IAAI,CAAW;QACf,iBAAY,GAAZ,YAAY,CAAQ;QACpB,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAe;IAChC,CAAC;IAEJ,KAAK,CAAC,EACJ,QAAQ,EACR,IAAI,EACJ,KAAK,EAAE,MAAM,EACb,cAAc,GACD;QACb,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,CAAC;YAC/C,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,KAAK,EAAE,MAAM,EACb,cAAc,EACd,MAAM,GACP,GAAG,gBAAgB,CAAC,OAAO,CAAA;YAE5B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC7B,QAAQ;gBACR,IAAI;gBACJ,KAAK,EAAE,MAAM;gBACb,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;QACjC,CAAC;QAED,OAAO,aAA+C,CAAA;IACxD,CAAC;CACF;AA9ED,wBA8EC"}
@@ -21,7 +21,7 @@ export declare class ServiceInterfaceBuilder {
21
21
  type: ServiceInterfaceType;
22
22
  username: string | null;
23
23
  path: string;
24
- search: Record<string, string>;
24
+ query: Record<string, string>;
25
25
  schemeOverride: {
26
26
  ssl: Scheme;
27
27
  noSsl: Scheme;
@@ -36,7 +36,7 @@ export declare class ServiceInterfaceBuilder {
36
36
  type: ServiceInterfaceType;
37
37
  username: string | null;
38
38
  path: string;
39
- search: Record<string, string>;
39
+ query: Record<string, string>;
40
40
  schemeOverride: {
41
41
  ssl: Scheme;
42
42
  noSsl: Scheme;
@@ -8,10 +8,8 @@ export type ServiceInterfacesReceipt = Array<T.AddressInfo[] & AddressReceipt>;
8
8
  export type SetServiceInterfaces<Output extends ServiceInterfacesReceipt> = (opts: {
9
9
  effects: T.Effects;
10
10
  }) => Promise<Output>;
11
- export type UpdateServiceInterfaces<Output extends ServiceInterfacesReceipt> = (opts: {
12
- effects: T.Effects;
13
- }) => Promise<Output & UpdateServiceInterfacesReceipt>;
14
- export type SetupServiceInterfaces = <Output extends ServiceInterfacesReceipt>(fn: SetServiceInterfaces<Output>) => UpdateServiceInterfaces<Output>;
11
+ export type UpdateServiceInterfaces = (effects: T.Effects) => Promise<null>;
12
+ export type SetupServiceInterfaces = <Output extends ServiceInterfacesReceipt>(fn: SetServiceInterfaces<Output>) => UpdateServiceInterfaces;
15
13
  export declare const NO_INTERFACE_CHANGES: UpdateServiceInterfacesReceipt;
16
14
  export declare const setupServiceInterfaces: SetupServiceInterfaces;
17
15
  export {};