@crvouga/mockingbird-service-wholescripts 3.12.0 → 3.13.0

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.
@@ -12,7 +12,7 @@ import {
12
12
  parseFaultHeader,
13
13
  resolveAdminPrefix,
14
14
  restoreClock
15
- } from "./chunk-LSHJ52FN.js";
15
+ } from "./chunk-A475SKFT.js";
16
16
 
17
17
  // src/server.ts
18
18
  import { readFileSync } from "node:fs";
@@ -3085,7 +3085,7 @@ async function preflightFleet(config, options) {
3085
3085
  break;
3086
3086
  }
3087
3087
  }
3088
- targets.set(name, { ...target, packageVersion: packageVersion ?? "3.12.0" });
3088
+ targets.set(name, { ...target, packageVersion: packageVersion ?? "3.13.0" });
3089
3089
  } catch (error) {
3090
3090
  throw new Error(`service ${name}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
3091
3091
  }
@@ -4943,20 +4943,35 @@ var start = async (target, values, config) => {
4943
4943
  console.log(`${target.name} ${line.replaceAll("/__admin", adminPrefix)}`);
4944
4944
  return listening;
4945
4945
  };
4946
- var untilSignal = async (servers) => new Promise((resolve4) => {
4947
- const stop = async () => {
4946
+ var watchSignals = () => {
4947
+ let received = false;
4948
+ let wake = () => {
4949
+ };
4950
+ const on = () => {
4951
+ received = true;
4952
+ wake();
4953
+ };
4954
+ const dispose = () => {
4948
4955
  ;
4949
- process.removeListener("SIGINT", stop);
4950
- process.removeListener("SIGTERM", stop);
4951
- const results = await Promise.allSettled(servers.map((s) => s.close()));
4952
- for (const result of results)
4953
- if (result.status === "rejected")
4954
- console.error(result.reason instanceof Error ? result.reason.message : String(result.reason));
4955
- resolve4(results.some((r) => r.status === "rejected") ? 1 : 0);
4956
+ process.removeListener("SIGINT", on);
4957
+ process.removeListener("SIGTERM", on);
4956
4958
  };
4957
- process.once("SIGINT", stop);
4958
- process.once("SIGTERM", stop);
4959
- });
4959
+ process.once("SIGINT", on);
4960
+ process.once("SIGTERM", on);
4961
+ return {
4962
+ dispose,
4963
+ async untilSignal(servers) {
4964
+ if (!received)
4965
+ await new Promise((resolve4) => wake = resolve4);
4966
+ dispose();
4967
+ const results = await Promise.allSettled(servers.map((s) => s.close()));
4968
+ for (const result of results)
4969
+ if (result.status === "rejected")
4970
+ console.error(result.reason instanceof Error ? result.reason.message : String(result.reason));
4971
+ return results.some((r) => r.status === "rejected") ? 1 : 0;
4972
+ }
4973
+ };
4974
+ };
4960
4975
  var serveCommand = (target) => ({
4961
4976
  fleetTarget: target,
4962
4977
  summary: `Serve the ${target.name} emulator or a configured fleet`,
@@ -4969,6 +4984,7 @@ var serveCommand = (target) => ({
4969
4984
  }
4970
4985
  const configPath = asString(values.config);
4971
4986
  if (configPath !== void 0) {
4987
+ const signals2 = watchSignals();
4972
4988
  try {
4973
4989
  const config = JSON.parse(await readFile5(configPath, "utf8"));
4974
4990
  config.adminPrefix = resolveAdminPrefix(config.adminPrefix ?? asString(values["admin-prefix"]) ?? process.env.MOCKINGBIRD_ADMIN_PREFIX);
@@ -4998,8 +5014,9 @@ var serveCommand = (target) => ({
4998
5014
  console.log(`${name} emulator listening on ${endpoint.url}`);
4999
5015
  }
5000
5016
  });
5001
- return untilSignal([fleet]);
5017
+ return signals2.untilSignal([fleet]);
5002
5018
  } catch (error) {
5019
+ signals2.dispose();
5003
5020
  console.error(error instanceof Error ? error.message : String(error));
5004
5021
  return 1;
5005
5022
  }
@@ -5012,6 +5029,7 @@ var serveCommand = (target) => ({
5012
5029
  const adminKey = asString(values["admin-key"]) ?? process.env.MOCKINGBIRD_ADMIN_KEY;
5013
5030
  const seed = asString(values.seed) ?? process.env.MOCKINGBIRD_SEED;
5014
5031
  let listening;
5032
+ const signals = watchSignals();
5015
5033
  try {
5016
5034
  const adminControls = await resolveServeControls(values);
5017
5035
  const idBase = resolveServeIdBase(values);
@@ -5028,10 +5046,11 @@ var serveCommand = (target) => ({
5028
5046
  log
5029
5047
  });
5030
5048
  } catch (error) {
5049
+ signals.dispose();
5031
5050
  console.error(error instanceof Error ? error.message : String(error));
5032
5051
  return 1;
5033
5052
  }
5034
- return untilSignal([listening]);
5053
+ return signals.untilSignal([listening]);
5035
5054
  }
5036
5055
  });
5037
5056
 
@@ -5143,4 +5162,4 @@ export {
5143
5162
  loadCatalogFile,
5144
5163
  serveTarget
5145
5164
  };
5146
- //# sourceMappingURL=chunk-A3XR5VOC.js.map
5165
+ //# sourceMappingURL=chunk-F36ZGEH5.js.map