@hyper-fetch/sockets 8.2.0 → 8.2.2
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 +3 -1
- package/__tests__/e2e/e2e.connection.spec.ts +1 -1
- package/__tests__/e2e/e2e.edge-cases.spec.ts +1 -1
- package/__tests__/e2e/e2e.emitters.spec.ts +1 -1
- package/__tests__/e2e/e2e.heartbeat.spec.ts +4 -4
- package/__tests__/features/adapter/adapter.base.spec.ts +1 -0
- package/__tests__/features/adapter/adapter.bindings.spec.ts +2 -1
- package/__tests__/features/adapter/adapter.connection.spec.ts +2 -2
- package/__tests__/features/adapter/adapter.error.spec.ts +1 -1
- package/__tests__/features/adapter/adapter.sse.connection.spec.ts +2 -2
- package/__tests__/features/adapter/adapter.sse.spec.ts +6 -6
- package/__tests__/features/adapter/adapter.websocket.heartbeat.spec.ts +1 -1
- package/__tests__/features/adapter/adapter.websocket.spec.ts +5 -5
- package/__tests__/features/listener/listener.listen.spec.ts +1 -1
- package/__tests__/features/listener/listener.sse.spec.ts +2 -2
- package/__tests__/features/listener/listener.typescript.spec.ts +0 -1
- package/__tests__/features/sdk/sdk.base.spec.ts +4 -3
- package/__tests__/features/sdk/sdk.configuration.spec.ts +3 -2
- package/__tests__/features/sdk/sdk.types.spec.ts +4 -4
- package/__tests__/features/socket/socket.base.spec.ts +4 -4
- package/__tests__/features/socket/socket.callbacks.spec.ts +1 -1
- package/__tests__/features/socket/socket.methods.spec.ts +1 -2
- package/__tests__/features/socket/socket.misc.spec.ts +3 -3
- package/__tests__/features/socket/socket.utils.spec.ts +0 -1
- package/__tests__/tsconfig.json +4 -17
- package/__tests__/utils/client.utils.ts +1 -1
- package/__tests__/utils/emitter.utils.ts +1 -2
- package/__tests__/utils/listener.utils.ts +2 -3
- package/__tests__/utils/socket.utils.ts +2 -2
- package/dist/adapter/adapter.bindings.d.ts +3 -3
- package/dist/adapter/adapter.bindings.d.ts.map +1 -1
- package/dist/adapter/adapter.d.ts +4 -4
- package/dist/adapter/adapter.d.ts.map +1 -1
- package/dist/adapter/adapter.types.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.map +1 -1
- package/dist/adapter-websockets/websocket-adapter.d.ts.map +1 -1
- package/dist/adapter-websockets/websocket-adapter.utils.d.ts.map +1 -1
- package/dist/emitter/emitter.d.ts +1 -1
- package/dist/emitter/emitter.d.ts.map +1 -1
- package/dist/emitter/emitter.types.d.ts.map +1 -1
- package/dist/index.mjs +862 -862
- package/dist/index.mjs.map +1 -1
- package/dist/listener/listener.d.ts +1 -1
- package/dist/listener/listener.d.ts.map +1 -1
- package/dist/listener/listener.types.d.ts.map +1 -1
- package/dist/sdk/sdk.d.ts +2 -2
- package/dist/sdk/sdk.d.ts.map +1 -1
- package/dist/socket/socket.create.d.ts +1 -1
- package/dist/socket/socket.create.d.ts.map +1 -1
- package/dist/socket/socket.d.ts +5 -5
- package/dist/socket/socket.d.ts.map +1 -1
- package/dist/socket/socket.events.d.ts +2 -2
- package/dist/socket/socket.events.d.ts.map +1 -1
- package/dist/socket/socket.types.d.ts +1 -1
- package/dist/socket/socket.types.d.ts.map +1 -1
- package/dist/socket/socket.utils.d.ts.map +1 -1
- package/dist/types/tuple.types.d.ts +1 -1
- package/dist/types/tuple.types.d.ts.map +1 -1
- package/dist/utils/socket.errors.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/adapter/adapter.bindings.ts +3 -3
- package/src/adapter/adapter.ts +8 -8
- package/src/adapter/adapter.types.ts +1 -0
- package/src/adapter-sse/sse-adapter.ts +7 -7
- package/src/adapter-sse/sse-adapter.utils.ts +4 -4
- package/src/adapter-websockets/websocket-adapter.ts +11 -11
- package/src/adapter-websockets/websocket-adapter.utils.ts +4 -4
- package/src/emitter/emitter.ts +5 -6
- package/src/emitter/emitter.types.ts +0 -1
- package/src/listener/listener.ts +4 -5
- package/src/listener/listener.types.ts +0 -1
- package/src/sdk/sdk.ts +9 -9
- package/src/socket/socket.create.ts +1 -1
- package/src/socket/socket.events.ts +3 -4
- package/src/socket/socket.ts +8 -9
- package/src/socket/socket.types.ts +1 -1
- package/src/socket/socket.utils.ts +3 -2
- package/src/types/tuple.types.ts +1 -1
- package/src/utils/socket.errors.ts +26 -13
- package/tsconfig.json +20 -2
- package/vite.config.ts +30 -21
- package/.eslintrc.cjs +0 -12
package/dist/sdk/sdk.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { SocketInstance } from '../socket';
|
|
2
|
-
import { Listener, ListenerInstance } from '../listener';
|
|
3
1
|
import { Emitter, EmitterInstance } from '../emitter';
|
|
2
|
+
import { Listener, ListenerInstance } from '../listener';
|
|
3
|
+
import { SocketInstance } from '../socket';
|
|
4
4
|
import { ExtractListenerResponseType, ExtractListenerTopicType, ExtractListenerHasParamsType, ExtractEmitterPayloadType, ExtractEmitterTopicType, ExtractEmitterHasPayloadType, ExtractEmitterHasParamsType } from '../types';
|
|
5
5
|
export type RecursiveSocketSchemaType = Record<string, any>;
|
|
6
6
|
type SocketSdkLeaf = ListenerInstance | EmitterInstance;
|
package/dist/sdk/sdk.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,EACV,2BAA2B,EAC3B,wBAAwB,EACxB,4BAA4B,EAC5B,yBAAyB,EACzB,uBAAuB,EACvB,4BAA4B,EAC5B,2BAA2B,EAC5B,MAAM,OAAO,CAAC;AAEf,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5D,KAAK,aAAa,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAExD;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,cAAc,EAAE,KAAK,SAAS,OAAO,EAAE,GAAG,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,GAC5G,CAAC,GACD,CAAC,SAAS,gBAAgB,GACxB,QAAQ,CACN,2BAA2B,CAAC,CAAC,CAAC,EAC9B,wBAAwB,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,wBAAwB,CAAC,CAAC,CAAC,GAAG,MAAM,EACjF,CAAC,EACD,4BAA4B,CAAC,CAAC,CAAC,SAAS,OAAO,GAAG,4BAA4B,CAAC,CAAC,CAAC,GAAG,KAAK,CAC1F,GACD,CAAC,SAAS,eAAe,GACvB,OAAO,CACL,yBAAyB,CAAC,CAAC,CAAC,EAC5B,uBAAuB,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC,GAAG,MAAM,EAC/E,CAAC,EACD,4BAA4B,CAAC,CAAC,CAAC,SAAS,OAAO,GAAG,4BAA4B,CAAC,CAAC,CAAC,GAAG,KAAK,EACzF,2BAA2B,CAAC,CAAC,CAAC,SAAS,OAAO,GAAG,2BAA2B,CAAC,CAAC,CAAC,GAAG,KAAK,CACxF,GACD,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC3B;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,CAAC;CAAE,GAC9D,CAAC,CAAC;AAEZ,KAAK,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,KAAK,SAAS,MAAM,CAAA;CAAE,GAAG,KAAK,GAAG,KAAK,CAAC;AAE/F;;GAEG;AACH,KAAK,mBAAmB,CAAC,CAAC,EAAE,KAAK,SAAS,OAAO,EAAE,GAAG,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,GAClF,KAAK,GACL;KACG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,aAAa,GAC/C,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC1B,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC9B,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,CAAC,GAC9C,KAAK;CACZ,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;AAExB;;;GAGG;AACH,KAAK,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,IAAI,MAAM,IAAI,EAAE,GAC1E,IAAI,GAAG,GAAG,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,GAChD,KAAK,CAAC;AAEV;;;GAGG;AACH,KAAK,qBAAqB,CAAC,CAAC,EAAE,MAAM,SAAS,MAAM,GAAG,EAAE,EAAE,KAAK,SAAS,OAAO,EAAE,GAAG,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,GAChH,KAAK,GACL;KACG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,aAAa,GAC/C,GAAG,MAAM,GAAG,CAAC,EAAE,GACf,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC9B,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,CAAC,GAClE,KAAK;CACZ,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;AAExB,KAAK,YAAY,CAAC,MAAM,SAAS,yBAAyB,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAE1F;;;;;;GAMG;AACH,KAAK,0BAA0B,CAAC,MAAM,SAAS,yBAAyB,IACpE,GAAG,GACH,YAAY,CAAC,MAAM,CAAC,GACpB,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,MAAM,IAAI,GACrF,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAElC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,iBAAiB,GAAG,CAAC,CAAC,QAAQ,EAAE,aAAa,KAAK,aAAa,CAAC,CAAC;AAE3G;;;GAGG;AACH,KAAK,cAAc,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,IAAI,IAAI,SAAS,GAAG,MAAM,IAAI,IAAI,MAAM,IAAI,EAAE,GACpF,IAAI,SAAS,MAAM,CAAC,GAClB,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAC7B,aAAa,GACf,IAAI,SAAS,MAAM,CAAC,GAClB,CAAC,CAAC,IAAI,CAAC,GACP,aAAa,CAAC;AAEpB,KAAK,8BAA8B,CAAC,CAAC,IAAI,iBAAiB,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;AAElF,MAAM,MAAM,yBAAyB,CAAC,MAAM,SAAS,yBAAyB,GAAG,yBAAyB,IAAI;KAC3G,CAAC,IAAI,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,8BAA8B,CACxE,CAAC,SAAS,qBAAqB,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,aAAa,CACpF;CACF,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAAC,MAAM,SAAS,yBAAyB,GAAG,yBAAyB,IAAI;IACzG,oBAAoB;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qDAAqD;IACrD,QAAQ,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC;AAwIF;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,CAC3B,MAAM,SAAS,yBAAyB,EACxC,CAAC,SAAS,cAAc,GAAG,cAAc,IACvC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG;IAC5B,UAAU,EAAE,CAAC,QAAQ,EAAE,yBAAyB,CAAC,MAAM,CAAC,KAAK,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CAC3F,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,cAAc,EAAE,eAAe,SAAS,yBAAyB,EACzG,QAAQ,CAAC,EACT,UAAU,sBAAsB,CAAC,eAAe,CAAC,KAChD,iBAAiB,CAAC,eAAe,EAAE,CAAC,CAoBtC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GAAI,MAAM,SAAS,yBAAyB,QACxE,UAAU,yBAAyB,CAAC,MAAM,CAAC,KAAG,yBAAyB,CAAC,MAAM,CACvF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SocketAdapterInstance } from '../adapter';
|
|
2
|
-
import { SocketOptionsType, Socket } from '.';
|
|
3
2
|
import { WebsocketAdapterType } from '../adapter-websockets/websocket-adapter';
|
|
3
|
+
import { SocketOptionsType, Socket } from '.';
|
|
4
4
|
export declare function createSocketClient<Adapter extends SocketAdapterInstance = WebsocketAdapterType>(options: SocketOptionsType<Adapter>): Socket<Adapter>;
|
|
5
5
|
//# sourceMappingURL=socket.create.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.create.d.ts","sourceRoot":"","sources":["../../src/socket/socket.create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"socket.create.d.ts","sourceRoot":"","sources":["../../src/socket/socket.create.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,wBAAgB,kBAAkB,CAAC,OAAO,SAAS,qBAAqB,GAAG,oBAAoB,EAC7F,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAClC,MAAM,CAAC,OAAO,CAAC,CAEjB"}
|
package/dist/socket/socket.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { default as EventEmitter } from 'events';
|
|
2
1
|
import { LogLevel, LoggerManager, AppManager } from '@hyper-fetch/core';
|
|
3
|
-
import { SocketOptionsType, ReconnectCallbackType, ReconnectFailedCallbackType, OpenCallbackType, CloseCallbackType, MessageCallbackType, SendCallbackType, ErrorCallbackType } from '.';
|
|
4
|
-
import { ListenerOptionsType, Listener } from '../listener';
|
|
5
|
-
import { EmitterInstance, EmitterOptionsType, Emitter } from '../emitter';
|
|
6
2
|
import { SocketAdapterInstance } from '../adapter';
|
|
7
|
-
import { ExtractAdapterExtraType, ExtractAdapterQueryParamsType } from '../types';
|
|
8
3
|
import { WebsocketAdapterType } from '../adapter-websockets/websocket-adapter';
|
|
4
|
+
import { EmitterInstance, EmitterOptionsType, Emitter } from '../emitter';
|
|
5
|
+
import { default as EventEmitter } from 'events';
|
|
6
|
+
import { ListenerOptionsType, Listener } from '../listener';
|
|
7
|
+
import { SocketOptionsType, ReconnectCallbackType, ReconnectFailedCallbackType, OpenCallbackType, CloseCallbackType, MessageCallbackType, SendCallbackType, ErrorCallbackType } from '.';
|
|
8
|
+
import { ExtractAdapterExtraType, ExtractAdapterQueryParamsType } from '../types';
|
|
9
9
|
export declare class Socket<Adapter extends SocketAdapterInstance = WebsocketAdapterType> {
|
|
10
10
|
options: SocketOptionsType<Adapter>;
|
|
11
11
|
emitter: EventEmitter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/socket/socket.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/socket/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SocketAdapterInstance } from '../adapter';
|
|
2
2
|
import { EmitterInstance } from '../emitter';
|
|
3
|
+
import { default as EventEmitter } from 'events';
|
|
3
4
|
import { ListenerInstance } from '../listener';
|
|
4
|
-
import { SocketAdapterInstance } from '../adapter';
|
|
5
5
|
import { ExtractAdapterExtraType } from '../types';
|
|
6
6
|
export declare const getSocketEvents: <Adapter extends SocketAdapterInstance>(eventEmitter: EventEmitter) => {
|
|
7
7
|
readonly emitError: <ResponseType>({ error }: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.events.d.ts","sourceRoot":"","sources":["../../src/socket/socket.events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"socket.events.d.ts","sourceRoot":"","sources":["../../src/socket/socket.events.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Socket } from '.';
|
|
2
1
|
import { SocketAdapterInstance } from '../adapter';
|
|
3
2
|
import { EmitterInstance } from '../emitter';
|
|
3
|
+
import { Socket } from '.';
|
|
4
4
|
import { ExtractAdapterOptionsType, ExtractAdapterQueryParamsType } from '../types';
|
|
5
5
|
export type SocketInstance = Socket<SocketAdapterInstance>;
|
|
6
6
|
export type SocketOptionsType<Adapter extends SocketAdapterInstance> = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.types.d.ts","sourceRoot":"","sources":["../../src/socket/socket.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"socket.types.d.ts","sourceRoot":"","sources":["../../src/socket/socket.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,yBAAyB,EAAE,6BAA6B,EAAE,MAAM,OAAO,CAAC;AAEtF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAE3D,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,GAAG,OAAO,CAAC;IACpC,cAAc,CAAC,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACpD,WAAW,CAAC,EAAE,6BAA6B,CAAC,OAAO,CAAC,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC;AAC/C,MAAM,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC;AACrD,MAAM,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC;AAC1C,MAAM,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC;AAC3C,MAAM,MAAM,mBAAmB,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,KAAK,KAAK,CAAC;AAC3E,MAAM,MAAM,gBAAgB,CAAC,WAAW,SAAS,eAAe,IAAI,CAAC,IAAI,EAAE;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,KAAK,eAAe,CAAC;AACxH,MAAM,MAAM,iBAAiB,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,KAAK,IAAI,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.utils.d.ts","sourceRoot":"","sources":["../../src/socket/socket.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"socket.utils.d.ts","sourceRoot":"","sources":["../../src/socket/socket.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE5E,eAAO,MAAM,WAAW,cAAuB,CAAC;AAChD,eAAO,MAAM,UAAU,cAAsB,CAAC;AAC9C,eAAO,MAAM,WAAW,cAAuB,CAAC;AAChD,eAAO,MAAM,gBAAgB,cAA4B,CAAC;AAC1D,eAAO,MAAM,kBAAkB,cAA8B,CAAC;AAC9D,eAAO,MAAM,wBAAwB,cAAmC,CAAC;AACzE,eAAO,MAAM,mBAAmB,cAAyB,CAAC;AAC1D,eAAO,MAAM,oBAAoB,cAA0B,CAAC;AAC5D,eAAO,MAAM,uBAAuB,cAA8B,CAAC;AACnE,eAAO,MAAM,kBAAkB,cAAwB,CAAC;AACxD,eAAO,MAAM,2BAA2B,GAAI,OAAO,MAAM,WAA+B,CAAC;AACzF,eAAO,MAAM,0BAA0B,GAAI,OAAO,MAAM,WAA8B,CAAC;AACvF,eAAO,MAAM,8BAA8B,GAAI,OAAO,MAAM,WAAmC,CAAC;AAChG,eAAO,MAAM,yBAAyB,GAAI,OAAO,MAAM,WAA6B,CAAC;AAErF,eAAO,MAAM,iBAAiB,GAAI,cAAc,mBAAmB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAAE;UAAjB,GAAG;WAAS,GAAG;CASzG,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,WAAW,SAAS,eAAe,EAClE,cAAc,gBAAgB,CAAC,WAAW,CAAC,EAAE,EAC7C,SAAS,WAAW,gBASrB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export type TupleRestType<T> = T extends [first: any, ...rest: infer Rest] ? (Rest extends
|
|
1
|
+
export type TupleRestType<T> = T extends [first: any, ...rest: infer Rest] ? (Rest extends any[] ? Rest : []) : [];
|
|
2
2
|
//# sourceMappingURL=tuple.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tuple.types.d.ts","sourceRoot":"","sources":["../../src/types/tuple.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"tuple.types.d.ts","sourceRoot":"","sources":["../../src/types/tuple.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.errors.d.ts","sourceRoot":"","sources":["../../src/utils/socket.errors.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,KAAG,
|
|
1
|
+
{"version":3,"file":"socket.errors.d.ts","sourceRoot":"","sources":["../../src/utils/socket.errors.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,KAAG,MA0D7C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hyper-fetch/sockets",
|
|
3
|
-
"version": "8.2.
|
|
3
|
+
"version": "8.2.2",
|
|
4
4
|
"description": "Sockets connection for hyper-fetch",
|
|
5
5
|
"author": "Maciej Pyrc <maciekpyrc@gmail.com>, Kacper Skawina <kacper.skawina@gmail.com>",
|
|
6
6
|
"homepage": "https://hyperfetch.bettertyped.com/",
|
|
@@ -11,17 +11,17 @@
|
|
|
11
11
|
"source": "src/index.ts",
|
|
12
12
|
"scripts": {
|
|
13
13
|
"test": "vitest run",
|
|
14
|
-
"start": "
|
|
14
|
+
"start": "pnpm build && npx run-when-changed --watch 'src/**/*.ts' --exec 'pnpm build'",
|
|
15
15
|
"build": "vite build",
|
|
16
|
-
"lint": "
|
|
17
|
-
"format": "
|
|
18
|
-
"typecheck": "
|
|
19
|
-
"tests": "
|
|
20
|
-
"release": "
|
|
16
|
+
"lint": "oxlint .",
|
|
17
|
+
"format": "oxfmt --write .",
|
|
18
|
+
"typecheck": "tsgo --noEmit --emitDeclarationOnly false && tsgo --noEmit -p __tests__/tsconfig.json",
|
|
19
|
+
"tests": "pnpm lint-staged",
|
|
20
|
+
"release": "pnpm semantic-release --extends ../../release.config.js -t 'hyper-fetch-sockets-v${version}'"
|
|
21
21
|
},
|
|
22
22
|
"publishConfig": {
|
|
23
23
|
"access": "public",
|
|
24
|
-
"registry": "https://registry.npmjs.
|
|
24
|
+
"registry": "https://registry.npmjs.org/"
|
|
25
25
|
},
|
|
26
26
|
"repository": {
|
|
27
27
|
"type": "git",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { Socket } from "socket";
|
|
2
|
-
import type { ListenerCallbackType, ListenerOfAdapter } from "listener";
|
|
3
|
-
import type { EmitterInstance } from "emitter";
|
|
4
1
|
import type { SocketAdapterInstance } from "adapter";
|
|
2
|
+
import type { EmitterInstance } from "emitter";
|
|
3
|
+
import type { ListenerCallbackType, ListenerOfAdapter } from "listener";
|
|
4
|
+
import type { Socket } from "socket";
|
|
5
5
|
import type { ExtractAdapterExtraType } from "types";
|
|
6
6
|
|
|
7
7
|
export const getAdapterBindings = <T extends SocketAdapterInstance>(socket: Socket<T>) => {
|
package/src/adapter/adapter.ts
CHANGED
|
@@ -6,14 +6,14 @@ import type {
|
|
|
6
6
|
QueryStringifyOptionsType,
|
|
7
7
|
} from "@hyper-fetch/core";
|
|
8
8
|
import { defaultMapper } from "@hyper-fetch/core";
|
|
9
|
-
|
|
10
|
-
import type { Socket, SocketInstance } from "socket";
|
|
11
|
-
import type { Connector, RemoveListenerCallbackType } from "./adapter.types";
|
|
12
|
-
import { getAdapterBindings } from "./adapter.bindings";
|
|
13
|
-
import type { ListenerOfAdapter, ListenerCallbackType } from "listener";
|
|
14
9
|
import type { EmitterInstance } from "emitter";
|
|
10
|
+
import type { ListenerOfAdapter, ListenerCallbackType } from "listener";
|
|
11
|
+
import type { Socket, SocketInstance } from "socket";
|
|
15
12
|
import type { ExtractAdapterExtraType } from "types";
|
|
16
13
|
|
|
14
|
+
import { getAdapterBindings } from "./adapter.bindings";
|
|
15
|
+
import type { Connector, RemoveListenerCallbackType } from "./adapter.types";
|
|
16
|
+
|
|
17
17
|
export class SocketAdapter<
|
|
18
18
|
Extra = undefined,
|
|
19
19
|
AdapterOptions extends Record<string, any> | EmptyTypes = undefined,
|
|
@@ -24,10 +24,10 @@ export class SocketAdapter<
|
|
|
24
24
|
> {
|
|
25
25
|
public name: string;
|
|
26
26
|
public socket: SocketInstance;
|
|
27
|
-
public defaultExtra?: Extra;
|
|
27
|
+
public defaultExtra?: Extra = undefined;
|
|
28
28
|
|
|
29
|
-
public queryParams?: QueryParams;
|
|
30
|
-
public queryParamsConfig?: QueryStringifyOptionsType;
|
|
29
|
+
public queryParams?: QueryParams = undefined;
|
|
30
|
+
public queryParamsConfig?: QueryStringifyOptionsType = undefined;
|
|
31
31
|
|
|
32
32
|
/** Config for the query params mapper */
|
|
33
33
|
public unstable_queryParamsMapperConfig: Parameters<QueryParamsMapperType>[1];
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-use-before-define */
|
|
2
2
|
import type { QueryParamsType } from "@hyper-fetch/core";
|
|
3
3
|
import { stringifyQueryParams } from "@hyper-fetch/core";
|
|
4
|
-
|
|
5
|
-
import type { ListenerCallbackType, ListenerOfAdapter } from "listener";
|
|
6
4
|
import type { SocketData } from "adapter";
|
|
7
5
|
import { SocketAdapter } from "adapter/adapter";
|
|
8
|
-
import {
|
|
9
|
-
|
|
6
|
+
import type { ListenerCallbackType, ListenerOfAdapter } from "listener";
|
|
7
|
+
|
|
10
8
|
import { getSocketUrl, parseMessageEvent } from "../utils";
|
|
11
9
|
import { getSocketError } from "../utils/socket.errors";
|
|
10
|
+
import type { SSEAdapterOptionsType } from "./sse-adapter.types";
|
|
11
|
+
import { getServerSentEventsAdapter } from "./sse-adapter.utils";
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* -------------------------------------------
|
|
@@ -130,21 +130,21 @@ export const ServerSentEventsAdapter = (): ServerSentEventsAdapterType =>
|
|
|
130
130
|
if (!sse) {
|
|
131
131
|
adapter.setConnected(false);
|
|
132
132
|
adapter.setConnecting(false);
|
|
133
|
-
return
|
|
133
|
+
return true;
|
|
134
134
|
}
|
|
135
135
|
const currentSse = sse;
|
|
136
136
|
|
|
137
137
|
if (currentSse.readyState === EventSource.CLOSED) {
|
|
138
138
|
adapter.setConnected(false);
|
|
139
139
|
adapter.setConnecting(false);
|
|
140
|
-
return
|
|
140
|
+
return true;
|
|
141
141
|
}
|
|
142
142
|
|
|
143
143
|
onDisconnect();
|
|
144
144
|
currentSse.close();
|
|
145
145
|
onDisconnected();
|
|
146
146
|
|
|
147
|
-
return
|
|
147
|
+
return true;
|
|
148
148
|
};
|
|
149
149
|
|
|
150
150
|
const reconnect = () => {
|
|
@@ -6,17 +6,17 @@ export const getServerSentEventsAdapter = (url: string, adapterOptions: SSEAdapt
|
|
|
6
6
|
/** istanbul ignore next */
|
|
7
7
|
try {
|
|
8
8
|
/** istanbul ignore next */
|
|
9
|
-
if (!window?.EventSource) return null;
|
|
10
|
-
} catch
|
|
9
|
+
if (!window?.EventSource) {return null;}
|
|
10
|
+
} catch {
|
|
11
11
|
return null;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
class HyperFetchEventSource extends EventSource {
|
|
15
15
|
// Named to avoid shadowing EventEmitter.listeners() in Node.js environments
|
|
16
|
-
public registeredHandlers
|
|
16
|
+
public registeredHandlers = new Map<
|
|
17
17
|
(...args: any[]) => any,
|
|
18
18
|
{ type: keyof EventSourceEventMap; listener: (...args: any[]) => void; options: any }
|
|
19
|
-
>
|
|
19
|
+
>();
|
|
20
20
|
|
|
21
21
|
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
|
|
22
22
|
constructor(socketUrl: string, eventSourceInit?: EventSourceInit) {
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-use-before-define */
|
|
2
2
|
import type { QueryParamsType } from "@hyper-fetch/core";
|
|
3
3
|
import { stringifyQueryParams, Time } from "@hyper-fetch/core";
|
|
4
|
-
|
|
5
|
-
import type { EmitterInstance } from "emitter";
|
|
6
|
-
import type { ListenerCallbackType, ListenerOfAdapter } from "listener";
|
|
7
4
|
import type { SocketData } from "adapter";
|
|
8
5
|
import { SocketAdapter } from "adapter/adapter";
|
|
9
|
-
import type {
|
|
10
|
-
import {
|
|
6
|
+
import type { EmitterInstance } from "emitter";
|
|
7
|
+
import type { ListenerCallbackType, ListenerOfAdapter } from "listener";
|
|
8
|
+
|
|
11
9
|
import { getSocketUrl, parseMessageEvent } from "../utils";
|
|
12
10
|
import { getSocketError } from "../utils/socket.errors";
|
|
11
|
+
import type { WebsocketAdapterOptionsType } from "./websocket-adapter.types";
|
|
12
|
+
import { getWebsocketAdapter } from "./websocket-adapter.utils";
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* -------------------------------------------
|
|
@@ -69,7 +69,7 @@ export const WebsocketAdapter = (): WebsocketAdapterType =>
|
|
|
69
69
|
const url = getSocketUrl(socket.url, getQueryParams());
|
|
70
70
|
const enabled = onConnect();
|
|
71
71
|
if (!enabled) {
|
|
72
|
-
return
|
|
72
|
+
return false;
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
clearTimeout(timeout);
|
|
@@ -88,7 +88,7 @@ export const WebsocketAdapter = (): WebsocketAdapterType =>
|
|
|
88
88
|
websocket,
|
|
89
89
|
},
|
|
90
90
|
});
|
|
91
|
-
return
|
|
91
|
+
return false;
|
|
92
92
|
}
|
|
93
93
|
|
|
94
94
|
// Clear listeners
|
|
@@ -163,7 +163,7 @@ export const WebsocketAdapter = (): WebsocketAdapterType =>
|
|
|
163
163
|
if (!websocket) {
|
|
164
164
|
socket.adapter.setConnected(false);
|
|
165
165
|
socket.adapter.setConnecting(false);
|
|
166
|
-
return
|
|
166
|
+
return true;
|
|
167
167
|
}
|
|
168
168
|
const currentWebsocket = websocket;
|
|
169
169
|
const promise = new Promise<boolean>((resolve) => {
|
|
@@ -198,7 +198,7 @@ export const WebsocketAdapter = (): WebsocketAdapterType =>
|
|
|
198
198
|
};
|
|
199
199
|
|
|
200
200
|
const sendEventMessage = ({ topic, payload }: Pick<EmitterInstance, "topic" | "payload">) => {
|
|
201
|
-
if (!websocket) return false;
|
|
201
|
+
if (!websocket) {return false;}
|
|
202
202
|
websocket!.send(JSON.stringify({ topic, data: payload }));
|
|
203
203
|
return true;
|
|
204
204
|
};
|
|
@@ -213,7 +213,7 @@ export const WebsocketAdapter = (): WebsocketAdapterType =>
|
|
|
213
213
|
/* istanbul ignore next */
|
|
214
214
|
{};
|
|
215
215
|
|
|
216
|
-
if (socket.adapter.connecting || !heartbeat) return;
|
|
216
|
+
if (socket.adapter.connecting || !heartbeat) {return;}
|
|
217
217
|
clearTimers();
|
|
218
218
|
pingTimer = setTimeout(() => {
|
|
219
219
|
sendEventMessage({ topic: "heartbeat", payload: heartbeatMessage });
|
|
@@ -233,7 +233,7 @@ export const WebsocketAdapter = (): WebsocketAdapterType =>
|
|
|
233
233
|
|
|
234
234
|
const emit = async (emitter: EmitterInstance) => {
|
|
235
235
|
const mappedEmitter = await onEmit({ emitter });
|
|
236
|
-
if (!mappedEmitter) return;
|
|
236
|
+
if (!mappedEmitter) {return;}
|
|
237
237
|
|
|
238
238
|
return sendEventMessage(mappedEmitter);
|
|
239
239
|
};
|
|
@@ -6,17 +6,17 @@ export const getWebsocketAdapter = (url: string, adapterOptions: WebsocketAdapte
|
|
|
6
6
|
/** istanbul ignore next */
|
|
7
7
|
try {
|
|
8
8
|
/** istanbul ignore next */
|
|
9
|
-
if (!window?.WebSocket) return null;
|
|
10
|
-
} catch
|
|
9
|
+
if (!window?.WebSocket) {return null;}
|
|
10
|
+
} catch {
|
|
11
11
|
return null;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
class HyperFetchWebsocket extends WebSocket {
|
|
15
15
|
// Named to avoid shadowing EventEmitter.listeners() in Node.js environments
|
|
16
|
-
public registeredHandlers
|
|
16
|
+
public registeredHandlers = new Map<
|
|
17
17
|
(...args: any[]) => any,
|
|
18
18
|
{ type: keyof WebSocketEventMap; listener: (...args: any[]) => void; options: any }
|
|
19
|
-
>
|
|
19
|
+
>();
|
|
20
20
|
|
|
21
21
|
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
|
|
22
22
|
constructor(socketUrl: string, protocols?: string | string[]) {
|
package/src/emitter/emitter.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { ExtractUrlParams, ParamsType, PayloadMapperType, EmptyTypes } from "@hyper-fetch/core";
|
|
2
|
-
|
|
3
|
-
import type { SocketInstance } from "socket";
|
|
4
2
|
import type { EmitMethodOptionsType, EmitterCloneOptionsType, EmitterOptionsType, EmitType } from "emitter";
|
|
3
|
+
import type { SocketInstance } from "socket";
|
|
5
4
|
import type { ExtractAdapterEmitterOptionsType, ExtractSocketAdapterType } from "types";
|
|
6
5
|
|
|
7
6
|
/**
|
|
@@ -16,11 +15,11 @@ export class Emitter<
|
|
|
16
15
|
HasParams extends boolean = false,
|
|
17
16
|
> {
|
|
18
17
|
readonly topic: Topic;
|
|
19
|
-
params?: ParamsType;
|
|
18
|
+
params?: ParamsType = undefined;
|
|
20
19
|
payload: Payload | undefined;
|
|
21
20
|
options: ExtractAdapterEmitterOptionsType<ExtractSocketAdapterType<Socket>> | undefined;
|
|
22
21
|
/** @internal */
|
|
23
|
-
unstable_payloadMapper?: PayloadMapperType<any
|
|
22
|
+
unstable_payloadMapper?: PayloadMapperType<any> = undefined;
|
|
24
23
|
|
|
25
24
|
constructor(
|
|
26
25
|
readonly socket: Socket,
|
|
@@ -53,7 +52,7 @@ export class Emitter<
|
|
|
53
52
|
|
|
54
53
|
/** Set a mapper function that transforms the payload before it is sent. */
|
|
55
54
|
setPayloadMapper = <DataMapper extends (payload: Payload) => any | Promise<any>>(payloadMapper: DataMapper) => {
|
|
56
|
-
const cloned = this.clone<Payload, HasPayload, HasParams>(
|
|
55
|
+
const cloned = this.clone<Payload, HasPayload, HasParams>();
|
|
57
56
|
|
|
58
57
|
cloned.unstable_payloadMapper = payloadMapper;
|
|
59
58
|
|
|
@@ -69,7 +68,7 @@ export class Emitter<
|
|
|
69
68
|
let topic = this.emitterOptions.topic as string;
|
|
70
69
|
if (params) {
|
|
71
70
|
Object.entries(params).forEach(([key, value]) => {
|
|
72
|
-
topic = topic.
|
|
71
|
+
topic = topic.replaceAll(new RegExp(`:${key}`, "g"), String(value));
|
|
73
72
|
});
|
|
74
73
|
}
|
|
75
74
|
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-shadow */
|
|
2
2
|
import type { ExtractUrlParams, EmptyTypes, TypeWithDefaults, ParamsType } from "@hyper-fetch/core";
|
|
3
|
-
|
|
4
3
|
import type { SocketAdapterInstance } from "adapter";
|
|
5
4
|
import type { Emitter } from "emitter";
|
|
6
5
|
import type { SocketInstance } from "socket";
|
package/src/listener/listener.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { ExtractUrlParams, ParamsType } from "@hyper-fetch/core";
|
|
2
|
-
|
|
3
|
-
import type { SocketInstance } from "socket";
|
|
4
2
|
import type { ListenType, ListenerConfigurationType, ListenerOptionsType } from "listener";
|
|
3
|
+
import type { SocketInstance } from "socket";
|
|
5
4
|
import type { ExtractAdapterListenerOptionsType, ExtractSocketAdapterType } from "types";
|
|
6
5
|
|
|
7
6
|
/**
|
|
@@ -15,8 +14,8 @@ export class Listener<
|
|
|
15
14
|
HasParams extends boolean = false,
|
|
16
15
|
> {
|
|
17
16
|
readonly topic: Topic;
|
|
18
|
-
params?: ParamsType;
|
|
19
|
-
options?: ExtractAdapterListenerOptionsType<ExtractSocketAdapterType<Socket
|
|
17
|
+
params?: ParamsType = undefined;
|
|
18
|
+
options?: ExtractAdapterListenerOptionsType<ExtractSocketAdapterType<Socket>> = undefined;
|
|
20
19
|
|
|
21
20
|
constructor(
|
|
22
21
|
readonly socket: Socket,
|
|
@@ -67,7 +66,7 @@ export class Listener<
|
|
|
67
66
|
let topic = this.listenerOptions.topic as string;
|
|
68
67
|
if (params) {
|
|
69
68
|
Object.entries(params).forEach(([key, value]) => {
|
|
70
|
-
topic = topic.
|
|
69
|
+
topic = topic.replaceAll(new RegExp(`:${key}`, "g"), String(value));
|
|
71
70
|
});
|
|
72
71
|
}
|
|
73
72
|
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-shadow */
|
|
2
2
|
import type { ExtractUrlParams, EmptyTypes, TypeWithDefaults } from "@hyper-fetch/core";
|
|
3
|
-
|
|
4
3
|
import type { SocketAdapterInstance } from "adapter";
|
|
5
4
|
import type { Listener } from "listener";
|
|
6
5
|
import type { Socket, SocketInstance } from "socket";
|
package/src/sdk/sdk.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { SocketInstance } from "socket";
|
|
2
|
-
import type { Listener, ListenerInstance } from "listener";
|
|
3
1
|
import type { Emitter, EmitterInstance } from "emitter";
|
|
2
|
+
import type { Listener, ListenerInstance } from "listener";
|
|
3
|
+
import type { SocketInstance } from "socket";
|
|
4
4
|
import type {
|
|
5
5
|
ExtractListenerResponseType,
|
|
6
6
|
ExtractListenerTopicType,
|
|
@@ -142,8 +142,8 @@ const isTopicGroup = (key: string): boolean => {
|
|
|
142
142
|
};
|
|
143
143
|
|
|
144
144
|
const topicMatchesPattern = (topic: string, pattern: string): boolean => {
|
|
145
|
-
if (pattern === "*") return true;
|
|
146
|
-
if (pattern === topic) return true;
|
|
145
|
+
if (pattern === "*") {return true;}
|
|
146
|
+
if (pattern === topic) {return true;}
|
|
147
147
|
if (pattern.endsWith("/*")) {
|
|
148
148
|
const prefix = pattern.slice(0, -1);
|
|
149
149
|
return topic.startsWith(prefix) || topic === prefix.slice(0, -1);
|
|
@@ -153,7 +153,7 @@ const topicMatchesPattern = (topic: string, pattern: string): boolean => {
|
|
|
153
153
|
|
|
154
154
|
const applySocketObjectDefaults = (instance: SocketSdkLeaf, config: SocketSdkDefaults): SocketSdkLeaf => {
|
|
155
155
|
let result = instance;
|
|
156
|
-
if (config.options !== undefined) result = result.setOptions(config.options);
|
|
156
|
+
if (config.options !== undefined) {result = result.setOptions(config.options);}
|
|
157
157
|
return result;
|
|
158
158
|
};
|
|
159
159
|
|
|
@@ -168,7 +168,7 @@ const applySocketDefaults = ({
|
|
|
168
168
|
sdkPath: string;
|
|
169
169
|
defaults?: Partial<Record<string, SocketSdkConfigurationValue>>;
|
|
170
170
|
}): SocketSdkLeaf => {
|
|
171
|
-
if (!defaults) return instance;
|
|
171
|
+
if (!defaults) {return instance;}
|
|
172
172
|
|
|
173
173
|
let result = instance;
|
|
174
174
|
const entries = Object.entries(defaults);
|
|
@@ -179,7 +179,7 @@ const applySocketDefaults = ({
|
|
|
179
179
|
|
|
180
180
|
for (let i = 0; i < entries.length; i += 1) {
|
|
181
181
|
const [key, value] = entries[i];
|
|
182
|
-
if (!value) continue;
|
|
182
|
+
if (!value) {continue;}
|
|
183
183
|
const entry: [string, SocketSdkConfigurationValue] = [key, value];
|
|
184
184
|
if (entry[0] === "*") {
|
|
185
185
|
globalEntries.push(entry);
|
|
@@ -229,7 +229,7 @@ const createSocketRecursiveProxy = ({
|
|
|
229
229
|
return new Proxy(() => {}, {
|
|
230
230
|
get: (_target, key: string) => {
|
|
231
231
|
if (typeof key === "symbol" || key === "inspect") {
|
|
232
|
-
return
|
|
232
|
+
return;
|
|
233
233
|
}
|
|
234
234
|
|
|
235
235
|
const currentSdkKeys = [...sdkKeys, key];
|
|
@@ -240,7 +240,7 @@ const createSocketRecursiveProxy = ({
|
|
|
240
240
|
if (key.startsWith("$") && !LEAF_KEYS.has(key)) {
|
|
241
241
|
pathSegment = `:${key.slice(1)}`;
|
|
242
242
|
} else if (options?.camelCaseToKebabCase) {
|
|
243
|
-
pathSegment = key.
|
|
243
|
+
pathSegment = key.replaceAll(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
|
|
244
244
|
}
|
|
245
245
|
|
|
246
246
|
if (LEAF_KEYS.has(key)) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { SocketAdapterInstance } from "adapter";
|
|
2
|
+
import type { WebsocketAdapterType } from "adapter-websockets/websocket-adapter";
|
|
2
3
|
import type { SocketOptionsType } from "socket";
|
|
3
4
|
import { Socket } from "socket";
|
|
4
|
-
import type { WebsocketAdapterType } from "adapter-websockets/websocket-adapter";
|
|
5
5
|
|
|
6
6
|
export function createSocketClient<Adapter extends SocketAdapterInstance = WebsocketAdapterType>(
|
|
7
7
|
options: SocketOptionsType<Adapter>,
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import type { SocketAdapterInstance } from "adapter";
|
|
2
|
+
import type { EmitterInstance } from "emitter";
|
|
1
3
|
import type EventEmitter from "events";
|
|
2
|
-
|
|
4
|
+
import type { ListenerInstance } from "listener";
|
|
3
5
|
import {
|
|
4
6
|
getErrorKey,
|
|
5
7
|
getCloseKey,
|
|
@@ -16,9 +18,6 @@ import {
|
|
|
16
18
|
getEmitterErrorKey,
|
|
17
19
|
getEmitterErrorByTopicKey,
|
|
18
20
|
} from "socket";
|
|
19
|
-
import type { EmitterInstance } from "emitter";
|
|
20
|
-
import type { ListenerInstance } from "listener";
|
|
21
|
-
import type { SocketAdapterInstance } from "adapter";
|
|
22
21
|
import type { ExtractAdapterExtraType } from "types";
|
|
23
22
|
|
|
24
23
|
export const getSocketEvents = <Adapter extends SocketAdapterInstance>(eventEmitter: EventEmitter) =>
|
package/src/socket/socket.ts
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
|
-
import EventEmitter from "events";
|
|
2
1
|
import type { LogLevel } from "@hyper-fetch/core";
|
|
3
2
|
import { LoggerManager, AppManager, Time } from "@hyper-fetch/core";
|
|
4
|
-
|
|
3
|
+
import type { SocketAdapterInstance } from "adapter";
|
|
4
|
+
import type { WebsocketAdapterType } from "adapter-websockets/websocket-adapter";
|
|
5
|
+
import { WebsocketAdapter } from "adapter-websockets/websocket-adapter";
|
|
6
|
+
import type { EmitterInstance, EmitterOptionsType } from "emitter";
|
|
7
|
+
import { Emitter } from "emitter";
|
|
8
|
+
import EventEmitter from "events";
|
|
9
|
+
import type { ListenerOptionsType } from "listener";
|
|
10
|
+
import { Listener } from "listener";
|
|
5
11
|
import type {
|
|
6
12
|
SocketOptionsType,
|
|
7
13
|
ReconnectCallbackType,
|
|
@@ -13,14 +19,7 @@ import type {
|
|
|
13
19
|
ErrorCallbackType,
|
|
14
20
|
} from "socket";
|
|
15
21
|
import { getSocketEvents, interceptListener, interceptEmitter } from "socket";
|
|
16
|
-
import type { ListenerOptionsType } from "listener";
|
|
17
|
-
import { Listener } from "listener";
|
|
18
|
-
import type { EmitterInstance, EmitterOptionsType } from "emitter";
|
|
19
|
-
import { Emitter } from "emitter";
|
|
20
|
-
import type { SocketAdapterInstance } from "adapter";
|
|
21
22
|
import type { ExtractAdapterExtraType, ExtractAdapterQueryParamsType } from "types";
|
|
22
|
-
import type { WebsocketAdapterType } from "adapter-websockets/websocket-adapter";
|
|
23
|
-
import { WebsocketAdapter } from "adapter-websockets/websocket-adapter";
|
|
24
23
|
|
|
25
24
|
export class Socket<Adapter extends SocketAdapterInstance = WebsocketAdapterType> {
|
|
26
25
|
public emitter = new EventEmitter();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { Socket } from "socket";
|
|
2
1
|
import type { SocketAdapterInstance } from "adapter";
|
|
3
2
|
import type { EmitterInstance } from "emitter";
|
|
3
|
+
import type { Socket } from "socket";
|
|
4
4
|
import type { ExtractAdapterOptionsType, ExtractAdapterQueryParamsType } from "types";
|
|
5
5
|
|
|
6
6
|
export type SocketInstance = Socket<SocketAdapterInstance>;
|