acebase-server 1.10.0 → 1.12.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 (250) hide show
  1. package/dist/cjs/index.js +16 -0
  2. package/dist/cjs/index.js.map +1 -1
  3. package/dist/cjs/logger.js +74 -0
  4. package/dist/cjs/logger.js.map +1 -0
  5. package/dist/cjs/middleware/admin-only.js +29 -0
  6. package/dist/cjs/middleware/admin-only.js.map +1 -0
  7. package/dist/cjs/middleware/user.js +4 -4
  8. package/dist/cjs/middleware/user.js.map +1 -1
  9. package/dist/cjs/oauth-providers/dropbox.js +3 -2
  10. package/dist/cjs/oauth-providers/dropbox.js.map +1 -1
  11. package/dist/cjs/oauth-providers/facebook.js +3 -2
  12. package/dist/cjs/oauth-providers/facebook.js.map +1 -1
  13. package/dist/cjs/oauth-providers/google.js +3 -2
  14. package/dist/cjs/oauth-providers/google.js.map +1 -1
  15. package/dist/cjs/oauth-providers/index.js.map +1 -1
  16. package/dist/cjs/oauth-providers/instagram.js +3 -2
  17. package/dist/cjs/oauth-providers/instagram.js.map +1 -1
  18. package/dist/cjs/oauth-providers/oauth-provider.js +23 -0
  19. package/dist/cjs/oauth-providers/oauth-provider.js.map +1 -1
  20. package/dist/cjs/oauth-providers/spotify.js +3 -2
  21. package/dist/cjs/oauth-providers/spotify.js.map +1 -1
  22. package/dist/cjs/routes/auth-change-password.js +7 -4
  23. package/dist/cjs/routes/auth-change-password.js.map +1 -1
  24. package/dist/cjs/routes/auth-delete.js +9 -7
  25. package/dist/cjs/routes/auth-delete.js.map +1 -1
  26. package/dist/cjs/routes/auth-forgot-password.js +9 -6
  27. package/dist/cjs/routes/auth-forgot-password.js.map +1 -1
  28. package/dist/cjs/routes/auth-reset-password.js +5 -3
  29. package/dist/cjs/routes/auth-reset-password.js.map +1 -1
  30. package/dist/cjs/routes/auth-signout.js +6 -4
  31. package/dist/cjs/routes/auth-signout.js.map +1 -1
  32. package/dist/cjs/routes/auth-signup.js +17 -15
  33. package/dist/cjs/routes/auth-signup.js.map +1 -1
  34. package/dist/cjs/routes/auth-update.js +9 -6
  35. package/dist/cjs/routes/auth-update.js.map +1 -1
  36. package/dist/cjs/routes/auth-verify-email.js +6 -3
  37. package/dist/cjs/routes/auth-verify-email.js.map +1 -1
  38. package/dist/cjs/routes/data-index-create.js +3 -5
  39. package/dist/cjs/routes/data-index-create.js.map +1 -1
  40. package/dist/cjs/routes/data-index-delete.js +2 -4
  41. package/dist/cjs/routes/data-index-delete.js.map +1 -1
  42. package/dist/cjs/routes/data-index-list.js +2 -4
  43. package/dist/cjs/routes/data-index-list.js.map +1 -1
  44. package/dist/cjs/routes/data-reflect.js +2 -4
  45. package/dist/cjs/routes/data-reflect.js.map +1 -1
  46. package/dist/cjs/routes/data-schema-get.js +2 -4
  47. package/dist/cjs/routes/data-schema-get.js.map +1 -1
  48. package/dist/cjs/routes/data-schema-set.js +2 -4
  49. package/dist/cjs/routes/data-schema-set.js.map +1 -1
  50. package/dist/cjs/routes/data-schema-test.js +2 -4
  51. package/dist/cjs/routes/data-schema-test.js.map +1 -1
  52. package/dist/cjs/routes/data-schemas-list.js +2 -4
  53. package/dist/cjs/routes/data-schemas-list.js.map +1 -1
  54. package/dist/cjs/routes/data-set.js +11 -7
  55. package/dist/cjs/routes/data-set.js.map +1 -1
  56. package/dist/cjs/routes/data-sync-changes.js.map +1 -1
  57. package/dist/cjs/routes/data-sync-mutations.js.map +1 -1
  58. package/dist/cjs/routes/data-transaction.js +30 -10
  59. package/dist/cjs/routes/data-transaction.js.map +1 -1
  60. package/dist/cjs/routes/data-update.js +11 -6
  61. package/dist/cjs/routes/data-update.js.map +1 -1
  62. package/dist/cjs/routes/meta-info.js.map +1 -1
  63. package/dist/cjs/routes/meta-logs.js +50 -0
  64. package/dist/cjs/routes/meta-logs.js.map +1 -0
  65. package/dist/cjs/routes/meta.js +3 -0
  66. package/dist/cjs/routes/meta.js.map +1 -1
  67. package/dist/cjs/routes/oauth2-signin.js +15 -11
  68. package/dist/cjs/routes/oauth2-signin.js.map +1 -1
  69. package/dist/cjs/rules.js +5 -5
  70. package/dist/cjs/rules.js.map +1 -1
  71. package/dist/cjs/server.js +6 -4
  72. package/dist/cjs/server.js.map +1 -1
  73. package/dist/cjs/settings/index.js +6 -7
  74. package/dist/cjs/settings/index.js.map +1 -1
  75. package/dist/cjs/shared/clients.js.map +1 -1
  76. package/dist/cjs/shared/env.js.map +1 -1
  77. package/dist/cjs/shared/http.js.map +1 -1
  78. package/dist/cjs/shared/signin.js +8 -3
  79. package/dist/cjs/shared/signin.js.map +1 -1
  80. package/dist/cjs/start.js +3 -0
  81. package/dist/cjs/start.js.map +1 -1
  82. package/dist/cjs/websocket/index.js +43 -24
  83. package/dist/cjs/websocket/index.js.map +1 -1
  84. package/dist/cjs/websocket/socket.io.js +8 -11
  85. package/dist/cjs/websocket/socket.io.js.map +1 -1
  86. package/dist/esm/index.js +2 -0
  87. package/dist/esm/index.js.map +1 -1
  88. package/dist/esm/logger.js +52 -0
  89. package/dist/esm/logger.js.map +1 -0
  90. package/dist/esm/middleware/admin-only.js +25 -0
  91. package/dist/esm/middleware/admin-only.js.map +1 -0
  92. package/dist/esm/middleware/user.js +4 -4
  93. package/dist/esm/middleware/user.js.map +1 -1
  94. package/dist/esm/oauth-providers/dropbox.js +3 -2
  95. package/dist/esm/oauth-providers/dropbox.js.map +1 -1
  96. package/dist/esm/oauth-providers/facebook.js +3 -2
  97. package/dist/esm/oauth-providers/facebook.js.map +1 -1
  98. package/dist/esm/oauth-providers/google.js +3 -2
  99. package/dist/esm/oauth-providers/google.js.map +1 -1
  100. package/dist/esm/oauth-providers/index.js.map +1 -1
  101. package/dist/esm/oauth-providers/instagram.js +3 -2
  102. package/dist/esm/oauth-providers/instagram.js.map +1 -1
  103. package/dist/esm/oauth-providers/oauth-provider.js +21 -1
  104. package/dist/esm/oauth-providers/oauth-provider.js.map +1 -1
  105. package/dist/esm/oauth-providers/spotify.js +3 -2
  106. package/dist/esm/oauth-providers/spotify.js.map +1 -1
  107. package/dist/esm/routes/auth-change-password.js +6 -3
  108. package/dist/esm/routes/auth-change-password.js.map +1 -1
  109. package/dist/esm/routes/auth-delete.js +7 -5
  110. package/dist/esm/routes/auth-delete.js.map +1 -1
  111. package/dist/esm/routes/auth-forgot-password.js +8 -6
  112. package/dist/esm/routes/auth-forgot-password.js.map +1 -1
  113. package/dist/esm/routes/auth-reset-password.js +4 -2
  114. package/dist/esm/routes/auth-reset-password.js.map +1 -1
  115. package/dist/esm/routes/auth-signout.js +4 -2
  116. package/dist/esm/routes/auth-signout.js.map +1 -1
  117. package/dist/esm/routes/auth-signup.js +12 -10
  118. package/dist/esm/routes/auth-signup.js.map +1 -1
  119. package/dist/esm/routes/auth-update.js +8 -6
  120. package/dist/esm/routes/auth-update.js.map +1 -1
  121. package/dist/esm/routes/auth-verify-email.js +6 -2
  122. package/dist/esm/routes/auth-verify-email.js.map +1 -1
  123. package/dist/esm/routes/data-index-create.js +4 -6
  124. package/dist/esm/routes/data-index-create.js.map +1 -1
  125. package/dist/esm/routes/data-index-delete.js +3 -5
  126. package/dist/esm/routes/data-index-delete.js.map +1 -1
  127. package/dist/esm/routes/data-index-list.js +3 -5
  128. package/dist/esm/routes/data-index-list.js.map +1 -1
  129. package/dist/esm/routes/data-reflect.js +1 -4
  130. package/dist/esm/routes/data-reflect.js.map +1 -1
  131. package/dist/esm/routes/data-schema-get.js +3 -5
  132. package/dist/esm/routes/data-schema-get.js.map +1 -1
  133. package/dist/esm/routes/data-schema-set.js +3 -5
  134. package/dist/esm/routes/data-schema-set.js.map +1 -1
  135. package/dist/esm/routes/data-schema-test.js +3 -5
  136. package/dist/esm/routes/data-schema-test.js.map +1 -1
  137. package/dist/esm/routes/data-schemas-list.js +3 -5
  138. package/dist/esm/routes/data-schemas-list.js.map +1 -1
  139. package/dist/esm/routes/data-set.js +9 -5
  140. package/dist/esm/routes/data-set.js.map +1 -1
  141. package/dist/esm/routes/data-sync-changes.js.map +1 -1
  142. package/dist/esm/routes/data-sync-mutations.js.map +1 -1
  143. package/dist/esm/routes/data-transaction.js +28 -8
  144. package/dist/esm/routes/data-transaction.js.map +1 -1
  145. package/dist/esm/routes/data-update.js +9 -4
  146. package/dist/esm/routes/data-update.js.map +1 -1
  147. package/dist/esm/routes/meta-info.js.map +1 -1
  148. package/dist/esm/routes/meta-logs.js +36 -0
  149. package/dist/esm/routes/meta-logs.js.map +1 -0
  150. package/dist/esm/routes/meta.js +3 -0
  151. package/dist/esm/routes/meta.js.map +1 -1
  152. package/dist/esm/routes/oauth2-signin.js +14 -10
  153. package/dist/esm/routes/oauth2-signin.js.map +1 -1
  154. package/dist/esm/rules.js +5 -5
  155. package/dist/esm/rules.js.map +1 -1
  156. package/dist/esm/server.js +6 -4
  157. package/dist/esm/server.js.map +1 -1
  158. package/dist/esm/settings/index.js +5 -6
  159. package/dist/esm/settings/index.js.map +1 -1
  160. package/dist/esm/shared/clients.js.map +1 -1
  161. package/dist/esm/shared/env.js.map +1 -1
  162. package/dist/esm/shared/http.js.map +1 -1
  163. package/dist/esm/shared/signin.js +7 -3
  164. package/dist/esm/shared/signin.js.map +1 -1
  165. package/dist/esm/start.js +3 -0
  166. package/dist/esm/start.js.map +1 -1
  167. package/dist/esm/websocket/index.js +38 -23
  168. package/dist/esm/websocket/index.js.map +1 -1
  169. package/dist/esm/websocket/socket.io.js +9 -11
  170. package/dist/esm/websocket/socket.io.js.map +1 -1
  171. package/dist/types/index.d.ts +2 -0
  172. package/dist/types/logger.d.ts +35 -0
  173. package/dist/types/middleware/admin-only.d.ts +19 -0
  174. package/dist/types/oauth-providers/dropbox.d.ts +3 -14
  175. package/dist/types/oauth-providers/facebook.d.ts +3 -7
  176. package/dist/types/oauth-providers/google.d.ts +3 -7
  177. package/dist/types/oauth-providers/index.d.ts +2 -10
  178. package/dist/types/oauth-providers/instagram.d.ts +3 -7
  179. package/dist/types/oauth-providers/oauth-provider.d.ts +25 -21
  180. package/dist/types/oauth-providers/spotify.d.ts +3 -7
  181. package/dist/types/routes/data-query.d.ts +1 -1
  182. package/dist/types/routes/meta-logs.d.ts +20 -0
  183. package/dist/types/rules.d.ts +4 -4
  184. package/dist/types/server.d.ts +9 -7
  185. package/dist/types/settings/email.d.ts +1 -1
  186. package/dist/types/settings/index.d.ts +5 -6
  187. package/dist/types/shared/clients.d.ts +3 -1
  188. package/dist/types/shared/env.d.ts +6 -4
  189. package/dist/types/shared/http.d.ts +2 -0
  190. package/dist/types/shared/signin.d.ts +1 -1
  191. package/dist/types/websocket/index.d.ts +4 -0
  192. package/dist/types/websocket/manager.d.ts +1 -1
  193. package/package.json +12 -11
  194. package/src/index.ts +3 -1
  195. package/src/logger.ts +56 -0
  196. package/src/middleware/admin-only.ts +29 -0
  197. package/src/middleware/user.ts +4 -4
  198. package/src/oauth-providers/dropbox.ts +5 -4
  199. package/src/oauth-providers/facebook.ts +5 -4
  200. package/src/oauth-providers/google.ts +5 -4
  201. package/src/oauth-providers/index.ts +2 -1
  202. package/src/oauth-providers/instagram.ts +5 -4
  203. package/src/oauth-providers/oauth-provider.ts +14 -4
  204. package/src/oauth-providers/spotify.ts +5 -4
  205. package/src/placeholder.d.ts +12 -0
  206. package/src/routes/auth-change-password.ts +6 -3
  207. package/src/routes/auth-delete.ts +7 -5
  208. package/src/routes/auth-forgot-password.ts +10 -6
  209. package/src/routes/auth-reset-password.ts +5 -2
  210. package/src/routes/auth-signout.ts +5 -2
  211. package/src/routes/auth-signup.ts +13 -10
  212. package/src/routes/auth-update.ts +8 -6
  213. package/src/routes/auth-verify-email.ts +11 -3
  214. package/src/routes/data-index-create.ts +4 -7
  215. package/src/routes/data-index-delete.ts +3 -6
  216. package/src/routes/data-index-list.ts +3 -6
  217. package/src/routes/data-query.ts +1 -1
  218. package/src/routes/data-reflect.ts +1 -4
  219. package/src/routes/data-schema-get.ts +3 -5
  220. package/src/routes/data-schema-set.ts +3 -6
  221. package/src/routes/data-schema-test.ts +3 -6
  222. package/src/routes/data-schemas-list.ts +3 -5
  223. package/src/routes/data-set.ts +14 -6
  224. package/src/routes/data-set.yaml +7 -1
  225. package/src/routes/data-sync-changes.ts +1 -1
  226. package/src/routes/data-sync-mutations.ts +1 -1
  227. package/src/routes/data-transaction-finish.yaml +6 -0
  228. package/src/routes/data-transaction.ts +35 -11
  229. package/src/routes/data-update.ts +12 -4
  230. package/src/routes/data-update.yaml +7 -1
  231. package/src/routes/meta-info.ts +1 -1
  232. package/src/routes/meta-logs.ts +57 -0
  233. package/src/routes/meta.ts +4 -0
  234. package/src/routes/oauth2-signin.ts +17 -12
  235. package/src/rules.ts +8 -8
  236. package/src/server.ts +13 -9
  237. package/src/settings/email.ts +1 -1
  238. package/src/settings/index.ts +7 -7
  239. package/src/shared/clients.ts +1 -1
  240. package/src/shared/env.ts +5 -4
  241. package/src/shared/http.ts +2 -0
  242. package/src/shared/signin.ts +10 -4
  243. package/src/start.ts +3 -0
  244. package/src/websocket/index.ts +41 -24
  245. package/src/websocket/manager.ts +1 -1
  246. package/src/websocket/socket.io.ts +9 -10
  247. package/webmanager/acebase-client-browser.min.js +16 -0
  248. package/webmanager/index.html +2 -2
  249. package/webmanager/index.js +3 -6
  250. package/.vscode/launch.json +0 -24
