@owlmeans/socket 0.1.18-rc.25 → 0.1.18-rc.27
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/README.md +2 -2
- package/agent-meta/manifest.json +2 -2
- package/agent-meta/skills/socket/SKILL.md +6 -1
- package/build/model.d.ts.map +1 -1
- package/build/model.js +125 -102
- package/build/model.js.map +1 -1
- package/build/types.d.ts +5 -0
- package/build/types.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/model.ts +130 -98
- package/src/types.ts +6 -0
- package/tests/model.spec.ts +59 -0
- package/tsconfig.json +1 -1
package/README.md
CHANGED
|
@@ -12,7 +12,7 @@ Shared WebSocket connection types and message protocol for OwlMeans real-time co
|
|
|
12
12
|
## Installation
|
|
13
13
|
|
|
14
14
|
```bash
|
|
15
|
-
bun add @owlmeans/socket@^0.1.18-rc.
|
|
15
|
+
bun add @owlmeans/socket@^0.1.18-rc.27
|
|
16
16
|
```
|
|
17
17
|
|
|
18
18
|
## Usage
|
|
@@ -91,7 +91,7 @@ This package ships embedded agent skills under `agent-meta/`. After installing y
|
|
|
91
91
|
your project's skill store (`.agents/skills/`):
|
|
92
92
|
|
|
93
93
|
```sh
|
|
94
|
-
npx @owlmeans/agent-skills@^0.1.18-rc.
|
|
94
|
+
npx @owlmeans/agent-skills@^0.1.18-rc.31
|
|
95
95
|
```
|
|
96
96
|
|
|
97
97
|
The embedded files are version-matched to this package release. Do not edit them
|
package/agent-meta/manifest.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 2,
|
|
3
3
|
"package": "@owlmeans/socket",
|
|
4
|
-
"version": "0.1.18-rc.
|
|
5
|
-
"generatedAt": "2026-09-
|
|
4
|
+
"version": "0.1.18-rc.27",
|
|
5
|
+
"generatedAt": "2026-09-21T21:54:22.959Z",
|
|
6
6
|
"canonicalRepo": "https://github.com/owlmeans/common",
|
|
7
7
|
"entries": [
|
|
8
8
|
{
|
|
@@ -8,7 +8,7 @@ user-invocable: false
|
|
|
8
8
|
# @owlmeans/socket
|
|
9
9
|
|
|
10
10
|
**Layer:** Core
|
|
11
|
-
**Install:** `"@owlmeans/socket": "^0.1.18-rc.
|
|
11
|
+
**Install:** `"@owlmeans/socket": "^0.1.18-rc.27"` in `dependencies`
|
|
12
12
|
|
|
13
13
|
Contracts and one implementation-free connection model. It knows nothing about WebSockets: the
|
|
14
14
|
browser side is `@owlmeans/client-socket`, the Fastify side `@owlmeans/server-socket`, and each
|
|
@@ -121,6 +121,11 @@ null stage and is rebuilt by the initiator. `connection.stage` holds the current
|
|
|
121
121
|
`AuthenticationStage` throughout. Only the server carrier implements a real sequence; see the
|
|
122
122
|
`server-socket` skill.
|
|
123
123
|
|
|
124
|
+
Raw inbound data is parsed and structurally checked before dispatch. A server connection may accept
|
|
125
|
+
only authentication frames until its carrier marks it authenticated; an unknown call returns a
|
|
126
|
+
typed socket error, and listener failures are isolated and logged so an EventEmitter never receives
|
|
127
|
+
an unhandled rejected promise. Keep sensitive actions behind the carrier's authentication stage.
|
|
128
|
+
|
|
124
129
|
## Depends On
|
|
125
130
|
|
|
126
131
|
- `@owlmeans/error` — `ResilientError`, which every socket error registers with
|
package/build/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAC2C,UAAU,EAEhE,MAAM,YAAY,CAAA;AAInB,eAAO,MAAM,qBAAqB,QAAO,UA+
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAC2C,UAAU,EAEhE,MAAM,YAAY,CAAA;AAInB,eAAO,MAAM,qBAAqB,QAAO,UA+XxC,CAAA"}
|
package/build/model.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ResilientError } from '@owlmeans/error';
|
|
2
2
|
import { CALL_TIMEOUT, MessageType } from './consts.js';
|
|
3
|
-
import { SocketMessageMalformed, SocketTimeout } from './errors.js';
|
|
3
|
+
import { SocketMessageMalformed, SocketTimeout, SocketUnauthorized, SocketUnsupported } from './errors.js';
|
|
4
4
|
import { uuid } from '@owlmeans/basic-ids';
|
|
5
5
|
import { AuthenticationStage, AuthError } from '@owlmeans/auth';
|
|
6
6
|
export const createBasicConnection = () => {
|
|
@@ -149,122 +149,145 @@ export const createBasicConnection = () => {
|
|
|
149
149
|
return [msg.payload, msg.id, queue.length];
|
|
150
150
|
},
|
|
151
151
|
receive: async (message) => {
|
|
152
|
-
if (message.startsWith('{')
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
152
|
+
if (!message.startsWith('{') && !message.startsWith('[')) {
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
let parsed;
|
|
156
|
+
try {
|
|
157
|
+
parsed = JSON.parse(message);
|
|
158
|
+
}
|
|
159
|
+
catch {
|
|
160
|
+
throw new SocketMessageMalformed('json');
|
|
161
|
+
}
|
|
162
|
+
if (parsed == null || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
163
|
+
throw new SocketMessageMalformed('shape');
|
|
164
|
+
}
|
|
165
|
+
const msg = parsed;
|
|
166
|
+
if (msg.payload == null) {
|
|
167
|
+
msg.payload = parsed;
|
|
168
|
+
}
|
|
169
|
+
if (msg.type == null) {
|
|
170
|
+
msg.type = MessageType.Message;
|
|
171
|
+
}
|
|
172
|
+
if (!Object.values(MessageType).includes(msg.type)) {
|
|
173
|
+
throw new SocketMessageMalformed('type');
|
|
174
|
+
}
|
|
175
|
+
// System frames belong to the carrier lifecycle and are never accepted from the wire.
|
|
176
|
+
if (msg.type === MessageType.System) {
|
|
177
|
+
throw new SocketMessageMalformed('system');
|
|
178
|
+
}
|
|
179
|
+
if (conn.requiresAuthentication === true
|
|
180
|
+
&& conn.stage !== AuthenticationStage.Authenticated
|
|
181
|
+
&& msg.type !== MessageType.Auth) {
|
|
182
|
+
throw new SocketUnauthorized('stage');
|
|
183
|
+
}
|
|
184
|
+
msg.rawData = message;
|
|
185
|
+
conn.prepare?.(msg, true);
|
|
186
|
+
try {
|
|
187
|
+
switch (msg.type) {
|
|
188
|
+
case MessageType.Call:
|
|
189
|
+
await conn._receiveCall(msg);
|
|
190
|
+
break;
|
|
191
|
+
case MessageType.Result:
|
|
192
|
+
await conn._receiveResult(msg);
|
|
193
|
+
break;
|
|
194
|
+
case MessageType.Error:
|
|
195
|
+
await conn._receiveError(msg);
|
|
196
|
+
break;
|
|
197
|
+
case MessageType.Request:
|
|
198
|
+
await conn._receiveRequest(msg);
|
|
199
|
+
break;
|
|
200
|
+
case MessageType.Response:
|
|
201
|
+
await conn._receiveResponse(msg);
|
|
202
|
+
break;
|
|
203
|
+
case MessageType.Event:
|
|
204
|
+
await conn._receiveEvent(msg);
|
|
205
|
+
break;
|
|
206
|
+
case MessageType.Message:
|
|
207
|
+
await conn._receiveMessage(msg);
|
|
208
|
+
break;
|
|
209
|
+
case MessageType.Auth: {
|
|
210
|
+
const authMessage = msg;
|
|
211
|
+
if (conn._authSequence != null) {
|
|
212
|
+
if (authMessage.stage == null) {
|
|
213
|
+
conn._authSequence.reject(ResilientError.ensure(authMessage.payload ?? new AuthError('socket:unknown')));
|
|
187
214
|
}
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
215
|
+
else {
|
|
216
|
+
conn.stage = authMessage.stage;
|
|
217
|
+
conn._authSequence.resolve(authMessage.payload);
|
|
191
218
|
}
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
219
|
+
conn._authSequence = undefined;
|
|
220
|
+
}
|
|
221
|
+
else {
|
|
222
|
+
try {
|
|
223
|
+
const [stage, response] = await conn.authenticate(authMessage.stage, authMessage.payload);
|
|
224
|
+
if (stage != null) {
|
|
225
|
+
void conn.auth(stage, response).catch(error => {
|
|
226
|
+
console.error('Error sending socket authentication response:', error);
|
|
227
|
+
});
|
|
228
|
+
}
|
|
195
229
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
230
|
+
catch (error) {
|
|
231
|
+
void conn.auth(null, ResilientError.marshal(ResilientError.ensure(error))).catch(sendError => {
|
|
232
|
+
console.error('Error sending socket authentication error:', sendError);
|
|
233
|
+
});
|
|
199
234
|
}
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
if (conn._authSequence != null) {
|
|
203
|
-
if (_msg.stage == null) {
|
|
204
|
-
conn._authSequence.reject(ResilientError.ensure(_msg.payload ?? new AuthError('socket:unknown')));
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
conn.stage = _msg.stage;
|
|
208
|
-
conn._authSequence.resolve(_msg.payload);
|
|
209
|
-
}
|
|
210
|
-
conn._authSequence = undefined;
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
213
|
-
try {
|
|
214
|
-
const [stage, response] = await conn.authenticate(_msg.stage, _msg.payload);
|
|
215
|
-
if (stage != null) {
|
|
216
|
-
conn.auth(stage, response).finally(() => void 0);
|
|
217
|
-
}
|
|
218
|
-
}
|
|
219
|
-
catch (e) {
|
|
220
|
-
conn.auth(null, ResilientError.marshal(ResilientError.ensure(e))).finally(() => void 0);
|
|
221
|
-
}
|
|
222
|
-
finally {
|
|
223
|
-
conn._authSequence = undefined;
|
|
224
|
-
}
|
|
225
|
-
}
|
|
226
|
-
break;
|
|
235
|
+
finally {
|
|
236
|
+
conn._authSequence = undefined;
|
|
227
237
|
}
|
|
228
238
|
}
|
|
229
|
-
|
|
230
|
-
catch (e) {
|
|
231
|
-
console.error('Error on message processing:', e);
|
|
232
|
-
throw ResilientError.ensure(e);
|
|
239
|
+
break;
|
|
233
240
|
}
|
|
234
241
|
}
|
|
235
|
-
await Promise.all(listeners.map(async (listener) => listener(msg)));
|
|
236
242
|
}
|
|
243
|
+
catch (error) {
|
|
244
|
+
throw ResilientError.ensure(error);
|
|
245
|
+
}
|
|
246
|
+
// A consumer listener is an observation hook, not part of dispatch. One rejecting listener
|
|
247
|
+
// must neither skip its peers nor reject the transport event callback.
|
|
248
|
+
await Promise.all(listeners.map(async (listener) => {
|
|
249
|
+
try {
|
|
250
|
+
await listener(msg);
|
|
251
|
+
}
|
|
252
|
+
catch (error) {
|
|
253
|
+
console.error('Socket listener error:', error);
|
|
254
|
+
}
|
|
255
|
+
}));
|
|
237
256
|
},
|
|
238
257
|
_receiveCall: async (msg) => {
|
|
258
|
+
if (msg.id == null) {
|
|
259
|
+
throw new SocketMessageMalformed('call:id');
|
|
260
|
+
}
|
|
261
|
+
if (typeof msg.method !== 'string' || msg.method.length === 0 || !Array.isArray(msg.payload)) {
|
|
262
|
+
throw new SocketMessageMalformed('call');
|
|
263
|
+
}
|
|
239
264
|
let cancel = false;
|
|
240
|
-
callPerformers[msg.method](...msg.payload)
|
|
241
|
-
.then(async (result) => {
|
|
242
|
-
if (cancel) {
|
|
243
|
-
return;
|
|
244
|
-
}
|
|
245
|
-
clearTimeout(timeout);
|
|
246
|
-
const resultMsg = {
|
|
247
|
-
id: msg.id,
|
|
248
|
-
type: MessageType.Result,
|
|
249
|
-
payload: result
|
|
250
|
-
};
|
|
251
|
-
await conn.send(resultMsg);
|
|
252
|
-
}).catch(async (error) => {
|
|
253
|
-
console.error('Error during the call:', error);
|
|
254
|
-
if (cancel) {
|
|
255
|
-
return;
|
|
256
|
-
}
|
|
257
|
-
clearTimeout(timeout);
|
|
258
|
-
const response = {
|
|
259
|
-
id: msg.id,
|
|
260
|
-
type: MessageType.Error,
|
|
261
|
-
payload: ResilientError.ensure(error).marshal().message
|
|
262
|
-
};
|
|
263
|
-
await conn.send(response);
|
|
264
|
-
});
|
|
265
265
|
msg.timeout = msg.timeout ?? conn.defaultCallTimeout ?? CALL_TIMEOUT;
|
|
266
266
|
const timeout = setTimeout(() => { if (msg.timeout !== 0)
|
|
267
267
|
cancel = true; }, msg.timeout);
|
|
268
|
+
try {
|
|
269
|
+
const performer = callPerformers[msg.method];
|
|
270
|
+
if (performer == null) {
|
|
271
|
+
throw new SocketUnsupported(`call:${msg.method}`);
|
|
272
|
+
}
|
|
273
|
+
const result = await performer(...msg.payload);
|
|
274
|
+
if (!cancel) {
|
|
275
|
+
await conn.send({ id: msg.id, type: MessageType.Result, payload: result });
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
catch (error) {
|
|
279
|
+
if (!cancel) {
|
|
280
|
+
const resilient = ResilientError.ensure(error);
|
|
281
|
+
await conn.send({
|
|
282
|
+
id: msg.id,
|
|
283
|
+
type: MessageType.Error,
|
|
284
|
+
payload: resilient.marshal().message
|
|
285
|
+
});
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
finally {
|
|
289
|
+
clearTimeout(timeout);
|
|
290
|
+
}
|
|
268
291
|
},
|
|
269
292
|
_receiveResult: async (msg) => {
|
|
270
293
|
if (msg.id == null) {
|
package/build/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
package/build/types.d.ts
CHANGED
|
@@ -5,6 +5,11 @@ export interface Connection {
|
|
|
5
5
|
defaultCallTimeout?: number;
|
|
6
6
|
_authSequence?: CallResolver<any>;
|
|
7
7
|
stage: AuthenticationStage;
|
|
8
|
+
/**
|
|
9
|
+
* When enabled by a server carrier, only authentication frames are accepted until the
|
|
10
|
+
* connection reaches `AuthenticationStage.Authenticated`.
|
|
11
|
+
*/
|
|
12
|
+
requiresAuthentication?: boolean;
|
|
8
13
|
notify: <T>(event: string, payload: T) => Promise<void>;
|
|
9
14
|
observe: <T>(event: string, handler: (event: EventMessage<T>) => Promise<void>) => () => void;
|
|
10
15
|
call: <R, T extends any[]>(method: string, ...payload: T) => Promise<R>;
|
package/build/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@owlmeans/socket",
|
|
3
|
-
"version": "0.1.18-rc.
|
|
3
|
+
"version": "0.1.18-rc.27",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
}
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@owlmeans/auth": "^0.1.18-rc.
|
|
25
|
-
"@owlmeans/basic-ids": "^0.1.18-rc.
|
|
26
|
-
"@owlmeans/error": "^0.1.18-rc.
|
|
24
|
+
"@owlmeans/auth": "^0.1.18-rc.29",
|
|
25
|
+
"@owlmeans/basic-ids": "^0.1.18-rc.28",
|
|
26
|
+
"@owlmeans/error": "^0.1.18-rc.29"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@owlmeans/dep-config": "workspace:*",
|
package/src/model.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ResilientError } from '@owlmeans/error'
|
|
2
2
|
import { CALL_TIMEOUT, MessageType } from './consts.js'
|
|
3
|
-
import { SocketMessageMalformed, SocketTimeout } from './errors.js'
|
|
3
|
+
import { SocketMessageMalformed, SocketTimeout, SocketUnauthorized, SocketUnsupported } from './errors.js'
|
|
4
4
|
import type {
|
|
5
5
|
AuthMessage, CallHendler, CallMessage, CallResolver, Connection, ConnectionListener,
|
|
6
6
|
EventMessage, Message, RequestHandler
|
|
@@ -175,116 +175,148 @@ export const createBasicConnection = (): Connection => {
|
|
|
175
175
|
},
|
|
176
176
|
|
|
177
177
|
receive: async message => {
|
|
178
|
-
if (message.startsWith('{')
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
178
|
+
if (!message.startsWith('{') && !message.startsWith('[')) {
|
|
179
|
+
return
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
let parsed: unknown
|
|
183
|
+
try {
|
|
184
|
+
parsed = JSON.parse(message)
|
|
185
|
+
} catch {
|
|
186
|
+
throw new SocketMessageMalformed('json')
|
|
187
|
+
}
|
|
188
|
+
if (parsed == null || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
189
|
+
throw new SocketMessageMalformed('shape')
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
const msg = parsed as Message<any>
|
|
193
|
+
if (msg.payload == null) {
|
|
194
|
+
msg.payload = parsed
|
|
195
|
+
}
|
|
196
|
+
if (msg.type == null) {
|
|
197
|
+
msg.type = MessageType.Message
|
|
198
|
+
}
|
|
199
|
+
if (!Object.values(MessageType).includes(msg.type)) {
|
|
200
|
+
throw new SocketMessageMalformed('type')
|
|
201
|
+
}
|
|
202
|
+
// System frames belong to the carrier lifecycle and are never accepted from the wire.
|
|
203
|
+
if (msg.type === MessageType.System) {
|
|
204
|
+
throw new SocketMessageMalformed('system')
|
|
205
|
+
}
|
|
206
|
+
if (conn.requiresAuthentication === true
|
|
207
|
+
&& conn.stage !== AuthenticationStage.Authenticated
|
|
208
|
+
&& msg.type !== MessageType.Auth) {
|
|
209
|
+
throw new SocketUnauthorized('stage')
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
msg.rawData = message
|
|
213
|
+
conn.prepare?.(msg, true)
|
|
214
|
+
|
|
215
|
+
try {
|
|
216
|
+
switch (msg.type) {
|
|
217
|
+
case MessageType.Call:
|
|
218
|
+
await conn._receiveCall(msg as CallMessage<any>)
|
|
219
|
+
break
|
|
220
|
+
case MessageType.Result:
|
|
221
|
+
await conn._receiveResult(msg)
|
|
222
|
+
break
|
|
223
|
+
case MessageType.Error:
|
|
224
|
+
await conn._receiveError(msg)
|
|
225
|
+
break
|
|
226
|
+
case MessageType.Request:
|
|
227
|
+
await conn._receiveRequest(msg)
|
|
228
|
+
break
|
|
229
|
+
case MessageType.Response:
|
|
230
|
+
await conn._receiveResponse(msg)
|
|
231
|
+
break
|
|
232
|
+
case MessageType.Event:
|
|
233
|
+
await conn._receiveEvent(msg as EventMessage<any>)
|
|
234
|
+
break
|
|
235
|
+
case MessageType.Message:
|
|
236
|
+
await conn._receiveMessage(msg)
|
|
237
|
+
break
|
|
238
|
+
case MessageType.Auth: {
|
|
239
|
+
const authMessage = msg as AuthMessage<any>
|
|
240
|
+
if (conn._authSequence != null) {
|
|
241
|
+
if (authMessage.stage == null) {
|
|
242
|
+
conn._authSequence.reject(ResilientError.ensure(
|
|
243
|
+
authMessage.payload ?? new AuthError('socket:unknown')
|
|
244
|
+
))
|
|
245
|
+
} else {
|
|
246
|
+
conn.stage = authMessage.stage
|
|
247
|
+
conn._authSequence.resolve(authMessage.payload)
|
|
224
248
|
}
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
}
|
|
234
|
-
conn._authSequence = undefined
|
|
235
|
-
} else {
|
|
236
|
-
try {
|
|
237
|
-
const [stage, response] = await conn.authenticate(_msg.stage, _msg.payload)
|
|
238
|
-
if (stage != null) {
|
|
239
|
-
conn.auth(stage, response).finally(() => void 0)
|
|
240
|
-
}
|
|
241
|
-
} catch (e) {
|
|
242
|
-
conn.auth(null as any, ResilientError.marshal(ResilientError.ensure(e as Error))).finally(() => void 0)
|
|
243
|
-
} finally {
|
|
244
|
-
conn._authSequence = undefined
|
|
245
|
-
}
|
|
249
|
+
conn._authSequence = undefined
|
|
250
|
+
} else {
|
|
251
|
+
try {
|
|
252
|
+
const [stage, response] = await conn.authenticate(authMessage.stage, authMessage.payload)
|
|
253
|
+
if (stage != null) {
|
|
254
|
+
void conn.auth(stage, response).catch(error => {
|
|
255
|
+
console.error('Error sending socket authentication response:', error)
|
|
256
|
+
})
|
|
246
257
|
}
|
|
247
|
-
|
|
258
|
+
} catch (error) {
|
|
259
|
+
void conn.auth(
|
|
260
|
+
null as any,
|
|
261
|
+
ResilientError.marshal(ResilientError.ensure(error as Error))
|
|
262
|
+
).catch(sendError => {
|
|
263
|
+
console.error('Error sending socket authentication error:', sendError)
|
|
264
|
+
})
|
|
265
|
+
} finally {
|
|
266
|
+
conn._authSequence = undefined
|
|
248
267
|
}
|
|
249
268
|
}
|
|
250
|
-
|
|
251
|
-
console.error('Error on message processing:', e)
|
|
252
|
-
throw ResilientError.ensure(e as Error)
|
|
269
|
+
break
|
|
253
270
|
}
|
|
254
271
|
}
|
|
255
|
-
|
|
272
|
+
} catch (error) {
|
|
273
|
+
throw ResilientError.ensure(error as Error)
|
|
256
274
|
}
|
|
275
|
+
|
|
276
|
+
// A consumer listener is an observation hook, not part of dispatch. One rejecting listener
|
|
277
|
+
// must neither skip its peers nor reject the transport event callback.
|
|
278
|
+
await Promise.all(listeners.map(async listener => {
|
|
279
|
+
try {
|
|
280
|
+
await listener(msg)
|
|
281
|
+
} catch (error) {
|
|
282
|
+
console.error('Socket listener error:', error)
|
|
283
|
+
}
|
|
284
|
+
}))
|
|
257
285
|
},
|
|
258
286
|
|
|
259
287
|
_receiveCall: async msg => {
|
|
288
|
+
if (msg.id == null) {
|
|
289
|
+
throw new SocketMessageMalformed('call:id')
|
|
290
|
+
}
|
|
291
|
+
if (typeof msg.method !== 'string' || msg.method.length === 0 || !Array.isArray(msg.payload)) {
|
|
292
|
+
throw new SocketMessageMalformed('call')
|
|
293
|
+
}
|
|
294
|
+
|
|
260
295
|
let cancel = false
|
|
261
|
-
callPerformers[msg.method](...msg.payload)
|
|
262
|
-
.then(async result => {
|
|
263
|
-
if (cancel) {
|
|
264
|
-
return
|
|
265
|
-
}
|
|
266
|
-
clearTimeout(timeout)
|
|
267
|
-
const resultMsg: Message<any> = {
|
|
268
|
-
id: msg.id,
|
|
269
|
-
type: MessageType.Result,
|
|
270
|
-
payload: result
|
|
271
|
-
}
|
|
272
|
-
await conn.send(resultMsg)
|
|
273
|
-
}).catch(async error => {
|
|
274
|
-
console.error('Error during the call:', error)
|
|
275
|
-
if (cancel) {
|
|
276
|
-
return
|
|
277
|
-
}
|
|
278
|
-
clearTimeout(timeout)
|
|
279
|
-
const response: Message<any> = {
|
|
280
|
-
id: msg.id,
|
|
281
|
-
type: MessageType.Error,
|
|
282
|
-
payload: ResilientError.ensure(error).marshal().message
|
|
283
|
-
}
|
|
284
|
-
await conn.send(response)
|
|
285
|
-
})
|
|
286
296
|
msg.timeout = msg.timeout ?? conn.defaultCallTimeout ?? CALL_TIMEOUT
|
|
287
297
|
const timeout = setTimeout(() => { if (msg.timeout !== 0) cancel = true }, msg.timeout)
|
|
298
|
+
|
|
299
|
+
try {
|
|
300
|
+
const performer = callPerformers[msg.method]
|
|
301
|
+
if (performer == null) {
|
|
302
|
+
throw new SocketUnsupported(`call:${msg.method}`)
|
|
303
|
+
}
|
|
304
|
+
const result = await performer(...msg.payload)
|
|
305
|
+
if (!cancel) {
|
|
306
|
+
await conn.send({ id: msg.id, type: MessageType.Result, payload: result })
|
|
307
|
+
}
|
|
308
|
+
} catch (error) {
|
|
309
|
+
if (!cancel) {
|
|
310
|
+
const resilient = ResilientError.ensure(error as Error)
|
|
311
|
+
await conn.send({
|
|
312
|
+
id: msg.id,
|
|
313
|
+
type: MessageType.Error,
|
|
314
|
+
payload: resilient.marshal().message
|
|
315
|
+
})
|
|
316
|
+
}
|
|
317
|
+
} finally {
|
|
318
|
+
clearTimeout(timeout)
|
|
319
|
+
}
|
|
288
320
|
},
|
|
289
321
|
|
|
290
322
|
_receiveResult: async msg => {
|
package/src/types.ts
CHANGED
|
@@ -9,6 +9,12 @@ export interface Connection {
|
|
|
9
9
|
|
|
10
10
|
stage: AuthenticationStage
|
|
11
11
|
|
|
12
|
+
/**
|
|
13
|
+
* When enabled by a server carrier, only authentication frames are accepted until the
|
|
14
|
+
* connection reaches `AuthenticationStage.Authenticated`.
|
|
15
|
+
*/
|
|
16
|
+
requiresAuthentication?: boolean
|
|
17
|
+
|
|
12
18
|
notify: <T>(event: string, payload: T) => Promise<void>
|
|
13
19
|
observe: <T>(event: string, handler: (event: EventMessage<T>) => Promise<void>) => () => void
|
|
14
20
|
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { describe, expect, test } from 'bun:test'
|
|
2
|
+
import { AuthenticationStage } from '@owlmeans/auth'
|
|
3
|
+
import { ResilientError } from '@owlmeans/error'
|
|
4
|
+
import {
|
|
5
|
+
createBasicConnection, MessageType, SocketMessageMalformed, SocketUnauthorized, SocketUnsupported
|
|
6
|
+
} from '../src/index.js'
|
|
7
|
+
import type { Message } from '../src/index.js'
|
|
8
|
+
|
|
9
|
+
describe('@owlmeans/socket — inbound frame boundary', () => {
|
|
10
|
+
test('rejects malformed JSON, non-object frames, and wire System frames', async () => {
|
|
11
|
+
const connection = createBasicConnection()
|
|
12
|
+
|
|
13
|
+
await expect(connection.receive('{')).rejects.toBeInstanceOf(SocketMessageMalformed)
|
|
14
|
+
await expect(connection.receive('[]')).rejects.toBeInstanceOf(SocketMessageMalformed)
|
|
15
|
+
await expect(connection.receive(JSON.stringify({
|
|
16
|
+
type: MessageType.System, event: 'close', payload: {}
|
|
17
|
+
}))).rejects.toBeInstanceOf(SocketMessageMalformed)
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
test('permits only authentication frames before a server carrier authenticates the connection', async () => {
|
|
21
|
+
const connection = createBasicConnection()
|
|
22
|
+
connection.requiresAuthentication = true
|
|
23
|
+
|
|
24
|
+
await expect(connection.receive(JSON.stringify({
|
|
25
|
+
type: MessageType.Message, payload: 'before-auth'
|
|
26
|
+
}))).rejects.toBeInstanceOf(SocketUnauthorized)
|
|
27
|
+
|
|
28
|
+
connection.stage = AuthenticationStage.Authenticated
|
|
29
|
+
await connection.receive(JSON.stringify({ type: MessageType.Message, payload: 'after-auth' }))
|
|
30
|
+
expect(connection.consume()).toEqual(['after-auth', undefined, 0])
|
|
31
|
+
})
|
|
32
|
+
|
|
33
|
+
test('answers an unknown call with a typed error instead of rejecting dispatch', async () => {
|
|
34
|
+
const connection = createBasicConnection()
|
|
35
|
+
const sent: Message<unknown>[] = []
|
|
36
|
+
connection.send = async message => {
|
|
37
|
+
if (typeof message !== 'string') sent.push(message)
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
await connection.receive(JSON.stringify({
|
|
41
|
+
type: MessageType.Call, id: 'call-1', method: 'missing', payload: []
|
|
42
|
+
}))
|
|
43
|
+
|
|
44
|
+
expect(sent).toHaveLength(1)
|
|
45
|
+
expect(sent[0]?.type).toBe(MessageType.Error)
|
|
46
|
+
expect(ResilientError.ensure(sent[0]?.payload as string)).toBeInstanceOf(SocketUnsupported)
|
|
47
|
+
})
|
|
48
|
+
|
|
49
|
+
test('isolates rejecting listeners and still runs their peers', async () => {
|
|
50
|
+
const connection = createBasicConnection()
|
|
51
|
+
let observed = false
|
|
52
|
+
connection.listen(async () => { throw new Error('listener failed') })
|
|
53
|
+
connection.listen(async () => { observed = true })
|
|
54
|
+
|
|
55
|
+
await connection.receive(JSON.stringify({ type: MessageType.Message, payload: 'event' }))
|
|
56
|
+
|
|
57
|
+
expect(observed).toBe(true)
|
|
58
|
+
})
|
|
59
|
+
})
|
package/tsconfig.json
CHANGED