@cloudpss/ubrpc 0.4.11 → 0.4.13

package/dist/types/payload.d.ts

@@ -1,99 +1,99 @@
-/** RPC 连接 ID */
-export type ConnectionID = string & {
-    tag: 'ConnectionID';
-};
-/** 认证信息 */
-export type RpcMetadata = Record<string, unknown>;
-/** RPC 错误 */
-export interface RpcErrorLike {
-    /** 名称 */
-    name: string;
-    /** 消息 */
-    message: string;
-    /** 调用 */
-    stack?: string;
-    /** 引发错误的其他错误 */
-    errors?: RpcErrorLike[];
-}
-/** RPC 调用的通用属性 */
-interface RpcPayloadBase {
-    /** 调用类型 */
-    type: string;
-    /** 序列号 */
-    seq: number;
-}
-/** RPC 认证调用 */
-export interface RpcAuthPayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'auth';
-    /** 连接 ID */
-    id: ConnectionID;
-    /** 协议版本 */
-    version: number;
-    /** 认证信息 */
-    metadata: RpcMetadata;
-    /** 异常 */
-    error?: RpcErrorLike;
-}
-/** RPC 方法调用 */
-export interface RpcCallPayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'call';
-    /** 调用的方法 */
-    method: string;
-    /** 参数 */
-    args: unknown[];
-}
-/** RPC 方法返回 */
-export interface RpcReturnPayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'return';
-    /** 返回值 */
-    result?: unknown;
-    /** 异常 */
-    error?: RpcErrorLike;
-}
-/** RPC 通知 */
-export interface RpcNotifyPayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'notify';
-    /** 调用的方法 */
-    method: string;
-    /** 参数 */
-    args: unknown[];
-}
-/** RPC 订阅 */
-export interface RpcSubscribePayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'subscribe';
-    /** 调用的方法 */
-    method: string;
-    /** 参数 */
-    args: unknown[];
-}
-/** RPC 发布 */
-export interface RpcPublishPayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'publish';
-    /** 发布的值 */
-    next?: unknown;
-    /** 异常结束 */
-    error?: RpcErrorLike;
-    /** 正常结束 */
-    complete?: true;
-}
-/** RPC 取消订阅 */
-export interface RpcUnsubscribePayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'unsubscribe';
-}
-/** RPC 错误 */
-export interface RpcErrorPayload extends RpcPayloadBase {
-    /** @inheritdoc */
-    type: 'error';
-    /** 异常 */
-    error: RpcErrorLike;
-}
-/** RPC 调用 */
-export type RpcPayload = RpcCallPayload | RpcReturnPayload | RpcNotifyPayload | RpcPublishPayload | RpcSubscribePayload | RpcUnsubscribePayload | RpcAuthPayload | RpcErrorPayload;
-export {};
+/** RPC 连接 ID */
+export type ConnectionID = string & {
+    tag: 'ConnectionID';
+};
+/** 认证信息 */
+export type RpcMetadata = Record<string, unknown>;
+/** RPC 错误 */
+export interface RpcErrorLike {
+    /** 名称 */
+    name: string;
+    /** 消息 */
+    message: string;
+    /** 调用 */
+    stack?: string;
+    /** 引发错误的其他错误 */
+    errors?: RpcErrorLike[];
+}
+/** RPC 调用的通用属性 */
+interface RpcPayloadBase {
+    /** 调用类型 */
+    type: string;
+    /** 序列号 */
+    seq: number;
+}
+/** RPC 认证调用 */
+export interface RpcAuthPayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'auth';
+    /** 连接 ID */
+    id: ConnectionID;
+    /** 协议版本 */
+    version: number;
+    /** 认证信息 */
+    metadata: RpcMetadata;
+    /** 异常 */
+    error?: RpcErrorLike;
+}
+/** RPC 方法调用 */
+export interface RpcCallPayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'call';
+    /** 调用的方法 */
+    method: string;
+    /** 参数 */
+    args: unknown[];
+}
+/** RPC 方法返回 */
+export interface RpcReturnPayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'return';
+    /** 返回值 */
+    result?: unknown;
+    /** 异常 */
+    error?: RpcErrorLike;
+}
+/** RPC 通知 */
+export interface RpcNotifyPayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'notify';
+    /** 调用的方法 */
+    method: string;
+    /** 参数 */
+    args: unknown[];
+}
+/** RPC 订阅 */
+export interface RpcSubscribePayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'subscribe';
+    /** 调用的方法 */
+    method: string;
+    /** 参数 */
+    args: unknown[];
+}
+/** RPC 发布 */
+export interface RpcPublishPayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'publish';
+    /** 发布的值 */
+    next?: unknown;
+    /** 异常结束 */
+    error?: RpcErrorLike;
+    /** 正常结束 */
+    complete?: true;
+}
+/** RPC 取消订阅 */
+export interface RpcUnsubscribePayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'unsubscribe';
+}
+/** RPC 错误 */
+export interface RpcErrorPayload extends RpcPayloadBase {
+    /** @inheritdoc */
+    type: 'error';
+    /** 异常 */
+    error: RpcErrorLike;
+}
+/** RPC 调用 */
+export type RpcPayload = RpcCallPayload | RpcReturnPayload | RpcNotifyPayload | RpcPublishPayload | RpcSubscribePayload | RpcUnsubscribePayload | RpcAuthPayload | RpcErrorPayload;
+export {};

