starpc 0.21.4 → 0.21.6

package/Makefile

@@ -1,5 +1,6 @@
 # https://github.com/aperturerobotics/protobuf-project
 
+SHELL:=bash
 PROTOWRAP=hack/bin/protowrap
 PROTOC_GEN_GO=hack/bin/protoc-gen-go
 PROTOC_GEN_STARPC=hack/bin/protoc-gen-go-starpc

package/README.md

@@ -195,6 +195,25 @@ Uses [vtprotobuf] to generate Protobuf marshal / unmarshal code.
 
 [vtprotobuf]: https://github.com/planetscale/vtprotobuf
 
+## Developing on MacOS
+
+On MacOS, some homebrew packages are required for `yarn gen`:
+
+```
+brew install bash make coreutils gnu-sed findutils protobuf
+brew link --overwrite protobuf
+```
+
+Add to your .bashrc or .zshrc:
+
+```
+export PATH="/opt/homebrew/opt/coreutils/libexec/gnubin:$PATH"
+export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
+export PATH="/opt/homebrew/opt/findutils/libexec/gnubin:$PATH"
+export PATH="/opt/homebrew/opt/make/libexec/gnubin:$PATH"
+```
+
+
 ## Support
 
 Please file a [GitHub issue] and/or [Join Discord] with any questions.

package/dist/e2e/mock/mock.pb.d.ts

@@ -28,6 +28,7 @@ export interface Mock {
     /** MockRequest runs a mock unary request. */
     MockRequest(request: MockMsg, abortSignal?: AbortSignal): Promise<MockMsg>;
 }
+export declare const MockServiceName = "e2e.mock.Mock";
 export declare class MockClientImpl implements Mock {
     private readonly rpc;
     private readonly service;
@@ -91,7 +92,7 @@ interface Rpc {
     request(service: string, method: string, data: Uint8Array, abortSignal?: AbortSignal): Promise<Uint8Array>;
 }
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;

package/dist/e2e/mock/mock.pb.js

@@ -20,13 +20,13 @@ export const MockMsg = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.body = reader.string();
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -37,7 +37,7 @@ export const MockMsg = {
     // Transform<MockMsg, Uint8Array>
     async *encodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [MockMsg.encode(p).finish()];
                 }
@@ -51,7 +51,7 @@ export const MockMsg = {
     // Transform<Uint8Array, MockMsg>
     async *decodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [MockMsg.decode(p)];
                 }
@@ -62,11 +62,13 @@ export const MockMsg = {
         }
     },
     fromJSON(object) {
-        return { body: isSet(object.body) ? String(object.body) : '' };
+        return { body: isSet(object.body) ? globalThis.String(object.body) : '' };
     },
     toJSON(message) {
         const obj = {};
-        message.body !== undefined && (obj.body = message.body);
+        if (message.body !== '') {
+            obj.body = message.body;
+        }
         return obj;
     },
     create(base) {
@@ -78,9 +80,10 @@ export const MockMsg = {
         return message;
     },
 };