@@ -6,7 +6,7 @@ import { decodePublicAccessToken } from "./tokens";
6
6
 
7
7
  export type SignInCredentials =
8
8
  { method: 'token'; access_token: string } |
9
- { method: 'private_token'; access_token: string } |
9
+ { method: 'internal'; access_token: string } |
10
10
  { method: 'email'; email: string; password: string } |
11
11
  { method: 'account', username: string, password: string };
12
12
 
@@ -25,6 +25,10 @@ export class SignInError extends Error {
25
25
  * @returns
26
26
  */
27
27
  export const signIn = async (credentials: SignInCredentials, env: RouteInitEnvironment, req: RouteRequest) => {
28
+
29
+ const LOG_ACTION = 'auth.signin';
30
+ const LOG_DETAILS = { ip: req.ip, method: credentials.method };
31
+
28
32
  try {
29
33
  const query = env.authRef.query();
30
34
  let tokenDetails: ReturnType<typeof decodePublicAccessToken>;
@@ -42,7 +46,7 @@ export const signIn = async (credentials: SignInCredentials, env: RouteInitEnvir
42
46
  }
43
47
  break;
44
48
  }
45
- case 'private_token': {
49
+ case 'internal': {
46
50
  // Method used internally: uses the access token extracted from a public access token (see tokenDetails.access_token in above 'token' case)
47
51
  if (typeof credentials.access_token !== 'string') {
48
52
  throw new SignInError('invalid_details', 'sign in request has invalid arguments');
@@ -125,7 +129,9 @@ export const signIn = async (credentials: SignInCredentials, env: RouteInitEnvir
125
129
  await snap.ref.update(updates);
126
130
 
127
131
  // Log history item
128
- env.logRef.push({ action: `signin`, type: credentials.method, [credentials.method]: credentials[credentials.method], ip: req.ip, date: new Date(), success: true });
132
+ if (credentials.method !== 'internal') {
133
+ env.log.event(LOG_ACTION, LOG_DETAILS);
134
+ }
129
135
 
130
136
  // Add to cache
131
137
  env.authCache.set(user.uid, user);
@@ -137,7 +143,7 @@ export const signIn = async (credentials: SignInCredentials, env: RouteInitEnvir
137
143
  }
138
144
  catch (err) {
139
145
  // Log error
140
- env.logRef.push({ action: 'signin', type: credentials.method, [credentials.method]: credentials[credentials.method], success: false, code: err.code || 'unexpected', message: err.code ? null : err.message, ip: req.ip, date: new Date(), ...err.details });
146
+ env.log.error(LOG_ACTION, err.code ?? 'unexpected', LOG_DETAILS, typeof err.code === 'undefined' ? err : null);
141
147
  throw err;
142
148
  }
143
149
  }
package/src/start.ts CHANGED
@@ -38,6 +38,9 @@ if (+getVariable('TXLOG', 0) === 1) {
38
38
  maxAge: +getVariable('TXDAYS', 30)
39
39
  };
40
40
  }
41
+ if (+getVariable('AUTH', 1) === 0) {
42
+ options.authentication = { enabled: false };
43
+ }
41
44
  const server = new AceBaseServer(dbname, options);
42
45
  server.once("ready", () => {
43
46
  server.debug.log(`AceBase server running`);
@@ -5,6 +5,12 @@ import { RouteInitEnvironment } from "../shared/env";
5
5
  import { decodePublicAccessToken } from "../shared/tokens";
6
6
  import { createServer, SocketType } from "./socket.io";
7
7
 
8
+ export class SocketRequestError extends Error {
9
+ constructor(public code: string, message: string) {
10
+ super(message);
11
+ }
12
+ }
13
+
8
14
  export const addWebsocketServer = (env: RouteInitEnvironment) => {
9
15
 
10
16
  // TODO: Allow using uWebSockets.js server instead of Socket.IO
@@ -107,7 +113,7 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
107
113
  }
108
114
  });
109
115
 
110
- const acknowlegdeRequest = (socket: SocketType, requestId: string) => {
116
+ const acknowledgeRequest = (socket: SocketType, requestId: string) => {
111
117
  // Send acknowledgement
112
118
  serverManager.send(socket, 'result', {
113
119
  success: true,
@@ -132,14 +138,14 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
132
138
  const subscriptionPath = event.data.path;
133
139
  const isSubscribed = () => subscriptionPath in client.subscriptions && client.subscriptions[subscriptionPath].some(s => s.event === event.data.event)
134
140
  if (isSubscribed()) {
135
- return acknowlegdeRequest(event.socket, event.data.req_id);
141
+ return acknowledgeRequest(event.socket, event.data.req_id);
136
142
  }
137
143
 
138
144
  // Get client
139
145
  // const client = clients.get(socket.id);
140
146
 
141
147
  if (!env.rules.userHasAccess(client.user, subscriptionPath, false)) {
142
- env.logRef.push({ action: 'subscribe', success: false, code: 'access_denied', uid: client.user ? client.user.uid : '-', path: subscriptionPath });
148
+ env.log.error('event.subscribe', 'access_denied', { uid: client.user?.uid ?? 'anonymous', path: subscriptionPath });
143
149
  return failRequest(event.socket, event.data.req_id, 'access_denied');
144
150
  }
145
151
 
@@ -183,7 +189,7 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
183
189
 
184
190
  env.db.api.subscribe(subscriptionPath, event.data.event, callback);
185
191
 
186
- acknowlegdeRequest(event.socket, event.data.req_id);
192
+ acknowledgeRequest(event.socket, event.data.req_id);
187
193
  });
188
194
 
189
195
  serverManager.on('unsubscribe', event => {
@@ -197,7 +203,7 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
197
203
  let pathSubs = client.subscriptions[event.data.path];
198
204
  if (!pathSubs) {
199
205
  // We have no knowledge of any active subscriptions on this path
200
- return acknowlegdeRequest(event.socket, event.data.req_id);
206
+ return acknowledgeRequest(event.socket, event.data.req_id);
201
207
  }
202
208
  let remove = pathSubs;
203
209
  if (event.data.event) {
@@ -214,7 +220,7 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
214
220
  // No subscriptions left on this path, remove the path entry
215
221
  delete client.subscriptions[event.data.path];
216
222
  }
217
- return acknowlegdeRequest(event.socket, event.data.req_id);
223
+ return acknowledgeRequest(event.socket, event.data.req_id);
218
224
  });
219
225
 
220
226
  serverManager.on('query-unsubscribe', event => {
@@ -226,7 +232,7 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
226
232
  // const client = clients.get(socket.id);
227
233
  delete client.realtimeQueries[event.data.query_id];
228
234
 
229
- acknowlegdeRequest(event.socket, event.data.req_id);
235
+ acknowledgeRequest(event.socket, event.data.req_id);
230
236
  });
231
237
 
232
238
  const TRANSACTION_TIMEOUT_MS = 10000; // 10s to finish a started transaction
@@ -234,7 +240,10 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
234
240
  serverManager.on('transaction-start', event => {
235
241
  // Start transaction
236
242
  const client = getClientBySocketId(event.socket_id, 'transaction-start');
237
- if (!client) { return; }
243
+ if (!client || !event.data) { return; }
244
+
245
+ const LOG_ACTION = 'socket.transaction.start';
246
+ const LOG_DETAILS = { ip: event.socket.conn.remoteAddress, uid: client.user?.uid ?? null, path: event.data.path };
238
247
 
239
248
  env.debug.verbose(`Client ${event.socket_id} is sending transaction start request on path "${event.data.path}"`);
240
249
  const data = event.data;
@@ -247,12 +256,15 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
247
256
  timeout: setTimeout(() => {
248
257
  delete client.transactions[tx.id];
249
258
  tx.finish(); // Finish without value cancels the transaction
259
+ env.log.error(LOG_ACTION, 'timeout', LOG_DETAILS);
250
260
  serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: 'timeout' });
251
261
  }, TRANSACTION_TIMEOUT_MS)
252
262
  };
253
263
 
254
- if (!env.rules.userHasAccess(client.user, data.path, true)) {
264
+ const access = env.rules.userHasAccess(client.user, data.path, true);
265
+ if (!access.allow) {
255
266
  // throw new AccessDeniedError(`access_denied`);
267
+ env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
256
268
  return serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: 'access_denied' });
257
269
  }
258
270
 
@@ -282,38 +294,43 @@ export const addWebsocketServer = (env: RouteInitEnvironment) => {
282
294
  serverManager.on('transaction-finish', async event => {
283
295
  // Finish transaction
284
296
  const client = getClientBySocketId(event.socket_id, 'transaction-finish');
285
- if (!client) { return; }
297
+ if (!client || !event.data) { return; }
298
+
299
+ const LOG_ACTION = 'socket.transaction.finish';
300
+ const LOG_DETAILS = { ip: event.socket.conn.remoteAddress, uid: client.user?.uid ?? null, path: event.data.path };
286
301
 
287
302
  const data = event.data;
288
303
  const tx = client.transactions[data.id];
289
304
 
290
305
  try {
291
306
  if (!tx || data.path !== tx.path) {
292
- throw new Error('transaction_not_found');
307
+ env.log.error(LOG_ACTION, tx ? 'wrong_path' : 'not_found', { ...LOG_DETAILS, id: data.id, tx_path: tx?.path ?? null });
308
+ throw new SocketRequestError('transaction_not_found', 'Transaction not found');
293
309
  }
294
310
 
295
311
  clearTimeout(tx.timeout);
296
312
  delete client.transactions[data.id];
297
313
 
298
- if (!env.rules.userHasAccess(client.user, data.path, true)) {
299
- throw new Error('access_denied');
314
+ const access = env.rules.userHasAccess(client.user, data.path, true);
315
+ if (!access.allow) {
316
+ env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
317
+ throw new SocketRequestError('access_denied', 'Access denied');
300
318
  }
301
319
 
302
- const newValue = Transport.deserialize(data.value);
303
- try {
304
- await tx.finish(newValue);
305
- env.debug.verbose(`Transaction ${tx.id} finished`);
306
- serverManager.send(event.socket, 'tx_completed', { id: tx.id });
307
- }
308
- catch (err) {
309
- serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.message });
310
- }
320
+ const newValue = 'val' in data.value ? Transport.deserialize(data.value) : undefined;
321
+ const { cursor } = await tx.finish(newValue);
322
+ env.debug.verbose(`Transaction ${tx.id} finished`);
323
+ serverManager.send(event.socket, 'tx_completed', { id: tx.id, context: { cursor } });
311
324
  }
312
325
  catch (err) {
313
- serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.message, data });
326
+ if (!(err instanceof SocketRequestError)) {
327
+ // Other errors have been logged already
328
+ env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
329
+ }
330
+ serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.code ?? err.message, data });
314
331
  tx.finish(); // Finish with undefined, canceling the transaction
315
332
  }
316
-
333
+
317
334
  });
