@hyper-fetch/sockets 8.0.1 → 8.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.
- package/__tests__/e2e/e2e.callbacks.spec.ts +224 -0
- package/__tests__/e2e/e2e.connection.spec.ts +162 -0
- package/__tests__/e2e/e2e.edge-cases.spec.ts +232 -0
- package/__tests__/e2e/e2e.emitters.spec.ts +160 -0
- package/__tests__/e2e/e2e.heartbeat.spec.ts +162 -0
- package/__tests__/e2e/e2e.listeners.spec.ts +215 -0
- package/__tests__/e2e/e2e.reconnection.spec.ts +240 -0
- package/__tests__/e2e/e2e.sse.spec.ts +191 -0
- package/__tests__/features/adapter/adapter.sse.connection.spec.ts +1 -1
- package/__tests__/features/sdk/sdk.base.spec.ts +125 -0
- package/__tests__/features/sdk/sdk.configuration.spec.ts +341 -0
- package/__tests__/vitest.setup.ts +19 -6
- package/dist/adapter/adapter.bindings.d.ts.map +1 -1
- package/dist/adapter-sse/sse-adapter.d.ts.map +1 -1
- package/dist/adapter-sse/sse-adapter.utils.d.ts +1 -1
- package/dist/adapter-sse/sse-adapter.utils.d.ts.map +1 -1
- package/dist/adapter-websockets/websocket-adapter.utils.d.ts +1 -1
- package/dist/adapter-websockets/websocket-adapter.utils.d.ts.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +153 -32
- package/dist/index.mjs.map +1 -1
- package/dist/sdk/index.d.ts +2 -0
- package/dist/sdk/index.d.ts.map +1 -0
- package/dist/sdk/sdk.d.ts +70 -0
- package/dist/sdk/sdk.d.ts.map +1 -0
- package/dist/socket/index.d.ts +1 -0
- package/dist/socket/index.d.ts.map +1 -1
- package/dist/socket/socket.create.d.ts +5 -0
- package/dist/socket/socket.create.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/adapter/adapter.bindings.ts +15 -6
- package/src/adapter-sse/sse-adapter.ts +6 -14
- package/src/adapter-sse/sse-adapter.utils.ts +8 -7
- package/src/adapter-websockets/websocket-adapter.utils.ts +5 -4
- package/src/index.ts +1 -0
- package/src/sdk/index.ts +1 -0
- package/src/sdk/sdk.ts +268 -0
- package/src/socket/index.ts +1 -0
- package/src/socket/socket.create.ts +10 -0
- package/vite.config.ts +1 -0
package/dist/index.mjs
CHANGED
|
@@ -450,30 +450,33 @@ var getAdapterBindings = (socket) => {
|
|
|
450
450
|
return true;
|
|
451
451
|
};
|
|
452
452
|
const onReconnect = async ({ disconnect, connect }) => {
|
|
453
|
+
const currentAttempts = adapter.reconnectionAttempts;
|
|
453
454
|
socket.unstable_onReconnectCallbacks.forEach((callback) => {
|
|
454
455
|
callback();
|
|
455
456
|
});
|
|
456
|
-
socket.events.emitReconnecting({ attempts:
|
|
457
|
+
socket.events.emitReconnecting({ attempts: currentAttempts });
|
|
457
458
|
await disconnect();
|
|
458
|
-
if (
|
|
459
|
-
|
|
459
|
+
if (currentAttempts < socket.reconnectAttempts) {
|
|
460
|
+
const nextAttempts = currentAttempts + 1;
|
|
461
|
+
socket.adapter.setReconnectionAttempts(nextAttempts);
|
|
460
462
|
logger.debug({
|
|
461
463
|
title: "Reconnecting",
|
|
462
464
|
type: "system",
|
|
463
|
-
extra: { reconnectionAttempts:
|
|
465
|
+
extra: { reconnectionAttempts: nextAttempts }
|
|
464
466
|
});
|
|
465
467
|
await connect();
|
|
468
|
+
if (!adapter.connected) socket.adapter.setReconnectionAttempts(nextAttempts);
|
|
466
469
|
return true;
|
|
467
470
|
}
|
|
468
471
|
logger.error({
|
|
469
472
|
title: "Stopped reconnecting",
|
|
470
473
|
type: "system",
|
|
471
|
-
extra: { reconnectionAttempts:
|
|
474
|
+
extra: { reconnectionAttempts: currentAttempts }
|
|
472
475
|
});
|
|
473
476
|
socket.unstable_onReconnectFailedCallbacks.forEach((callback) => {
|
|
474
477
|
callback();
|
|
475
478
|
});
|
|
476
|
-
socket.events.emitReconnectingFailed({ attempts:
|
|
479
|
+
socket.events.emitReconnectingFailed({ attempts: currentAttempts });
|
|
477
480
|
return false;
|
|
478
481
|
};
|
|
479
482
|
const onListen = ({ listener, callback, onUnmount = () => null }) => {
|
|
@@ -511,6 +514,7 @@ var getAdapterBindings = (socket) => {
|
|
|
511
514
|
});
|
|
512
515
|
adapter.setConnected(true);
|
|
513
516
|
adapter.setConnecting(false);
|
|
517
|
+
adapter.setReconnectionAttempts(0);
|
|
514
518
|
socket.events.emitConnecting({ connecting: false });
|
|
515
519
|
socket.events.emitConnected();
|
|
516
520
|
socket.unstable_onConnectedCallbacks.forEach((callback) => {
|
|
@@ -723,13 +727,13 @@ var getWebsocketAdapter = (url, adapterOptions) => {
|
|
|
723
727
|
return null;
|
|
724
728
|
}
|
|
725
729
|
class HyperFetchWebsocket extends WebSocket {
|
|
726
|
-
|
|
730
|
+
registeredHandlers = /* @__PURE__ */ new Map();
|
|
727
731
|
constructor(socketUrl, protocols) {
|
|
728
732
|
super(socketUrl, protocols);
|
|
729
733
|
}
|
|
730
734
|
addEventListener = (type, listener, options) => {
|
|
731
735
|
super.addEventListener(type, listener, options);
|
|
732
|
-
this.
|
|
736
|
+
this.registeredHandlers.set(listener, {
|
|
733
737
|
type,
|
|
734
738
|
listener,
|
|
735
739
|
options
|
|
@@ -737,10 +741,10 @@ var getWebsocketAdapter = (url, adapterOptions) => {
|
|
|
737
741
|
};
|
|
738
742
|
removeEventListener = (type, listener, options) => {
|
|
739
743
|
super.removeEventListener(type, listener, options);
|
|
740
|
-
this.
|
|
744
|
+
this.registeredHandlers.delete(listener);
|
|
741
745
|
};
|
|
742
746
|
clearListeners = () => {
|
|
743
|
-
this.
|
|
747
|
+
this.registeredHandlers.forEach(({ type, listener, options }) => {
|
|
744
748
|
if (!options?.disableCleanup) this.removeEventListener(type, listener, options);
|
|
745
749
|
});
|
|
746
750
|
};
|
|
@@ -1124,6 +1128,11 @@ var Socket = class {
|
|
|
1124
1128
|
};
|
|
1125
1129
|
};
|
|
1126
1130
|
//#endregion
|
|
1131
|
+
//#region src/socket/socket.create.ts
|
|
1132
|
+
function createSocketClient(options) {
|
|
1133
|
+
return new Socket(options);
|
|
1134
|
+
}
|
|
1135
|
+
//#endregion
|
|
1127
1136
|
//#region src/socket/socket.utils.ts
|
|
1128
1137
|
var getErrorKey = () => "socket_error";
|
|
1129
1138
|
var getOpenKey = () => "socket_open";
|
|
@@ -1274,28 +1283,28 @@ var getServerSentEventsAdapter = (url, adapterOptions) => {
|
|
|
1274
1283
|
return null;
|
|
1275
1284
|
}
|
|
1276
1285
|
class HyperFetchEventSource extends EventSource {
|
|
1277
|
-
|
|
1286
|
+
registeredHandlers = /* @__PURE__ */ new Map();
|
|
1278
1287
|
constructor(socketUrl, eventSourceInit) {
|
|
1279
1288
|
super(socketUrl, eventSourceInit);
|
|
1280
1289
|
}
|
|
1281
1290
|
onopen = (...args) => {
|
|
1282
|
-
this.
|
|
1291
|
+
this.registeredHandlers.forEach(({ type, listener }) => {
|
|
1283
1292
|
if (type === "open") listener(...args);
|
|
1284
1293
|
});
|
|
1285
1294
|
};
|
|
1286
1295
|
onerror = (...args) => {
|
|
1287
|
-
this.
|
|
1296
|
+
this.registeredHandlers.forEach(({ type, listener }) => {
|
|
1288
1297
|
if (type === "error") listener(...args);
|
|
1289
1298
|
});
|
|
1290
1299
|
};
|
|
1291
1300
|
onmessage = (...args) => {
|
|
1292
|
-
this.
|
|
1301
|
+
this.registeredHandlers.forEach(({ type, listener }) => {
|
|
1293
1302
|
if (type === "message") listener(...args);
|
|
1294
1303
|
});
|
|
1295
1304
|
};
|
|
1296
1305
|
addEventListener = (type, listener, options) => {
|
|
1297
1306
|
super.addEventListener(type, listener, options);
|
|
1298
|
-
this.
|
|
1307
|
+
this.registeredHandlers.set(listener, {
|
|
1299
1308
|
type,
|
|
1300
1309
|
listener,
|
|
1301
1310
|
options
|
|
@@ -1303,10 +1312,10 @@ var getServerSentEventsAdapter = (url, adapterOptions) => {
|
|
|
1303
1312
|
};
|
|
1304
1313
|
removeEventListener = (type, listener, options) => {
|
|
1305
1314
|
super.removeEventListener(type, listener, options);
|
|
1306
|
-
this.
|
|
1315
|
+
this.registeredHandlers.delete(listener);
|
|
1307
1316
|
};
|
|
1308
1317
|
clearListeners = () => {
|
|
1309
|
-
this.
|
|
1318
|
+
this.registeredHandlers.forEach(({ type, listener, options }) => {
|
|
1310
1319
|
if (!options?.disableCleanup) this.removeEventListener(type, listener, options);
|
|
1311
1320
|
});
|
|
1312
1321
|
};
|
|
@@ -1374,23 +1383,15 @@ var ServerSentEventsAdapter = () => new SocketAdapter({ name: "sse" }).setQueryP
|
|
|
1374
1383
|
return Promise.resolve(true);
|
|
1375
1384
|
}
|
|
1376
1385
|
const currentSse = sse;
|
|
1377
|
-
|
|
1378
|
-
|
|
1379
|
-
|
|
1380
|
-
|
|
1381
|
-
|
|
1382
|
-
return;
|
|
1383
|
-
}
|
|
1384
|
-
const resolveDisconnected = () => {
|
|
1385
|
-
resolve(true);
|
|
1386
|
-
currentSse.removeEventListener("error", resolveDisconnected);
|
|
1387
|
-
};
|
|
1388
|
-
currentSse.addEventListener("error", resolveDisconnected, { disableCleanup: true });
|
|
1389
|
-
});
|
|
1386
|
+
if (currentSse.readyState === EventSource.CLOSED) {
|
|
1387
|
+
adapter.setConnected(false);
|
|
1388
|
+
adapter.setConnecting(false);
|
|
1389
|
+
return Promise.resolve(true);
|
|
1390
|
+
}
|
|
1390
1391
|
onDisconnect();
|
|
1391
1392
|
currentSse.close();
|
|
1392
1393
|
onDisconnected();
|
|
1393
|
-
return
|
|
1394
|
+
return Promise.resolve(true);
|
|
1394
1395
|
};
|
|
1395
1396
|
const reconnect = () => {
|
|
1396
1397
|
onReconnect({
|
|
@@ -1420,6 +1421,126 @@ var ServerSentEventsAdapter = () => new SocketAdapter({ name: "sse" }).setQueryP
|
|
|
1420
1421
|
};
|
|
1421
1422
|
});
|
|
1422
1423
|
//#endregion
|
|
1423
|
-
|
|
1424
|
+
//#region src/sdk/sdk.ts
|
|
1425
|
+
var LEAF_KEYS = new Set(["$listener", "$emitter"]);
|
|
1426
|
+
var isDotPath = (key) => {
|
|
1427
|
+
return key.includes(".") && !key.includes("/");
|
|
1428
|
+
};
|
|
1429
|
+
var isTopicGroup = (key) => {
|
|
1430
|
+
return key.includes("/") || !key.includes(".") && key !== "*";
|
|
1431
|
+
};
|
|
1432
|
+
var topicMatchesPattern = (topic, pattern) => {
|
|
1433
|
+
if (pattern === "*") return true;
|
|
1434
|
+
if (pattern === topic) return true;
|
|
1435
|
+
if (pattern.endsWith("/*")) {
|
|
1436
|
+
const prefix = pattern.slice(0, -1);
|
|
1437
|
+
return topic.startsWith(prefix) || topic === prefix.slice(0, -1);
|
|
1438
|
+
}
|
|
1439
|
+
return false;
|
|
1440
|
+
};
|
|
1441
|
+
var applySocketObjectDefaults = (instance, config) => {
|
|
1442
|
+
let result = instance;
|
|
1443
|
+
if (config.options !== void 0) result = result.setOptions(config.options);
|
|
1444
|
+
return result;
|
|
1445
|
+
};
|
|
1446
|
+
var applySocketDefaults = ({ instance, topic, sdkPath, defaults }) => {
|
|
1447
|
+
if (!defaults) return instance;
|
|
1448
|
+
let result = instance;
|
|
1449
|
+
const entries = Object.entries(defaults);
|
|
1450
|
+
const globalEntries = [];
|
|
1451
|
+
const groupEntries = [];
|
|
1452
|
+
const pathEntries = [];
|
|
1453
|
+
for (let i = 0; i < entries.length; i += 1) {
|
|
1454
|
+
const [key, value] = entries[i];
|
|
1455
|
+
if (!value) continue;
|
|
1456
|
+
const entry = [key, value];
|
|
1457
|
+
if (entry[0] === "*") globalEntries.push(entry);
|
|
1458
|
+
else if (isDotPath(entry[0])) pathEntries.push(entry);
|
|
1459
|
+
else if (isTopicGroup(entry[0])) groupEntries.push(entry);
|
|
1460
|
+
}
|
|
1461
|
+
const sorted = [
|
|
1462
|
+
...globalEntries,
|
|
1463
|
+
...groupEntries,
|
|
1464
|
+
...pathEntries
|
|
1465
|
+
];
|
|
1466
|
+
for (let i = 0; i < sorted.length; i += 1) {
|
|
1467
|
+
const [pattern, config] = sorted[i];
|
|
1468
|
+
let matches = false;
|
|
1469
|
+
if (isDotPath(pattern)) matches = pattern === sdkPath;
|
|
1470
|
+
else matches = topicMatchesPattern(topic, pattern);
|
|
1471
|
+
if (matches) if (typeof config === "function") result = config(result);
|
|
1472
|
+
else result = applySocketObjectDefaults(result, config);
|
|
1473
|
+
}
|
|
1474
|
+
return result;
|
|
1475
|
+
};
|
|
1476
|
+
var createSocketRecursiveProxy = ({ socket, path, sdkKeys, options }) => {
|
|
1477
|
+
return new Proxy(() => {}, { get: (_target, key) => {
|
|
1478
|
+
if (typeof key === "symbol" || key === "inspect") return;
|
|
1479
|
+
const currentSdkKeys = [...sdkKeys, key];
|
|
1480
|
+
const sdkPath = currentSdkKeys.join(".");
|
|
1481
|
+
let pathSegment = key;
|
|
1482
|
+
if (key.startsWith("$") && !LEAF_KEYS.has(key)) pathSegment = `:${key.slice(1)}`;
|
|
1483
|
+
else if (options?.camelCaseToKebabCase) pathSegment = key.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
|
|
1484
|
+
if (LEAF_KEYS.has(key)) {
|
|
1485
|
+
const topic = path.join("/");
|
|
1486
|
+
let instance;
|
|
1487
|
+
if (key === "$listener") instance = socket.createListener()({ topic });
|
|
1488
|
+
else instance = socket.createEmitter()({ topic });
|
|
1489
|
+
instance = applySocketDefaults({
|
|
1490
|
+
instance,
|
|
1491
|
+
topic,
|
|
1492
|
+
sdkPath,
|
|
1493
|
+
defaults: options?.defaults
|
|
1494
|
+
});
|
|
1495
|
+
return instance;
|
|
1496
|
+
}
|
|
1497
|
+
return createSocketRecursiveProxy({
|
|
1498
|
+
socket,
|
|
1499
|
+
path: [...path, pathSegment],
|
|
1500
|
+
sdkKeys: currentSdkKeys,
|
|
1501
|
+
options
|
|
1502
|
+
});
|
|
1503
|
+
} });
|
|
1504
|
+
};
|
|
1505
|
+
var createSocketSdk = (socket, options) => {
|
|
1506
|
+
const { camelCaseToKebabCase = true, ...rest } = options ?? {};
|
|
1507
|
+
const mergedOptions = {
|
|
1508
|
+
camelCaseToKebabCase,
|
|
1509
|
+
...rest
|
|
1510
|
+
};
|
|
1511
|
+
const proxy = createSocketRecursiveProxy({
|
|
1512
|
+
socket,
|
|
1513
|
+
path: [],
|
|
1514
|
+
sdkKeys: [],
|
|
1515
|
+
options: mergedOptions
|
|
1516
|
+
});
|
|
1517
|
+
return new Proxy(proxy, { get: (target, key) => {
|
|
1518
|
+
if (key === "$configure") return (defaults) => {
|
|
1519
|
+
const existingDefaults = mergedOptions.defaults || {};
|
|
1520
|
+
return createSocketSdk(socket, {
|
|
1521
|
+
...mergedOptions,
|
|
1522
|
+
defaults: {
|
|
1523
|
+
...existingDefaults,
|
|
1524
|
+
...defaults
|
|
1525
|
+
}
|
|
1526
|
+
});
|
|
1527
|
+
};
|
|
1528
|
+
return target[key];
|
|
1529
|
+
} });
|
|
1530
|
+
};
|
|
1531
|
+
/**
|
|
1532
|
+
* Type-safe factory for creating socket SDK configuration maps.
|
|
1533
|
+
*
|
|
1534
|
+
* @example
|
|
1535
|
+
* const config = createSocketConfiguration<MyChatSchema>()({
|
|
1536
|
+
* "*": { options: { reconnect: true } },
|
|
1537
|
+
* "chat.messages.$listener": (instance) => instance.setOptions({ buffer: true }),
|
|
1538
|
+
* })
|
|
1539
|
+
*/
|
|
1540
|
+
var createSocketConfiguration = () => {
|
|
1541
|
+
return (defaults) => defaults;
|
|
1542
|
+
};
|
|
1543
|
+
//#endregion
|
|
1544
|
+
export { Emitter, Listener, ServerSentEventsAdapter, Socket, SocketAdapter, WebsocketAdapter, createSocketClient, createSocketConfiguration, createSocketSdk, getAdapterBindings, getCloseKey, getConnectingKey, getEmitterErrorByTopicKey, getEmitterErrorKey, getEmitterStartEventByTopicKey, getEmitterStartEventKey, getErrorKey, getListenerEventByTopicKey, getListenerEventKey, getListenerRemoveByTopicKey, getListenerRemoveKey, getOpenKey, getReconnectingFailedKey, getReconnectingKey, getServerSentEventsAdapter, getSocketError, getSocketEvents, getSocketUrl, getWebsocketAdapter, interceptEmitter, interceptListener, parseMessageEvent };
|
|
1424
1545
|
|
|
1425
1546
|
//# sourceMappingURL=index.mjs.map
|