@microsoft/agents-copilotstudio-client 1.6.0-beta.8.g226709c215 → 1.6.1
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/package.json +4 -5
- package/dist/src/browser/crypto.d.ts +5 -0
- package/dist/src/browser/crypto.js +11 -0
- package/dist/src/browser/crypto.js.map +1 -0
- package/dist/src/browser.mjs +6 -6
- package/dist/src/browser.mjs.map +4 -4
- package/dist/src/connectionSettings.js +13 -1
- package/dist/src/connectionSettings.js.map +1 -1
- package/dist/src/copilotStudioWebChat.js +9 -2
- package/dist/src/copilotStudioWebChat.js.map +1 -1
- package/dist/src/userAgentHelper.js +5 -9
- package/dist/src/userAgentHelper.js.map +1 -1
- package/package.json +4 -5
- package/src/browser/crypto.ts +8 -0
- package/src/connectionSettings.ts +14 -0
- package/src/copilotStudioWebChat.ts +11 -3
- package/src/userAgentHelper.ts +9 -8
|
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.loadCopilotStudioConnectionSettingsFromEnv = exports.ConnectionSettings = void 0;
|
|
8
8
|
const agentType_1 = require("./agentType");
|
|
9
9
|
const powerPlatformCloud_1 = require("./powerPlatformCloud");
|
|
10
|
+
const agents_telemetry_1 = require("@microsoft/agents-telemetry");
|
|
11
|
+
const logger = (0, agents_telemetry_1.debug)('copilot-studio:settings');
|
|
10
12
|
/**
|
|
11
13
|
* Configuration options for establishing a connection to Copilot Studio.
|
|
12
14
|
*/
|
|
@@ -26,7 +28,7 @@ class ConnectionSettings extends ConnectionOptions {
|
|
|
26
28
|
* @private
|
|
27
29
|
*/
|
|
28
30
|
constructor(options) {
|
|
29
|
-
var _a, _b, _c;
|
|
31
|
+
var _a, _b, _c, _d;
|
|
30
32
|
super();
|
|
31
33
|
if (!options) {
|
|
32
34
|
return;
|
|
@@ -40,6 +42,16 @@ class ConnectionSettings extends ConnectionOptions {
|
|
|
40
42
|
if (!Object.values(agentType_1.AgentType).includes(copilotAgentType)) {
|
|
41
43
|
throw new Error(`Invalid AgentType: '${copilotAgentType}'. Supported values: ${Object.values(agentType_1.AgentType).join(', ')}`);
|
|
42
44
|
}
|
|
45
|
+
logger.info('Copilot Studio connection settings loaded', {
|
|
46
|
+
schemaName: (_d = options.schemaName) !== null && _d !== void 0 ? _d : options.agentIdentifier,
|
|
47
|
+
cloud,
|
|
48
|
+
environmentId: options.environmentId,
|
|
49
|
+
customPowerPlatformCloud: (0, agents_telemetry_1.redactUrl)(options.customPowerPlatformCloud),
|
|
50
|
+
copilotAgentType,
|
|
51
|
+
directConnectUrl: (0, agents_telemetry_1.redactUrl)(options.directConnectUrl),
|
|
52
|
+
useExperimentalEndpoint: options.useExperimentalEndpoint,
|
|
53
|
+
enableDiagnostics: options.enableDiagnostics,
|
|
54
|
+
});
|
|
43
55
|
Object.assign(this, { ...options, cloud, copilotAgentType, authority });
|
|
44
56
|
}
|
|
45
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectionSettings.js","sourceRoot":"","sources":["../../src/connectionSettings.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,2CAAuC;AAEvC,6DAAyD;
|
|
1
|
+
{"version":3,"file":"connectionSettings.js","sourceRoot":"","sources":["../../src/connectionSettings.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.CopilotStudioWebChat = void 0;
|
|
8
|
-
const
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
9
9
|
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
10
10
|
const rxjs_1 = require("rxjs");
|
|
11
11
|
const agents_telemetry_1 = require("@microsoft/agents-telemetry");
|
|
@@ -150,6 +150,13 @@ class CopilotStudioWebChat {
|
|
|
150
150
|
? settings.conversationId.trim()
|
|
151
151
|
: undefined;
|
|
152
152
|
const shouldStart = (_a = settings === null || settings === void 0 ? void 0 : settings.startConversation) !== null && _a !== void 0 ? _a : !normalizedConversationId;
|
|
153
|
+
logger.info('Copilot Studio WebChat settings loaded', {
|
|
154
|
+
showTyping: settings === null || settings === void 0 ? void 0 : settings.showTyping,
|
|
155
|
+
conversationId: (0, agents_telemetry_1.redactString)(normalizedConversationId, true),
|
|
156
|
+
startConversation: settings === null || settings === void 0 ? void 0 : settings.startConversation,
|
|
157
|
+
connectionMode: normalizedConversationId ? 'resume' : 'new',
|
|
158
|
+
acknowledgementMode: shouldStart ? 'startConversationStreaming' : 'resumeWithoutStart',
|
|
159
|
+
});
|
|
153
160
|
let sequence = 0;
|
|
154
161
|
let activitySubscriber;
|
|
155
162
|
let conversation;
|
|
@@ -241,7 +248,7 @@ class CopilotStudioWebChat {
|
|
|
241
248
|
logger.info('--> Sending activity to Copilot Studio ...');
|
|
242
249
|
const newActivity = agents_activity_1.Activity.fromObject({
|
|
243
250
|
...activity,
|
|
244
|
-
id: (0,
|
|
251
|
+
id: (0, crypto_1.randomUUID)(),
|
|
245
252
|
attachments: await processAttachments(activity)
|
|
246
253
|
});
|
|
247
254
|
notifyActivity(newActivity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilotStudioWebChat.js","sourceRoot":"","sources":["../../src/copilotStudioWebChat.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH
|
|
1
|
+
{"version":3,"file":"copilotStudioWebChat.js","sourceRoot":"","sources":["../../src/copilotStudioWebChat.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,17 +21,13 @@ class UserAgentHelper {
|
|
|
21
21
|
* @returns A user agent string for HTTP headers.
|
|
22
22
|
*/
|
|
23
23
|
static getProductInfo() {
|
|
24
|
+
var _a;
|
|
24
25
|
const versionString = `CopilotStudioClient.agents-sdk-js/${package_json_1.version}`;
|
|
25
|
-
|
|
26
|
-
if (typeof
|
|
27
|
-
|
|
28
|
-
userAgent = `${versionString} ${navigator.userAgent}`;
|
|
26
|
+
const browserGlobal = globalThis;
|
|
27
|
+
if (typeof browserGlobal.document !== 'undefined' && typeof ((_a = browserGlobal.navigator) === null || _a === void 0 ? void 0 : _a.userAgent) === 'string') {
|
|
28
|
+
return `${versionString} ${browserGlobal.navigator.userAgent}`;
|
|
29
29
|
}
|
|
30
|
-
|
|
31
|
-
// Node.js environment
|
|
32
|
-
userAgent = `${versionString} nodejs/${process.version} ${os_1.default.platform()}-${os_1.default.arch()}/${os_1.default.release()}`;
|
|
33
|
-
}
|
|
34
|
-
return userAgent;
|
|
30
|
+
return `${versionString} nodejs/${process.version} ${os_1.default.platform()}-${os_1.default.arch()}/${os_1.default.release()}`;
|
|
35
31
|
}
|
|
36
32
|
/**
|
|
37
33
|
* Gets just the version string without environment details.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userAgentHelper.js","sourceRoot":"","sources":["../../src/userAgentHelper.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,kDAAyC;AACzC,4CAAmB;AAEnB;;GAEG;AACH,MAAa,eAAe;IAC1B;;;;;OAKG;IACH,MAAM,CAAC,cAAc
|
|
1
|
+
{"version":3,"file":"userAgentHelper.js","sourceRoot":"","sources":["../../src/userAgentHelper.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,kDAAyC;AACzC,4CAAmB;AAEnB;;GAEG;AACH,MAAa,eAAe;IAC1B;;;;;OAKG;IACH,MAAM,CAAC,cAAc;;QACnB,MAAM,aAAa,GAAG,qCAAqC,sBAAO,EAAE,CAAA;QACpE,MAAM,aAAa,GAAG,UAKrB,CAAA;QAED,IAAI,OAAO,aAAa,CAAC,QAAQ,KAAK,WAAW,IAAI,OAAO,CAAA,MAAA,aAAa,CAAC,SAAS,0CAAE,SAAS,CAAA,KAAK,QAAQ,EAAE,CAAC;YAC5G,OAAO,GAAG,aAAa,IAAI,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,CAAA;QAChE,CAAC;QAED,OAAO,GAAG,aAAa,WAAW,OAAO,CAAC,OAAO,IAAI,YAAE,CAAC,QAAQ,EAAE,IAAI,YAAE,CAAC,IAAI,EAAE,IAAI,YAAE,CAAC,OAAO,EAAE,EAAE,CAAA;IACnG,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,gBAAgB;QACrB,OAAO,qCAAqC,sBAAO,EAAE,CAAA;IACvD,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU;QACf,OAAO,sBAAO,CAAA;IAChB,CAAC;CACF;AAtCD,0CAsCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/agents-copilotstudio-client",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.1",
|
|
4
4
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,11 +27,10 @@
|
|
|
27
27
|
"build:browser": "esbuild --platform=browser --target=es2019 --format=esm --bundle --sourcemap --minify --outfile=dist/src/browser.mjs src/index.ts"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@microsoft/agents-activity": "1.6.
|
|
31
|
-
"@microsoft/agents-telemetry": "1.6.
|
|
30
|
+
"@microsoft/agents-activity": "1.6.1",
|
|
31
|
+
"@microsoft/agents-telemetry": "1.6.1",
|
|
32
32
|
"eventsource-client": "1.2.0",
|
|
33
|
-
"rxjs": "7.8.2"
|
|
34
|
-
"uuid": "11.1.0"
|
|
33
|
+
"rxjs": "7.8.2"
|
|
35
34
|
},
|
|
36
35
|
"license": "MIT",
|
|
37
36
|
"files": [
|
|
@@ -6,6 +6,9 @@
|
|
|
6
6
|
import { AgentType } from './agentType'
|
|
7
7
|
import { CopilotStudioConnectionSettings } from './copilotStudioConnectionSettings'
|
|
8
8
|
import { PowerPlatformCloud } from './powerPlatformCloud'
|
|
9
|
+
import { debug, redactUrl } from '@microsoft/agents-telemetry'
|
|
10
|
+
|
|
11
|
+
const logger = debug('copilot-studio:settings')
|
|
9
12
|
|
|
10
13
|
/**
|
|
11
14
|
* Configuration options for establishing a connection to Copilot Studio.
|
|
@@ -90,6 +93,17 @@ export class ConnectionSettings extends ConnectionOptions {
|
|
|
90
93
|
throw new Error(`Invalid AgentType: '${copilotAgentType}'. Supported values: ${Object.values(AgentType).join(', ')}`)
|
|
91
94
|
}
|
|
92
95
|
|
|
96
|
+
logger.info('Copilot Studio connection settings loaded', {
|
|
97
|
+
schemaName: options.schemaName ?? options.agentIdentifier,
|
|
98
|
+
cloud,
|
|
99
|
+
environmentId: options.environmentId,
|
|
100
|
+
customPowerPlatformCloud: redactUrl(options.customPowerPlatformCloud),
|
|
101
|
+
copilotAgentType,
|
|
102
|
+
directConnectUrl: redactUrl(options.directConnectUrl),
|
|
103
|
+
useExperimentalEndpoint: options.useExperimentalEndpoint,
|
|
104
|
+
enableDiagnostics: options.enableDiagnostics,
|
|
105
|
+
})
|
|
106
|
+
|
|
93
107
|
Object.assign(this, { ...options, cloud, copilotAgentType, authority })
|
|
94
108
|
}
|
|
95
109
|
}
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { randomUUID } from 'crypto'
|
|
7
7
|
|
|
8
8
|
import { Activity, Attachment, ConversationAccount } from '@microsoft/agents-activity'
|
|
9
9
|
import { Observable, BehaviorSubject, type Subscriber } from 'rxjs'
|
|
10
10
|
|
|
11
11
|
import { CopilotStudioClient } from './copilotStudioClient'
|
|
12
|
-
import { debug, trace } from '@microsoft/agents-telemetry'
|
|
12
|
+
import { debug, trace, redactString } from '@microsoft/agents-telemetry'
|
|
13
13
|
import { CopilotStudioClientTraceDefinitions } from './observability'
|
|
14
14
|
|
|
15
15
|
const logger = debug('copilot-studio:webchat')
|
|
@@ -269,6 +269,14 @@ export class CopilotStudioWebChat {
|
|
|
269
269
|
: undefined
|
|
270
270
|
const shouldStart = settings?.startConversation ?? !normalizedConversationId
|
|
271
271
|
|
|
272
|
+
logger.info('Copilot Studio WebChat settings loaded', {
|
|
273
|
+
showTyping: settings?.showTyping,
|
|
274
|
+
conversationId: redactString(normalizedConversationId, true),
|
|
275
|
+
startConversation: settings?.startConversation,
|
|
276
|
+
connectionMode: normalizedConversationId ? 'resume' : 'new',
|
|
277
|
+
acknowledgementMode: shouldStart ? 'startConversationStreaming' : 'resumeWithoutStart',
|
|
278
|
+
})
|
|
279
|
+
|
|
272
280
|
let sequence = 0
|
|
273
281
|
let activitySubscriber: Subscriber<Partial<Activity>> | undefined
|
|
274
282
|
let conversation: ConversationAccount | undefined
|
|
@@ -371,7 +379,7 @@ export class CopilotStudioWebChat {
|
|
|
371
379
|
logger.info('--> Sending activity to Copilot Studio ...')
|
|
372
380
|
const newActivity = Activity.fromObject({
|
|
373
381
|
...activity,
|
|
374
|
-
id:
|
|
382
|
+
id: randomUUID(),
|
|
375
383
|
attachments: await processAttachments(activity)
|
|
376
384
|
})
|
|
377
385
|
|
package/src/userAgentHelper.ts
CHANGED
|
@@ -18,17 +18,18 @@ export class UserAgentHelper {
|
|
|
18
18
|
*/
|
|
19
19
|
static getProductInfo (): string {
|
|
20
20
|
const versionString = `CopilotStudioClient.agents-sdk-js/${version}`
|
|
21
|
-
|
|
21
|
+
const browserGlobal = globalThis as typeof globalThis & {
|
|
22
|
+
document?: object
|
|
23
|
+
navigator?: {
|
|
24
|
+
userAgent?: string
|
|
25
|
+
}
|
|
26
|
+
}
|
|
22
27
|
|
|
23
|
-
if (typeof
|
|
24
|
-
|
|
25
|
-
userAgent = `${versionString} ${navigator.userAgent}`
|
|
26
|
-
} else {
|
|
27
|
-
// Node.js environment
|
|
28
|
-
userAgent = `${versionString} nodejs/${process.version} ${os.platform()}-${os.arch()}/${os.release()}`
|
|
28
|
+
if (typeof browserGlobal.document !== 'undefined' && typeof browserGlobal.navigator?.userAgent === 'string') {
|
|
29
|
+
return `${versionString} ${browserGlobal.navigator.userAgent}`
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
return
|
|
32
|
+
return `${versionString} nodejs/${process.version} ${os.platform()}-${os.arch()}/${os.release()}`
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
/**
|