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.
- package/dist/cjs/index.js +16 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/logger.js +74 -0
- package/dist/cjs/logger.js.map +1 -0
- package/dist/cjs/middleware/admin-only.js +29 -0
- package/dist/cjs/middleware/admin-only.js.map +1 -0
- package/dist/cjs/middleware/user.js +4 -4
- package/dist/cjs/middleware/user.js.map +1 -1
- package/dist/cjs/oauth-providers/dropbox.js +3 -2
- package/dist/cjs/oauth-providers/dropbox.js.map +1 -1
- package/dist/cjs/oauth-providers/facebook.js +3 -2
- package/dist/cjs/oauth-providers/facebook.js.map +1 -1
- package/dist/cjs/oauth-providers/google.js +3 -2
- package/dist/cjs/oauth-providers/google.js.map +1 -1
- package/dist/cjs/oauth-providers/index.js.map +1 -1
- package/dist/cjs/oauth-providers/instagram.js +3 -2
- package/dist/cjs/oauth-providers/instagram.js.map +1 -1
- package/dist/cjs/oauth-providers/oauth-provider.js +23 -0
- package/dist/cjs/oauth-providers/oauth-provider.js.map +1 -1
- package/dist/cjs/oauth-providers/spotify.js +3 -2
- package/dist/cjs/oauth-providers/spotify.js.map +1 -1
- package/dist/cjs/routes/auth-change-password.js +7 -4
- package/dist/cjs/routes/auth-change-password.js.map +1 -1
- package/dist/cjs/routes/auth-delete.js +9 -7
- package/dist/cjs/routes/auth-delete.js.map +1 -1
- package/dist/cjs/routes/auth-forgot-password.js +9 -6
- package/dist/cjs/routes/auth-forgot-password.js.map +1 -1
- package/dist/cjs/routes/auth-reset-password.js +5 -3
- package/dist/cjs/routes/auth-reset-password.js.map +1 -1
- package/dist/cjs/routes/auth-signout.js +6 -4
- package/dist/cjs/routes/auth-signout.js.map +1 -1
- package/dist/cjs/routes/auth-signup.js +17 -15
- package/dist/cjs/routes/auth-signup.js.map +1 -1
- package/dist/cjs/routes/auth-update.js +9 -6
- package/dist/cjs/routes/auth-update.js.map +1 -1
- package/dist/cjs/routes/auth-verify-email.js +6 -3
- package/dist/cjs/routes/auth-verify-email.js.map +1 -1
- package/dist/cjs/routes/data-index-create.js +3 -5
- package/dist/cjs/routes/data-index-create.js.map +1 -1
- package/dist/cjs/routes/data-index-delete.js +2 -4
- package/dist/cjs/routes/data-index-delete.js.map +1 -1
- package/dist/cjs/routes/data-index-list.js +2 -4
- package/dist/cjs/routes/data-index-list.js.map +1 -1
- package/dist/cjs/routes/data-reflect.js +2 -4
- package/dist/cjs/routes/data-reflect.js.map +1 -1
- package/dist/cjs/routes/data-schema-get.js +2 -4
- package/dist/cjs/routes/data-schema-get.js.map +1 -1
- package/dist/cjs/routes/data-schema-set.js +2 -4
- package/dist/cjs/routes/data-schema-set.js.map +1 -1
- package/dist/cjs/routes/data-schema-test.js +2 -4
- package/dist/cjs/routes/data-schema-test.js.map +1 -1
- package/dist/cjs/routes/data-schemas-list.js +2 -4
- package/dist/cjs/routes/data-schemas-list.js.map +1 -1
- package/dist/cjs/routes/data-set.js +11 -7
- package/dist/cjs/routes/data-set.js.map +1 -1
- package/dist/cjs/routes/data-sync-changes.js.map +1 -1
- package/dist/cjs/routes/data-sync-mutations.js.map +1 -1
- package/dist/cjs/routes/data-transaction.js +30 -10
- package/dist/cjs/routes/data-transaction.js.map +1 -1
- package/dist/cjs/routes/data-update.js +11 -6
- package/dist/cjs/routes/data-update.js.map +1 -1
- package/dist/cjs/routes/meta-info.js.map +1 -1
- package/dist/cjs/routes/meta-logs.js +50 -0
- package/dist/cjs/routes/meta-logs.js.map +1 -0
- package/dist/cjs/routes/meta.js +3 -0
- package/dist/cjs/routes/meta.js.map +1 -1
- package/dist/cjs/routes/oauth2-signin.js +15 -11
- package/dist/cjs/routes/oauth2-signin.js.map +1 -1
- package/dist/cjs/rules.js +5 -5
- package/dist/cjs/rules.js.map +1 -1
- package/dist/cjs/server.js +6 -4
- package/dist/cjs/server.js.map +1 -1
- package/dist/cjs/settings/index.js +6 -7
- package/dist/cjs/settings/index.js.map +1 -1
- package/dist/cjs/shared/clients.js.map +1 -1
- package/dist/cjs/shared/env.js.map +1 -1
- package/dist/cjs/shared/http.js.map +1 -1
- package/dist/cjs/shared/signin.js +8 -3
- package/dist/cjs/shared/signin.js.map +1 -1
- package/dist/cjs/start.js +3 -0
- package/dist/cjs/start.js.map +1 -1
- package/dist/cjs/websocket/index.js +43 -24
- package/dist/cjs/websocket/index.js.map +1 -1
- package/dist/cjs/websocket/socket.io.js +8 -11
- package/dist/cjs/websocket/socket.io.js.map +1 -1
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/logger.js +52 -0
- package/dist/esm/logger.js.map +1 -0
- package/dist/esm/middleware/admin-only.js +25 -0
- package/dist/esm/middleware/admin-only.js.map +1 -0
- package/dist/esm/middleware/user.js +4 -4
- package/dist/esm/middleware/user.js.map +1 -1
- package/dist/esm/oauth-providers/dropbox.js +3 -2
- package/dist/esm/oauth-providers/dropbox.js.map +1 -1
- package/dist/esm/oauth-providers/facebook.js +3 -2
- package/dist/esm/oauth-providers/facebook.js.map +1 -1
- package/dist/esm/oauth-providers/google.js +3 -2
- package/dist/esm/oauth-providers/google.js.map +1 -1
- package/dist/esm/oauth-providers/index.js.map +1 -1
- package/dist/esm/oauth-providers/instagram.js +3 -2
- package/dist/esm/oauth-providers/instagram.js.map +1 -1
- package/dist/esm/oauth-providers/oauth-provider.js +21 -1
- package/dist/esm/oauth-providers/oauth-provider.js.map +1 -1
- package/dist/esm/oauth-providers/spotify.js +3 -2
- package/dist/esm/oauth-providers/spotify.js.map +1 -1
- package/dist/esm/routes/auth-change-password.js +6 -3
- package/dist/esm/routes/auth-change-password.js.map +1 -1
- package/dist/esm/routes/auth-delete.js +7 -5
- package/dist/esm/routes/auth-delete.js.map +1 -1
- package/dist/esm/routes/auth-forgot-password.js +8 -6
- package/dist/esm/routes/auth-forgot-password.js.map +1 -1
- package/dist/esm/routes/auth-reset-password.js +4 -2
- package/dist/esm/routes/auth-reset-password.js.map +1 -1
- package/dist/esm/routes/auth-signout.js +4 -2
- package/dist/esm/routes/auth-signout.js.map +1 -1
- package/dist/esm/routes/auth-signup.js +12 -10
- package/dist/esm/routes/auth-signup.js.map +1 -1
- package/dist/esm/routes/auth-update.js +8 -6
- package/dist/esm/routes/auth-update.js.map +1 -1
- package/dist/esm/routes/auth-verify-email.js +6 -2
- package/dist/esm/routes/auth-verify-email.js.map +1 -1
- package/dist/esm/routes/data-index-create.js +4 -6
- package/dist/esm/routes/data-index-create.js.map +1 -1
- package/dist/esm/routes/data-index-delete.js +3 -5
- package/dist/esm/routes/data-index-delete.js.map +1 -1
- package/dist/esm/routes/data-index-list.js +3 -5
- package/dist/esm/routes/data-index-list.js.map +1 -1
- package/dist/esm/routes/data-reflect.js +1 -4
- package/dist/esm/routes/data-reflect.js.map +1 -1
- package/dist/esm/routes/data-schema-get.js +3 -5
- package/dist/esm/routes/data-schema-get.js.map +1 -1
- package/dist/esm/routes/data-schema-set.js +3 -5
- package/dist/esm/routes/data-schema-set.js.map +1 -1
- package/dist/esm/routes/data-schema-test.js +3 -5
- package/dist/esm/routes/data-schema-test.js.map +1 -1
- package/dist/esm/routes/data-schemas-list.js +3 -5
- package/dist/esm/routes/data-schemas-list.js.map +1 -1
- package/dist/esm/routes/data-set.js +9 -5
- package/dist/esm/routes/data-set.js.map +1 -1
- package/dist/esm/routes/data-sync-changes.js.map +1 -1
- package/dist/esm/routes/data-sync-mutations.js.map +1 -1
- package/dist/esm/routes/data-transaction.js +28 -8
- package/dist/esm/routes/data-transaction.js.map +1 -1
- package/dist/esm/routes/data-update.js +9 -4
- package/dist/esm/routes/data-update.js.map +1 -1
- package/dist/esm/routes/meta-info.js.map +1 -1
- package/dist/esm/routes/meta-logs.js +36 -0
- package/dist/esm/routes/meta-logs.js.map +1 -0
- package/dist/esm/routes/meta.js +3 -0
- package/dist/esm/routes/meta.js.map +1 -1
- package/dist/esm/routes/oauth2-signin.js +14 -10
- package/dist/esm/routes/oauth2-signin.js.map +1 -1
- package/dist/esm/rules.js +5 -5
- package/dist/esm/rules.js.map +1 -1
- package/dist/esm/server.js +6 -4
- package/dist/esm/server.js.map +1 -1
- package/dist/esm/settings/index.js +5 -6
- package/dist/esm/settings/index.js.map +1 -1
- package/dist/esm/shared/clients.js.map +1 -1
- package/dist/esm/shared/env.js.map +1 -1
- package/dist/esm/shared/http.js.map +1 -1
- package/dist/esm/shared/signin.js +7 -3
- package/dist/esm/shared/signin.js.map +1 -1
- package/dist/esm/start.js +3 -0
- package/dist/esm/start.js.map +1 -1
- package/dist/esm/websocket/index.js +38 -23
- package/dist/esm/websocket/index.js.map +1 -1
- package/dist/esm/websocket/socket.io.js +9 -11
- package/dist/esm/websocket/socket.io.js.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/logger.d.ts +35 -0
- package/dist/types/middleware/admin-only.d.ts +19 -0
- package/dist/types/oauth-providers/dropbox.d.ts +3 -14
- package/dist/types/oauth-providers/facebook.d.ts +3 -7
- package/dist/types/oauth-providers/google.d.ts +3 -7
- package/dist/types/oauth-providers/index.d.ts +2 -10
- package/dist/types/oauth-providers/instagram.d.ts +3 -7
- package/dist/types/oauth-providers/oauth-provider.d.ts +25 -21
- package/dist/types/oauth-providers/spotify.d.ts +3 -7
- package/dist/types/routes/data-query.d.ts +1 -1
- package/dist/types/routes/meta-logs.d.ts +20 -0
- package/dist/types/rules.d.ts +4 -4
- package/dist/types/server.d.ts +9 -7
- package/dist/types/settings/email.d.ts +1 -1
- package/dist/types/settings/index.d.ts +5 -6
- package/dist/types/shared/clients.d.ts +3 -1
- package/dist/types/shared/env.d.ts +6 -4
- package/dist/types/shared/http.d.ts +2 -0
- package/dist/types/shared/signin.d.ts +1 -1
- package/dist/types/websocket/index.d.ts +4 -0
- package/dist/types/websocket/manager.d.ts +1 -1
- package/package.json +12 -11
- package/src/index.ts +3 -1
- package/src/logger.ts +56 -0
- package/src/middleware/admin-only.ts +29 -0
- package/src/middleware/user.ts +4 -4
- package/src/oauth-providers/dropbox.ts +5 -4
- package/src/oauth-providers/facebook.ts +5 -4
- package/src/oauth-providers/google.ts +5 -4
- package/src/oauth-providers/index.ts +2 -1
- package/src/oauth-providers/instagram.ts +5 -4
- package/src/oauth-providers/oauth-provider.ts +14 -4
- package/src/oauth-providers/spotify.ts +5 -4
- package/src/placeholder.d.ts +12 -0
- package/src/routes/auth-change-password.ts +6 -3
- package/src/routes/auth-delete.ts +7 -5
- package/src/routes/auth-forgot-password.ts +10 -6
- package/src/routes/auth-reset-password.ts +5 -2
- package/src/routes/auth-signout.ts +5 -2
- package/src/routes/auth-signup.ts +13 -10
- package/src/routes/auth-update.ts +8 -6
- package/src/routes/auth-verify-email.ts +11 -3
- package/src/routes/data-index-create.ts +4 -7
- package/src/routes/data-index-delete.ts +3 -6
- package/src/routes/data-index-list.ts +3 -6
- package/src/routes/data-query.ts +1 -1
- package/src/routes/data-reflect.ts +1 -4
- package/src/routes/data-schema-get.ts +3 -5
- package/src/routes/data-schema-set.ts +3 -6
- package/src/routes/data-schema-test.ts +3 -6
- package/src/routes/data-schemas-list.ts +3 -5
- package/src/routes/data-set.ts +14 -6
- package/src/routes/data-set.yaml +7 -1
- package/src/routes/data-sync-changes.ts +1 -1
- package/src/routes/data-sync-mutations.ts +1 -1
- package/src/routes/data-transaction-finish.yaml +6 -0
- package/src/routes/data-transaction.ts +35 -11
- package/src/routes/data-update.ts +12 -4
- package/src/routes/data-update.yaml +7 -1
- package/src/routes/meta-info.ts +1 -1
- package/src/routes/meta-logs.ts +57 -0
- package/src/routes/meta.ts +4 -0
- package/src/routes/oauth2-signin.ts +17 -12
- package/src/rules.ts +8 -8
- package/src/server.ts +13 -9
- package/src/settings/email.ts +1 -1
- package/src/settings/index.ts +7 -7
- package/src/shared/clients.ts +1 -1
- package/src/shared/env.ts +5 -4
- package/src/shared/http.ts +2 -0
- package/src/shared/signin.ts +10 -4
- package/src/start.ts +3 -0
- package/src/websocket/index.ts +41 -24
- package/src/websocket/manager.ts +1 -1
- package/src/websocket/socket.io.ts +9 -10
- package/webmanager/acebase-client-browser.min.js +16 -0
- package/webmanager/index.html +2 -2
- package/webmanager/index.js +3 -6
- package/.vscode/launch.json +0 -24
package/src/shared/signin.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { decodePublicAccessToken } from "./tokens";
|
|
|
6
6
|
|
|
7
7
|
export type SignInCredentials =
|
|
8
8
|
{ method: 'token'; access_token: string } |
|
|
9
|
-
{ method: '
|
|
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 '
|
|
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
|
-
|
|
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.
|
|
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`);
|
package/src/websocket/index.ts
CHANGED
|
@@ -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
|
|
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
|
|
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.
|
|
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
|
-
|
|
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
|
|
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
|
|
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
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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
|
-
|
|
299
|
-
|
|
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
|
-
|
|
304
|
-
|
|
305
|
-
|
|
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
|
-
|
|
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;
|
package/src/websocket/manager.ts
CHANGED
|
@@ -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
|
|
2
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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',
|
|
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 }));
|