@mstuercke/api-utils 6.0.2 → 6.1.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.
Files changed (2) hide show
  1. package/package.json +2 -2
  2. package/src/ws/server/trpc/awsLambdaTrpcSubscriptionRequestHandler.ts +95 -90
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mstuercke/api-utils",
3
- "version": "6.0.2",
3
+ "version": "6.1.0",
4
4
  "type": "module",
5
5
  "main": "src/index.ts",
6
6
  "files": [
@@ -55,7 +55,7 @@
55
55
  "@types/aws-lambda": "^8.10.138"
56
56
  },
57
57
  "devDependencies": {
58
- "@mstuercke/bun-utils": "6.1.0",
58
+ "@mstuercke/bun-utils": "6.2.20",
59
59
  "@trpc/server": "^11.0.0-rc.390",
60
60
  "@types/aws-lambda": "^8.10.138",
61
61
  "@types/bun": "^1.1.3",
package/src/ws/server/trpc/awsLambdaTrpcSubscriptionRequestHandler.ts CHANGED
@@ -19,107 +19,112 @@ export const awsLambdaTrpcSubscriptionRequestHandler = <Router extends AnyTRPCRo
19
19
 
20
20
  if (!event.body || event.body === '[]') return {statusCode: 200, body: '{}'}
21
21
 
22
- const request = JSON.parse(event.body) as TrpcSubscriptionRequest
23
-
24
- const sendMessage = async (response: TrpcSubscriptionResponse) => {
25
- await getApiGatewayManagementApiClient(connection.endpoint).send(
26
- new PostToConnectionCommand({
27
- ConnectionId: connection.connectionId,
28
- Data: JSON.stringify(response),
29
- }),
30
- )
31
- }
32
- const isConnected = async (): Promise<boolean> => {
33
- return getApiGatewayManagementApiClient(connection.endpoint)
34
- .send(new GetConnectionCommand({ConnectionId: connection.connectionId}))
35
- .then(() => true)
36
- .catch(() => false)
37
- }
38
- const stopConnection = async (): Promise<void> => {
39
- await sendMessage({
40
- id: request.id,
41
- result: {type: 'stopped'},
42
- })
43
- }
44
-
45
- try {
46
- const messageQueue: TrpcSubscriptionResponse[] = []
47
-
48
- if (request.method === 'subscription.stop') {
49
- await stopConnection()
22
+ const requestOrRequests = JSON.parse(event.body) as TrpcSubscriptionRequest | TrpcSubscriptionRequest[]
23
+
24
+ const requests = Array.isArray(requestOrRequests) ? requestOrRequests : [requestOrRequests]
25
+
26
+ for (const request of requests) {
27
+ const sendMessage = async (response: TrpcSubscriptionResponse) => {
28
+ await getApiGatewayManagementApiClient(connection.endpoint).send(
29
+ new PostToConnectionCommand({
30
+ ConnectionId: connection.connectionId,
31
+ Data: JSON.stringify(response),
32
+ }),
33
+ )
50
34
  }
51
-
52
- if (request.method === 'subscription') {
53
- messageQueue.push({
35
+ const isConnected = async (): Promise<boolean> => {
36
+ return getApiGatewayManagementApiClient(connection.endpoint)
37
+ .send(new GetConnectionCommand({ConnectionId: connection.connectionId}))
38
+ .then(() => true)
39
+ .catch(() => false)
40
+ }
41
+ const stopConnection = async (): Promise<void> => {
42
+ await sendMessage({
54
43
  id: request.id,
55
- result: {type: 'started'},
44
+ result: {type: 'stopped'},
56
45
  })
46
+ }
57
47
 
58
- const procedure = await callTRPCProcedure({
59
- procedures: router._def.procedures,
60
- path: request.params.path,
61
- type: 'subscription',
62
- ctx: (await createContext?.(event)) || {},
63
- getRawInput: async () => request.params.input,
64
- })
48
+ try {
49
+ const messageQueue: TrpcSubscriptionResponse[] = []
65
50
 
66
- if (!isObservable(procedure)) {
67
- console.error(`observable`, procedure)
68
- throw `Procedure is not an observable!`
51
+ if (request.method === 'subscription.stop') {
52
+ await stopConnection()
69
53
  }
70
54
 
71
- procedure.subscribe({
72
- next: (data: unknown) => {
73
- messageQueue.push({
74
- id: request.id,
75
- result: {
76
- type: 'data',
77
- data: data,
78
- },
79
- })
80
- },
81
- error: (err) => {
82
- console.error(err)
83
- messageQueue.push({
84
- id: request.id,
85
- result: {type: 'stopped'},
86
- })
87
- },
88
- complete: () => {
89
- messageQueue.push({
90
- id: request.id,
91
- result: {type: 'stopped'},
92
- })
93
- },
94
- })
95
-
96
- const pingIntervalMs = 5_000
97
- let lastPing = Date.now()
98
- let stopped = false
99
- while (!stopped) {
100
- if (messageQueue.length === 0) await new Promise((resolve) => setTimeout(resolve, 10))
101
- const message = messageQueue.shift()
102
- if (!message) continue
103
-
104
- await sendMessage(message)
105
-
106
- stopped = message.result.type === 'stopped'
55
+ if (request.method === 'subscription') {
56
+ messageQueue.push({
57
+ id: request.id,
58
+ result: {type: 'started'},
59
+ })
60
+
61
+ const procedure = await callTRPCProcedure({
62
+ procedures: router._def.procedures,
63
+ path: request.params.path,
64
+ type: 'subscription',
65
+ ctx: (await createContext?.(event)) || {},
66
+ getRawInput: async () => request.params.input,
67
+ })
68
+
69
+ if (!isObservable(procedure)) {
70
+ console.error(`observable`, procedure)
71
+ throw `Procedure is not an observable!`
72
+ }
107
73
 
108
- if (Date.now() > lastPing + pingIntervalMs) {
109
- if (!(await isConnected())) {
110
- console.info('Connection closed by client')
111
- stopped = true
74
+ procedure.subscribe({
75
+ next: (data: unknown) => {
76
+ messageQueue.push({
77
+ id: request.id,
78
+ result: {
79
+ type: 'data',
80
+ data: data,
81
+ },
82
+ })
83
+ },
84
+ error: (err) => {
85
+ console.error(err)
86
+ messageQueue.push({
87
+ id: request.id,
88
+ result: {type: 'stopped'},
89
+ })
90
+ },
91
+ complete: () => {
92
+ messageQueue.push({
93
+ id: request.id,
94
+ result: {type: 'stopped'},
95
+ })
96
+ },
97
+ })
98
+
99
+ const pingIntervalMs = 5_000
100
+ let lastPing = Date.now()
101
+ let stopped = false
102
+ while (!stopped) {
103
+ if (messageQueue.length === 0) await new Promise((resolve) => setTimeout(resolve, 10))
104
+ const message = messageQueue.shift()
105
+ if (!message) continue
106
+
107
+ await sendMessage(message)
108
+
109
+ stopped = message.result.type === 'stopped'
110
+
111
+ if (Date.now() > lastPing + pingIntervalMs) {
112
+ const connected = await isConnected()
113
+ if (!connected) {
114
+ console.info('Ping: Connection closed by client')
115
+ stopped = true
116
+ }
117
+ lastPing = Date.now()
112
118
  }
113
- lastPing = Date.now()
114
119
  }
115
120
  }
116
- }
117
- } catch (err) {
118
- if (err instanceof GoneException) {
119
- console.info('Connection closed by client')
120
- } else {
121
- console.error(err)
122
- await stopConnection()
121
+ } catch (err) {
122
+ if (err instanceof GoneException) {
123
+ console.info('Error: Connection closed by client', err.message)
124
+ } else {
125
+ console.error(err)
126
+ await stopConnection()
127
+ }
123
128
  }
124
129
  }
125
130