package/dist/types/payload.js

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=payload.js.map

package/dist/types/utils.d.ts

@@ -1,32 +1,32 @@
-import type { InteropObservable, Observable } from 'rxjs';
-/** 可转换为 Observable 的类型 */
-export type ObservableLike<T> = Observable<T> | InteropObservable<T> | AsyncIterable<T>;
-/** Returns a boolean for whether the two given types are equal. */
-type IsEqual<A, B> = (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B ? 1 : 2 ? true : false;
-/** 作为通知输出的方法 */
-type IsNotificationReturn<R> = IsEqual<R, void> extends true ? true : IsEqual<R, undefined> extends true ? true : R extends PromiseLike<void> | void ? true : false;
-/** 作为 Observable 输出的方法 */
-type ObservableReturn = ObservableLike<any> | PromiseLike<ObservableLike<any>>;
-/** 提取类型中的方法 */
-export type Methods<T> = {
-    [P in keyof T]: T[P] extends (...args: any[]) => infer R ? (R extends ObservableReturn ? never : P) : never;
-}[keyof T] & string;
-/** 提取类型中的通知 */
-export type Notifications<T> = {
-    [P in keyof T]: T[P] extends (...args: any[]) => infer R ? IsNotificationReturn<R> extends true ? P : never : never;
-}[keyof T] & string;
-/** 提取类型中的订阅主题 */
-export type Subjects<T> = {
-    [P in keyof T]: T[P] extends (...args: any[]) => ObservableReturn ? P : never;
-}[keyof T] & string;
-/** RPC 调用的参数 */
-export type RpcParameters<T> = T extends (...args: infer R) => any ? R : never;
-/** RPC 调用的返回 */
-export type RpcReturns<T> = T extends (...args: any[]) => infer R ? Awaited<R> extends ObservableLike<infer U> ? U : Awaited<R> : never;
-/** RPC 调用函数的实现 */
-type RpcField<T> = T extends (...args: infer P) => infer R ? Awaited<R> extends ObservableReturn ? (...args: P) => ObservableLike<RpcReturns<T>> | PromiseLike<ObservableLike<RpcReturns<T>>> : (...args: P) => RpcReturns<T> | PromiseLike<RpcReturns<T>> : never;
-/** RPC 调用对象的实现 */
-export type RpcObject<T> = {
-    [K in Methods<T> | Subjects<T>]: RpcField<T[K]>;
-};
-export {};
+import type { InteropObservable, Observable } from 'rxjs';
+/** 可转换为 Observable 的类型 */
+export type ObservableLike<T> = Observable<T> | InteropObservable<T> | AsyncIterable<T>;
+/** Returns a boolean for whether the two given types are equal. */
+type IsEqual<A, B> = (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B ? 1 : 2 ? true : false;
+/** 作为通知输出的方法 */
+type IsNotificationReturn<R> = IsEqual<R, void> extends true ? true : IsEqual<R, undefined> extends true ? true : R extends PromiseLike<void> | void ? true : false;
+/** 作为 Observable 输出的方法 */
+type ObservableReturn = ObservableLike<any> | PromiseLike<ObservableLike<any>>;
+/** 提取类型中的方法 */
+export type Methods<T> = {
+    [P in keyof T]: T[P] extends (...args: any[]) => infer R ? (R extends ObservableReturn ? never : P) : never;
+}[keyof T] & string;
+/** 提取类型中的通知 */
+export type Notifications<T> = {
+    [P in keyof T]: T[P] extends (...args: any[]) => infer R ? IsNotificationReturn<R> extends true ? P : never : never;
+}[keyof T] & string;
+/** 提取类型中的订阅主题 */
+export type Subjects<T> = {
+    [P in keyof T]: T[P] extends (...args: any[]) => ObservableReturn ? P : never;
+}[keyof T] & string;
+/** RPC 调用的参数 */
+export type RpcParameters<T> = T extends (...args: infer R) => any ? R : never;
+/** RPC 调用的返回 */
+export type RpcReturns<T> = T extends (...args: any[]) => infer R ? Awaited<R> extends ObservableLike<infer U> ? U : Awaited<R> : never;
+/** RPC 调用函数的实现 */
+type RpcField<T> = T extends (...args: infer P) => infer R ? Awaited<R> extends ObservableReturn ? (...args: P) => ObservableLike<RpcReturns<T>> | PromiseLike<ObservableLike<RpcReturns<T>>> : (...args: P) => RpcReturns<T> | PromiseLike<RpcReturns<T>> : never;
+/** RPC 调用对象的实现 */
+export type RpcObject<T> = {
+    [K in Methods<T> | Subjects<T>]: RpcField<T[K]>;
+};
+export {};

package/dist/types/utils.js

@@ -1,22 +1,22 @@
-export {};
-// interface A {
-//     field: number;
-//     methodA(x: number): number | undefined;
-//     methodB: (x: string, y: number) => Promise<number>;
-//     readonly methodC: () => Iterable<number>;
-//     readonly methodD: () => void | Promise<null | undefined>;
-//     readonly notificationA: () => undefined;
-//     readonly notificationB: () => Promise<void>;
-//     notificationC(): void;
-//     readonly notificationD: () => void | PromiseLike<undefined>;
-//     readonly notificationE: () => void | Promise<void>;
-//     subjectA(x: number): Observable<number>;
-//     subjectB: (x: string) => Promise<Observable<number>>;
-//     subjectC: () => PromiseLike<InteropObservable<number>>;
-//     subjectD: () => AsyncGenerator<number>;
-//     subjectE: () => PromiseLike<AsyncGenerator<number>>;
-// }
-// type X = Methods<A>;
-// type Y = Subjects<A>;
-// type Z = Notifications<A>;
+export {};
+// interface A {
+//     field: number;
+//     methodA(x: number): number | undefined;
+//     methodB: (x: string, y: number) => Promise<number>;
+//     readonly methodC: () => Iterable<number>;
+//     readonly methodD: () => void | Promise<null | undefined>;
+//     readonly notificationA: () => undefined;
+//     readonly notificationB: () => Promise<void>;
+//     notificationC(): void;
+//     readonly notificationD: () => void | PromiseLike<undefined>;
+//     readonly notificationE: () => void | Promise<void>;
+//     subjectA(x: number): Observable<number>;
+//     subjectB: (x: string) => Promise<Observable<number>>;
+//     subjectC: () => PromiseLike<InteropObservable<number>>;
+//     subjectD: () => AsyncGenerator<number>;
+//     subjectE: () => PromiseLike<AsyncGenerator<number>>;
+// }
+// type X = Methods<A>;
+// type Y = Subjects<A>;
+// type Z = Notifications<A>;
 //# sourceMappingURL=utils.js.map

package/dist/utils/messaging.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="ws" />
-import type WebSocket from 'isomorphic-ws';
-import type { RpcPayload } from '../types/payload.js';
-/** 发送消息 */
-export declare function send<T extends RpcPayload['type']>(socket: WebSocket, type: T, info: Omit<RpcPayload & {
-    type: T;
-}, 'type'>): void;
+/// <reference types="ws" />
+import type WebSocket from 'isomorphic-ws';
+import type { RpcPayload } from '../types/payload.js';
+/** 发送消息 */
+export declare function send<T extends RpcPayload['type']>(socket: WebSocket, type: T, info: Omit<RpcPayload & {
+    type: T;
+}, 'type'>): void;

package/dist/utils/messaging.js

@@ -1,9 +1,9 @@
-import { encode } from '@cloudpss/ubjson';
-/** 发送消息 */
-export function send(socket, type, info) {
-    socket.send(encode({
-        ...info,
-        type,
-    }));
-}
+import { encode } from '@cloudpss/ubjson';
+/** 发送消息 */
+export function send(socket, type, info) {
+    socket.send(encode({
+        ...info,
+        type,
+    }));
+}
 //# sourceMappingURL=messaging.js.map

package/dist/utils/serialize.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="ws" />
-import type WebSocket from 'isomorphic-ws';
-import type { RpcErrorLike, RpcPayload } from '../types/payload.js';
-/** 反序列化 */
-export declare function decodePayload(data: WebSocket.Data): RpcPayload | undefined;
-/** 序列化错误信息 */
-export declare function serializeError(error: unknown): RpcErrorLike;
-/** 反序列化错误信息 */
-export declare function deserializeError(error: RpcErrorLike): Error;
+/// <reference types="ws" />
+import type WebSocket from 'isomorphic-ws';
+import type { RpcErrorLike, RpcPayload } from '../types/payload.js';
+/** 反序列化 */
+export declare function decodePayload(data: WebSocket.Data): RpcPayload | undefined;
+/** 序列化错误信息 */
+export declare function serializeError(error: unknown): RpcErrorLike;
+/** 反序列化错误信息 */
+export declare function deserializeError(error: RpcErrorLike): Error;

package/dist/utils/serialize.js

@@ -1,73 +1,73 @@
-import { decode } from '@cloudpss/ubjson';
-/** 反序列化 */
-export function decodePayload(data) {
-    if (!data || typeof data == 'string')
-        return undefined;
-    if (Array.isArray(data))
-        data = Buffer.concat(data);
-    try {
-        const payload = decode(data);
-        if (!payload || typeof payload != 'object')
-            return undefined;
-        if (typeof payload.type !== 'string')
-            return undefined;
-        if (typeof payload.seq !== 'number')
-            return undefined;
-        return payload;
-    }
-    catch (ex) {
-        return undefined;
-    }
-}
-const serializing = Symbol('serializing error');
-/** 序列化错误信息 */
-export function serializeError(error) {
-    if (error == null)
-        return {
-            name: 'Error',
-            message: '',
-        };
-    if (typeof error != 'object')
-        return {
-            name: 'Error',
-            message: String(error),
-        };
-    try {
-        const reenter = !!error[serializing];
-        error[serializing] = true;
-        const { message, stack, name, errors, ...rest } = error;
-        return {
-            ...rest,
-            name: String(name ?? 'Error'),
-            message: String(message ?? ''),
-            stack: stack,
-            errors: reenter ? undefined : Array.isArray(errors) ? errors.map(serializeError) : errors,
-        };
-    }
-    finally {
-        delete error[serializing];
-    }
-}
-/** 反序列化错误信息 */
-export function deserializeError(error) {
-    if (error == null || typeof error != 'object')
-        return new Error(error ?? '');
-    const { message, stack, name, errors, ...rest } = error;
-    let ex;
-    if (Array.isArray(errors)) {
-        ex = new AggregateError(errors.map(deserializeError), message);
-    }
-    else {
-        ex = new Error(message);
-    }
-    if (name !== ex?.name)
-        Object.defineProperty(ex, 'name', { value: String(name), configurable: true, writable: true });
-    Object.defineProperty(ex, 'stack', {
-        value: stack ? String(stack) : undefined,
-        configurable: true,
-        writable: true,
-    });
-    Object.assign(ex, rest);
-    return ex;
-}
+import { decode } from '@cloudpss/ubjson';
+/** 反序列化 */
+export function decodePayload(data) {
+    if (!data || typeof data == 'string')
+        return undefined;
+    if (Array.isArray(data))
+        data = Buffer.concat(data);
+    try {
+        const payload = decode(data);
+        if (!payload || typeof payload != 'object')
+            return undefined;
+        if (typeof payload.type !== 'string')
+            return undefined;
+        if (typeof payload.seq !== 'number')
+            return undefined;
+        return payload;
+    }
+    catch (ex) {
+        return undefined;
+    }
+}
+const serializing = Symbol('serializing error');
+/** 序列化错误信息 */
+export function serializeError(error) {
+    if (error == null)
+        return {
+            name: 'Error',
+            message: '',
+        };
+    if (typeof error != 'object')
+        return {
+            name: 'Error',
+            message: String(error),
+        };
+    try {
+        const reenter = !!error[serializing];
+        error[serializing] = true;
+        const { message, stack, name, errors, ...rest } = error;
+        return {
+            ...rest,
+            name: String(name ?? 'Error'),
+            message: String(message ?? ''),
+            stack: stack,
+            errors: reenter ? undefined : Array.isArray(errors) ? errors.map(serializeError) : errors,
+        };
+    }
+    finally {
+        delete error[serializing];
+    }
+}
+/** 反序列化错误信息 */
+export function deserializeError(error) {
+    if (error == null || typeof error != 'object')
+        return new Error(error ?? '');
+    const { message, stack, name, errors, ...rest } = error;
+    let ex;
+    if (Array.isArray(errors)) {
+        ex = new AggregateError(errors.map(deserializeError), message);
+    }
+    else {
+        ex = new Error(message);
+    }
+    if (name !== ex?.name)
+        Object.defineProperty(ex, 'name', { value: String(name), configurable: true, writable: true });
+    Object.defineProperty(ex, 'stack', {
+        value: stack ? String(stack) : undefined,
+        configurable: true,
+        writable: true,
+    });
+    Object.assign(ex, rest);
+    return ex;
+}
 //# sourceMappingURL=serialize.js.map

package/dist/utils/websocket.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="ws" />
-import type WebSocket from 'isomorphic-ws';
-/** 等待连接建立 */
-export declare function ready(socket: WebSocket): Promise<void>;
+/// <reference types="ws" />
+import type WebSocket from 'isomorphic-ws';
+/** 等待连接建立 */
+export declare function ready(socket: WebSocket): Promise<void>;

package/dist/utils/websocket.js

@@ -1,21 +1,21 @@
-/** 等待连接建立 */
-export function ready(socket) {
-    switch (socket.readyState) {
-        case socket.CONNECTING:
-            return new Promise((resolve, reject) => {
-                socket.addEventListener('open', () => resolve(), { once: true });
-                socket.addEventListener('error', (ev) => reject(ev.error ?? new Error(`Failed to connect`)), {
-                    once: true,
-                });
-            });
-        case socket.OPEN:
-            return Promise.resolve();
-        case socket.CLOSING:
-            return Promise.reject(new Error(`Socket is closing.`));
-        case socket.CLOSED:
-            return Promise.reject(new Error(`Socket is closed.`));
-        default:
-            return Promise.reject(new Error(`Socket is in unknown state.`));
-    }
-}
+/** 等待连接建立 */
+export function ready(socket) {
+    switch (socket.readyState) {
+        case socket.CONNECTING:
+            return new Promise((resolve, reject) => {
+                socket.addEventListener('open', () => resolve(), { once: true });
+                socket.addEventListener('error', (ev) => reject(ev.error ?? new Error(`Failed to connect`)), {
+                    once: true,
+                });
+            });
+        case socket.OPEN:
+            return Promise.resolve();
+        case socket.CLOSING:
+            return Promise.reject(new Error(`Socket is closing.`));
+        case socket.CLOSED:
+            return Promise.reject(new Error(`Socket is closed.`));
+        default:
+            return Promise.reject(new Error(`Socket is in unknown state.`));
+    }
+}
 //# sourceMappingURL=websocket.js.map

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = 1;
+export declare const VERSION = 1;

package/dist/version.js

@@ -1,2 +1,2 @@
-export const VERSION = 1;
+export const VERSION = 1;
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/ubrpc",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "author": "CloudPSS",
   "license": "MIT",
   "keywords": [
@@ -28,7 +28,7 @@
     "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest"
   },
   "dependencies": {
-    "@cloudpss/ubjson": "~0.4.11",
+    "@cloudpss/ubjson": "~0.4.13",
     "@types/ws": "^8.5.4",
     "isomorphic-ws": "^5.0.0",
     "rxjs": "^7.8.0",

package/src/server.ts

@@ -39,20 +39,19 @@ export class RpcServer<TRemote extends {}, TLocal extends {}> {
         const s = socket as WebSocketWithMetadata;
         const [id, metadata] = await this.authSocket(socket);
         s[kMetadata] = metadata;
-        const exist = this.sockets.get(id);
-        if (!exist) {
-            const client = new RpcServerSocket(id, this, s);
+        let client = this.sockets.get(id);
+        if (!client) {
+            client = new RpcServerSocket(id, this);
             this.sockets.set(id, client);
-            return client;
         } else {
             const tid = this.disconnectingSockets.get(id);
             if (tid != null) {
                 this.disconnectingSockets.delete(id);
                 clearTimeout(tid);
             }
-            exist[kReplaceSocket](s);
-            return exist;
         }
+        await client[kReplaceSocket](s);
+        return client;
     }
     /** 认证客户端 */
     protected async authSocket(socket: WebSocket): Promise<[ConnectionID, RpcMetadata]> {
@@ -102,10 +101,9 @@ export class RpcServer<TRemote extends {}, TLocal extends {}> {
 
 /** 由 WS Server 建立的 RPC 连接 */
 export class RpcServerSocket<TRemote extends object, TLocal extends object> extends RpcSocket<TRemote, TLocal> {
-    constructor(id: ConnectionID, readonly server: RpcServer<TRemote, TLocal>, socket: WebSocketWithMetadata) {
+    constructor(id: ConnectionID, readonly server: RpcServer<TRemote, TLocal>) {
         super(id);
         this.seq = 1;
-        this.socket = socket;
     }
     /** @inheritdoc */
     protected authSocket(): Promise<RpcMetadata> {
@@ -121,7 +119,8 @@ export class RpcServerSocket<TRemote extends object, TLocal extends object> exte
         this.server[kOnClose](this, ev);
     }
     /** 替换 socket */
-    [kReplaceSocket](newSocket: WebSocketWithMetadata): void {
+    [kReplaceSocket](newSocket: WebSocketWithMetadata): Promise<void> {
         this.socket = newSocket;
+        return this.ready;
     }
 }