318
335
 
319
336
  return serverManager;
@@ -31,7 +31,7 @@ export abstract class WebSocketManager<SocketType> extends SimpleEventEmitter {
31
31
  }
32
32
 
33
33
  emit(event: 'connect', data: WebSocketEventData<SocketType>): void;
34
- emit(event: 'disconnect', data: WebSocketEventData<SocketType>): void;
34
+ emit(event: 'disconnect', data: WebSocketEventData<SocketType, string>): void;
35
35
  /** @deprecated deprecated since client v0.9.4 */
36
36
  emit(event: 'signin', data: WebSocketEventData<SocketType, { accessToken: string }>): void;
37
37
  /** @deprecated deprecated since client v0.9.4 */
@@ -1,5 +1,8 @@
1
- import * as socketIO from 'socket.io';
2
- const createSocketIOServer = (socketIO as any).default ?? socketIO; // ESM and CJS compatible approach
1
+ import { Server as SocketIOServer } from 'socket.io';
2
+ import type { ServerOptions as SocketIOServerOptions } from 'socket.io';
3
+ const createSocketIOServer = (httpServer: any, options: Partial<SocketIOServerOptions>) => {
4
+ return new SocketIOServer(httpServer, options);
5
+ }
3
6
 
4
7
  import type { Socket } from 'socket.io';
