@sangria-sdk/cli 0.2.6 → 0.2.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/client.d.ts.map +1 -1
- package/dist/lib/client.js +13 -8
- package/dist/lib/client.js.map +1 -1
- package/package.json +1 -1
package/dist/lib/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/lib/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,eAAe,EACf,gBAAgB,EAEhB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,6BAA6B,EAC9B,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/lib/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,eAAe,EACf,gBAAgB,EAEhB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,6BAA6B,EAC9B,MAAM,iBAAiB,CAAC;AAWzB,wBAAgB,sBAAsB,IAAI,OAAO,CAIhD;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;IAQlD,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAInC,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAM1D,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAS3D,MAAM,CAAC,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,cAAc,CAAC;IAWlG,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAM1D,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAM1E,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAIxD,qBAAqB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAIvF,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;YAInC,OAAO;CA0DtB"}
|
package/dist/lib/client.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ApiError, CliError, EXIT } from "./errors.js";
|
|
2
2
|
import { cliVersion } from "./version.js";
|
|
3
|
+
// discover and buy wait on the 60s merchant scrape (MERCHANT_*_TIMEOUT_SECONDS); the client must outlast it.
|
|
4
|
+
const SCRAPE_TIMEOUT_MS = 90_000;
|
|
3
5
|
// Set by request() whenever a backend response carries
|
|
4
6
|
// X-Sangria-Update-Available: true. Read once at end of main() via
|
|
5
7
|
// consumeUpdateAvailable() so the stderr notice prints once per CLI
|
|
@@ -24,13 +26,12 @@ export class SangriaAgentClient {
|
|
|
24
26
|
return this.request("GET", "/v1/balance");
|
|
25
27
|
}
|
|
26
28
|
async discover(body) {
|
|
27
|
-
return this.request("POST", "/v1/discover", body
|
|
29
|
+
return this.request("POST", "/v1/discover", body, {
|
|
30
|
+
timeoutMs: SCRAPE_TIMEOUT_MS,
|
|
31
|
+
});
|
|
28
32
|
}
|
|
29
33
|
async buy(discoveryId, sku) {
|
|
30
|
-
return this.request("POST", "/v1/buy", {
|
|
31
|
-
discovery_id: discoveryId,
|
|
32
|
-
sku,
|
|
33
|
-
});
|
|
34
|
+
return this.request("POST", "/v1/buy", { discovery_id: discoveryId, sku }, { timeoutMs: SCRAPE_TIMEOUT_MS, outcomeUnknownOnTimeout: true });
|
|
34
35
|
}
|
|
35
36
|
async orders(options = {}) {
|
|
36
37
|
const params = new URLSearchParams();
|
|
@@ -64,9 +65,11 @@ export class SangriaAgentClient {
|
|
|
64
65
|
async getSettings() {
|
|
65
66
|
return this.request("GET", "/v1/settings");
|
|
66
67
|
}
|
|
67
|
-
async request(method, path, body
|
|
68
|
+
async request(method, path, body,
|
|
69
|
+
// outcomeUnknownOnTimeout: an abort may leave the caller charged, so the message must not imply it did not.
|
|
70
|
+
options) {
|
|
68
71
|
const controller = new AbortController();
|
|
69
|
-
const timeout = setTimeout(() => controller.abort(), 30_000);
|
|
72
|
+
const timeout = setTimeout(() => controller.abort(), options?.timeoutMs ?? 30_000);
|
|
70
73
|
try {
|
|
71
74
|
const response = await fetch(`${this.baseUrl}${path}`, {
|
|
72
75
|
method,
|
|
@@ -102,7 +105,9 @@ export class SangriaAgentClient {
|
|
|
102
105
|
if (error instanceof ApiError || error instanceof CliError)
|
|
103
106
|
throw error;
|
|
104
107
|
if (error instanceof Error && error.name === "AbortError") {
|
|
105
|
-
throw new CliError(
|
|
108
|
+
throw new CliError(options?.outcomeUnknownOnTimeout
|
|
109
|
+
? "Sangria did not respond in time. The purchase may still have completed — retry the same command to check; it is safe."
|
|
110
|
+
: "Sangria API request timed out. Retry the same command.", EXIT.unavailable);
|
|
106
111
|
}
|
|
107
112
|
throw new CliError("Could not reach Sangria API. Check your connection and retry.", EXIT.unavailable, {
|
|
108
113
|
cause: error instanceof Error ? error.message : String(error),
|
package/dist/lib/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/lib/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAgB1C,uDAAuD;AACvD,mEAAmE;AACnE,oEAAoE;AACpE,yCAAyC;AACzC,IAAI,eAAe,GAAG,KAAK,CAAC;AAE5B,MAAM,UAAU,sBAAsB;IACpC,MAAM,KAAK,GAAG,eAAe,CAAC;IAC9B,eAAe,GAAG,KAAK,CAAC;IACxB,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,OAAO,kBAAkB;IACZ,MAAM,CAAS;IACf,OAAO,CAAS;IAEjC,YAAY,MAA4C;QACtD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,QAAQ,CAAC,qFAAqF,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACvH,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,OAAO,CAAkB,KAAK,EAAE,aAAa,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAqB;QAClC,OAAO,IAAI,CAAC,OAAO,CAAmB,MAAM,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/lib/client.ts"],"names":[],"mappings":"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"}
|