@sonisoft/now-sdk-ext-core 5.2.0 → 6.0.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/LICENSE +21 -21
- package/README.md +40 -3
- package/dist/comm/http/ServiceNowProcessorRequest.d.ts +1 -0
- package/dist/comm/http/ServiceNowProcessorRequest.js +8 -1
- package/dist/comm/http/ServiceNowProcessorRequest.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/sn/OperationProgress.d.ts +63 -0
- package/dist/sn/OperationProgress.js +69 -0
- package/dist/sn/OperationProgress.js.map +1 -0
- package/dist/sn/amb/AMBClient.js +24 -11
- package/dist/sn/amb/AMBClient.js.map +1 -1
- package/dist/sn/amb/SubscriptionCommandSender.js +19 -2
- package/dist/sn/amb/SubscriptionCommandSender.js.map +1 -1
- package/dist/sn/amb/XMLHttpRequest.d.ts +1 -0
- package/dist/sn/amb/XMLHttpRequest.js +5 -1
- package/dist/sn/amb/XMLHttpRequest.js.map +1 -1
- package/dist/sn/application/AppRepoApplication.d.ts +3 -2
- package/dist/sn/application/AppRepoApplication.js +9 -5
- package/dist/sn/application/AppRepoApplication.js.map +1 -1
- package/dist/sn/application/ApplicationManager.d.ts +3 -2
- package/dist/sn/application/ApplicationManager.js +9 -5
- package/dist/sn/application/ApplicationManager.js.map +1 -1
- package/dist/sn/atf/ATFTestExecutor.d.ts +4 -3
- package/dist/sn/atf/ATFTestExecutor.js +9 -5
- package/dist/sn/atf/ATFTestExecutor.js.map +1 -1
- package/dist/sn/scripttracer/ScriptTracer.js +6 -2
- package/dist/sn/scripttracer/ScriptTracer.js.map +1 -1
- package/dist/util/LogConfig.d.ts +83 -0
- package/dist/util/LogConfig.js +387 -0
- package/dist/util/LogConfig.js.map +1 -0
- package/dist/util/Logger.d.ts +40 -18
- package/dist/util/Logger.js +78 -84
- package/dist/util/Logger.js.map +1 -1
- package/dist/util/redact.d.ts +12 -0
- package/dist/util/redact.js +76 -0
- package/dist/util/redact.js.map +1 -1
- package/package.json +1 -1
package/LICENSE
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 SoniSoft Inc
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -452,7 +452,8 @@ console.log('Return value:', result.result);
|
|
|
452
452
|
|
|
453
453
|
### Utilities
|
|
454
454
|
|
|
455
|
-
- **`Logger`** - Winston-based logging
|
|
455
|
+
- **`Logger`** - Winston-based structured logging (stderr by default; file output is opt-in)
|
|
456
|
+
- **`configureLogging`** - sets destination, level, and rotation for the whole process
|
|
456
457
|
- **`NowStringUtil`** - String manipulation utilities
|
|
457
458
|
- **`AppUtil`** - Application utility functions
|
|
458
459
|
|
|
@@ -581,16 +582,52 @@ const handler = new RequestHandler(instance, {
|
|
|
581
582
|
});
|
|
582
583
|
```
|
|
583
584
|
|
|
584
|
-
###
|
|
585
|
+
### Logging
|
|
586
|
+
|
|
587
|
+
Logging goes to **stderr at `warn` and above**, and **writes no files by default** —
|
|
588
|
+
stdout is left clean for `--json` output and for MCP's JSON-RPC framing.
|
|
585
589
|
|
|
586
590
|
```typescript
|
|
587
591
|
import { Logger } from '@sonisoft/now-sdk-ext-core';
|
|
588
592
|
|
|
589
|
-
const logger = Logger
|
|
593
|
+
const logger = new Logger('MyApp');
|
|
590
594
|
logger.info('Application started');
|
|
591
595
|
logger.error('Error occurred', { details: errorObj });
|
|
592
596
|
```
|
|
593
597
|
|
|
598
|
+
Credential material is stripped from both metadata and the message text before anything
|
|
599
|
+
is written, so passing a whole request config or session object is safe.
|
|
600
|
+
|
|
601
|
+
#### Turning on file logging
|
|
602
|
+
|
|
603
|
+
The application that owns the entry point configures logging once, at boot. Libraries
|
|
604
|
+
should not call this.
|
|
605
|
+
|
|
606
|
+
```typescript
|
|
607
|
+
import { configureLogging, flushLogs } from '@sonisoft/now-sdk-ext-core';
|
|
608
|
+
|
|
609
|
+
configureLogging({
|
|
610
|
+
file: true, // default false
|
|
611
|
+
level: 'debug', // default 'info'
|
|
612
|
+
dir: './logs', // default ~/.local/state/now-sdk-ext/logs (honours XDG_STATE_HOME)
|
|
613
|
+
});
|
|
614
|
+
|
|
615
|
+
// Winston buffers; process.exit() would drop the tail.
|
|
616
|
+
await flushLogs();
|
|
617
|
+
```
|
|
618
|
+
|
|
619
|
+
Equivalent environment variables, honoured with no code change — this is how the MCP
|
|
620
|
+
server is configured, since it has no flags:
|
|
621
|
+
|
|
622
|
+
| Variable | Effect |
|
|
623
|
+
| --- | --- |
|
|
624
|
+
| `NEX_LOG_FILE` | `1`/`true` enables file logging |
|
|
625
|
+
| `NEX_LOG_DIR` | Directory for log files. Implies `NEX_LOG_FILE` |
|
|
626
|
+
| `NEX_LOG_LEVEL` | `error`, `warn`, `info`, `http`, `verbose`, `debug`, `silly` |
|
|
627
|
+
|
|
628
|
+
Explicit `configureLogging()` arguments win over the environment, which wins over the
|
|
629
|
+
defaults. Files rotate at 10 MB, keeping 5.
|
|
630
|
+
|
|
594
631
|
### Authentication Handler
|
|
595
632
|
|
|
596
633
|
```typescript
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { IHttpResponse } from "./IHttpResponse.js";
|
|
2
2
|
import { ServiceNowInstance } from "../../sn/ServiceNowInstance.js";
|
|
3
3
|
export declare class ServiceNowProcessorRequest {
|
|
4
|
+
private static _logger;
|
|
4
5
|
_instance: ServiceNowInstance;
|
|
5
6
|
constructor(instance: ServiceNowInstance);
|
|
6
7
|
private _headers;
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { ServiceNowRequest } from "../../comm/http/ServiceNowRequest.js";
|
|
2
2
|
import { XMLHTTP_PROCESSOR_ENDPOINT } from '../../constants/ServiceNow.js';
|
|
3
3
|
import { Parser } from 'xml2js';
|
|
4
|
+
import { Logger } from "../../util/Logger.js";
|
|
5
|
+
import { redactError } from "../../util/redact.js";
|
|
4
6
|
export class ServiceNowProcessorRequest {
|
|
7
|
+
static _logger = new Logger("ServiceNowProcessorRequest");
|
|
5
8
|
_instance;
|
|
6
9
|
constructor(instance) {
|
|
7
10
|
this._instance = instance;
|
|
@@ -41,7 +44,11 @@ export class ServiceNowProcessorRequest {
|
|
|
41
44
|
resp = await req.post(request);
|
|
42
45
|
}
|
|
43
46
|
catch (err) {
|
|
44
|
-
console.log
|
|
47
|
+
// Was console.log, which writes to fd 1 — the MCP server's JSON-RPC channel.
|
|
48
|
+
// A single stray line there desynchronises the protocol framing.
|
|
49
|
+
ServiceNowProcessorRequest._logger.error("Processor request failed", {
|
|
50
|
+
error: redactError(err),
|
|
51
|
+
});
|
|
45
52
|
}
|
|
46
53
|
return resp;
|
|
47
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceNowProcessorRequest.js","sourceRoot":"","sources":["../../../src/comm/http/ServiceNowProcessorRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"ServiceNowProcessorRequest.js","sourceRoot":"","sources":["../../../src/comm/http/ServiceNowProcessorRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,OAAO,0BAA0B;IAE3B,MAAM,CAAC,OAAO,GAAW,IAAI,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAE1E,SAAS,CAAoB;IAE7B,YAAmB,QAA2B;QAC1C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAGO,QAAQ,GAAU;QACtB,cAAc,EAAC,mCAAmC;KACrD,CAAC;IAEK,KAAK,CAAC,OAAO,CAAC,SAAgB,EAAE,eAAsB,EAAE,KAAY,EAAE,aAAoB;QAC7F,IAAI,MAAM,GAAU,IAAI,CAAC;QACzB,IAAI,IAAI,GAA2B,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;QACjH,IAAG,IAAI,CAAC,MAAM,IAAI,GAAG,EAAC,CAAC;YACnB,IAAI,IAAI,GAAU,IAAI,CAAC,IAAc,CAAC;YACtC,IAAG,OAAO,IAAI,IAAI,WAAW,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAC,CAAC;gBAEpE,IAAI,MAAM,GAAU,IAAI,MAAM,EAAE,CAAC;gBACjC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,EAAE,MAAM;oBAC1C,IAAI,MAAM,GAAU,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;oBACxC,MAAM,GAAG,MAAM,CAAC;oBAChB,sBAAsB;gBAC1B,CAAC,CAAC,CAAC;YAEP,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,SAAgB,EAAE,eAAsB,EAAE,KAAY,EAAE,aAAoB;QAC/F,IAAI,IAAI,GAA0B,IAAI,CAAC;QAEvC,IAAG,CAAC;YACA,IAAI,OAAO,GAAyB,EAAE,CAAC;YACvC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;YACtC,OAAO,CAAC,YAAY,GAAG,eAAe,CAAC;YACvC,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;YAE9B,KAAI,IAAI,IAAI,IAAI,aAAa,EAAC,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YAED,mCAAmC;YAEnC,IAAI,GAAG,GAAqB,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClE,IAAI,OAAO,GAAe,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,IAAI,EAAC,CAAC;YAC7I,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;QAAA,OAAM,GAAG,EAAC,CAAC;YACR,6EAA6E;YAC7E,iEAAiE;YACjE,0BAA0B,CAAC,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE;gBACjE,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC;aAC1B,CAAC,CAAC;QACP,CAAC;QAGD,OAAO,IAAI,CAAC;IAChB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -13,11 +13,13 @@ export * from './model/types.js';
|
|
|
13
13
|
export * from './sn/Application.js';
|
|
14
14
|
export * from './sn/BackgroundScriptExecutor.js';
|
|
15
15
|
export * from './sn/IServiceNowInstance.js';
|
|
16
|
+
export * from './sn/OperationProgress.js';
|
|
16
17
|
export * from './sn/ProgressWorker.js';
|
|
17
18
|
export * from './sn/ServiceNowInstance.js';
|
|
18
19
|
export * from './sn/SNRequestBase.js';
|
|
19
20
|
export * from './util/AppUtil.js';
|
|
20
21
|
export * from './util/CSRFTokenHelper.js';
|
|
22
|
+
export * from './util/LogConfig.js';
|
|
21
23
|
export * from './util/Logger.js';
|
|
22
24
|
export * from './util/NowStringUtil.js';
|
|
23
25
|
export * from './util/redact.js';
|
package/dist/index.js
CHANGED
|
@@ -13,11 +13,13 @@ export * from './model/types.js';
|
|
|
13
13
|
export * from './sn/Application.js';
|
|
14
14
|
export * from './sn/BackgroundScriptExecutor.js';
|
|
15
15
|
export * from './sn/IServiceNowInstance.js';
|
|
16
|
+
export * from './sn/OperationProgress.js';
|
|
16
17
|
export * from './sn/ProgressWorker.js';
|
|
17
18
|
export * from './sn/ServiceNowInstance.js';
|
|
18
19
|
export * from './sn/SNRequestBase.js';
|
|
19
20
|
export * from './util/AppUtil.js';
|
|
20
21
|
export * from './util/CSRFTokenHelper.js';
|
|
22
|
+
export * from './util/LogConfig.js';
|
|
21
23
|
export * from './util/Logger.js';
|
|
22
24
|
export * from './util/NowStringUtil.js';
|
|
23
25
|
export * from './util/redact.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Progress reporting for long-running platform operations.
|
|
3
|
+
*
|
|
4
|
+
* App installs, app-repo publishes and ATF suite runs all poll a tracker for
|
|
5
|
+
* minutes — up to a 30-minute default timeout — and until now reported nothing
|
|
6
|
+
* until they finished. A caller could not distinguish "working" from "hung".
|
|
7
|
+
*
|
|
8
|
+
* This is a structured callback rather than the `(message: string) => void`
|
|
9
|
+
* shape used by the older batch and update-set options. That is a deliberate
|
|
10
|
+
* divergence: the tracker returns `percent_complete`, so these operations know
|
|
11
|
+
* how far along they are, and flattening that into a string would throw away the
|
|
12
|
+
* one thing that lets a consumer render real progress instead of a spinner. The
|
|
13
|
+
* MCP server, for instance, can only send a determinate `progress`/`total`
|
|
14
|
+
* notification if it receives a number.
|
|
15
|
+
*/
|
|
16
|
+
export interface OperationProgress {
|
|
17
|
+
/** Human-readable description of the current state, suitable for display. */
|
|
18
|
+
message: string;
|
|
19
|
+
/**
|
|
20
|
+
* Completion percentage, 0-100, where the platform reports one.
|
|
21
|
+
* Absent rather than zero when genuinely unknown — a caller rendering a bar
|
|
22
|
+
* needs to tell "no information" apart from "not started".
|
|
23
|
+
*/
|
|
24
|
+
percentComplete?: number;
|
|
25
|
+
/** Raw platform status code, for callers that need to branch on it. */
|
|
26
|
+
status?: string;
|
|
27
|
+
}
|
|
28
|
+
export type OperationProgressCallback = (progress: OperationProgress) => void;
|
|
29
|
+
/**
|
|
30
|
+
* Wraps a callback so it only fires when the reported state actually changes.
|
|
31
|
+
*
|
|
32
|
+
* The poll loops run every 5 seconds by default. Over a 30-minute install that
|
|
33
|
+
* is 360 ticks, almost all of them identical — forwarding each one would bury
|
|
34
|
+
* the handful of updates that mean something, and for the MCP server it would
|
|
35
|
+
* mean 360 notifications for perhaps five state changes.
|
|
36
|
+
*
|
|
37
|
+
* Returns a no-op when no callback is supplied, so the loops can call it
|
|
38
|
+
* unconditionally rather than guarding at every site.
|
|
39
|
+
*/
|
|
40
|
+
export declare function createProgressEmitter(onProgress?: OperationProgressCallback): OperationProgressCallback;
|
|
41
|
+
/**
|
|
42
|
+
* Shape of the tracker payloads returned by ProgressWorker and the ATF and
|
|
43
|
+
* app-repo progress endpoints. Structural rather than imported, because the
|
|
44
|
+
* three sources declare their own near-identical response types.
|
|
45
|
+
*/
|
|
46
|
+
export interface TrackerLikeProgress {
|
|
47
|
+
percent_complete?: number;
|
|
48
|
+
status?: string;
|
|
49
|
+
status_label?: string;
|
|
50
|
+
status_message?: string;
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Builds an OperationProgress from a tracker payload.
|
|
54
|
+
*
|
|
55
|
+
* Exists because the same message-fallback chain was repeated at six call sites
|
|
56
|
+
* across three files, differing only in the fallback string — the kind of
|
|
57
|
+
* duplication where one copy quietly drifts.
|
|
58
|
+
*
|
|
59
|
+
* `fallback` is only used when the platform reports no message at all. It is
|
|
60
|
+
* phrased by the caller because "started" is wrong for a poll that has been
|
|
61
|
+
* running for ten minutes.
|
|
62
|
+
*/
|
|
63
|
+
export declare function toOperationProgress(progress: TrackerLikeProgress, fallback: string): OperationProgress;
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Progress reporting for long-running platform operations.
|
|
3
|
+
*
|
|
4
|
+
* App installs, app-repo publishes and ATF suite runs all poll a tracker for
|
|
5
|
+
* minutes — up to a 30-minute default timeout — and until now reported nothing
|
|
6
|
+
* until they finished. A caller could not distinguish "working" from "hung".
|
|
7
|
+
*
|
|
8
|
+
* This is a structured callback rather than the `(message: string) => void`
|
|
9
|
+
* shape used by the older batch and update-set options. That is a deliberate
|
|
10
|
+
* divergence: the tracker returns `percent_complete`, so these operations know
|
|
11
|
+
* how far along they are, and flattening that into a string would throw away the
|
|
12
|
+
* one thing that lets a consumer render real progress instead of a spinner. The
|
|
13
|
+
* MCP server, for instance, can only send a determinate `progress`/`total`
|
|
14
|
+
* notification if it receives a number.
|
|
15
|
+
*/
|
|
16
|
+
/**
|
|
17
|
+
* Wraps a callback so it only fires when the reported state actually changes.
|
|
18
|
+
*
|
|
19
|
+
* The poll loops run every 5 seconds by default. Over a 30-minute install that
|
|
20
|
+
* is 360 ticks, almost all of them identical — forwarding each one would bury
|
|
21
|
+
* the handful of updates that mean something, and for the MCP server it would
|
|
22
|
+
* mean 360 notifications for perhaps five state changes.
|
|
23
|
+
*
|
|
24
|
+
* Returns a no-op when no callback is supplied, so the loops can call it
|
|
25
|
+
* unconditionally rather than guarding at every site.
|
|
26
|
+
*/
|
|
27
|
+
export function createProgressEmitter(onProgress) {
|
|
28
|
+
if (!onProgress) {
|
|
29
|
+
return () => { };
|
|
30
|
+
}
|
|
31
|
+
let lastKey;
|
|
32
|
+
return (progress) => {
|
|
33
|
+
const key = `${progress.percentComplete ?? ""}|${progress.status ?? ""}|${progress.message}`;
|
|
34
|
+
if (key === lastKey) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
lastKey = key;
|
|
38
|
+
// Best-effort. A consumer's reporting sink is not allowed to abort the
|
|
39
|
+
// operation it is reporting on: a throwing callback would otherwise take
|
|
40
|
+
// down a thirty-minute install that had already succeeded. Swallowed
|
|
41
|
+
// rather than logged here, because this module has no logger and adding
|
|
42
|
+
// one would make an error-reporting path able to fail on its own.
|
|
43
|
+
try {
|
|
44
|
+
onProgress(progress);
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
/* progress reporting must never fail the operation */
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Builds an OperationProgress from a tracker payload.
|
|
53
|
+
*
|
|
54
|
+
* Exists because the same message-fallback chain was repeated at six call sites
|
|
55
|
+
* across three files, differing only in the fallback string — the kind of
|
|
56
|
+
* duplication where one copy quietly drifts.
|
|
57
|
+
*
|
|
58
|
+
* `fallback` is only used when the platform reports no message at all. It is
|
|
59
|
+
* phrased by the caller because "started" is wrong for a poll that has been
|
|
60
|
+
* running for ten minutes.
|
|
61
|
+
*/
|
|
62
|
+
export function toOperationProgress(progress, fallback) {
|
|
63
|
+
return {
|
|
64
|
+
message: progress.status_message || progress.status_label || fallback,
|
|
65
|
+
percentComplete: progress.percent_complete,
|
|
66
|
+
status: progress.status,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=OperationProgress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OperationProgress.js","sourceRoot":"","sources":["../../src/sn/OperationProgress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAmBH;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CACjC,UAAsC;IAEtC,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,GAAG,EAAE,GAAqD,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,OAA2B,CAAC;IAChC,OAAO,CAAC,QAA2B,EAAE,EAAE;QACnC,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC,eAAe,IAAI,EAAE,IAAI,QAAQ,CAAC,MAAM,IAAI,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC7F,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YAClB,OAAO;QACX,CAAC;QACD,OAAO,GAAG,GAAG,CAAC;QAEd,uEAAuE;QACvE,yEAAyE;QACzE,qEAAqE;QACrE,wEAAwE;QACxE,kEAAkE;QAClE,IAAI,CAAC;YACD,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACL,sDAAsD;QAC1D,CAAC;IACL,CAAC,CAAC;AACN,CAAC;AAcD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAC/B,QAA6B,EAC7B,QAAgB;IAEhB,OAAO;QACH,OAAO,EAAE,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,YAAY,IAAI,QAAQ;QACrE,eAAe,EAAE,QAAQ,CAAC,gBAAgB;QAC1C,MAAM,EAAE,QAAQ,CAAC,MAAM;KAC1B,CAAC;AACN,CAAC"}
|
package/dist/sn/amb/AMBClient.js
CHANGED
|
@@ -3,6 +3,7 @@ import { MessageClient } from "./MessageClient.js";
|
|
|
3
3
|
import Base64 from "crypto-js/enc-base64.js";
|
|
4
4
|
import Utf8 from "crypto-js/enc-utf8.js";
|
|
5
5
|
import { Logger } from "../../util/Logger.js";
|
|
6
|
+
import { redactError, stripSecretsFromError } from "../../util/redact.js";
|
|
6
7
|
import { SessionManager } from "../../comm/http/SessionManager.js";
|
|
7
8
|
export class AMBClient {
|
|
8
9
|
_clientSubscriptions;
|
|
@@ -63,20 +64,25 @@ export class AMBClient {
|
|
|
63
64
|
if (typeof cookieJar.getCookieStringSync === 'function') {
|
|
64
65
|
try {
|
|
65
66
|
cookieString = cookieJar.getCookieStringSync(instanceUrl);
|
|
66
|
-
|
|
67
|
+
// Length, not content. A truncated cookie is still a cookie.
|
|
68
|
+
this._logger.debug("Extracted cookies via getCookieStringSync", {
|
|
69
|
+
length: cookieString?.length ?? 0,
|
|
70
|
+
});
|
|
67
71
|
}
|
|
68
72
|
catch (e) {
|
|
69
|
-
this._logger.debug(
|
|
73
|
+
this._logger.debug("getCookieStringSync failed", { error: redactError(e) });
|
|
70
74
|
}
|
|
71
75
|
}
|
|
72
76
|
// Method 2: Try async getCookieString
|
|
73
77
|
if (!cookieString && typeof cookieJar.getCookieString === 'function') {
|
|
74
78
|
try {
|
|
75
79
|
cookieString = await cookieJar.getCookieString(instanceUrl);
|
|
76
|
-
this._logger.debug(
|
|
80
|
+
this._logger.debug("Extracted cookies via getCookieString", {
|
|
81
|
+
length: cookieString?.length ?? 0,
|
|
82
|
+
});
|
|
77
83
|
}
|
|
78
84
|
catch (e) {
|
|
79
|
-
this._logger.debug(
|
|
85
|
+
this._logger.debug("getCookieString failed", { error: redactError(e) });
|
|
80
86
|
}
|
|
81
87
|
}
|
|
82
88
|
// Method 3: Try getCookiesSync and manually format
|
|
@@ -89,7 +95,7 @@ export class AMBClient {
|
|
|
89
95
|
}
|
|
90
96
|
}
|
|
91
97
|
catch (e) {
|
|
92
|
-
this._logger.debug(
|
|
98
|
+
this._logger.debug("getCookiesSync failed", { error: redactError(e) });
|
|
93
99
|
}
|
|
94
100
|
}
|
|
95
101
|
// Method 4: Access the store directly
|
|
@@ -106,7 +112,9 @@ export class AMBClient {
|
|
|
106
112
|
this._serverConnection.setSessionCookies(cookieString);
|
|
107
113
|
this._authenticated = true;
|
|
108
114
|
this._logger.info("Successfully authenticated and obtained session cookies");
|
|
109
|
-
this._logger.debug(
|
|
115
|
+
this._logger.debug("Session cookies set on the connection", {
|
|
116
|
+
length: cookieString.length,
|
|
117
|
+
});
|
|
110
118
|
}
|
|
111
119
|
else {
|
|
112
120
|
this._logger.error("Could not extract session cookies!");
|
|
@@ -121,8 +129,13 @@ export class AMBClient {
|
|
|
121
129
|
}
|
|
122
130
|
}
|
|
123
131
|
catch (error) {
|
|
124
|
-
this._logger.error(
|
|
125
|
-
|
|
132
|
+
this._logger.error("Authentication failed", { error: redactError(error) });
|
|
133
|
+
// The cause travels on `cause`, scrubbed in place so its stack survives.
|
|
134
|
+
// Interpolating it into the message would put it somewhere no consumer's
|
|
135
|
+
// redaction can reach.
|
|
136
|
+
throw new Error("Failed to authenticate for AMB connection", {
|
|
137
|
+
cause: stripSecretsFromError(error),
|
|
138
|
+
});
|
|
126
139
|
}
|
|
127
140
|
}
|
|
128
141
|
/**
|
|
@@ -189,7 +202,7 @@ export class AMBClient {
|
|
|
189
202
|
}
|
|
190
203
|
else if (typeof cookieStore.getCookies === 'function') {
|
|
191
204
|
const domain = instanceUrl ? new URL(instanceUrl).hostname : null;
|
|
192
|
-
this._logger.debug(
|
|
205
|
+
this._logger.debug("Getting cookies for domain", { domain: domain });
|
|
193
206
|
if (!domain) {
|
|
194
207
|
this._logger.warn("No domain available for cookie extraction");
|
|
195
208
|
return null;
|
|
@@ -226,7 +239,7 @@ export class AMBClient {
|
|
|
226
239
|
}
|
|
227
240
|
if (cookies.length > 0) {
|
|
228
241
|
const cookieString = cookies.join('; ');
|
|
229
|
-
this._logger.debug(
|
|
242
|
+
this._logger.debug("Built cookie string", { length: cookieString.length });
|
|
230
243
|
return cookieString;
|
|
231
244
|
}
|
|
232
245
|
else {
|
|
@@ -234,7 +247,7 @@ export class AMBClient {
|
|
|
234
247
|
}
|
|
235
248
|
}
|
|
236
249
|
catch (e) {
|
|
237
|
-
this._logger.error(
|
|
250
|
+
this._logger.error("Error extracting cookies from store", { error: redactError(e) });
|
|
238
251
|
}
|
|
239
252
|
return null;
|
|
240
253
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AMBClient.js","sourceRoot":"","sources":["../../../src/sn/amb/AMBClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AMBClient.js","sourceRoot":"","sources":["../../../src/sn/amb/AMBClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,8 +82,25 @@ export class SubscriptionCommandSender {
|
|
|
82
82
|
setTimeout(retryMessage, retryDelay);
|
|
83
83
|
}
|
|
84
84
|
onResponse(response, channel, mode, triesLeft, retryDelay) {
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
// `response` and `channel` go in the metadata rather than the message, because
|
|
86
|
+
// only metadata passes through the redaction format. That is a real guarantee
|
|
87
|
+
// ONLY for keys the format recognises — a Bayeux response carries `clientId`,
|
|
88
|
+
// which authorises every later message on this connection, so it had to be
|
|
89
|
+
// added to SECRET_KEYS for this to be safe. Adding a field here that carries a
|
|
90
|
+
// secret under an unrecognised name puts it on disk.
|
|
91
|
+
/* eslint-disable @typescript-eslint/no-unsafe-assignment -- the whole CometD
|
|
92
|
+
surface is `any`; these were already interpolated into the message before. */
|
|
93
|
+
this._logger.debug("onResponse", {
|
|
94
|
+
response: response,
|
|
95
|
+
channel: channel,
|
|
96
|
+
mode: mode,
|
|
97
|
+
triesLeft: triesLeft,
|
|
98
|
+
stopping: this.stopping,
|
|
99
|
+
tokenCount: this.tokenManager.getTokenCount(),
|
|
100
|
+
isBucketFull: this.isBucketFull(),
|
|
101
|
+
retryDelay: retryDelay,
|
|
102
|
+
});
|
|
103
|
+
/* eslint-enable @typescript-eslint/no-unsafe-assignment */
|
|
87
104
|
if (!this.stopping) {
|
|
88
105
|
triesLeft = triesLeft - 1;
|
|
89
106
|
if (this.isBucketFull())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubscriptionCommandSender.js","sourceRoot":"","sources":["../../../src/sn/amb/SubscriptionCommandSender.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SubscriptionCommandSender.js","sourceRoot":"","sources":["../../../src/sn/amb/SubscriptionCommandSender.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,10 @@ import * as httpc from "node:http";
|
|
|
19
19
|
import * as https from "node:https";
|
|
20
20
|
import * as httpcProxyAgent from "http-proxy-agent";
|
|
21
21
|
import * as httpsProxyAgent from "https-proxy-agent";
|
|
22
|
+
import { Logger } from "../../util/Logger.js";
|
|
22
23
|
// Bare minimum XMLHttpRequest implementation that works with CometD.
|
|
23
24
|
export class XMLHttpRequest {
|
|
25
|
+
static _logger = new Logger("XMLHttpRequest");
|
|
24
26
|
static UNSENT = 0;
|
|
25
27
|
static OPENED = 1;
|
|
26
28
|
static HEADERS_RECEIVED = 2;
|
|
@@ -279,7 +281,9 @@ export class XMLHttpRequest {
|
|
|
279
281
|
}
|
|
280
282
|
debug(...args) {
|
|
281
283
|
if (this.#options.logLevel === "debug") {
|
|
282
|
-
console.log
|
|
284
|
+
// Never console.log here: this runs inside the MCP server process, where
|
|
285
|
+
// fd 1 carries JSON-RPC. The logger writes to stderr and redacts.
|
|
286
|
+
_a._logger.debug("xhr", { args: Array.from(args) });
|
|
283
287
|
}
|
|
284
288
|
}
|
|
285
289
|
}
|