@mstuercke/api-utils 4.2.1 → 4.2.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.
@@ -1 +1 @@
1
- {"version":3,"file":"WsApi.d.ts","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,qBAAqB,EAAC,MAAM,YAAY,CAAC;AACvE,OAAO,EACL,WAAW,EAEX,YAAY,EAEZ,aAAa,EACb,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAIlB,qBAAa,KAAK;IAEhB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG5B;IAEF,eAAe,CACX,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,EACpC,QAAQ,SAAS,aAAa,EAChC,YAAY,EAAE,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;IAKtD,aAAa,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAqCjF"}
1
+ {"version":3,"file":"WsApi.d.ts","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,qBAAqB,EAAC,MAAM,YAAY,CAAC;AACvE,OAAO,EACL,WAAW,EAEX,YAAY,EAEZ,aAAa,EACb,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAIlB,qBAAa,KAAK;IAEhB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG5B;IAEF,eAAe,CACX,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,EACpC,QAAQ,SAAS,aAAa,EAChC,YAAY,EAAE,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;IAKtD,aAAa,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CA8CjF"}
@@ -11,30 +11,35 @@ export class WsApi {
11
11
  return this;
12
12
  }
13
13
  async handleRequest(event) {
14
- const { body } = event;
15
- const { connectionId, domainName, stage, routeKey } = event.requestContext;
16
- if (!routeKey)
17
- throw 'No routeKey';
14
+ const { connectionId, domainName, stage, eventType } = event.requestContext;
15
+ if (!eventType)
16
+ throw 'No eventType';
18
17
  if (!connectionId)
19
18
  throw 'No connectionId';
20
19
  if (!domainName)
21
20
  throw 'No domainName';
22
- let action = routeKey;
23
- let request = { action: routeKey };
24
- if (routeKey !== '$connect' && routeKey !== '$disconnect') {
25
- if (!body)
26
- throw 'No body';
27
- request = JSON.parse(body);
28
- action = request.action;
29
- if (!action)
30
- throw 'No routeKey/action';
21
+ let request;
22
+ switch (eventType) {
23
+ case 'CONNECT':
24
+ request = { action: '$connect' };
25
+ break;
26
+ case 'DISCONNECT':
27
+ request = { action: '$disconnect' };
28
+ break;
29
+ case 'MESSAGE':
30
+ if (!event.body)
31
+ throw 'No body';
32
+ request = JSON.parse(event.body);
33
+ break;
34
+ default:
35
+ throw `Unknown eventType ${eventType}`;
31
36
  }
32
37
  const endpoint = `https://${domainName}/${stage}`;
33
38
  const connection = { endpoint, connectionId };
34
- const requestHandler = this.routeHandlers[action];
39
+ const requestHandler = this.routeHandlers[request.action];
35
40
  if (!requestHandler) {
36
41
  await closeConnection(connection);
37
- throw `No requestHandler found for action ${action}`;
42
+ throw `No requestHandler found for action ${request.action}`;
38
43
  }
39
44
  await requestHandler(request, {
40
45
  connection,
@@ -1 +1 @@
1
- {"version":3,"file":"WsApi.js","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,KAAK;IAChB,8DAA8D;IAC7C,aAAa,GAAkE;QAC9F,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACnC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KACvC,CAAC;IAEF,eAAe,CAIb,YAA0D;QAC1D,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA2B;QAC7C,MAAM,EAAC,IAAI,EAAC,GAAG,KAAK,CAAC;QACrB,MAAM,EAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC,cAAc,CAAC;QAEzE,IAAI,CAAC,QAAQ;YAAE,MAAM,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY;YAAE,MAAM,iBAAiB,CAAC;QAC3C,IAAI,CAAC,UAAU;YAAE,MAAM,eAAe,CAAC;QAEvC,IAAI,MAAM,GAAgB,QAAQ,CAAC;QACnC,IAAI,OAAO,GAA8B,EAAC,MAAM,EAAE,QAAQ,EAAC,CAAC;QAC5D,IAAI,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC1D,IAAI,CAAC,IAAI;gBAAE,MAAM,SAAS,CAAC;YAC3B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA8B,CAAC;YACxD,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YACxB,IAAI,CAAC,MAAM;gBAAE,MAAM,oBAAoB,CAAC;QAC1C,CAAC;QAED,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,KAAK,EAAE,CAAC;QAClD,MAAM,UAAU,GAAoB,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;YAClC,MAAM,sCAAsC,MAAM,EAAE,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,CAAC,OAAO,EAAE;YAC5B,UAAU;YACV,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC;YAC1E,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC;SAC/D,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE;SACT,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"WsApi.js","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,KAAK;IAChB,8DAA8D;IAC7C,aAAa,GAAkE;QAC9F,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACnC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KACvC,CAAC;IAEF,eAAe,CAIb,YAA0D;QAC1D,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA2B;QAC7C,MAAM,EAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAC,GAAG,KAAK,CAAC,cAAc,CAAC;QAE1E,IAAI,CAAC,SAAS;YAAE,MAAM,cAAc,CAAC;QACrC,IAAI,CAAC,YAAY;YAAE,MAAM,iBAAiB,CAAC;QAC3C,IAAI,CAAC,UAAU;YAAE,MAAM,eAAe,CAAC;QAEvC,IAAI,OAAkC,CAAC;QACvC,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,SAAS;gBACZ,OAAO,GAAG,EAAC,MAAM,EAAE,UAAU,EAAC,CAAC;gBAC/B,MAAM;YAER,KAAK,YAAY;gBACf,OAAO,GAAG,EAAC,MAAM,EAAE,aAAa,EAAC,CAAC;gBAClC,MAAM;YAER,KAAK,SAAS;gBACZ,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,MAAM,SAAS,CAAC;gBACjC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAA8B,CAAC;gBAC9D,MAAM;YAER;gBACE,MAAM,qBAAqB,SAAS,EAAE,CAAC;QAC3C,CAAC;QAED,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,KAAK,EAAE,CAAC;QAClD,MAAM,UAAU,GAAoB,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;YAClC,MAAM,sCAAsC,OAAO,CAAC,MAAM,EAAE,CAAC;QAC/D,CAAC;QAED,MAAM,cAAc,CAAC,OAAO,EAAE;YAC5B,UAAU;YACV,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC;YAC1E,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC;SAC/D,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE;SACT,CAAC;IACJ,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mstuercke/api-utils",
3
- "version": "4.2.1",
3
+ "version": "4.2.2",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "dist/**/*.js",