@microsoft/agents-hosting 0.4.3 → 0.5.1-g2e246ff274
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/src/activityWireCompat.js +1 -1
- package/dist/src/activityWireCompat.js.map +1 -1
- package/dist/src/app/adaptiveCards/activityValueParsers.d.ts +115 -0
- package/dist/src/app/adaptiveCards/activityValueParsers.js +224 -0
- package/dist/src/app/adaptiveCards/activityValueParsers.js.map +1 -0
- package/dist/src/app/adaptiveCards/adaptiveCardActionExecuteResponseType.d.ts +21 -0
- package/dist/src/app/adaptiveCards/adaptiveCardActionExecuteResponseType.js +26 -0
- package/dist/src/app/adaptiveCards/adaptiveCardActionExecuteResponseType.js.map +1 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsActions.d.ts +57 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsActions.js +272 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsActions.js.map +1 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsOptions.d.ts +20 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsOptions.js +7 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsOptions.js.map +1 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsSearchParams.d.ts +31 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsSearchParams.js +16 -0
- package/dist/src/app/adaptiveCards/adaptiveCardsSearchParams.js.map +1 -0
- package/dist/src/app/adaptiveCards/index.d.ts +3 -0
- package/dist/src/app/adaptiveCards/index.js +20 -0
- package/dist/src/app/adaptiveCards/index.js.map +1 -0
- package/dist/src/app/adaptiveCards/query.d.ts +22 -0
- package/dist/src/app/adaptiveCards/query.js +7 -0
- package/dist/src/app/adaptiveCards/query.js.map +1 -0
- package/dist/src/app/agentApplication.d.ts +56 -8
- package/dist/src/app/agentApplication.js +88 -11
- package/dist/src/app/agentApplication.js.map +1 -1
- package/dist/src/app/agentApplicationBuilder.d.ts +2 -2
- package/dist/src/app/agentApplicationBuilder.js.map +1 -1
- package/dist/src/app/agentApplicationOptions.d.ts +17 -2
- package/dist/src/app/appRoute.d.ts +5 -0
- package/dist/src/app/attachmentDownloader.js +1 -0
- package/dist/src/app/attachmentDownloader.js.map +1 -1
- package/dist/src/app/extensions.d.ts +9 -0
- package/dist/src/app/extensions.js +16 -0
- package/dist/src/app/extensions.js.map +1 -0
- package/dist/src/app/index.d.ts +2 -0
- package/dist/src/app/index.js +2 -0
- package/dist/src/app/index.js.map +1 -1
- package/dist/src/auth/jwt-middleware.js +1 -0
- package/dist/src/auth/jwt-middleware.js.map +1 -1
- package/dist/src/baseAdapter.js +1 -1
- package/dist/src/baseAdapter.js.map +1 -1
- package/dist/src/cards/adaptiveCard.d.ts +15 -0
- package/dist/src/cards/adaptiveCard.js +7 -0
- package/dist/src/cards/adaptiveCard.js.map +1 -0
- package/dist/src/cards/index.d.ts +1 -0
- package/dist/src/cards/index.js +1 -0
- package/dist/src/cards/index.js.map +1 -1
- package/dist/src/cloudAdapter.js +6 -7
- package/dist/src/cloudAdapter.js.map +1 -1
- package/dist/src/connector-client/connectorClient.d.ts +6 -4
- package/dist/src/connector-client/connectorClient.js +34 -17
- package/dist/src/connector-client/connectorClient.js.map +1 -1
- package/package.json +2 -2
- package/src/activityWireCompat.ts +1 -1
- package/src/app/adaptiveCards/activityValueParsers.ts +249 -0
- package/src/app/adaptiveCards/adaptiveCardActionExecuteResponseType.ts +24 -0
- package/src/app/adaptiveCards/adaptiveCardsActions.ts +320 -0
- package/src/app/adaptiveCards/adaptiveCardsOptions.ts +23 -0
- package/src/app/adaptiveCards/adaptiveCardsSearchParams.ts +28 -0
- package/src/app/adaptiveCards/index.ts +3 -0
- package/src/app/adaptiveCards/query.ts +25 -0
- package/src/app/agentApplication.ts +109 -29
- package/src/app/agentApplicationBuilder.ts +2 -2
- package/src/app/agentApplicationOptions.ts +20 -2
- package/src/app/appRoute.ts +6 -0
- package/src/app/attachmentDownloader.ts +1 -0
- package/src/app/extensions.ts +19 -0
- package/src/app/index.ts +2 -0
- package/src/auth/jwt-middleware.ts +1 -1
- package/src/baseAdapter.ts +2 -2
- package/src/cards/adaptiveCard.ts +16 -0
- package/src/cards/index.ts +1 -0
- package/src/cloudAdapter.ts +5 -7
- package/src/connector-client/connectorClient.ts +38 -19
|
@@ -17,35 +17,38 @@ const logger = (0, logger_1.debug)('agents:connector-client');
|
|
|
17
17
|
class ConnectorClient {
|
|
18
18
|
/**
|
|
19
19
|
* Private constructor for the ConnectorClient.
|
|
20
|
-
* @param
|
|
20
|
+
* @param axInstance - The AxiosInstance to use for HTTP requests.
|
|
21
21
|
*/
|
|
22
|
-
constructor(
|
|
23
|
-
this.
|
|
24
|
-
this.
|
|
22
|
+
constructor(axInstance) {
|
|
23
|
+
this._axiosInstance = axInstance;
|
|
24
|
+
this._axiosInstance.interceptors.response.use((config) => {
|
|
25
25
|
const { status, statusText, config: requestConfig } = config;
|
|
26
26
|
logger.debug('Response: ', {
|
|
27
27
|
status,
|
|
28
28
|
statusText,
|
|
29
|
-
host: this.
|
|
29
|
+
host: this._axiosInstance.getUri(),
|
|
30
30
|
url: requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.url,
|
|
31
31
|
data: config.config.data,
|
|
32
32
|
method: requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.method,
|
|
33
33
|
});
|
|
34
34
|
return config;
|
|
35
35
|
}, (error) => {
|
|
36
|
-
const { code, message, stack } = error;
|
|
36
|
+
const { code, message, stack, response } = error;
|
|
37
37
|
const errorDetails = {
|
|
38
38
|
code,
|
|
39
|
-
host: this.
|
|
39
|
+
host: this._axiosInstance.getUri(),
|
|
40
40
|
url: error.config.url,
|
|
41
41
|
method: error.config.method,
|
|
42
42
|
data: error.config.data,
|
|
43
|
-
message,
|
|
43
|
+
message: message + JSON.stringify(response === null || response === void 0 ? void 0 : response.data),
|
|
44
44
|
stack,
|
|
45
45
|
};
|
|
46
46
|
return Promise.reject(errorDetails);
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
|
+
get axiosInstance() {
|
|
50
|
+
return this._axiosInstance;
|
|
51
|
+
}
|
|
49
52
|
/**
|
|
50
53
|
* Creates a new instance of ConnectorClient with authentication.
|
|
51
54
|
* @param baseURL - The base URL for the API.
|
|
@@ -84,7 +87,21 @@ class ConnectorClient {
|
|
|
84
87
|
url: '/v3/conversations',
|
|
85
88
|
params: continuationToken ? { continuationToken } : undefined
|
|
86
89
|
};
|
|
87
|
-
const response = await this.
|
|
90
|
+
const response = await this._axiosInstance(config);
|
|
91
|
+
return response.data;
|
|
92
|
+
}
|
|
93
|
+
async getConversationMember(userId, conversationId) {
|
|
94
|
+
if (!userId || !conversationId) {
|
|
95
|
+
throw new Error('userId and conversationId are required');
|
|
96
|
+
}
|
|
97
|
+
const config = {
|
|
98
|
+
method: 'get',
|
|
99
|
+
url: `v3/conversations/${conversationId}/members/${userId}`,
|
|
100
|
+
headers: {
|
|
101
|
+
'Content-Type': 'application/json'
|
|
102
|
+
}
|
|
103
|
+
};
|
|
104
|
+
const response = await this._axiosInstance(config);
|
|
88
105
|
return response.data;
|
|
89
106
|
}
|
|
90
107
|
/**
|
|
@@ -102,7 +119,7 @@ class ConnectorClient {
|
|
|
102
119
|
},
|
|
103
120
|
data: body
|
|
104
121
|
};
|
|
105
|
-
const response = await this.
|
|
122
|
+
const response = await this._axiosInstance(config);
|
|
106
123
|
return response.data;
|
|
107
124
|
}
|
|
108
125
|
/**
|
|
@@ -125,7 +142,7 @@ class ConnectorClient {
|
|
|
125
142
|
},
|
|
126
143
|
data: body
|
|
127
144
|
};
|
|
128
|
-
const response = await this.
|
|
145
|
+
const response = await this._axiosInstance(config);
|
|
129
146
|
logger.info('Reply to conversation/activity: ', response.data.id, activityId);
|
|
130
147
|
return response.data;
|
|
131
148
|
}
|
|
@@ -148,7 +165,7 @@ class ConnectorClient {
|
|
|
148
165
|
},
|
|
149
166
|
data: body
|
|
150
167
|
};
|
|
151
|
-
const response = await this.
|
|
168
|
+
const response = await this._axiosInstance(config);
|
|
152
169
|
return response.data;
|
|
153
170
|
}
|
|
154
171
|
/**
|
|
@@ -170,7 +187,7 @@ class ConnectorClient {
|
|
|
170
187
|
},
|
|
171
188
|
data: body
|
|
172
189
|
};
|
|
173
|
-
const response = await this.
|
|
190
|
+
const response = await this._axiosInstance(config);
|
|
174
191
|
return response.data;
|
|
175
192
|
}
|
|
176
193
|
/**
|
|
@@ -190,7 +207,7 @@ class ConnectorClient {
|
|
|
190
207
|
'Content-Type': 'application/json'
|
|
191
208
|
}
|
|
192
209
|
};
|
|
193
|
-
const response = await this.
|
|
210
|
+
const response = await this._axiosInstance(config);
|
|
194
211
|
return response.data;
|
|
195
212
|
}
|
|
196
213
|
/**
|
|
@@ -211,7 +228,7 @@ class ConnectorClient {
|
|
|
211
228
|
},
|
|
212
229
|
data: body
|
|
213
230
|
};
|
|
214
|
-
const response = await this.
|
|
231
|
+
const response = await this._axiosInstance(config);
|
|
215
232
|
return response.data;
|
|
216
233
|
}
|
|
217
234
|
/**
|
|
@@ -230,7 +247,7 @@ class ConnectorClient {
|
|
|
230
247
|
'Content-Type': 'application/json'
|
|
231
248
|
}
|
|
232
249
|
};
|
|
233
|
-
const response = await this.
|
|
250
|
+
const response = await this._axiosInstance(config);
|
|
234
251
|
return response.data;
|
|
235
252
|
}
|
|
236
253
|
/**
|
|
@@ -253,7 +270,7 @@ class ConnectorClient {
|
|
|
253
270
|
'Content-Type': 'application/json'
|
|
254
271
|
}
|
|
255
272
|
};
|
|
256
|
-
const response = await this.
|
|
273
|
+
const response = await this._axiosInstance(config);
|
|
257
274
|
return response.data;
|
|
258
275
|
}
|
|
259
276
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectorClient.js","sourceRoot":"","sources":["../../../src/connector-client/connectorClient.ts"],"names":[],"mappings":";;;;;;AAAA,oGAAoG;AACpG,kDAA+E;AAG/E,sCAAiC;AAOjC,8DAAiE;AACjE,sDAAkD;AAGzC,+FAHA,+BAAc,OAGA;AAFvB,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,yBAAyB,CAAC,CAAA;AAI/C;;GAEG;AACH,MAAa,eAAe;IAG1B;;;OAGG;IACH,YAAuB,
|
|
1
|
+
{"version":3,"file":"connectorClient.js","sourceRoot":"","sources":["../../../src/connector-client/connectorClient.ts"],"names":[],"mappings":";;;;;;AAAA,oGAAoG;AACpG,kDAA+E;AAG/E,sCAAiC;AAOjC,8DAAiE;AACjE,sDAAkD;AAGzC,+FAHA,+BAAc,OAGA;AAFvB,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,yBAAyB,CAAC,CAAA;AAI/C;;GAEG;AACH,MAAa,eAAe;IAG1B;;;OAGG;IACH,YAAuB,UAAyB;QAC9C,IAAI,CAAC,cAAc,GAAG,UAAU,CAAA;QAChC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAC3C,CAAC,MAAM,EAAE,EAAE;YACT,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;YAC5D,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE;gBACzB,MAAM;gBACN,UAAU;gBACV,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;gBAClC,GAAG,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG;gBACvB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;gBACxB,MAAM,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM;aAC9B,CAAC,CAAA;YACF,OAAO,MAAM,CAAA;QACf,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;YAChD,MAAM,YAAY,GAAG;gBACnB,IAAI;gBACJ,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;gBAClC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG;gBACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM;gBAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;gBACvB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC;gBACjD,KAAK;aACN,CAAA;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QACrC,CAAC,CACF,CAAA;IACH,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,KAAK,CAAC,yBAAyB,CACpC,OAAe,EACf,UAA6B,EAC7B,YAA0B,EAC1B,KAAa;QAEb,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,CAAC;YACjC,OAAO;YACP,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,YAAY,EAAE,IAAA,+BAAc,GAAE;aAC/B;YACD,gBAAgB,EAAE;gBAChB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;oBAChB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAA,8CAAyB,EAAC,IAAI,CAAC,CAAC,CAAA;gBACxD,CAAC;aAAC;SACL,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,cAAc,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;QAClE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAA;QACzE,CAAC;QACD,OAAO,IAAI,eAAe,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,qBAAqB,CAAE,iBAA0B;QAC5D,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,mBAAmB;YACxB,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS;SAC9D,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAE,MAAc,EAAE,cAAsB;QACxE,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;QAC3D,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,oBAAoB,cAAc,YAAY,MAAM,EAAE;YAC3D,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,uBAAuB,CAAE,IAA4B;QAChE,qDAAqD;QACrD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,mBAAmB;YACxB,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI;SACX,CAAA;QACD,MAAM,QAAQ,GAAkB,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QACjE,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,oBAAoB,CAC/B,cAAsB,EACtB,UAAkB,EAClB,IAAc;QAEd,MAAM,CAAC,KAAK,CAAC,yBAAyB,UAAU,qBAAqB,cAAc,EAAE,CAAC,CAAA;QACtF,IAAI,CAAC,cAAc,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;QAC/D,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,oBAAoB,cAAc,eAAe,kBAAkB,CAAC,UAAU,CAAC,EAAE;YACtF,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI;SACX,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAG,EAAE,UAAU,CAAC,CAAA;QAC9E,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,uBAAuB,CAClC,cAAsB,EACtB,IAAc;QAEd,MAAM,CAAC,KAAK,CAAC,yBAAyB,cAAc,cAAc,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;QAC5E,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC/C,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,oBAAoB,cAAc,aAAa;YACpD,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI;SACX,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,mBAAmB,CAC9B,cAAsB,EACtB,UAAkB,EAClB,IAAc;QAEd,IAAI,CAAC,cAAc,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;QAC/D,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,oBAAoB,cAAc,eAAe,UAAU,EAAE;YAClE,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI;SACX,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,mBAAmB,CAC9B,cAAsB,EACtB,UAAkB;QAElB,IAAI,CAAC,cAAc,IAAI,CAAC,UAAU,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;QAC/D,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,oBAAoB,cAAc,eAAe,UAAU,EAAE;YAClE,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;;SAKK;IACE,KAAK,CAAC,gBAAgB,CAC3B,cAAsB,EACtB,IAAoB;QAEpB,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC/C,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,oBAAoB,cAAc,cAAc;YACrD,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI;SACX,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,iBAAiB,CAC5B,YAAoB;QAEpB,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC7C,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,kBAAkB,YAAY,EAAE;YACrC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,aAAa,CACxB,YAAoB,EACpB,MAAc;QAEd,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC7C,CAAC;QACD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACvC,CAAC;QACD,MAAM,MAAM,GAAuB;YACjC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,kBAAkB,YAAY,UAAU,MAAM,EAAE;YACrD,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAClD,OAAO,QAAQ,CAAC,IAAI,CAAA;IACtB,CAAC;CACF;AA/SD,0CA+SC"}
|
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": "0.
|
|
4
|
+
"version": "0.5.1-g2e246ff274",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"types": "dist/src/index.d.ts",
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@azure/msal-node": "^3.5.3",
|
|
23
|
-
"@microsoft/agents-activity": "0.
|
|
23
|
+
"@microsoft/agents-activity": "0.5.1-g2e246ff274",
|
|
24
24
|
"axios": "^1.9.0",
|
|
25
25
|
"debug": "^4.3.7",
|
|
26
26
|
"jsonwebtoken": "^9.0.2",
|
|
@@ -25,7 +25,7 @@ export function normalizeIncomingActivity (payload: any): object {
|
|
|
25
25
|
* @returns The normalized payload object with `agent` replaced by `bot` in `relatesTo`.
|
|
26
26
|
*/
|
|
27
27
|
export function normalizeOutgoingActivity (payload: any): object {
|
|
28
|
-
if (payload['relatesTo'] && payload['relatesTo']['agent']) {
|
|
28
|
+
if (payload && payload['relatesTo'] && payload['relatesTo']['agent']) {
|
|
29
29
|
const relatesTo = payload['relatesTo']
|
|
30
30
|
const ov = relatesTo['agent']
|
|
31
31
|
delete relatesTo['agent']
|
|
@@ -0,0 +1,249 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { z } from 'zod'
|
|
7
|
+
import { activityZodSchema, AdaptiveCardInvokeAction, adaptiveCardInvokeActionZodSchema } from '@microsoft/agents-activity'
|
|
8
|
+
// import { MessagingExtensionQuery, messagingExtensionQueryZodSchema } from '../messageExtension/messagingExtensionQuery'
|
|
9
|
+
import { adaptiveCardsSearchParamsZodSchema } from './adaptiveCardsSearchParams'
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Parses the given value as a value action.
|
|
13
|
+
*
|
|
14
|
+
* @param {unknown} value - The value to parse.
|
|
15
|
+
* @returns {string} - The parsed value action.
|
|
16
|
+
*/
|
|
17
|
+
export function parseValueAction (value: unknown): string {
|
|
18
|
+
const valueActionZodSchema = z.object({
|
|
19
|
+
action: z.string().min(1)
|
|
20
|
+
})
|
|
21
|
+
valueActionZodSchema.passthrough().parse(value)
|
|
22
|
+
return value as string
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Parses the given value as a value action name.
|
|
27
|
+
*
|
|
28
|
+
* @param {unknown} value - The value to parse.
|
|
29
|
+
* @returns {string} - The parsed value action name.
|
|
30
|
+
*/
|
|
31
|
+
export function parseValueActionName (value: unknown): string {
|
|
32
|
+
const valueActionNameZodSchema = z.object({
|
|
33
|
+
actionName: z.string().min(1),
|
|
34
|
+
})
|
|
35
|
+
valueActionNameZodSchema.passthrough().parse(value)
|
|
36
|
+
return value as string
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* Parses the given value as a value continuation.
|
|
41
|
+
*
|
|
42
|
+
* @param {unknown} value - The value to parse.
|
|
43
|
+
* @returns {string} - The parsed value continuation.
|
|
44
|
+
*/
|
|
45
|
+
export function parseValueContinuation (value: unknown): string {
|
|
46
|
+
const valueContinuationZodSchema = z.object({
|
|
47
|
+
continuation: z.string().min(1)
|
|
48
|
+
})
|
|
49
|
+
valueContinuationZodSchema.passthrough().parse(value)
|
|
50
|
+
return value as string
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export interface ValueAction {
|
|
54
|
+
action: {
|
|
55
|
+
type: string;
|
|
56
|
+
verb: string;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* Parses the given value as a value action execute selector.
|
|
62
|
+
*
|
|
63
|
+
* @param {unknown} value - The value to parse.
|
|
64
|
+
* @returns {object} - The parsed value action execute selector.
|
|
65
|
+
*/
|
|
66
|
+
export function parseValueActionExecuteSelector (value: unknown): ValueAction | undefined {
|
|
67
|
+
if (value === undefined || value === null) {
|
|
68
|
+
return undefined
|
|
69
|
+
}
|
|
70
|
+
const actionZodSchema = z.object({
|
|
71
|
+
type: z.string().min(1),
|
|
72
|
+
verb: z.string().min(1)
|
|
73
|
+
})
|
|
74
|
+
const actionValueExecuteSelector = z.object({
|
|
75
|
+
action: actionZodSchema
|
|
76
|
+
})
|
|
77
|
+
const safeParsedValue = actionValueExecuteSelector.passthrough().safeParse(value)
|
|
78
|
+
if (!safeParsedValue.success) {
|
|
79
|
+
throw new Error(`Invalid action value: ${safeParsedValue.error}`)
|
|
80
|
+
}
|
|
81
|
+
const parsedValue = safeParsedValue.data
|
|
82
|
+
return {
|
|
83
|
+
action: {
|
|
84
|
+
type: parsedValue.action.type,
|
|
85
|
+
verb: parsedValue.action.verb
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Parses the given value as a dataset.
|
|
92
|
+
*
|
|
93
|
+
* @param {unknown} value - The value to parse.
|
|
94
|
+
* @returns {object} - The parsed dataset.
|
|
95
|
+
*/
|
|
96
|
+
export function parseValueDataset (value: unknown): {
|
|
97
|
+
dataset: string;
|
|
98
|
+
} | undefined {
|
|
99
|
+
if (value === undefined || value === null) {
|
|
100
|
+
return undefined
|
|
101
|
+
}
|
|
102
|
+
const datasetZodSchema = z.object({
|
|
103
|
+
dataset: z.string().min(1)
|
|
104
|
+
})
|
|
105
|
+
const parsedValue = datasetZodSchema.passthrough().parse(value)
|
|
106
|
+
return {
|
|
107
|
+
dataset: parsedValue.dataset
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* Parses the given value as action feedback loop data.
|
|
113
|
+
*
|
|
114
|
+
* @param {unknown} value - The value to parse.
|
|
115
|
+
* @returns {object} - The parsed action feedback loop data.
|
|
116
|
+
*/
|
|
117
|
+
export function parseValueActionFeedbackLoopData (value: unknown): {
|
|
118
|
+
actionValue: {
|
|
119
|
+
reaction: 'like' | 'dislike';
|
|
120
|
+
feedback: string | Record<string, any>;
|
|
121
|
+
}
|
|
122
|
+
} {
|
|
123
|
+
const feedbackLoopDataActionValueZodSchema = z.object({
|
|
124
|
+
actionValue: z.object({
|
|
125
|
+
reaction: z.union([z.literal('like'), z.literal('dislike')]),
|
|
126
|
+
feedback: z.union([z.string().min(1), z.record(z.string(), z.any())])
|
|
127
|
+
})
|
|
128
|
+
})
|
|
129
|
+
const parsedValue = feedbackLoopDataActionValueZodSchema.passthrough().parse(value)
|
|
130
|
+
return {
|
|
131
|
+
actionValue: {
|
|
132
|
+
reaction: parsedValue.actionValue.reaction,
|
|
133
|
+
feedback: parsedValue.actionValue.feedback
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/**
|
|
139
|
+
* Parses the given value as an adaptive card invoke action.
|
|
140
|
+
*
|
|
141
|
+
* @param {unknown} value - The value to parse.
|
|
142
|
+
* @returns {AdaptiveCardInvokeAction} - The parsed adaptive card invoke action.
|
|
143
|
+
*/
|
|
144
|
+
export function parseAdaptiveCardInvokeAction (value: unknown): AdaptiveCardInvokeAction {
|
|
145
|
+
adaptiveCardInvokeActionZodSchema.passthrough().parse(value)
|
|
146
|
+
return value as AdaptiveCardInvokeAction
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* Parses the given value as a search query.
|
|
151
|
+
*
|
|
152
|
+
* @param {unknown} value - The value to parse.
|
|
153
|
+
* @returns {object} - The parsed search query.
|
|
154
|
+
*/
|
|
155
|
+
export function parseValueSearchQuery (value: unknown): {
|
|
156
|
+
queryOptions: {
|
|
157
|
+
top: number;
|
|
158
|
+
skip: number;
|
|
159
|
+
};
|
|
160
|
+
queryText: string;
|
|
161
|
+
dataset: string;
|
|
162
|
+
} {
|
|
163
|
+
const queryOptionsZodSchema = z.object({
|
|
164
|
+
top: z.number(),
|
|
165
|
+
skip: z.number(),
|
|
166
|
+
})
|
|
167
|
+
const searchValueZodSchema = adaptiveCardsSearchParamsZodSchema.extend({
|
|
168
|
+
queryOptions: queryOptionsZodSchema
|
|
169
|
+
})
|
|
170
|
+
const validSearchValue = searchValueZodSchema.passthrough().parse(value)
|
|
171
|
+
return {
|
|
172
|
+
queryOptions: {
|
|
173
|
+
top: validSearchValue.queryOptions.top,
|
|
174
|
+
skip: validSearchValue.queryOptions.skip
|
|
175
|
+
},
|
|
176
|
+
queryText: validSearchValue.queryText,
|
|
177
|
+
dataset: validSearchValue.dataset
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/**
|
|
182
|
+
* Parses the given value as a query.
|
|
183
|
+
*
|
|
184
|
+
* @param {unknown} value - The value to parse.
|
|
185
|
+
* @returns {object} - The parsed query.
|
|
186
|
+
*/
|
|
187
|
+
export function parseValueQuery (value: unknown): {
|
|
188
|
+
url: string;
|
|
189
|
+
} {
|
|
190
|
+
const urlZodSchema = z.object({
|
|
191
|
+
url: z.string().min(1)
|
|
192
|
+
})
|
|
193
|
+
const parsedValue = urlZodSchema.passthrough().parse(value)
|
|
194
|
+
return {
|
|
195
|
+
url: parsedValue.url
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
/**
|
|
200
|
+
* Parses the given value as an activity message preview action.
|
|
201
|
+
*
|
|
202
|
+
* @param {unknown} value - The value to parse.
|
|
203
|
+
* @returns {object} - The parsed message preview action.
|
|
204
|
+
*/
|
|
205
|
+
export function parseValueAgentMessagePreviewAction (value: unknown): {
|
|
206
|
+
botMessagePreviewAction: string;
|
|
207
|
+
} {
|
|
208
|
+
const botMessagePreviewActionZodSchema = z.object({
|
|
209
|
+
botMessagePreviewAction: z.string().min(1)
|
|
210
|
+
})
|
|
211
|
+
const parsedValue = botMessagePreviewActionZodSchema.passthrough().parse(value)
|
|
212
|
+
return {
|
|
213
|
+
botMessagePreviewAction: parsedValue.botMessagePreviewAction
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
/**
|
|
218
|
+
* Parses the given value as an activity preview.
|
|
219
|
+
*
|
|
220
|
+
* @param {unknown} value - The value to parse.
|
|
221
|
+
* @returns {object} - The parsed activity preview.
|
|
222
|
+
*/
|
|
223
|
+
export function parseValueAgentActivityPreview (value: unknown): object {
|
|
224
|
+
const botActivityPreviewZodSchema = z.object({
|
|
225
|
+
botActivityPreview: z.array(activityZodSchema.partial())
|
|
226
|
+
})
|
|
227
|
+
const parsedValue = botActivityPreviewZodSchema.passthrough().parse(value)
|
|
228
|
+
return {
|
|
229
|
+
botActivityPreview: parsedValue.botActivityPreview
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
/**
|
|
234
|
+
* Parses the given value as a command ID.
|
|
235
|
+
*
|
|
236
|
+
* @param {unknown} value - The value to parse.
|
|
237
|
+
* @returns {object} - The parsed command ID.
|
|
238
|
+
*/
|
|
239
|
+
export function parseValueCommandId (value: unknown): {
|
|
240
|
+
commandId: string;
|
|
241
|
+
} {
|
|
242
|
+
const commandIdZodSchema = z.object({
|
|
243
|
+
commandId: z.string().min(1)
|
|
244
|
+
})
|
|
245
|
+
const parsedValue = commandIdZodSchema.passthrough().parse(value)
|
|
246
|
+
return {
|
|
247
|
+
commandId: parsedValue.commandId
|
|
248
|
+
}
|
|
249
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Defines the types of responses that can be returned after executing an Adaptive Card action.
|
|
8
|
+
*/
|
|
9
|
+
export enum AdaptiveCardActionExecuteResponseType {
|
|
10
|
+
/**
|
|
11
|
+
* Replaces the Adaptive Card only for the user who interacted with it.
|
|
12
|
+
*/
|
|
13
|
+
REPLACE_FOR_INTERACTOR,
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Replaces the Adaptive Card for all users.
|
|
17
|
+
*/
|
|
18
|
+
REPLACE_FOR_ALL,
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Sends a new message containing an Adaptive Card to all users.
|
|
22
|
+
*/
|
|
23
|
+
NEW_MESSAGE_FOR_ALL
|
|
24
|
+
}
|