@doist/todoist-cli 3.3.0 → 3.3.2
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/CHANGELOG.md +9 -0
- package/dist/lib/logger.d.ts +11 -0
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +21 -5
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/migrate-auth.d.ts.map +1 -1
- package/dist/lib/migrate-auth.js +3 -1
- package/dist/lib/migrate-auth.js.map +1 -1
- package/dist/lib/usage-tracking.d.ts.map +1 -1
- package/dist/lib/usage-tracking.js +45 -18
- package/dist/lib/usage-tracking.js.map +1 -1
- package/package.json +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
## [3.3.2](https://github.com/Doist/todoist-cli/compare/v3.3.1...v3.3.2) (2026-08-25)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* pin the changelog preset to a version semantic-release can render ([#493](https://github.com/Doist/todoist-cli/issues/493)) ([0810ecf](https://github.com/Doist/todoist-cli/commit/0810ecf5586d5f5abbc4369939af8faf86e8c6c2))
|
|
6
|
+
* use the fetch the SDK pairs with its dispatcher ([#492](https://github.com/Doist/todoist-cli/issues/492)) ([9f31932](https://github.com/Doist/todoist-cli/commit/9f31932b993e89e76d6ca2486539d18dbae47b86))
|
|
7
|
+
|
|
8
|
+
## [3.3.1](https://github.com/Doist/todoist-cli/compare/v3.3.0...v3.3.1) (2026-08-24)
|
|
9
|
+
|
|
1
10
|
## [3.3.0](https://github.com/Doist/todoist-cli/compare/v3.2.3...v3.3.0) (2026-08-21)
|
|
2
11
|
|
|
3
12
|
## [3.2.3](https://github.com/Doist/todoist-cli/compare/v3.2.2...v3.2.3) (2026-08-20)
|
package/dist/lib/logger.d.ts
CHANGED
|
@@ -36,6 +36,17 @@ declare class Logger {
|
|
|
36
36
|
}
|
|
37
37
|
export declare function getLogger(): Logger;
|
|
38
38
|
export declare function initializeLogger(): void;
|
|
39
|
+
/** Whether HTTP logging should be applied to a fetch implementation. */
|
|
40
|
+
export declare function isHttpLoggingEnabled(): boolean;
|
|
41
|
+
/**
|
|
42
|
+
* Wraps a fetch implementation with request and response logging.
|
|
43
|
+
*
|
|
44
|
+
* Used both to patch `globalThis.fetch` and, in the transport layer, to wrap
|
|
45
|
+
* the fetch the SDK pairs with its dispatcher. That one is undici's own fetch
|
|
46
|
+
* rather than the runtime's, so it never passes through the global patch and
|
|
47
|
+
* would otherwise be invisible to `--verbose`.
|
|
48
|
+
*/
|
|
49
|
+
export declare function withHttpLogging(originalFetch: typeof fetch): typeof fetch;
|
|
39
50
|
/** Reset for testing. */
|
|
40
51
|
export declare function resetLogger(): void;
|
|
41
52
|
export {};
|
package/dist/lib/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,eAAO,MAAM,SAAS;aAClB,MAAM,EAAE,CAAC;aACT,IAAI,EAAE,CAAC;aACP,MAAM,EAAE,CAAC;aACT,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,CAAC;CACF,CAAA;AAEV,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAA;AASlE,cAAM,MAAM;IACR,OAAO,CAAC,KAAK,CAA8B;IAE3C,0DAA0D;IAC1D,UAAU,IAAI,IAAI,CAmBjB;IAED,QAAQ,IAAI,SAAS,CAEpB;IAED,SAAS,CAAC,KAAK,GAAE,SAA0B,GAAG,OAAO,CAEpD;IAED,2EAA2E;IAC3E,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAmB3E;IAED,0CAA0C;IAC1C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE1D;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE5D;IAED,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE3D;IAED,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE3D;IAED,sEAAsE;IAChE,KAAK,CAAC,CAAC,EACT,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC,OAAO,CAAC,CAAC,CAAC,CAyBZ;CACJ;AAKD,wBAAgB,SAAS,IAAI,MAAM,CAKlC;AAED,wBAAgB,gBAAgB,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,eAAO,MAAM,SAAS;aAClB,MAAM,EAAE,CAAC;aACT,IAAI,EAAE,CAAC;aACP,MAAM,EAAE,CAAC;aACT,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,CAAC;CACF,CAAA;AAEV,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAA;AASlE,cAAM,MAAM;IACR,OAAO,CAAC,KAAK,CAA8B;IAE3C,0DAA0D;IAC1D,UAAU,IAAI,IAAI,CAmBjB;IAED,QAAQ,IAAI,SAAS,CAEpB;IAED,SAAS,CAAC,KAAK,GAAE,SAA0B,GAAG,OAAO,CAEpD;IAED,2EAA2E;IAC3E,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAmB3E;IAED,0CAA0C;IAC1C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE1D;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE5D;IAED,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE3D;IAED,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAE3D;IAED,sEAAsE;IAChE,KAAK,CAAC,CAAC,EACT,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC,OAAO,CAAC,CAAC,CAAC,CAyBZ;CACJ;AAKD,wBAAgB,SAAS,IAAI,MAAM,CAKlC;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAYvC;AAED,wEAAwE;AACxE,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;AAOD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,OAAO,KAAK,GAAG,OAAO,KAAK,CAwFzE;AAED,yBAAyB;AACzB,wBAAgB,WAAW,IAAI,IAAI,CAElC"}
|
package/dist/lib/logger.js
CHANGED
|
@@ -122,17 +122,33 @@ export function getLogger() {
|
|
|
122
122
|
export function initializeLogger() {
|
|
123
123
|
const log = getLogger();
|
|
124
124
|
log.initialize();
|
|
125
|
-
// When verbose, patch globalThis.fetch so
|
|
126
|
-
// This
|
|
127
|
-
//
|
|
125
|
+
// When verbose, patch globalThis.fetch so HTTP calls made through it are
|
|
126
|
+
// logged. This covers everything that reaches the runtime's own fetch:
|
|
127
|
+
// the help centre client, and anything inside our dependencies that calls
|
|
128
|
+
// fetch directly. Todoist API traffic does not go through the global fetch
|
|
129
|
+
// — see `withHttpLogging`, which the transport layer applies itself.
|
|
128
130
|
if (log.isEnabled()) {
|
|
129
131
|
patchGlobalFetch();
|
|
130
132
|
}
|
|
131
133
|
}
|
|
134
|
+
/** Whether HTTP logging should be applied to a fetch implementation. */
|
|
135
|
+
export function isHttpLoggingEnabled() {
|
|
136
|
+
return getLogger().isEnabled();
|
|
137
|
+
}
|
|
132
138
|
/** Save original fetch and replace with logging wrapper. */
|
|
133
139
|
function patchGlobalFetch() {
|
|
134
|
-
|
|
135
|
-
|
|
140
|
+
globalThis.fetch = withHttpLogging(globalThis.fetch);
|
|
141
|
+
}
|
|
142
|
+
/**
|
|
143
|
+
* Wraps a fetch implementation with request and response logging.
|
|
144
|
+
*
|
|
145
|
+
* Used both to patch `globalThis.fetch` and, in the transport layer, to wrap
|
|
146
|
+
* the fetch the SDK pairs with its dispatcher. That one is undici's own fetch
|
|
147
|
+
* rather than the runtime's, so it never passes through the global patch and
|
|
148
|
+
* would otherwise be invisible to `--verbose`.
|
|
149
|
+
*/
|
|
150
|
+
export function withHttpLogging(originalFetch) {
|
|
151
|
+
return async (input, init) => {
|
|
136
152
|
const log = getLogger();
|
|
137
153
|
const urlStr = typeof input === 'string' ? input : input instanceof URL ? input.toString() : input.url;
|
|
138
154
|
const method = init?.method ?? (typeof input === 'object' && 'method' in input ? input.method : 'GET');
|
package/dist/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/lib/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-auth.d.ts","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAmBH,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAA;IACvE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,UAAU,cAAc;IACpB,sFAAsF;IACtF,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,kCAAkC;IAClC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;CAC3B;AAID,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"migrate-auth.d.ts","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAmBH,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAA;IACvE,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,UAAU,cAAc;IACpB,sFAAsF;IACtF,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,kCAAkC;IAClC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;CAC3B;AAID,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA2D7F"}
|
package/dist/lib/migrate-auth.js
CHANGED
|
@@ -17,7 +17,9 @@ import { fetchTodoist } from './usage-tracking.js';
|
|
|
17
17
|
import { createTodoistUserRecordStore } from './user-records.js';
|
|
18
18
|
const USER_ENDPOINT = 'https://api.todoist.com/api/v1/user';
|
|
19
19
|
export async function migrateLegacyAuth(opts = {}) {
|
|
20
|
-
|
|
20
|
+
// Left undefined when the caller supplies nothing, so `fetchTodoist`
|
|
21
|
+
// resolves the SDK's transport rather than the bare global fetch.
|
|
22
|
+
const fetchImpl = opts.fetchImpl;
|
|
21
23
|
// Cache the config across the cli-core callbacks: a successful migration
|
|
22
24
|
// hits `hasMigrated`, `loadLegacyPlaintextToken`, `identifyAccount`, and
|
|
23
25
|
// `cleanupLegacyConfig` back-to-back. Without the cache we'd re-read +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-auth.js","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACjF,OAAO,EACH,cAAc,EACd,YAAY,EACZ,gBAAgB,GAEnB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAEH,cAAc,EACd,UAAU,EACV,qBAAqB,EACrB,WAAW,GACd,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAgBhE,MAAM,aAAa,GAAG,qCAAqC,CAAA;AAE3D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAI,GAAmB,EAAE;IAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"migrate-auth.js","sourceRoot":"","sources":["../../src/lib/migrate-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACjF,OAAO,EACH,cAAc,EACd,YAAY,EACZ,gBAAgB,GAEnB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAEH,cAAc,EACd,UAAU,EACV,qBAAqB,EACrB,WAAW,GACd,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAgBhE,MAAM,aAAa,GAAG,qCAAqC,CAAA;AAE3D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAI,GAAmB,EAAE;IAC7D,qEAAqE;IACrE,kEAAkE;IAClE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;IAEhC,yEAAyE;IACzE,yEAAyE;IACzE,uEAAuE;IACvE,6DAA6D;IAC7D,IAAI,MAA0B,CAAA;IAC9B,MAAM,IAAI,GAAG,KAAK,IAAqB,EAAE;QACrC,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,GAAG,MAAM,UAAU,EAAE,CAAA;QACrD,OAAO,MAAM,CAAA;IACjB,CAAC,CAAA;IACD,MAAM,KAAK,GAAG,KAAK,EAAE,IAAY,EAAiB,EAAE;QAChD,MAAM,WAAW,CAAC,IAAI,CAAC,CAAA;QACvB,MAAM,GAAG,IAAI,CAAA;IACjB,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAiB;QACvD,WAAW,EAAE,YAAY;QACzB,aAAa,EAAE,cAAc;QAC7B,WAAW,EAAE,4BAA4B,EAAE;QAC3C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,SAAS,EAAE,aAAa;QACxB,uEAAuE;QACvE,wEAAwE;QACxE,kEAAkE;QAClE,8BAA8B;QAC9B,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,cAAc,KAAK,cAAc;QACzE,YAAY,EAAE,KAAK,IAAI,EAAE;YACrB,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;YAC3B,IAAI,MAAM,CAAC,cAAc,KAAK,cAAc;gBAAE,OAAM;YACpD,MAAM,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC,CAAA;QAC9D,CAAC;QACD,wBAAwB,EAAE,KAAK,IAAI,EAAE;YACjC,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;YAC3B,OAAO,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE;gBAClE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE;gBACzB,CAAC,CAAC,IAAI,CAAA;QACd,CAAC;QACD,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;YAC3B,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;YAC9C,OAAO,gBAAgB,CAAC;gBACpB,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,MAAM,CAAC,SAAS,IAAI,SAAS;gBACvC,SAAS,EAAE,MAAM,CAAC,UAAU;gBAC5B,SAAS,EAAE,MAAM,CAAC,UAAU;aAC/B,CAAC,CAAA;QACN,CAAC;QACD,mBAAmB,EAAE,KAAK,IAAI,EAAE;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;YAC3B,MAAM,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAA;QAC9C,CAAC;KACJ,CAAC,CAAA;IAEF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAA;AAChC,CAAC;AAOD,KAAK,UAAU,SAAS,CAAC,KAAa,EAAE,SAAwB;IAC5D,MAAM,QAAQ,GAAG,MAAM,YAAY,CAC/B,aAAa,EACb,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,EAAE,EACjD,SAAS,EACT,0BAA0B,CAC7B,CAAA;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;IACrE,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsC,CAAA;IACzE,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC/C,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAA;AAC7C,CAAC;AAED,SAAS,aAAa,CAClB,MAAyE;IAEzE,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO;YACH,MAAM,EAAE,UAAU;YAClB,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE;YACjC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;SACtC,CAAA;IACL,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,CAAA;IAC9E,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAA;AACpC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-tracking.d.ts","sourceRoot":"","sources":["../../src/lib/usage-tracking.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"usage-tracking.d.ts","sourceRoot":"","sources":["../../src/lib/usage-tracking.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAiD,MAAM,oBAAoB,CAAA;AA6BpG,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE1E;AAED,wBAAgB,oBAAoB,IAAI,MAAM,GAAG,SAAS,CAEzD;AAED,wBAAgB,yBAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBtF;AAwED,wBAAgB,kBAAkB,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,GAAG,WAAW,CAoBxE;AAED,wBAAsB,YAAY,CAC9B,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,OAAO,GAAE,WAAgB,EACzB,SAAS,CAAC,EAAE,OAAO,KAAK,EACxB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,QAAQ,CAAC,CAQnB;AAED,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
-
import {
|
|
2
|
+
import { getDefaultTransport } from '@doist/todoist-sdk';
|
|
3
3
|
import packageJson from '../../package.json' with { type: 'json' };
|
|
4
|
+
import { isHttpLoggingEnabled, withHttpLogging } from './logger.js';
|
|
4
5
|
const CLI_NAME = 'todoist-cli';
|
|
5
6
|
const CLI_VERSION = packageJson.version;
|
|
6
7
|
const SESSION_ID = randomUUID();
|
|
@@ -55,20 +56,46 @@ function mergeTodoistHeaders(headersInit, commandPath) {
|
|
|
55
56
|
}
|
|
56
57
|
return Object.fromEntries(mergedHeaders.entries());
|
|
57
58
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
/**
|
|
60
|
+
* Picks the fetch for one request, attaching the SDK's proxy dispatcher when
|
|
61
|
+
* we own the request path. Mutates `options` to add the dispatcher, so the
|
|
62
|
+
* fetch and the dispatcher can only ever be chosen together.
|
|
63
|
+
*
|
|
64
|
+
* A caller that supplies its own fetch — test stubs, injected clients — keeps
|
|
65
|
+
* it untouched and gets no dispatcher: a dispatcher means nothing to a stub,
|
|
66
|
+
* and attaching one to a fetch it was not paired with is the failure this
|
|
67
|
+
* function exists to prevent. Passing `globalThis.fetch` explicitly counts as
|
|
68
|
+
* asking for the default path, so callers that captured the global binding
|
|
69
|
+
* before calling us keep proxy support.
|
|
70
|
+
*
|
|
71
|
+
* The dispatcher and its fetch come from `getDefaultTransport()` as a single
|
|
72
|
+
* value and must not be mixed with anything else. The dispatcher decompresses
|
|
73
|
+
* the response body itself, so a fetch from a different undici build decodes
|
|
74
|
+
* it a second time and the request fails mid-stream with `terminated`.
|
|
75
|
+
*/
|
|
76
|
+
async function resolveRequestFetch(fetchImpl, options) {
|
|
77
|
+
if (fetchImpl !== undefined && fetchImpl !== globalThis.fetch)
|
|
78
|
+
return fetchImpl;
|
|
79
|
+
const transport = await getDefaultTransport();
|
|
80
|
+
// No transport outside Node (browser, edge): the global fetch is on its own.
|
|
81
|
+
if (transport === undefined)
|
|
82
|
+
return globalThis.fetch;
|
|
64
83
|
// Don't clobber a dispatcher the caller already chose.
|
|
65
|
-
if ('dispatcher' in options)
|
|
66
|
-
return;
|
|
67
|
-
const dispatcher = await getDefaultDispatcher();
|
|
68
|
-
if (dispatcher !== undefined) {
|
|
84
|
+
if (!('dispatcher' in options)) {
|
|
69
85
|
// @ts-expect-error - dispatcher is a valid option for Node's fetch but not in the TS types
|
|
70
|
-
options.dispatcher = dispatcher;
|
|
86
|
+
options.dispatcher = transport.dispatcher;
|
|
71
87
|
}
|
|
88
|
+
// `fetch: undefined` means the global fetch is the correct partner for
|
|
89
|
+
// this dispatcher (Bun, which decompresses natively). It has already been
|
|
90
|
+
// wrapped for logging by `initializeLogger` if verbose is on.
|
|
91
|
+
if (transport.fetch === undefined)
|
|
92
|
+
return globalThis.fetch;
|
|
93
|
+
// undici's fetch and the global fetch are the same call at runtime but
|
|
94
|
+
// carry different (undici vs DOM) types.
|
|
95
|
+
const pairedFetch = transport.fetch;
|
|
96
|
+
// The global patch in `initializeLogger` cannot see this fetch, so apply
|
|
97
|
+
// the same wrapper here or `--verbose` goes quiet for all API traffic.
|
|
98
|
+
return isHttpLoggingEnabled() ? withHttpLogging(pairedFetch) : pairedFetch;
|
|
72
99
|
}
|
|
73
100
|
function toCustomFetchResponse(response) {
|
|
74
101
|
return {
|
|
@@ -81,7 +108,7 @@ function toCustomFetchResponse(response) {
|
|
|
81
108
|
arrayBuffer: () => response.arrayBuffer(),
|
|
82
109
|
};
|
|
83
110
|
}
|
|
84
|
-
export function createTrackedFetch(baseFetch
|
|
111
|
+
export function createTrackedFetch(baseFetch) {
|
|
85
112
|
return async (url, options = {}) => {
|
|
86
113
|
const { timeout: timeoutMs, headers, signal, ...rest } = options;
|
|
87
114
|
let abortSignal = signal;
|
|
@@ -94,19 +121,19 @@ export function createTrackedFetch(baseFetch = globalThis.fetch) {
|
|
|
94
121
|
signal: abortSignal,
|
|
95
122
|
headers: mergeTodoistHeaders(headers),
|
|
96
123
|
};
|
|
97
|
-
await
|
|
98
|
-
const response = await
|
|
124
|
+
const requestFetch = await resolveRequestFetch(baseFetch, fetchOptions);
|
|
125
|
+
const response = await requestFetch(url, fetchOptions);
|
|
99
126
|
return toCustomFetchResponse(response);
|
|
100
127
|
};
|
|
101
128
|
}
|
|
102
|
-
export async function fetchTodoist(url, options = {}, fetchImpl
|
|
129
|
+
export async function fetchTodoist(url, options = {}, fetchImpl, commandPath) {
|
|
103
130
|
const { headers, ...rest } = options;
|
|
104
131
|
const fetchOptions = {
|
|
105
132
|
...rest,
|
|
106
133
|
headers: mergeTodoistHeaders(headers, commandPath),
|
|
107
134
|
};
|
|
108
|
-
await
|
|
109
|
-
return
|
|
135
|
+
const requestFetch = await resolveRequestFetch(fetchImpl, fetchOptions);
|
|
136
|
+
return requestFetch(url, fetchOptions);
|
|
110
137
|
}
|
|
111
138
|
export function resetUsageTrackingForTests() {
|
|
112
139
|
activeCommandPath = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-tracking.js","sourceRoot":"","sources":["../../src/lib/usage-tracking.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"usage-tracking.js","sourceRoot":"","sources":["../../src/lib/usage-tracking.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@doist/todoist-cli",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.2",
|
|
4
4
|
"description": "TypeScript CLI for Todoist",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -53,13 +53,13 @@
|
|
|
53
53
|
],
|
|
54
54
|
"dependencies": {
|
|
55
55
|
"@doist/cli-core": "1.2.0",
|
|
56
|
-
"@doist/todoist-sdk": "14.
|
|
56
|
+
"@doist/todoist-sdk": "14.2.0",
|
|
57
57
|
"@napi-rs/keyring": "1.3.0",
|
|
58
58
|
"@pnpm/tabtab": "0.5.4",
|
|
59
59
|
"chalk": "6.0.0",
|
|
60
60
|
"commander": "14.0.3",
|
|
61
61
|
"date-fns": "4.4.0",
|
|
62
|
-
"marked": "18.0.
|
|
62
|
+
"marked": "18.0.10",
|
|
63
63
|
"marked-terminal-renderer": "2.2.0",
|
|
64
64
|
"oauth4webapi": "3.8.7",
|
|
65
65
|
"open": "11.0.1"
|
|
@@ -68,12 +68,12 @@
|
|
|
68
68
|
"@semantic-release/changelog": "7.0.0",
|
|
69
69
|
"@semantic-release/git": "11.0.1",
|
|
70
70
|
"@types/node": "25.9.5",
|
|
71
|
-
"conventional-changelog-conventionalcommits": "
|
|
71
|
+
"conventional-changelog-conventionalcommits": "9.3.1",
|
|
72
72
|
"lefthook": "2.1.10",
|
|
73
|
-
"oxfmt": "0.
|
|
74
|
-
"oxlint": "1.
|
|
73
|
+
"oxfmt": "0.64.0",
|
|
74
|
+
"oxlint": "1.79.0",
|
|
75
75
|
"semantic-release": "25.0.9",
|
|
76
76
|
"typescript": "7.0.2",
|
|
77
|
-
"vitest": "4.1.
|
|
77
|
+
"vitest": "4.1.11"
|
|
78
78
|
}
|
|
79
79
|
}
|