@owlmeans/socket 0.1.18-rc.37 → 0.1.18-rc.38
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 +1 -1
- package/build/model.d.ts.map +1 -1
- package/build/model.js +5 -3
- package/build/model.js.map +1 -1
- package/package.json +4 -3
- package/src/model.ts +6 -3
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.38
|
|
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.47
|
|
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-10-
|
|
4
|
+
"version": "0.1.18-rc.38",
|
|
5
|
+
"generatedAt": "2026-10-03T20:05:07.595Z",
|
|
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.38"` 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
|
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;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAC2C,UAAU,EAEhE,MAAM,YAAY,CAAA;AAOnB,eAAO,MAAM,qBAAqB,QAAO,UA+XxC,CAAA"}
|
package/build/model.js
CHANGED
|
@@ -3,6 +3,8 @@ import { CALL_TIMEOUT, MessageType } from './consts.js';
|
|
|
3
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
|
+
import { logger } from '@owlmeans/log';
|
|
7
|
+
const log = logger('socket');
|
|
6
8
|
export const createBasicConnection = () => {
|
|
7
9
|
const listeners = [];
|
|
8
10
|
const callPerformers = {};
|
|
@@ -223,13 +225,13 @@ export const createBasicConnection = () => {
|
|
|
223
225
|
const [stage, response] = await conn.authenticate(authMessage.stage, authMessage.payload);
|
|
224
226
|
if (stage != null) {
|
|
225
227
|
void conn.auth(stage, response).catch(error => {
|
|
226
|
-
|
|
228
|
+
log.warn('Socket authentication response not sent', { error });
|
|
227
229
|
});
|
|
228
230
|
}
|
|
229
231
|
}
|
|
230
232
|
catch (error) {
|
|
231
233
|
void conn.auth(null, ResilientError.marshal(ResilientError.ensure(error))).catch(sendError => {
|
|
232
|
-
|
|
234
|
+
log.warn('Socket authentication error not sent', { error: sendError });
|
|
233
235
|
});
|
|
234
236
|
}
|
|
235
237
|
finally {
|
|
@@ -250,7 +252,7 @@ export const createBasicConnection = () => {
|
|
|
250
252
|
await listener(msg);
|
|
251
253
|
}
|
|
252
254
|
catch (error) {
|
|
253
|
-
|
|
255
|
+
log.error('Socket listener failed', { error });
|
|
254
256
|
}
|
|
255
257
|
}));
|
|
256
258
|
},
|
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/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.38",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -22,8 +22,9 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@owlmeans/auth": "^0.1.18-rc.38",
|
|
25
|
-
"@owlmeans/basic-ids": "^0.1.18-rc.
|
|
26
|
-
"@owlmeans/error": "^0.1.18-rc.36"
|
|
25
|
+
"@owlmeans/basic-ids": "^0.1.18-rc.35",
|
|
26
|
+
"@owlmeans/error": "^0.1.18-rc.36",
|
|
27
|
+
"@owlmeans/log": "^0.1.18-rc.0"
|
|
27
28
|
},
|
|
28
29
|
"devDependencies": {
|
|
29
30
|
"@owlmeans/dep-config": "workspace:*",
|
package/src/model.ts
CHANGED
|
@@ -7,6 +7,9 @@ import type {
|
|
|
7
7
|
} from './types.js'
|
|
8
8
|
import { uuid } from '@owlmeans/basic-ids'
|
|
9
9
|
import { AuthenticationStage, AuthError } from '@owlmeans/auth'
|
|
10
|
+
import { logger } from '@owlmeans/log'
|
|
11
|
+
|
|
12
|
+
const log = logger('socket')
|
|
10
13
|
|
|
11
14
|
export const createBasicConnection = (): Connection => {
|
|
12
15
|
const listeners: ConnectionListener[] = []
|
|
@@ -252,7 +255,7 @@ export const createBasicConnection = (): Connection => {
|
|
|
252
255
|
const [stage, response] = await conn.authenticate(authMessage.stage, authMessage.payload)
|
|
253
256
|
if (stage != null) {
|
|
254
257
|
void conn.auth(stage, response).catch(error => {
|
|
255
|
-
|
|
258
|
+
log.warn('Socket authentication response not sent', { error })
|
|
256
259
|
})
|
|
257
260
|
}
|
|
258
261
|
} catch (error) {
|
|
@@ -260,7 +263,7 @@ export const createBasicConnection = (): Connection => {
|
|
|
260
263
|
null as any,
|
|
261
264
|
ResilientError.marshal(ResilientError.ensure(error as Error))
|
|
262
265
|
).catch(sendError => {
|
|
263
|
-
|
|
266
|
+
log.warn('Socket authentication error not sent', { error: sendError })
|
|
264
267
|
})
|
|
265
268
|
} finally {
|
|
266
269
|
conn._authSequence = undefined
|
|
@@ -279,7 +282,7 @@ export const createBasicConnection = (): Connection => {
|
|
|
279
282
|
try {
|
|
280
283
|
await listener(msg)
|
|
281
284
|
} catch (error) {
|
|
282
|
-
|
|
285
|
+
log.error('Socket listener failed', { error })
|
|
283
286
|
}
|
|
284
287
|
}))
|
|
285
288
|
},
|