firecrawl-cli 1.24.6 → 1.25.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.
- package/dist/__tests__/commands/parse.test.js +2 -1
- package/dist/__tests__/commands/parse.test.js.map +1 -1
- package/dist/__tests__/utils/client.test.d.ts +10 -0
- package/dist/__tests__/utils/client.test.d.ts.map +1 -0
- package/dist/__tests__/utils/client.test.js +57 -0
- package/dist/__tests__/utils/client.test.js.map +1 -0
- package/dist/__tests__/utils/receipt.test.js +90 -0
- package/dist/__tests__/utils/receipt.test.js.map +1 -1
- package/dist/commands/interact.d.ts.map +1 -1
- package/dist/commands/interact.js +2 -0
- package/dist/commands/interact.js.map +1 -1
- package/dist/commands/parse.d.ts.map +1 -1
- package/dist/commands/parse.js +7 -1
- package/dist/commands/parse.js.map +1 -1
- package/dist/utils/client.d.ts +8 -0
- package/dist/utils/client.d.ts.map +1 -1
- package/dist/utils/client.js +13 -2
- package/dist/utils/client.js.map +1 -1
- package/dist/utils/receipt.d.ts +1 -0
- package/dist/utils/receipt.d.ts.map +1 -1
- package/dist/utils/receipt.js +27 -12
- package/dist/utils/receipt.js.map +1 -1
- package/package.json +1 -1
|
@@ -83,7 +83,8 @@ vitest_1.vi.mock('../../utils/credentials', () => ({
|
|
|
83
83
|
const [url, init] = mockFetch.mock.calls[0];
|
|
84
84
|
(0, vitest_1.expect)(url).toBe('https://api.firecrawl.dev/v2/parse');
|
|
85
85
|
(0, vitest_1.expect)(init.method).toBe('POST');
|
|
86
|
-
|
|
86
|
+
// No Authorization; X-Origin attributes the keyless call to the CLI.
|
|
87
|
+
(0, vitest_1.expect)(init.headers).toEqual({ 'X-Origin': 'cli' });
|
|
87
88
|
const options = JSON.parse(init.body.get('options'));
|
|
88
89
|
(0, vitest_1.expect)(options).toEqual({
|
|
89
90
|
formats: ['markdown'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.test.js","sourceRoot":"","sources":["../../../src/__tests__/commands/parse.test.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,uCAAyB;AACzB,2CAA6B;AAC7B,mCAAyE;AACzE,gDAAoD;AACpD,+CAAsD;AACtD,sDAA+D;AAE/D,WAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,eAAe,EAAE,WAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;CACnC,CAAC,CAAC,CAAC;AAEJ,IAAA,iBAAQ,EAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,MAAc,CAAC;IACnB,IAAI,QAAgB,CAAC;IACrB,IAAI,SAAmC,CAAC;IAExC,IAAA,mBAAU,EAAC,GAAG,EAAE;QACd,IAAA,uBAAS,GAAE,CAAC;QACZ,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAAC,CAAC;QACzE,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC1C,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,gCAAgC,CAAC,CAAC;QAE7D,SAAS,GAAG,WAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YACpC,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,GAAG;YACX,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,WAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBAC9B,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;aAC7B,CAAC;SACH,CAAC,CAAC;QACH,WAAE,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAA,kBAAS,EAAC,GAAG,EAAE;QACb,WAAE,CAAC,gBAAgB,EAAE,CAAC;QACtB,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,IAAA,0BAAY,GAAE,CAAC;QACf,WAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,IAAA,yBAAgB,EAAC,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEtD,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;SAC7B,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAE3C,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAGzC,CAAC;QACF,IAAA,eAAM,EAAC,GAAG,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACvD,IAAA,eAAM,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,IAAA,eAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"parse.test.js","sourceRoot":"","sources":["../../../src/__tests__/commands/parse.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for keyless request errors
|
|
3
|
+
*
|
|
4
|
+
* The API links every keyless prompt to the caller's own opaque signup link,
|
|
5
|
+
* https://firecrawl.dev/k/<id>, which the site resolves to CLI attribution when
|
|
6
|
+
* the request came from the CLI. The CLI prints that link unchanged and tells
|
|
7
|
+
* the API it is the CLI with X-Origin, including on requests without a body.
|
|
8
|
+
*/
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=client.test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/utils/client.test.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Tests for keyless request errors
|
|
4
|
+
*
|
|
5
|
+
* The API links every keyless prompt to the caller's own opaque signup link,
|
|
6
|
+
* https://firecrawl.dev/k/<id>, which the site resolves to CLI attribution when
|
|
7
|
+
* the request came from the CLI. The CLI prints that link unchanged and tells
|
|
8
|
+
* the API it is the CLI with X-Origin, including on requests without a body.
|
|
9
|
+
*/
|
|
10
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
+
const vitest_1 = require("vitest");
|
|
12
|
+
const client_1 = require("../../utils/client");
|
|
13
|
+
const OWN_SIGNUP_URL = 'https://firecrawl.dev/k/7fq2xab9';
|
|
14
|
+
const API_LIMIT_MESSAGE = `You've hit Firecrawl's keyless free tier rate limit. To continue now, create a free API key at ${OWN_SIGNUP_URL}
|
|
15
|
+
|
|
16
|
+
Then authenticate with:
|
|
17
|
+
Authorization: Bearer YOUR_API_KEY`;
|
|
18
|
+
// Before the /k links, the API sent a UTM-tagged link. An API still sending it
|
|
19
|
+
// must not be rewritten into something else.
|
|
20
|
+
const LEGACY_LIMIT_MESSAGE = "You've hit Firecrawl's keyless free tier rate limit. To continue now, create a free API key at https://www.firecrawl.dev/signin?utm_source=keyless&utm_medium=api";
|
|
21
|
+
function stubFetch(status, body) {
|
|
22
|
+
const fetchMock = vitest_1.vi.fn(async (_url, _init) => new Response(JSON.stringify(body), { status }));
|
|
23
|
+
vitest_1.vi.stubGlobal('fetch', fetchMock);
|
|
24
|
+
return fetchMock;
|
|
25
|
+
}
|
|
26
|
+
(0, vitest_1.describe)('keyless requests', () => {
|
|
27
|
+
(0, vitest_1.afterEach)(() => {
|
|
28
|
+
vitest_1.vi.unstubAllGlobals();
|
|
29
|
+
});
|
|
30
|
+
(0, vitest_1.it)('reports the keyless limit with the API-issued signup link unchanged', async () => {
|
|
31
|
+
stubFetch(429, {
|
|
32
|
+
success: false,
|
|
33
|
+
error: API_LIMIT_MESSAGE,
|
|
34
|
+
signup_url: OWN_SIGNUP_URL,
|
|
35
|
+
});
|
|
36
|
+
await (0, vitest_1.expect)((0, client_1.keylessRequest)('/v2/scrape', { url: 'https://example.com' })).rejects.toThrow(API_LIMIT_MESSAGE);
|
|
37
|
+
});
|
|
38
|
+
(0, vitest_1.it)('reports the keyless limit on GET requests with the API-issued link', async () => {
|
|
39
|
+
stubFetch(429, { success: false, error: API_LIMIT_MESSAGE });
|
|
40
|
+
await (0, vitest_1.expect)((0, client_1.keylessGet)('/v2/research/search?q=test')).rejects.toThrow(OWN_SIGNUP_URL);
|
|
41
|
+
});
|
|
42
|
+
(0, vitest_1.it)('no longer rewrites a legacy UTM link', async () => {
|
|
43
|
+
stubFetch(429, { success: false, error: LEGACY_LIMIT_MESSAGE });
|
|
44
|
+
await (0, vitest_1.expect)((0, client_1.keylessRequest)('/v2/scrape', { url: 'https://example.com' })).rejects.toThrow(LEGACY_LIMIT_MESSAGE);
|
|
45
|
+
});
|
|
46
|
+
(0, vitest_1.it)('identifies the CLI with X-Origin on POST and GET requests', async () => {
|
|
47
|
+
const fetchMock = stubFetch(200, { success: true });
|
|
48
|
+
await (0, client_1.keylessRequest)('/v2/scrape', { url: 'https://example.com' });
|
|
49
|
+
await (0, client_1.keylessGet)('/v2/research/search?q=test');
|
|
50
|
+
for (const [, init] of fetchMock.mock.calls) {
|
|
51
|
+
const headers = init?.headers;
|
|
52
|
+
(0, vitest_1.expect)(headers['X-Origin']).toBe('cli');
|
|
53
|
+
(0, vitest_1.expect)(headers.Authorization).toBeUndefined();
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=client.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils/client.test.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;AAEH,mCAA6D;AAC7D,+CAAgE;AAEhE,MAAM,cAAc,GAAG,kCAAkC,CAAC;AAE1D,MAAM,iBAAiB,GAAG,kGAAkG,cAAc;;;mCAGvG,CAAC;AAEpC,+EAA+E;AAC/E,6CAA6C;AAC7C,MAAM,oBAAoB,GACxB,mKAAmK,CAAC;AAEtK,SAAS,SAAS,CAAC,MAAc,EAAE,IAAa;IAC9C,MAAM,SAAS,GAAG,WAAE,CAAC,EAAE,CACrB,KAAK,EAAE,IAAY,EAAE,KAAmB,EAAE,EAAE,CAC1C,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CACjD,CAAC;IACF,WAAE,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAClC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,IAAA,iBAAQ,EAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAA,kBAAS,EAAC,GAAG,EAAE;QACb,WAAE,CAAC,gBAAgB,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACnF,SAAS,CAAC,GAAG,EAAE;YACb,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,iBAAiB;YACxB,UAAU,EAAE,cAAc;SAC3B,CAAC,CAAC;QAEH,MAAM,IAAA,eAAM,EACV,IAAA,uBAAc,EAAC,YAAY,EAAE,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAC7D,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAE7D,MAAM,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,4BAA4B,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACpE,cAAc,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAEhE,MAAM,IAAA,eAAM,EACV,IAAA,uBAAc,EAAC,YAAY,EAAE,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAC7D,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpD,MAAM,IAAA,uBAAc,EAAC,YAAY,EAAE,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACnE,MAAM,IAAA,mBAAU,EAAC,4BAA4B,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,IAAI,EAAE,OAAiC,CAAC;YACxD,IAAA,eAAM,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxC,IAAA,eAAM,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC,aAAa,EAAE,CAAC;QAChD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -115,4 +115,94 @@ vitest_1.it.each([
|
|
|
115
115
|
separatelyBilledCredits: 0,
|
|
116
116
|
});
|
|
117
117
|
});
|
|
118
|
+
const enrichmentResponse = (cost, complete = true, overrides = {}) => ({
|
|
119
|
+
data: {
|
|
120
|
+
creditsCost: 0,
|
|
121
|
+
alexandria: [
|
|
122
|
+
{
|
|
123
|
+
provider: 'firecrawl',
|
|
124
|
+
capability: 'enrich',
|
|
125
|
+
data: {
|
|
126
|
+
status: 'matched',
|
|
127
|
+
providerCredits: cost,
|
|
128
|
+
billingComplete: complete,
|
|
129
|
+
steps: [{ creditsCost: cost }],
|
|
130
|
+
},
|
|
131
|
+
...overrides,
|
|
132
|
+
},
|
|
133
|
+
],
|
|
134
|
+
},
|
|
135
|
+
});
|
|
136
|
+
(0, vitest_1.it)('shows enrichment provider costs once while retaining the zero outer charge', () => {
|
|
137
|
+
const receipt = (0, receipt_1.receiptFor)(enrichmentResponse(30), 'scrape');
|
|
138
|
+
(0, vitest_1.expect)(receipt).toEqual({
|
|
139
|
+
creditsUsed: 0,
|
|
140
|
+
separatelyBilledCredits: 30,
|
|
141
|
+
providerCostsComplete: true,
|
|
142
|
+
});
|
|
143
|
+
const log = vitest_1.vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
144
|
+
try {
|
|
145
|
+
(0, receipt_1.printReceipt)(receipt);
|
|
146
|
+
(0, vitest_1.expect)(log).toHaveBeenCalledWith('Credits: 30 (0 outer request + 30 separately billed provider calls)');
|
|
147
|
+
(0, vitest_1.expect)(log).toHaveBeenCalledTimes(1);
|
|
148
|
+
}
|
|
149
|
+
finally {
|
|
150
|
+
log.mockRestore();
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
(0, vitest_1.it)('labels partial enrichment costs without claiming they are the final total', () => {
|
|
154
|
+
const receipt = (0, receipt_1.receiptFor)(enrichmentResponse(5, false), 'scrape');
|
|
155
|
+
(0, vitest_1.expect)(receipt).toMatchObject({
|
|
156
|
+
separatelyBilledCredits: 5,
|
|
157
|
+
providerCostsComplete: false,
|
|
158
|
+
});
|
|
159
|
+
const log = vitest_1.vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
160
|
+
try {
|
|
161
|
+
(0, receipt_1.printReceipt)(receipt);
|
|
162
|
+
(0, vitest_1.expect)(log).toHaveBeenCalledWith('Known credits: 5 (0 outer request + 5 separately billed provider calls)');
|
|
163
|
+
(0, vitest_1.expect)(log).toHaveBeenCalledWith('Provider costs are incomplete; additional credits may have been incurred.');
|
|
164
|
+
}
|
|
165
|
+
finally {
|
|
166
|
+
log.mockRestore();
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
(0, vitest_1.it)('preserves confirmed zero-cost enrichment', () => {
|
|
170
|
+
(0, vitest_1.expect)((0, receipt_1.receiptFor)(enrichmentResponse(0), 'scrape')).toEqual({
|
|
171
|
+
creditsUsed: 0,
|
|
172
|
+
separatelyBilledCredits: 0,
|
|
173
|
+
providerCostsComplete: true,
|
|
174
|
+
});
|
|
175
|
+
});
|
|
176
|
+
vitest_1.it.each([undefined, -1, NaN, Infinity, '30'])('does not present malformed enrichment costs as complete: %s', (cost) => {
|
|
177
|
+
(0, vitest_1.expect)((0, receipt_1.receiptFor)(enrichmentResponse(cost), 'scrape')).toEqual({
|
|
178
|
+
creditsUsed: 0,
|
|
179
|
+
providerCostsComplete: false,
|
|
180
|
+
});
|
|
181
|
+
});
|
|
182
|
+
vitest_1.it.each([
|
|
183
|
+
{ provider: 'other' },
|
|
184
|
+
{ capability: 'bash' },
|
|
185
|
+
{ error: { code: 'unauthorized' } },
|
|
186
|
+
])('ignores unrelated or rejected enrichment-like data: %j', (overrides) => {
|
|
187
|
+
(0, vitest_1.expect)((0, receipt_1.receiptFor)(enrichmentResponse(30, true, overrides), 'scrape')).toEqual({ creditsUsed: 0 });
|
|
188
|
+
});
|
|
189
|
+
(0, vitest_1.it)('preserves separate SQL and enrichment costs without changing search receipts', () => {
|
|
190
|
+
const value = {
|
|
191
|
+
data: {
|
|
192
|
+
creditsCost: 0,
|
|
193
|
+
alexandria: [
|
|
194
|
+
...sqlResponse(10).data.alexandria,
|
|
195
|
+
...enrichmentResponse(30).data.alexandria,
|
|
196
|
+
],
|
|
197
|
+
},
|
|
198
|
+
};
|
|
199
|
+
(0, vitest_1.expect)((0, receipt_1.receiptFor)(value, 'scrape')).toEqual({
|
|
200
|
+
creditsUsed: 0,
|
|
201
|
+
separatelyBilledCredits: 40,
|
|
202
|
+
providerCostsComplete: true,
|
|
203
|
+
});
|
|
204
|
+
(0, vitest_1.expect)((0, receipt_1.receiptFor)({ ...value, creditsUsed: 2 }, 'search')).toEqual({
|
|
205
|
+
creditsUsed: 2,
|
|
206
|
+
});
|
|
207
|
+
});
|
|
118
208
|
//# sourceMappingURL=receipt.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receipt.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils/receipt.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"receipt.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils/receipt.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interact.d.ts","sourceRoot":"","sources":["../../src/commands/interact.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;
|
|
1
|
+
{"version":3,"file":"interact.d.ts","sourceRoot":"","sources":["../../src/commands/interact.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAiCD;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA+Ef;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAqDf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interact.js","sourceRoot":"","sources":["../../src/commands/interact.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"interact.js","sourceRoot":"","sources":["../../src/commands/interact.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/commands/parse.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA4GhE;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/commands/parse.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA4GhE;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,CAAC,CAiGtB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB7E"}
|
package/dist/commands/parse.js
CHANGED
|
@@ -178,7 +178,13 @@ async function executeParse(options) {
|
|
|
178
178
|
try {
|
|
179
179
|
const response = await fetch(`${apiUrl}/v2/parse`, {
|
|
180
180
|
method: 'POST',
|
|
181
|
-
|
|
181
|
+
// Multipart options are parsed after auth, so the header carries the
|
|
182
|
+
// CLI origin to the keyless check.
|
|
183
|
+
headers: !keyless && apiKey
|
|
184
|
+
? { Authorization: `Bearer ${apiKey}` }
|
|
185
|
+
: keyless
|
|
186
|
+
? { ...client_1.KEYLESS_CLI_HEADERS }
|
|
187
|
+
: undefined,
|
|
182
188
|
body: form,
|
|
183
189
|
});
|
|
184
190
|
const requestEndTime = Date.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/commands/parse.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoHH,
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/commands/parse.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/client.d.ts
CHANGED
|
@@ -13,6 +13,14 @@ import { type GlobalConfig } from './config';
|
|
|
13
13
|
* default URL; a custom/self-hosted URL keeps its existing optional-auth path.
|
|
14
14
|
*/
|
|
15
15
|
export declare function isKeylessMode(apiKey?: string, apiUrl?: string): boolean;
|
|
16
|
+
/**
|
|
17
|
+
* Headers for keyless requests. The API reads X-Origin to attribute keyless
|
|
18
|
+
* use, and a keyless prompt's signup link, to the CLI; requests without a body
|
|
19
|
+
* (GET research and developer lookups, interact stop) carry nothing else.
|
|
20
|
+
* Keyless error messages are printed as the API sends them: their
|
|
21
|
+
* firecrawl.dev/k/<id> link already resolves to CLI attribution.
|
|
22
|
+
*/
|
|
23
|
+
export declare const KEYLESS_CLI_HEADERS: Readonly<Record<string, string>>;
|
|
16
24
|
export declare function keylessRequest(path: string, body: Record<string, unknown>): Promise<any>;
|
|
17
25
|
export declare function keylessGet(path: string): Promise<any>;
|
|
18
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAML,KAAK,YAAY,EAClB,MAAM,UAAU,CAAC;AAMlB;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,GAAG,CAAC,CAcd;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAa3D;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,OAAO,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,GACxC,SAAS,CAoEX;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAS1E;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAElC"}
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAML,KAAK,YAAY,EAClB,MAAM,UAAU,CAAC;AAMlB;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAEhE,CAAC;AAEF,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,GAAG,CAAC,CAcd;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAa3D;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,OAAO,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,GACxC,SAAS,CAoEX;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,SAAS,CAS1E;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAElC"}
|
package/dist/utils/client.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Provides a singleton client instance initialized with global configuration
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.KEYLESS_CLI_HEADERS = void 0;
|
|
7
8
|
exports.isKeylessMode = isKeylessMode;
|
|
8
9
|
exports.keylessRequest = keylessRequest;
|
|
9
10
|
exports.keylessGet = keylessGet;
|
|
@@ -24,11 +25,21 @@ const DEFAULT_API_URL = 'https://api.firecrawl.dev';
|
|
|
24
25
|
function isKeylessMode(apiKey, apiUrl) {
|
|
25
26
|
return !(0, config_1.getApiKey)(apiKey) && !(0, config_1.isCustomApiUrl)(apiUrl);
|
|
26
27
|
}
|
|
28
|
+
/**
|
|
29
|
+
* Headers for keyless requests. The API reads X-Origin to attribute keyless
|
|
30
|
+
* use, and a keyless prompt's signup link, to the CLI; requests without a body
|
|
31
|
+
* (GET research and developer lookups, interact stop) carry nothing else.
|
|
32
|
+
* Keyless error messages are printed as the API sends them: their
|
|
33
|
+
* firecrawl.dev/k/<id> link already resolves to CLI attribution.
|
|
34
|
+
*/
|
|
35
|
+
exports.KEYLESS_CLI_HEADERS = {
|
|
36
|
+
'X-Origin': 'cli',
|
|
37
|
+
};
|
|
27
38
|
async function keylessRequest(path, body) {
|
|
28
39
|
const apiUrl = ((0, config_1.getConfig)().apiUrl || DEFAULT_API_URL).replace(/\/$/, '');
|
|
29
40
|
const response = await fetch(`${apiUrl}${path}`, {
|
|
30
41
|
method: 'POST',
|
|
31
|
-
headers: { 'Content-Type': 'application/json' },
|
|
42
|
+
headers: { 'Content-Type': 'application/json', ...exports.KEYLESS_CLI_HEADERS },
|
|
32
43
|
body: JSON.stringify(body),
|
|
33
44
|
});
|
|
34
45
|
const json = await response.json().catch(() => ({}));
|
|
@@ -41,7 +52,7 @@ async function keylessGet(path) {
|
|
|
41
52
|
const apiUrl = ((0, config_1.getConfig)().apiUrl || DEFAULT_API_URL).replace(/\/$/, '');
|
|
42
53
|
const response = await fetch(`${apiUrl}${path}`, {
|
|
43
54
|
method: 'GET',
|
|
44
|
-
headers: { 'Content-Type': 'application/json' },
|
|
55
|
+
headers: { 'Content-Type': 'application/json', ...exports.KEYLESS_CLI_HEADERS },
|
|
45
56
|
});
|
|
46
57
|
const json = await response.json().catch(() => ({}));
|
|
47
58
|
if (!response.ok) {
|
package/dist/utils/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":";AAAA;;;GAGG
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/utils/client.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/receipt.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receipt.d.ts","sourceRoot":"","sources":["../../src/utils/receipt.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CACrC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,GAAG,EACV,aAAa,EAAE,QAAQ,GAAG,QAAQ,EAClC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,
|
|
1
|
+
{"version":3,"file":"receipt.d.ts","sourceRoot":"","sources":["../../src/utils/receipt.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CACrC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,GAAG,EACV,aAAa,EAAE,QAAQ,GAAG,QAAQ,EAClC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CA4DT;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,UAAO,GAAG,IAAI,CA0B5E;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAGjE"}
|
package/dist/utils/receipt.js
CHANGED
|
@@ -13,19 +13,31 @@ function receiptFor(value, operationType, requestId) {
|
|
|
13
13
|
? value?.id
|
|
14
14
|
: (value?.metadata?.scrapeId ?? value?.scrape_id ?? value?.scrapeId);
|
|
15
15
|
const entries = value?.data?.alexandria;
|
|
16
|
-
const
|
|
17
|
-
? entries
|
|
18
|
-
.filter((entry) => entry?.provider === 'firecrawl' &&
|
|
19
|
-
entry?.capability === 'sql' &&
|
|
20
|
-
!entry.error &&
|
|
21
|
-
entry?.data?.kind === 'result')
|
|
22
|
-
.map((entry) => entry.data.creditsCost)
|
|
16
|
+
const providerResults = operationType === 'scrape' && Array.isArray(entries)
|
|
17
|
+
? entries.filter((entry) => entry?.provider === 'firecrawl' && !entry.error)
|
|
23
18
|
: [];
|
|
24
|
-
const
|
|
25
|
-
const
|
|
26
|
-
|
|
19
|
+
const enrichmentResults = providerResults.filter((entry) => entry.capability === 'enrich' && entry.data);
|
|
20
|
+
const validCost = (cost) => typeof cost === 'number' && Number.isFinite(cost) && cost >= 0;
|
|
21
|
+
const costs = providerResults
|
|
22
|
+
.flatMap((entry) => {
|
|
23
|
+
if (entry.capability === 'sql' && entry.data?.kind === 'result')
|
|
24
|
+
return [entry.data.creditsCost];
|
|
25
|
+
if (entry.capability === 'enrich' && entry.data)
|
|
26
|
+
return [entry.data.providerCredits];
|
|
27
|
+
return [];
|
|
28
|
+
})
|
|
29
|
+
.filter(validCost);
|
|
30
|
+
const separatelyBilledCredits = costs.length > 0
|
|
31
|
+
? costs.reduce((sum, cost) => sum + cost, 0)
|
|
32
|
+
: undefined;
|
|
33
|
+
const providerCostsComplete = enrichmentResults.length > 0
|
|
34
|
+
? enrichmentResults.every((entry) => entry.data.billingComplete === true &&
|
|
35
|
+
validCost(entry.data.providerCredits)) &&
|
|
36
|
+
(separatelyBilledCredits === undefined ||
|
|
37
|
+
Number.isFinite(separatelyBilledCredits))
|
|
27
38
|
: undefined;
|
|
28
39
|
return {
|
|
40
|
+
...(providerCostsComplete !== undefined ? { providerCostsComplete } : {}),
|
|
29
41
|
...(separatelyBilledCredits !== undefined &&
|
|
30
42
|
Number.isFinite(separatelyBilledCredits)
|
|
31
43
|
? { separatelyBilledCredits }
|
|
@@ -44,17 +56,20 @@ function printReceipt(receipt, includeRequestId = true) {
|
|
|
44
56
|
console.error(`Request ID: ${receipt.requestId}`);
|
|
45
57
|
if (receipt.operationId)
|
|
46
58
|
console.error(`${receipt.operationType === 'search' ? 'Search' : 'Scrape'} ID: ${receipt.operationId}`);
|
|
59
|
+
const label = receipt.providerCostsComplete === false ? 'Known credits' : 'Credits';
|
|
47
60
|
if (receipt.separatelyBilledCredits !== undefined) {
|
|
48
61
|
if (receipt.creditsUsed !== undefined) {
|
|
49
|
-
console.error(
|
|
62
|
+
console.error(`${label}: ${receipt.creditsUsed + receipt.separatelyBilledCredits} (${receipt.creditsUsed} outer request + ${receipt.separatelyBilledCredits} separately billed provider calls)`);
|
|
50
63
|
}
|
|
51
64
|
else {
|
|
52
65
|
console.error(`Provider credits (billed separately): ${receipt.separatelyBilledCredits}`);
|
|
53
66
|
}
|
|
54
67
|
}
|
|
55
68
|
else if (receipt.creditsUsed !== undefined) {
|
|
56
|
-
console.error(
|
|
69
|
+
console.error(`${label}: ${receipt.creditsUsed}`);
|
|
57
70
|
}
|
|
71
|
+
if (receipt.providerCostsComplete === false)
|
|
72
|
+
console.error('Provider costs are incomplete; additional credits may have been incurred.');
|
|
58
73
|
}
|
|
59
74
|
function printRetry(failure) {
|
|
60
75
|
if (typeof failure.retryAfterSeconds === 'number')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receipt.js","sourceRoot":"","sources":["../../src/utils/receipt.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"receipt.js","sourceRoot":"","sources":["../../src/utils/receipt.ts"],"names":[],"mappings":"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"}
|