@microsoft/agents-hosting 1.3.0-beta.10.gf7fc2bf267 → 1.3.0-beta.14.gf38b0646bb
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 +2 -2
- package/dist/src/app/auth/authorizationManager.js +8 -3
- package/dist/src/app/auth/authorizationManager.js.map +1 -1
- package/dist/src/app/auth/handlers/azureBotAuthorization.d.ts +1 -1
- package/dist/src/app/auth/handlers/azureBotAuthorization.js +6 -10
- package/dist/src/app/auth/handlers/azureBotAuthorization.js.map +1 -1
- package/dist/src/app/streaming/streamingResponse.js +15 -23
- package/dist/src/app/streaming/streamingResponse.js.map +1 -1
- package/package.json +2 -2
- package/src/app/auth/authorizationManager.ts +7 -1
- package/src/app/auth/handlers/azureBotAuthorization.ts +4 -9
- package/src/app/streaming/streamingResponse.ts +12 -22
package/dist/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json.schemastore.org/package.json",
|
|
3
3
|
"name": "@microsoft/agents-hosting",
|
|
4
|
-
"version": "1.3.0-beta.
|
|
4
|
+
"version": "1.3.0-beta.14.gf38b0646bb",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "^1.10.1",
|
|
23
23
|
"@azure/msal-node": "^3.8.4",
|
|
24
|
-
"@microsoft/agents-activity": "1.3.0-beta.
|
|
24
|
+
"@microsoft/agents-activity": "1.3.0-beta.14.gf38b0646bb",
|
|
25
25
|
"axios": "^1.13.2",
|
|
26
26
|
"jsonwebtoken": "^9.0.3",
|
|
27
27
|
"jwks-rsa": "^3.2.0",
|
|
@@ -73,16 +73,21 @@ class AuthorizationManager {
|
|
|
73
73
|
* @returns The result of the authorization process.
|
|
74
74
|
*/
|
|
75
75
|
async process(context, getHandlerIds) {
|
|
76
|
-
var _a, _b, _c;
|
|
76
|
+
var _a, _b, _c, _d, _e;
|
|
77
77
|
const storage = new handlerStorage_1.HandlerStorage(this.app.options.storage, context);
|
|
78
78
|
let active = await this.active(storage, getHandlerIds);
|
|
79
|
-
|
|
79
|
+
if (active !== undefined && ((_a = active === null || active === void 0 ? void 0 : active.data.activity.conversation) === null || _a === void 0 ? void 0 : _a.id) !== ((_b = context.activity.conversation) === null || _b === void 0 ? void 0 : _b.id)) {
|
|
80
|
+
logger.warn('Discarding the active session due to the conversation has changed during an active sign-in process', active === null || active === void 0 ? void 0 : active.data.activity);
|
|
81
|
+
await storage.delete();
|
|
82
|
+
return { authorized: true };
|
|
83
|
+
}
|
|
84
|
+
const handlers = (_e = (_c = active === null || active === void 0 ? void 0 : active.handlers) !== null && _c !== void 0 ? _c : this.mapHandlers((_d = await getHandlerIds(context.activity)) !== null && _d !== void 0 ? _d : [])) !== null && _e !== void 0 ? _e : [];
|
|
80
85
|
for (const handler of handlers) {
|
|
81
86
|
const status = await this.signin(storage, handler, context, active === null || active === void 0 ? void 0 : active.data);
|
|
82
87
|
logger.debug(this.prefix(handler.id, `Sign-in status: ${status}`));
|
|
83
88
|
if (status === types_1.AuthorizationHandlerStatus.IGNORED) {
|
|
84
89
|
await storage.delete();
|
|
85
|
-
|
|
90
|
+
continue;
|
|
86
91
|
}
|
|
87
92
|
if (status === types_1.AuthorizationHandlerStatus.PENDING) {
|
|
88
93
|
return { authorized: false };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorizationManager.js","sourceRoot":"","sources":["../../../../src/app/auth/authorizationManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"authorizationManager.js","sourceRoot":"","sources":["../../../../src/app/auth/authorizationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -207,7 +207,7 @@ export declare class AzureBotAuthorization implements AuthorizationHandler {
|
|
|
207
207
|
*/
|
|
208
208
|
private getUserTokenClient;
|
|
209
209
|
/**
|
|
210
|
-
* Sends an InvokeResponse activity if the channel is Microsoft Teams.
|
|
210
|
+
* Sends an InvokeResponse activity if the channel is Microsoft Teams, including Copilot within MS Teams.
|
|
211
211
|
*/
|
|
212
212
|
private sendInvokeResponse;
|
|
213
213
|
/**
|
|
@@ -158,7 +158,7 @@ class AzureBotAuthorization {
|
|
|
158
158
|
* @returns The status of the sign-in attempt.
|
|
159
159
|
*/
|
|
160
160
|
async signin(context, active) {
|
|
161
|
-
var _a, _b, _c
|
|
161
|
+
var _a, _b, _c;
|
|
162
162
|
const { activity } = context;
|
|
163
163
|
const [category] = (_b = (_a = activity.name) === null || _a === void 0 ? void 0 : _a.split('/')) !== null && _b !== void 0 ? _b : [Category.UNKNOWN];
|
|
164
164
|
const storage = new handlerStorage_1.HandlerStorage(this.settings.storage, context);
|
|
@@ -166,11 +166,6 @@ class AzureBotAuthorization {
|
|
|
166
166
|
return this.setToken(storage, context);
|
|
167
167
|
}
|
|
168
168
|
logger.debug(this.prefix('Sign-in active session detected'), active.activity);
|
|
169
|
-
if (((_c = active.activity.conversation) === null || _c === void 0 ? void 0 : _c.id) !== ((_d = activity.conversation) === null || _d === void 0 ? void 0 : _d.id)) {
|
|
170
|
-
await this.sendInvokeResponse(context, { status: 400 });
|
|
171
|
-
logger.warn(this.prefix('Discarding the active session due to the conversation has changed during an active sign-in process'), activity);
|
|
172
|
-
return types_1.AuthorizationHandlerStatus.IGNORED;
|
|
173
|
-
}
|
|
174
169
|
if (active.attemptsLeft <= 0) {
|
|
175
170
|
logger.warn(this.prefix('Maximum sign-in attempts exceeded'), activity);
|
|
176
171
|
await context.sendActivity(messageFactory_1.MessageFactory.text(this.messages.maxAttemptsExceeded(this.maxAttempts)));
|
|
@@ -200,7 +195,7 @@ class AzureBotAuthorization {
|
|
|
200
195
|
return result;
|
|
201
196
|
}
|
|
202
197
|
await this.sendInvokeResponse(context, { status: 200 });
|
|
203
|
-
await ((
|
|
198
|
+
await ((_c = this._onSuccess) === null || _c === void 0 ? void 0 : _c.call(this, context));
|
|
204
199
|
return result;
|
|
205
200
|
}
|
|
206
201
|
catch (error) {
|
|
@@ -283,7 +278,7 @@ class AzureBotAuthorization {
|
|
|
283
278
|
const userTokenClient = await this.getUserTokenClient(context);
|
|
284
279
|
if (activity.name === 'signin/tokenExchange') {
|
|
285
280
|
const tokenExchangeInvokeRequest = activity.value;
|
|
286
|
-
const tokenExchangeRequest = { token: tokenExchangeInvokeRequest.token };
|
|
281
|
+
const tokenExchangeRequest = { token: tokenExchangeInvokeRequest === null || tokenExchangeInvokeRequest === void 0 ? void 0 : tokenExchangeInvokeRequest.token };
|
|
287
282
|
if (!(tokenExchangeRequest === null || tokenExchangeRequest === void 0 ? void 0 : tokenExchangeRequest.token)) {
|
|
288
283
|
const reason = 'The Agent received an InvokeActivity that is missing a TokenExchangeInvokeRequest value. This is required to be sent with the InvokeActivity.';
|
|
289
284
|
await this.sendInvokeResponse(context, {
|
|
@@ -394,10 +389,11 @@ class AzureBotAuthorization {
|
|
|
394
389
|
return userTokenClient;
|
|
395
390
|
}
|
|
396
391
|
/**
|
|
397
|
-
* Sends an InvokeResponse activity if the channel is Microsoft Teams.
|
|
392
|
+
* Sends an InvokeResponse activity if the channel is Microsoft Teams, including Copilot within MS Teams.
|
|
398
393
|
*/
|
|
399
394
|
sendInvokeResponse(context, response) {
|
|
400
|
-
|
|
395
|
+
const [parentChannel] = agents_activity_1.Activity.parseChannelId(context.activity.channelId);
|
|
396
|
+
if (parentChannel !== agents_activity_1.Channels.Msteams) {
|
|
401
397
|
return Promise.resolve();
|
|
402
398
|
}
|
|
403
399
|
return context.sendActivity(agents_activity_1.Activity.fromObject({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureBotAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/azureBotAuthorization.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"azureBotAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/azureBotAuthorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -334,14 +334,10 @@ class StreamingResponse {
|
|
|
334
334
|
* Queues an activity to be sent to the client.
|
|
335
335
|
*/
|
|
336
336
|
queueActivity(factory) {
|
|
337
|
+
var _a;
|
|
337
338
|
this._queue.push(factory);
|
|
338
339
|
// If there's no sync in progress, start one
|
|
339
|
-
|
|
340
|
-
this._queueSync = this.drainQueue().catch((err) => {
|
|
341
|
-
logger.error(`Error occurred when sending activity while streaming: "${JSON.stringify(err)}".`);
|
|
342
|
-
// throw err
|
|
343
|
-
});
|
|
344
|
-
}
|
|
340
|
+
(_a = this._queueSync) !== null && _a !== void 0 ? _a : (this._queueSync = this.drainQueue());
|
|
345
341
|
}
|
|
346
342
|
/**
|
|
347
343
|
* Sends any queued activities to the client until the queue is empty.
|
|
@@ -350,24 +346,20 @@ class StreamingResponse {
|
|
|
350
346
|
* @private
|
|
351
347
|
*/
|
|
352
348
|
async drainQueue() {
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
const activity = factory();
|
|
360
|
-
await this.sendActivity(activity);
|
|
361
|
-
}
|
|
362
|
-
resolve();
|
|
363
|
-
}
|
|
364
|
-
catch (err) {
|
|
365
|
-
reject(err);
|
|
366
|
-
}
|
|
367
|
-
finally {
|
|
368
|
-
this._queueSync = undefined;
|
|
349
|
+
try {
|
|
350
|
+
logger.debug(`Draining queue with ${this._queue.length} activities.`);
|
|
351
|
+
while (this._queue.length > 0) {
|
|
352
|
+
const factory = this._queue.shift();
|
|
353
|
+
const activity = factory();
|
|
354
|
+
await this.sendActivity(activity);
|
|
369
355
|
}
|
|
370
|
-
}
|
|
356
|
+
}
|
|
357
|
+
catch (err) {
|
|
358
|
+
logger.error(`Error occurred when draining activity queue: "${JSON.stringify(err)}".`);
|
|
359
|
+
}
|
|
360
|
+
finally {
|
|
361
|
+
this._queueSync = undefined;
|
|
362
|
+
}
|
|
371
363
|
}
|
|
372
364
|
/**
|
|
373
365
|
* Creates the final message to be sent at the end of the stream.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamingResponse.js","sourceRoot":"","sources":["../../../../src/app/streaming/streamingResponse.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gEAAyJ;AAGzJ,iDAA6C;AAC7C,8DAAyD;AAEzD,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,0BAA0B,CAAC,CAAA;AAEhD;;GAEG;AACH,IAAY,uBAiBX;AAjBD,WAAY,uBAAuB;IACjC;;OAEG;IACH,8CAAmB,CAAA;IACnB;;OAEG;IACH,wDAA6B,CAAA;IAC7B;;OAEG;IACH,wDAA6B,CAAA;IAC7B;;OAEG;IACH,0CAAe,CAAA;AACjB,CAAC,EAjBW,uBAAuB,uCAAvB,uBAAuB,QAiBlC;AAED;;;;;;;;;;GAUG;AACH,MAAa,iBAAiB;IAyB5B;;;;;OAKG;IACH,YAAoB,OAAoB;QA7BhC,kBAAa,GAAW,CAAC,CAAA;QAEzB,aAAQ,GAAW,EAAE,CAAA;QAErB,WAAM,GAAG,KAAK,CAAA;QACd,eAAU,GAAG,GAAG,CAAA;QAChB,wBAAmB,GAAY,IAAI,CAAA;QAEnC,cAAS,GAAG,KAAK,CAAA;QACjB,kBAAa,GAAG,KAAK,CAAA;QAE7B,gCAAgC;QACxB,WAAM,GAA0B,EAAE,CAAA;QAElC,iBAAY,GAAG,KAAK,CAAA;QAE5B,8BAA8B;QACtB,wBAAmB,GAAG,KAAK,CAAA;QAE3B,8BAAyB,GAAG,KAAK,CAAA;QACjC,eAAU,GAAsB,EAAE,CAAA;QAUxC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACrC,CAAC;IAED;;;;;;;OAOG;IACH,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAED;;SAEK;IACL,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAED;;;;OAIG;IACH,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,aAAa,GAAG,CAAC,CAAA;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,IAAW,kBAAkB;QAC3B,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACjC,CAAC;IAED;;;;OAIG;IACI,sBAAsB,CAAE,IAAY;QACzC,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/D,OAAM;QACR,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAClD,CAAC;QAED,0BAA0B;QAC1B,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,0BAAQ,CAAC,UAAU,CAAC;YAC3C,IAAI,EAAE,QAAQ;YACd,IAAI;YACJ,QAAQ,EAAE,CAAC;oBACT,IAAI,EAAE,YAAY;oBAClB,UAAU,EAAE,aAAa;oBACzB,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE;iBACrC,CAAC;SACH,CAAC,CAAC,CAAA;IACL,CAAC;IAED;;;;;;;;;;OAUG;IACI,cAAc,CAAE,IAAY,EAAE,SAAsB;QACzD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnC,OAAM;QACR,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAClD,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAA;QAErB,6GAA6G;QAC7G,IAAI,CAAC,QAAQ,GAAG,2BAAY,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEnE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,OAAM;QACR,CAAC;QAED,uBAAuB;QACvB,IAAI,CAAC,cAAc,EAAE,CAAA;IACvB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,SAAS;QACpB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,uBAAuB,CAAC,YAAY,CAAA;QAC7C,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAA;QAClG,CAAC;QAED,sBAAsB;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAElB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAA;YAClD,OAAO,uBAAuB,CAAC,OAAO,CAAA;QACxC,CAAC;QAED,sBAAsB;QACtB,IAAI,CAAC,cAAc,EAAE,CAAA;QAErB,8BAA8B;QAC9B,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;QACzB,OAAO,uBAAuB,CAAC,OAAO,CAAA;IACxC,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,KAAK;QAChB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;QAEzB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAA;QAChB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QACzB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QACtB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;QAC1B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAA;QAClB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAED;;OAEG;IACI,eAAe,CAAE,QAAkB;QACxC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAA;IAC/B,CAAC;IAED;;;;OAIG;IACI,cAAc,CAAE,WAAyB;QAC9C,IAAI,CAAC,YAAY,GAAG,WAAW,CAAA;IACjC,CAAC;IAED;;;;OAIG;IACI,mBAAmB,CAAE,gBAAsC;QAChE,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAA;IAC3C,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAE,SAAqB;QACxC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;YACtB,CAAC;YACD,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAA;YAEpC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,MAAM,cAAc,GAAmB;oBACrC,OAAO,EAAE,OAAO;oBAChB,QAAQ,EAAE,OAAO,GAAG,CAAC;oBACrB,UAAU,EAAE;wBACV,OAAO,EAAE,iBAAiB;wBAC1B,IAAI,EAAE,QAAQ,CAAC,KAAK,IAAI,aAAa,OAAO,GAAG,CAAC,EAAE;wBAClD,QAAQ,EAAE,2BAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;wBACrD,GAAG,EAAE,QAAQ,CAAC,GAAI;qBACnB;iBACF,CAAA;gBACD,OAAO,EAAE,CAAA;gBACT,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YACtC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,eAAe,CAAE,kBAA2B;QACjD,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAA;IAC/C,CAAC;IAED;;;;OAIG;IACI,mBAAmB,CAAE,gBAAsC;QAChE,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAA;IAC3C,CAAC;IAED;;;;;OAKG;IACI,qBAAqB,CAAE,wBAAiC;QAC7D,IAAI,CAAC,yBAAyB,GAAG,wBAAwB,CAAA;IAC3D,CAAC;IAED;;;OAGG;IACI,YAAY,CAAE,SAAiB;QACpC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;IAC7B,CAAC;IAED;;;;OAIG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED;;;;OAIG;IACK,YAAY;QAClB,OAAO,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;IAC7C,CAAC;IAED;;;;OAIG;IACK,cAAc;QACpB,0CAA0C;QAC1C,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAM;QACR,CAAC;QAED,mCAAmC;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QACxB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YACtB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;YACzB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,qBAAqB;gBACrB,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAA;YAClC,CAAC;iBAAM,CAAC;gBACN,uBAAuB;gBACvB,OAAO,0BAAQ,CAAC,UAAU,CAAC;oBACzB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,IAAI,CAAC,QAAQ;oBACnB,QAAQ,EAAE,CAAC;4BACT,IAAI,EAAE,YAAY;4BAClB,UAAU,EAAE,WAAW;4BACvB,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE;yBACrC,CAAC;iBACH,CAAC,CAAA;YACJ,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACK,aAAa,CAAE,OAAuB
|
|
1
|
+
{"version":3,"file":"streamingResponse.js","sourceRoot":"","sources":["../../../../src/app/streaming/streamingResponse.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json.schemastore.org/package.json",
|
|
3
3
|
"name": "@microsoft/agents-hosting",
|
|
4
|
-
"version": "1.3.0-beta.
|
|
4
|
+
"version": "1.3.0-beta.14.gf38b0646bb",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/core-auth": "^1.10.1",
|
|
23
23
|
"@azure/msal-node": "^3.8.4",
|
|
24
|
-
"@microsoft/agents-activity": "1.3.0-beta.
|
|
24
|
+
"@microsoft/agents-activity": "1.3.0-beta.14.gf38b0646bb",
|
|
25
25
|
"axios": "^1.13.2",
|
|
26
26
|
"jsonwebtoken": "^9.0.3",
|
|
27
27
|
"jwks-rsa": "^3.2.0",
|
|
@@ -108,6 +108,12 @@ export class AuthorizationManager {
|
|
|
108
108
|
|
|
109
109
|
let active = await this.active(storage, getHandlerIds)
|
|
110
110
|
|
|
111
|
+
if (active !== undefined && active?.data.activity.conversation?.id !== context.activity.conversation?.id) {
|
|
112
|
+
logger.warn('Discarding the active session due to the conversation has changed during an active sign-in process', active?.data.activity)
|
|
113
|
+
await storage.delete()
|
|
114
|
+
return { authorized: true }
|
|
115
|
+
}
|
|
116
|
+
|
|
111
117
|
const handlers = active?.handlers ?? this.mapHandlers(await getHandlerIds(context.activity) ?? []) ?? []
|
|
112
118
|
|
|
113
119
|
for (const handler of handlers) {
|
|
@@ -116,7 +122,7 @@ export class AuthorizationManager {
|
|
|
116
122
|
|
|
117
123
|
if (status === AuthorizationHandlerStatus.IGNORED) {
|
|
118
124
|
await storage.delete()
|
|
119
|
-
|
|
125
|
+
continue
|
|
120
126
|
}
|
|
121
127
|
|
|
122
128
|
if (status === AuthorizationHandlerStatus.PENDING) {
|
|
@@ -295,12 +295,6 @@ export class AzureBotAuthorization implements AuthorizationHandler {
|
|
|
295
295
|
|
|
296
296
|
logger.debug(this.prefix('Sign-in active session detected'), active.activity)
|
|
297
297
|
|
|
298
|
-
if (active.activity.conversation?.id !== activity.conversation?.id) {
|
|
299
|
-
await this.sendInvokeResponse(context, { status: 400 })
|
|
300
|
-
logger.warn(this.prefix('Discarding the active session due to the conversation has changed during an active sign-in process'), activity)
|
|
301
|
-
return AuthorizationHandlerStatus.IGNORED
|
|
302
|
-
}
|
|
303
|
-
|
|
304
298
|
if (active.attemptsLeft <= 0) {
|
|
305
299
|
logger.warn(this.prefix('Maximum sign-in attempts exceeded'), activity)
|
|
306
300
|
await context.sendActivity(MessageFactory.text(this.messages.maxAttemptsExceeded(this.maxAttempts)))
|
|
@@ -426,7 +420,7 @@ export class AzureBotAuthorization implements AuthorizationHandler {
|
|
|
426
420
|
|
|
427
421
|
if (activity.name === 'signin/tokenExchange') {
|
|
428
422
|
const tokenExchangeInvokeRequest = activity.value as TokenExchangeInvokeRequest
|
|
429
|
-
const tokenExchangeRequest: TokenExchangeRequest = { token: tokenExchangeInvokeRequest
|
|
423
|
+
const tokenExchangeRequest: TokenExchangeRequest = { token: tokenExchangeInvokeRequest?.token }
|
|
430
424
|
|
|
431
425
|
if (!tokenExchangeRequest?.token) {
|
|
432
426
|
const reason = 'The Agent received an InvokeActivity that is missing a TokenExchangeInvokeRequest value. This is required to be sent with the InvokeActivity.'
|
|
@@ -553,10 +547,11 @@ export class AzureBotAuthorization implements AuthorizationHandler {
|
|
|
553
547
|
}
|
|
554
548
|
|
|
555
549
|
/**
|
|
556
|
-
* Sends an InvokeResponse activity if the channel is Microsoft Teams.
|
|
550
|
+
* Sends an InvokeResponse activity if the channel is Microsoft Teams, including Copilot within MS Teams.
|
|
557
551
|
*/
|
|
558
552
|
private sendInvokeResponse <T>(context: TurnContext, response: InvokeResponse<T>) {
|
|
559
|
-
|
|
553
|
+
const [parentChannel] = Activity.parseChannelId(context.activity.channelId!)
|
|
554
|
+
if (parentChannel !== Channels.Msteams) {
|
|
560
555
|
return Promise.resolve()
|
|
561
556
|
}
|
|
562
557
|
|
|
@@ -384,12 +384,7 @@ export class StreamingResponse {
|
|
|
384
384
|
this._queue.push(factory)
|
|
385
385
|
|
|
386
386
|
// If there's no sync in progress, start one
|
|
387
|
-
|
|
388
|
-
this._queueSync = this.drainQueue().catch((err) => {
|
|
389
|
-
logger.error(`Error occurred when sending activity while streaming: "${JSON.stringify(err)}".`)
|
|
390
|
-
// throw err
|
|
391
|
-
})
|
|
392
|
-
}
|
|
387
|
+
this._queueSync ??= this.drainQueue()
|
|
393
388
|
}
|
|
394
389
|
|
|
395
390
|
/**
|
|
@@ -399,23 +394,18 @@ export class StreamingResponse {
|
|
|
399
394
|
* @private
|
|
400
395
|
*/
|
|
401
396
|
private async drainQueue (): Promise<void> {
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
const activity = factory()
|
|
409
|
-
await this.sendActivity(activity)
|
|
410
|
-
}
|
|
411
|
-
|
|
412
|
-
resolve()
|
|
413
|
-
} catch (err) {
|
|
414
|
-
reject(err)
|
|
415
|
-
} finally {
|
|
416
|
-
this._queueSync = undefined
|
|
397
|
+
try {
|
|
398
|
+
logger.debug(`Draining queue with ${this._queue.length} activities.`)
|
|
399
|
+
while (this._queue.length > 0) {
|
|
400
|
+
const factory = this._queue.shift()!
|
|
401
|
+
const activity = factory()
|
|
402
|
+
await this.sendActivity(activity)
|
|
417
403
|
}
|
|
418
|
-
})
|
|
404
|
+
} catch (err) {
|
|
405
|
+
logger.error(`Error occurred when draining activity queue: "${JSON.stringify(err)}".`)
|
|
406
|
+
} finally {
|
|
407
|
+
this._queueSync = undefined
|
|
408
|
+
}
|
|
419
409
|
}
|
|
420
410
|
|
|
421
411
|
/**
|