+export const MockServiceName = 'e2e.mock.Mock';
 export class MockClientImpl {
     constructor(rpc, opts) {
-        this.service = opts?.service || 'e2e.mock.Mock';
+        this.service = opts?.service || MockServiceName;
         this.rpc = rpc;
         this.MockRequest = this.MockRequest.bind(this);
     }

package/dist/echo/echo.pb.d.ts

@@ -37,6 +37,7 @@ export interface Echoer {
     /** RpcStream opens a nested rpc call stream. */
     RpcStream(request: AsyncIterable<RpcStreamPacket>, abortSignal?: AbortSignal): AsyncIterable<RpcStreamPacket>;
 }
+export declare const EchoerServiceName = "echo.Echoer";
 export declare class EchoerClientImpl implements Echoer {
     private readonly rpc;
     private readonly service;
@@ -475,7 +476,7 @@ interface Rpc {
     bidirectionalStreamingRequest(service: string, method: string, data: AsyncIterable<Uint8Array>, abortSignal?: AbortSignal): AsyncIterable<Uint8Array>;
 }
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;

package/dist/echo/echo.pb.js

@@ -21,13 +21,13 @@ export const EchoMsg = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.body = reader.string();
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -38,7 +38,7 @@ export const EchoMsg = {
     // Transform<EchoMsg, Uint8Array>
     async *encodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [EchoMsg.encode(p).finish()];
                 }
@@ -52,7 +52,7 @@ export const EchoMsg = {
     // Transform<Uint8Array, EchoMsg>
     async *decodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [EchoMsg.decode(p)];
                 }
@@ -63,11 +63,13 @@ export const EchoMsg = {
         }
     },
     fromJSON(object) {
-        return { body: isSet(object.body) ? String(object.body) : '' };
+        return { body: isSet(object.body) ? globalThis.String(object.body) : '' };
     },
     toJSON(message) {
         const obj = {};
-        message.body !== undefined && (obj.body = message.body);
+        if (message.body !== '') {
+            obj.body = message.body;
+        }
         return obj;
     },
     create(base) {
@@ -79,9 +81,10 @@ export const EchoMsg = {
         return message;
     },
 };
+export const EchoerServiceName = 'echo.Echoer';
 export class EchoerClientImpl {
     constructor(rpc, opts) {
-        this.service = opts?.service || 'echo.Echoer';
+        this.service = opts?.service || EchoerServiceName;
         this.rpc = rpc;
         this.Echo = this.Echo.bind(this);
         this.EchoServerStream = this.EchoServerStream.bind(this);

package/dist/rpcstream/rpcstream.pb.d.ts

@@ -12,7 +12,7 @@ export interface RpcStreamPacket {
     } | {
         $case: 'data';
         data: Uint8Array;
-    };
+    } | undefined;
 }
 /** RpcStreamInit is the first message in a RPC stream. */
 export interface RpcStreamInit {
@@ -177,7 +177,7 @@ export declare const RpcAck: {
     } & { [K_1 in Exclude<keyof I_1, "error">]: never; }>(object: I_1): RpcAck;
 };
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;

package/dist/rpcstream/rpcstream.pb.js

@@ -28,7 +28,7 @@ export const RpcStreamPacket = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.body = {
@@ -37,7 +37,7 @@ export const RpcStreamPacket = {
                     };
                     continue;
                 case 2:
-                    if (tag != 18) {
+                    if (tag !== 18) {
                         break;
                     }
                     message.body = {
@@ -46,13 +46,13 @@ export const RpcStreamPacket = {
                     };
                     continue;
                 case 3:
-                    if (tag != 26) {
+                    if (tag !== 26) {
                         break;
                     }
                     message.body = { $case: 'data', data: reader.bytes() };
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -63,7 +63,7 @@ export const RpcStreamPacket = {
     // Transform<RpcStreamPacket, Uint8Array>
     async *encodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [RpcStreamPacket.encode(p).finish()];
                 }
@@ -77,7 +77,7 @@ export const RpcStreamPacket = {
     // Transform<Uint8Array, RpcStreamPacket>
     async *decodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [RpcStreamPacket.decode(p)];
                 }
@@ -100,19 +100,15 @@ export const RpcStreamPacket = {
     },
     toJSON(message) {
         const obj = {};
-        message.body?.$case === 'init' &&
-            (obj.init = message.body?.init
-                ? RpcStreamInit.toJSON(message.body?.init)
-                : undefined);
-        message.body?.$case === 'ack' &&
-            (obj.ack = message.body?.ack
-                ? RpcAck.toJSON(message.body?.ack)
-                : undefined);
-        message.body?.$case === 'data' &&
-            (obj.data =
-                message.body?.data !== undefined
-                    ? base64FromBytes(message.body?.data)
-                    : undefined);
+        if (message.body?.$case === 'init') {
+            obj.init = RpcStreamInit.toJSON(message.body.init);
+        }
+        if (message.body?.$case === 'ack') {
+            obj.ack = RpcAck.toJSON(message.body.ack);
+        }
+        if (message.body?.$case === 'data') {
+            obj.data = base64FromBytes(message.body.data);
+        }
         return obj;
     },
     create(base) {
@@ -159,13 +155,13 @@ export const RpcStreamInit = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.componentId = reader.string();
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -176,7 +172,7 @@ export const RpcStreamInit = {
     // Transform<RpcStreamInit, Uint8Array>
     async *encodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [RpcStreamInit.encode(p).finish()];
                 }
@@ -190,7 +186,7 @@ export const RpcStreamInit = {
     // Transform<Uint8Array, RpcStreamInit>
     async *decodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [RpcStreamInit.decode(p)];
                 }
@@ -202,12 +198,16 @@ export const RpcStreamInit = {
     },
     fromJSON(object) {
         return {
-            componentId: isSet(object.componentId) ? String(object.componentId) : '',
+            componentId: isSet(object.componentId)
+                ? globalThis.String(object.componentId)
+                : '',
         };
     },
     toJSON(message) {
         const obj = {};
-        message.componentId !== undefined && (obj.componentId = message.componentId);
+        if (message.componentId !== '') {
+            obj.componentId = message.componentId;
+        }
         return obj;
     },
     create(base) {
@@ -237,13 +237,13 @@ export const RpcAck = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.error = reader.string();
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -254,7 +254,7 @@ export const RpcAck = {
     // Transform<RpcAck, Uint8Array>
     async *encodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [RpcAck.encode(p).finish()];
                 }
@@ -268,7 +268,7 @@ export const RpcAck = {
     // Transform<Uint8Array, RpcAck>
     async *decodeTransform(source) {
         for await (const pkt of source) {
-            if (Array.isArray(pkt)) {
+            if (globalThis.Array.isArray(pkt)) {
                 for (const p of pkt) {
                     yield* [RpcAck.decode(p)];
                 }
@@ -279,11 +279,13 @@ export const RpcAck = {
         }
     },
     fromJSON(object) {
-        return { error: isSet(object.error) ? String(object.error) : '' };
+        return { error: isSet(object.error) ? globalThis.String(object.error) : '' };
     },
     toJSON(message) {
         const obj = {};
-        message.error !== undefined && (obj.error = message.error);
+        if (message.error !== '') {
+            obj.error = message.error;
+        }
         return obj;
     },
     create(base) {
@@ -295,27 +297,12 @@ export const RpcAck = {
         return message;
     },
 };
-var tsProtoGlobalThis = (() => {
-    if (typeof globalThis !== 'undefined') {
-        return globalThis;
-    }
-    if (typeof self !== 'undefined') {
-        return self;
-    }
-    if (typeof window !== 'undefined') {
-        return window;
-    }
-    if (typeof global !== 'undefined') {
-        return global;
-    }
-    throw 'Unable to locate global object';
-})();
 function bytesFromBase64(b64) {
-    if (tsProtoGlobalThis.Buffer) {
-        return Uint8Array.from(tsProtoGlobalThis.Buffer.from(b64, 'base64'));
+    if (globalThis.Buffer) {
+        return Uint8Array.from(globalThis.Buffer.from(b64, 'base64'));
     }
     else {
-        const bin = tsProtoGlobalThis.atob(b64);
+        const bin = globalThis.atob(b64);
         const arr = new Uint8Array(bin.length);
         for (let i = 0; i < bin.length; ++i) {
             arr[i] = bin.charCodeAt(i);
@@ -324,15 +311,15 @@ function bytesFromBase64(b64) {
     }
 }
 function base64FromBytes(arr) {
-    if (tsProtoGlobalThis.Buffer) {
-        return tsProtoGlobalThis.Buffer.from(arr).toString('base64');
+    if (globalThis.Buffer) {
+        return globalThis.Buffer.from(arr).toString('base64');
     }
     else {
         const bin = [];
         arr.forEach((byte) => {
-            bin.push(String.fromCharCode(byte));
+            bin.push(globalThis.String.fromCharCode(byte));
         });
-        return tsProtoGlobalThis.btoa(bin.join(''));
+        return globalThis.btoa(bin.join(''));
     }
 }
 if (_m0.util.Long !== Long) {

package/dist/srpc/conn.d.ts

@@ -12,7 +12,7 @@ export interface StreamHandler {
     handlePacketStream(strm: SRPCStream): void;
 }
 export declare function streamToSRPCStream(stream: Duplex<AsyncIterable<Uint8ArrayList>, Source<Uint8ArrayList | Uint8Array>, Promise<void>>): SRPCStream;
-export declare class Conn implements Duplex<AsyncGenerator<Uint8Array>, Source<Uint8ArrayList | Uint8Array>, Promise<void>> {
+export declare class Conn implements Duplex<AsyncGenerator<Uint8Array | Uint8ArrayList>> {
     private muxer;
     private server?;
     constructor(server?: StreamHandler, connParams?: ConnParams);

package/dist/srpc/conn.js

@@ -1,5 +1,5 @@
-import { pipe } from 'it-pipe';
 import { yamux } from '@chainsafe/libp2p-yamux';
+import { pipe } from 'it-pipe';
 import isPromise from 'is-promise';
 import { pushable } from 'it-pushable';
 import { Client } from './client.js';

package/dist/srpc/log.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentLogger, Logger } from '@libp2p/interface';
+export declare function createDisabledLogger(namespace: string): Logger;
+export declare function createDisabledComponentLogger(): ComponentLogger;

package/dist/srpc/log.js

@@ -0,0 +1,21 @@
+// https://github.com/libp2p/js-libp2p/issues/2276
+// https://github.com/libp2p/js-libp2p/blob/bca8d6e689b47d85dda74082ed72e671139391de/packages/logger/src/index.ts#L86
+// https://github.com/libp2p/js-libp2p/issues/2275
+// https://github.com/ChainSafe/js-libp2p-yamux/issues/69
+export function createDisabledLogger(namespace) {
+    const logger = () => { };
+    logger.enabled = false;
+    logger.color = '';
+    logger.diff = 0;
+    logger.log = () => { };
+    logger.namespace = namespace;
+    logger.destroy = () => true;
+    logger.extend = () => logger;
+    logger.debug = logger;
+    logger.error = logger;
+    logger.trace = logger;
+    return logger;
+}
+export function createDisabledComponentLogger() {
+    return { forComponent: createDisabledLogger };
+}

package/dist/srpc/rpcproto.pb.d.ts

@@ -12,7 +12,7 @@ export interface Packet {
     } | {
         $case: 'callCancel';
         callCancel: boolean;
-    };
+    } | undefined;
 }
 /** CallStart requests starting a new RPC call. */
 export interface CallStart {
@@ -273,7 +273,7 @@ export declare const CallData: {
     } & { [K_1 in Exclude<keyof I_1, keyof CallData>]: never; }>(object: I_1): CallData;
 };
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;