5
8
  import { RouteInitEnvironment } from '../shared/env';
@@ -42,15 +45,11 @@ export const createServer = (env: RouteInitEnvironment) => {
42
45
  pingTimeout: 5000, // socket.io 2.x default is 5000, 3.x default = 20000
43
46
  maxHttpBufferSize: maxPayloadBytes,
44
47
 
45
- // socket.io 2.x:
46
- handlePreflightRequest: (req, res) => {
47
- const headers = getCorsHeaders(env.config.allowOrigin, req.headers.origin);
48
- res.writeHead(200, headers);
49
- res.end();
50
- }
48
+ // Allow socket.io 2.x clients (using engine.io 3.x):
49
+ allowEIO3: true,
51
50
 
52
51
  // socket.io 3+ uses cors package:
53
- // cors: getCorsOptions(env.config.allowOrigin)
52
+ cors: getCorsOptions(env.config.allowOrigin)
54
53
  });
55
54
 
56
55
  // Setup event emitter for communication with consuming server
@@ -64,7 +63,7 @@ export const createServer = (env: RouteInitEnvironment) => {
64
63
  manager.emit('connect', { socket, socket_id: socket.id });
65
64
 
66
65
  // Pass any events to manager
67
- socket.on('disconnect', data => manager.emit('disconnect', { socket, socket_id: socket.id, data }));
66
+ socket.on('disconnect', reason => manager.emit('disconnect', { socket, socket_id: socket.id, data: reason }));
68
67
  socket.on('reconnect', data => manager.emit('connect', { socket, socket_id: socket.id, data }));
69
68
  socket.on('signin', accessToken => manager.emit('signin', { socket, socket_id: socket.id, data: { accessToken } }));
70
69
  socket.on('signout', data => manager.emit('signout', { socket, socket_id: socket.id, data }));