@nmtjs/client 0.6.0 → 0.6.2

package/dist/runtime.js

@@ -71,8 +71,11 @@ export class RuntimeContractTransformer extends ProtocolBaseTransformer {
 export class RuntimeClient extends ProtocolBaseClient {
     _;
     #callers = {};
-    constructor(contract, transport, format){
-        super(transport, format, new RuntimeContractTransformer(contract));
+    constructor(contract, options){
+        super({
+            ...options,
+            transformer: new RuntimeContractTransformer(contract)
+        });
         const callers = {};
         for (const [namespaceKey, namespace] of Object.entries(contract.namespaces)){
             namespace.procedures;

package/dist/runtime.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../lib/runtime.ts"],"sourcesContent":["import type { TAnyAPIContract } from '@nmtjs/contract'\nimport {\n  ProtocolBaseClient,\n  ProtocolBaseTransformer,\n  type ProtocolTransport,\n} from '@nmtjs/protocol/client'\nimport type { BaseClientFormat } from '@nmtjs/protocol/client'\nimport { ErrorCode } from '@nmtjs/protocol/common'\nimport { type BaseTypeAny, NeverType } from '@nmtjs/type'\nimport { type Compiled, compile } from '@nmtjs/type/compiler'\nimport { ClientError } from './common.ts'\nimport type {\n  ClientCallers,\n  ResolveAPIContract,\n  ResolveClientEvents,\n  RuntimeContractTypeProvider,\n} from './types.ts'\n\nexport class RuntimeContractTransformer extends ProtocolBaseTransformer {\n  #contract: TAnyAPIContract\n  #types = new Set<BaseTypeAny>()\n  #compiled = new Map<BaseTypeAny, Compiled>()\n\n  constructor(contract: TAnyAPIContract) {\n    super()\n\n    this.#contract = contract\n\n    for (const namespace of Object.values(contract.namespaces)) {\n      for (const procedure of Object.values(namespace.procedures)) {\n        const { input, output, stream } = procedure\n        this.#registerType(input)\n        this.#registerType(output)\n        this.#registerType(stream)\n      }\n\n      for (const subscription of Object.values(namespace.subscriptions)) {\n        const { input, output } = subscription\n        this.#registerType(input)\n        this.#registerType(output)\n\n        for (const event of Object.values(subscription.events)) {\n          this.#registerType(event.payload)\n        }\n      }\n\n      for (const event of Object.values(namespace.events)) {\n        this.#registerType(event.payload)\n      }\n    }\n\n    this.#compile()\n  }\n\n  decodeEvent(namespace: string, event: string, payload: any) {\n    const type = this.#contract.namespaces[namespace].events[event].payload\n    if (type instanceof NeverType) return undefined\n    const compiled = this.#compiled.get(type)!\n    return compiled.decode(payload)\n  }\n\n  decodeRPC(namespace: string, procedure: string, payload: any) {\n    const type =\n      this.#contract.namespaces[namespace].procedures[procedure].output\n    if (type instanceof NeverType) return undefined\n    const compiled = this.#compiled.get(type)!\n    return compiled.decode(payload)\n  }\n\n  decodeRPCChunk(namespace: string, procedure: string, payload: any) {\n    const type =\n      this.#contract.namespaces[namespace].procedures[procedure].stream\n    if (type instanceof NeverType) return undefined\n\n    const compiled = this.#compiled.get(type)!\n    return compiled.decode(payload)\n  }\n\n  encodeRPC(namespace: string, procedure: string, payload: any) {\n    const type =\n      this.#contract.namespaces[namespace].procedures[procedure].input\n    if (type instanceof NeverType) return undefined\n\n    const compiled = this.#compiled.get(type)!\n    if (!compiled.check(payload)) {\n      const errors = compiled.errors(payload)\n      throw new ClientError(\n        ErrorCode.ValidationError,\n        'Invalid RPC payload',\n        errors,\n      )\n    }\n\n    return compiled.encode(payload)\n  }\n\n  #registerType(type: BaseTypeAny) {\n    this.#types.add(type)\n  }\n\n  #compile() {\n    for (const type of this.#types) {\n      this.#compiled.set(type, compile(type))\n    }\n  }\n}\n\nexport class RuntimeClient<\n  APIContract extends TAnyAPIContract,\n  ResolvedAPIContract extends ResolveAPIContract<\n    APIContract,\n    RuntimeContractTypeProvider\n  > = ResolveAPIContract<APIContract, RuntimeContractTypeProvider>,\n> extends ProtocolBaseClient<ResolveClientEvents<ResolvedAPIContract>> {\n  _!: ResolvedAPIContract\n  #callers = {} as ClientCallers<ResolvedAPIContract>\n\n  constructor(\n    contract: APIContract,\n    transport: ProtocolTransport,\n    format: BaseClientFormat,\n  ) {\n    super(transport, format, new RuntimeContractTransformer(contract))\n\n    const callers = {} as any\n\n    for (const [namespaceKey, namespace] of Object.entries(\n      contract.namespaces,\n    )) {\n      namespace.procedures\n\n      callers[namespaceKey] = {} as any\n\n      for (const [procedureKey, procedure] of Object.entries(\n        namespace.procedures,\n      )) {\n        callers[namespaceKey][procedureKey] = (payload, options) =>\n          this._call(namespace.name, procedure.name, payload, {\n            timeout: namespace.timeout,\n            ...options,\n          })\n      }\n    }\n    this.#callers = callers\n  }\n\n  get call() {\n    return this.#callers\n  }\n}\n"],"names":["ProtocolBaseClient","ProtocolBaseTransformer","ErrorCode","NeverType","compile","ClientError","RuntimeContractTransformer","Set","Map","constructor","contract","namespace","Object","values","namespaces","procedure","procedures","input","output","stream","subscription","subscriptions","event","events","payload","decodeEvent","type","undefined","compiled","get","decode","decodeRPC","decodeRPCChunk","encodeRPC","check","errors","ValidationError","encode","add","set","RuntimeClient","_","transport","format","callers","namespaceKey","entries","procedureKey","options","_call","name","timeout","call"],"mappings":"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"}
+{"version":3,"sources":["../../lib/runtime.ts"],"sourcesContent":["import type { TAnyAPIContract } from '@nmtjs/contract'\nimport {\n  ProtocolBaseClient,\n  ProtocolBaseTransformer,\n  type ProtocolTransport,\n} from '@nmtjs/protocol/client'\nimport type { BaseClientFormat } from '@nmtjs/protocol/client'\nimport { ErrorCode } from '@nmtjs/protocol/common'\nimport { type BaseTypeAny, NeverType } from '@nmtjs/type'\nimport { type Compiled, compile } from '@nmtjs/type/compiler'\nimport { ClientError } from './common.ts'\nimport type {\n  ClientCallers,\n  ResolveAPIContract,\n  ResolveClientEvents,\n  RuntimeContractTypeProvider,\n} from './types.ts'\n\nexport class RuntimeContractTransformer extends ProtocolBaseTransformer {\n  #contract: TAnyAPIContract\n  #types = new Set<BaseTypeAny>()\n  #compiled = new Map<BaseTypeAny, Compiled>()\n\n  constructor(contract: TAnyAPIContract) {\n    super()\n\n    this.#contract = contract\n\n    for (const namespace of Object.values(contract.namespaces)) {\n      for (const procedure of Object.values(namespace.procedures)) {\n        const { input, output, stream } = procedure\n        this.#registerType(input)\n        this.#registerType(output)\n        this.#registerType(stream)\n      }\n\n      for (const subscription of Object.values(namespace.subscriptions)) {\n        const { input, output } = subscription\n        this.#registerType(input)\n        this.#registerType(output)\n\n        for (const event of Object.values(subscription.events)) {\n          this.#registerType(event.payload)\n        }\n      }\n\n      for (const event of Object.values(namespace.events)) {\n        this.#registerType(event.payload)\n      }\n    }\n\n    this.#compile()\n  }\n\n  decodeEvent(namespace: string, event: string, payload: any) {\n    const type = this.#contract.namespaces[namespace].events[event].payload\n    if (type instanceof NeverType) return undefined\n    const compiled = this.#compiled.get(type)!\n    return compiled.decode(payload)\n  }\n\n  decodeRPC(namespace: string, procedure: string, payload: any) {\n    const type =\n      this.#contract.namespaces[namespace].procedures[procedure].output\n    if (type instanceof NeverType) return undefined\n    const compiled = this.#compiled.get(type)!\n    return compiled.decode(payload)\n  }\n\n  decodeRPCChunk(namespace: string, procedure: string, payload: any) {\n    const type =\n      this.#contract.namespaces[namespace].procedures[procedure].stream\n    if (type instanceof NeverType) return undefined\n\n    const compiled = this.#compiled.get(type)!\n    return compiled.decode(payload)\n  }\n\n  encodeRPC(namespace: string, procedure: string, payload: any) {\n    const type =\n      this.#contract.namespaces[namespace].procedures[procedure].input\n    if (type instanceof NeverType) return undefined\n\n    const compiled = this.#compiled.get(type)!\n    if (!compiled.check(payload)) {\n      const errors = compiled.errors(payload)\n      throw new ClientError(\n        ErrorCode.ValidationError,\n        'Invalid RPC payload',\n        errors,\n      )\n    }\n\n    return compiled.encode(payload)\n  }\n\n  #registerType(type: BaseTypeAny) {\n    this.#types.add(type)\n  }\n\n  #compile() {\n    for (const type of this.#types) {\n      this.#compiled.set(type, compile(type))\n    }\n  }\n}\n\nexport class RuntimeClient<\n  APIContract extends TAnyAPIContract,\n  ResolvedAPIContract extends ResolveAPIContract<\n    APIContract,\n    RuntimeContractTypeProvider\n  > = ResolveAPIContract<APIContract, RuntimeContractTypeProvider>,\n> extends ProtocolBaseClient<ResolveClientEvents<ResolvedAPIContract>> {\n  _!: ResolvedAPIContract\n  #callers = {} as ClientCallers<ResolvedAPIContract>\n\n  constructor(\n    contract: APIContract,\n    options: {\n      transport: ProtocolTransport\n      format: BaseClientFormat\n      timeout?: number\n    },\n  ) {\n    super({\n      ...options,\n      transformer: new RuntimeContractTransformer(contract),\n    })\n\n    const callers = {} as any\n\n    for (const [namespaceKey, namespace] of Object.entries(\n      contract.namespaces,\n    )) {\n      namespace.procedures\n\n      callers[namespaceKey] = {} as any\n\n      for (const [procedureKey, procedure] of Object.entries(\n        namespace.procedures,\n      )) {\n        callers[namespaceKey][procedureKey] = (payload, options) =>\n          this._call(namespace.name, procedure.name, payload, {\n            timeout: namespace.timeout,\n            ...options,\n          })\n      }\n    }\n    this.#callers = callers\n  }\n\n  get call() {\n    return this.#callers\n  }\n}\n"],"names":["ProtocolBaseClient","ProtocolBaseTransformer","ErrorCode","NeverType","compile","ClientError","RuntimeContractTransformer","Set","Map","constructor","contract","namespace","Object","values","namespaces","procedure","procedures","input","output","stream","subscription","subscriptions","event","events","payload","decodeEvent","type","undefined","compiled","get","decode","decodeRPC","decodeRPCChunk","encodeRPC","check","errors","ValidationError","encode","add","set","RuntimeClient","_","options","transformer","callers","namespaceKey","entries","procedureKey","_call","name","timeout","call"],"mappings":"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"}

package/dist/static.js

@@ -2,15 +2,15 @@ import { ProtocolBaseClient } from '@nmtjs/protocol/client';
 export class StaticClient extends ProtocolBaseClient {
     _;
     #callers;
-    constructor(transport, format){
-        super(transport, format);
+    constructor(options){
+        super(options);
         this.#callers = new Proxy(Object(), {
-            get: (target, namespaceProp, receiver)=>{
-                if (namespaceProp === 'then') return target;
+            get: (target, namespace)=>{
+                if (namespace === 'then') return target;
                 return new Proxy(Object(), {
-                    get: (target, procedureProp, receiver)=>{
-                        if (procedureProp === 'then') return target;
-                        return (payload, options)=>this._call(namespaceProp, procedureProp, payload);
+                    get: (target, procedure)=>{
+                        if (procedure === 'then') return target;
+                        return (payload, options)=>this._call(namespace, procedure, payload, options);
                     }
                 });
             }

package/dist/static.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../lib/static.ts"],"sourcesContent":["import type { TAnyAPIContract } from '@nmtjs/contract'\nimport {\n  type BaseClientFormat,\n  ProtocolBaseClient,\n  type ProtocolTransport,\n} from '@nmtjs/protocol/client'\n\nimport type {\n  ClientCallers,\n  ResolveAPIContract,\n  ResolveClientEvents,\n  StaticContractTypeProvider,\n} from './types.ts'\n\nexport class StaticClient<\n  APIContract extends TAnyAPIContract,\n  ResolvedAPIContract extends ResolveAPIContract<\n    APIContract,\n    StaticContractTypeProvider\n  > = ResolveAPIContract<APIContract, StaticContractTypeProvider>,\n> extends ProtocolBaseClient<ResolveClientEvents<ResolvedAPIContract>> {\n  _!: ResolvedAPIContract\n\n  #callers: ClientCallers<ResolvedAPIContract>\n\n  constructor(transport: ProtocolTransport, format: BaseClientFormat) {\n    super(transport, format)\n\n    this.#callers = new Proxy(Object(), {\n      get: (target, namespaceProp, receiver) => {\n        // `await client.call.namespaceName` or `await client.call.namespaceName.procedureName`\n        // without explicitly calling a function implicitly calls .then() on target\n        // FIXME: this basically makes \"then\" a reserved word\n        if (namespaceProp === 'then') return target\n        return new Proxy(Object(), {\n          get: (target, procedureProp, receiver) => {\n            // `await client.call.namespaceName` or `await client.call.namespaceName.procedureName`\n            // without explicitly calling a function implicitly calls .then() on target\n            // FIXME: this basically makes \"then\" a reserved word\n            if (procedureProp === 'then') return target\n            return (payload, options) =>\n              this._call(\n                namespaceProp as string,\n                procedureProp as string,\n                payload,\n              )\n          },\n        })\n      },\n    })\n  }\n\n  get call() {\n    return this.#callers\n  }\n}\n"],"names":["ProtocolBaseClient","StaticClient","_","constructor","transport","format","Proxy","Object","get","target","namespaceProp","receiver","procedureProp","payload","options","_call","call"],"mappings":"AACA,SAEEA,kBAAkB,QAEb,yBAAwB;AAS/B,OAAO,MAAMC,qBAMHD;IACRE,EAAuB;IAEvB,CAAA,OAAQ,CAAoC;IAE5CC,YAAYC,SAA4B,EAAEC,MAAwB,CAAE;QAClE,KAAK,CAACD,WAAWC;QAEjB,IAAI,CAAC,CAAA,OAAQ,GAAG,IAAIC,MAAMC,UAAU;YAClCC,KAAK,CAACC,QAAQC,eAAeC;gBAI3B,IAAID,kBAAkB,QAAQ,OAAOD;gBACrC,OAAO,IAAIH,MAAMC,UAAU;oBACzBC,KAAK,CAACC,QAAQG,eAAeD;wBAI3B,IAAIC,kBAAkB,QAAQ,OAAOH;wBACrC,OAAO,CAACI,SAASC,UACf,IAAI,CAACC,KAAK,CACRL,eACAE,eACAC;oBAEN;gBACF;YACF;QACF;IACF;IAEA,IAAIG,OAAO;QACT,OAAO,IAAI,CAAC,CAAA,OAAQ;IACtB;AACF"}
+{"version":3,"sources":["../../lib/static.ts"],"sourcesContent":["import type { TAnyAPIContract } from '@nmtjs/contract'\nimport {\n  type BaseClientFormat,\n  ProtocolBaseClient,\n  type ProtocolTransport,\n} from '@nmtjs/protocol/client'\n\nimport type {\n  ClientCallers,\n  ResolveAPIContract,\n  ResolveClientEvents,\n  StaticContractTypeProvider,\n} from './types.ts'\n\nexport class StaticClient<\n  APIContract extends TAnyAPIContract,\n  ResolvedAPIContract extends ResolveAPIContract<\n    APIContract,\n    StaticContractTypeProvider\n  > = ResolveAPIContract<APIContract, StaticContractTypeProvider>,\n> extends ProtocolBaseClient<ResolveClientEvents<ResolvedAPIContract>> {\n  _!: ResolvedAPIContract\n\n  #callers: ClientCallers<ResolvedAPIContract>\n\n  constructor(options: {\n    transport: ProtocolTransport\n    format: BaseClientFormat\n    timeout?: number\n  }) {\n    super(options)\n\n    this.#callers = new Proxy(Object(), {\n      get: (target, namespace) => {\n        // `await client.call.namespaceName` or `await client.call.namespaceName.procedureName`\n        // without explicitly calling a function implicitly calls .then() on target\n        // FIXME: this basically makes \"then\" a reserved word\n        if (namespace === 'then') return target\n        return new Proxy(Object(), {\n          get: (target, procedure) => {\n            // `await client.call.namespaceName` or `await client.call.namespaceName.procedureName`\n            // without explicitly calling a function implicitly calls .then() on target\n            // FIXME: this basically makes \"then\" a reserved word\n            if (procedure === 'then') return target\n            return (payload, options) =>\n              this._call(\n                namespace as string,\n                procedure as string,\n                payload,\n                options,\n              )\n          },\n        })\n      },\n    })\n  }\n\n  get call() {\n    return this.#callers\n  }\n}\n"],"names":["ProtocolBaseClient","StaticClient","_","constructor","options","Proxy","Object","get","target","namespace","procedure","payload","_call","call"],"mappings":"AACA,SAEEA,kBAAkB,QAEb,yBAAwB;AAS/B,OAAO,MAAMC,qBAMHD;IACRE,EAAuB;IAEvB,CAAA,OAAQ,CAAoC;IAE5CC,YAAYC,OAIX,CAAE;QACD,KAAK,CAACA;QAEN,IAAI,CAAC,CAAA,OAAQ,GAAG,IAAIC,MAAMC,UAAU;YAClCC,KAAK,CAACC,QAAQC;gBAIZ,IAAIA,cAAc,QAAQ,OAAOD;gBACjC,OAAO,IAAIH,MAAMC,UAAU;oBACzBC,KAAK,CAACC,QAAQE;wBAIZ,IAAIA,cAAc,QAAQ,OAAOF;wBACjC,OAAO,CAACG,SAASP,UACf,IAAI,CAACQ,KAAK,CACRH,WACAC,WACAC,SACAP;oBAEN;gBACF;YACF;QACF;IACF;IAEA,IAAIS,OAAO;QACT,OAAO,IAAI,CAAC,CAAA,OAAQ;IACtB;AACF"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../lib/types.ts"],"sourcesContent":["import type { CallTypeProvider, TypeProvider } from '@nmtjs/common'\nimport type { TAnyAPIContract } from '@nmtjs/contract'\nimport type { ProtocolServerStream } from '@nmtjs/protocol/client'\nimport type { InputType, OutputType } from '@nmtjs/protocol/common'\nimport type { BaseTypeAny, NeverType, t } from '@nmtjs/type'\n\nexport interface StaticContractTypeProvider extends TypeProvider {\n  output: this['input'] extends BaseTypeAny\n    ? t.infer.input.decoded<this['input']>\n    : never\n}\n\nexport interface RuntimeContractTypeProvider extends TypeProvider {\n  output: this['input'] extends BaseTypeAny\n    ? t.infer.decoded<this['input']>\n    : never\n}\n\nexport type ResolveAPIContract<\n  C extends TAnyAPIContract = TAnyAPIContract,\n  T extends TypeProvider = TypeProvider,\n> = {\n  [N in keyof C['namespaces'] as C['namespaces'][N]['name']]: {\n    procedures: {\n      [P in keyof C['namespaces'][N]['procedures'] as C['namespaces'][N]['procedures'][P]['name']]: {\n        contract: C['namespaces'][N]['procedures'][P]\n        input: InputType<\n          CallTypeProvider<T, C['namespaces'][N]['procedures'][P]['input']>\n        >\n        output: C['namespaces'][N]['procedures'][P]['stream'] extends NeverType\n          ? OutputType<\n              CallTypeProvider<T, C['namespaces'][N]['procedures'][P]['output']>\n            >\n          : [\n              result: OutputType<\n                CallTypeProvider<\n                  T,\n                  C['namespaces'][N]['procedures'][P]['output']\n                >\n              >,\n              stream: ProtocolServerStream<\n                CallTypeProvider<\n                  T,\n                  C['namespaces'][N]['procedures'][P]['stream']\n                >\n              >,\n            ]\n      }\n    }\n    events: {\n      [KE in keyof C['namespaces'][N]['events'] as C['namespaces'][N]['events'][KE]['name']]: {\n        payload: OutputType<\n          CallTypeProvider<T, C['namespaces'][N]['events'][KE]['payload']>\n        >\n      }\n    }\n  }\n}\n\nexport type ResolveClientEvents<\n  C extends ResolveAPIContract = ResolveAPIContract,\n> = {\n  [N in keyof C]: {\n    [KE in keyof C[N]['events']]: C[N]['events'][KE]['payload']\n  }\n}\n\nexport type ClientCallOptions = {\n  signal?: AbortSignal\n}\n\nexport type ClientCallers<Resolved extends ResolveAPIContract> = {\n  [N in keyof Resolved]: {\n    [P in keyof Resolved[N]['procedures']]: (\n      ...args: Resolved[N]['procedures'][P]['input'] extends NeverType\n        ? [options?: ClientCallOptions]\n        : t.infer.input.encoded<\n              Resolved[N]['procedures'][P]['contract']['input']\n            > extends undefined\n          ? [\n              data?: Resolved[N]['procedures'][P]['input'],\n              options?: ClientCallOptions,\n            ]\n          : [\n              data: Resolved[N]['procedures'][P]['input'],\n              options?: ClientCallOptions,\n            ]\n    ) => Promise<Resolved[N]['procedures'][P]['output']>\n  }\n}\n"],"names":[],"mappings":"AAuEA,WAkBC"}
+{"version":3,"sources":["../../lib/types.ts"],"sourcesContent":["import type { CallTypeProvider, TypeProvider } from '@nmtjs/common'\nimport type { TAnyAPIContract } from '@nmtjs/contract'\nimport type {\n  ProtocolBaseClientCallOptions,\n  ProtocolServerStreamInterface,\n} from '@nmtjs/protocol/client'\nimport type { InputType, OutputType } from '@nmtjs/protocol/common'\nimport type { BaseTypeAny, NeverType, t } from '@nmtjs/type'\n\nexport interface StaticContractTypeProvider extends TypeProvider {\n  output: this['input'] extends BaseTypeAny\n    ? t.infer.input.decoded<this['input']>\n    : never\n}\n\nexport interface RuntimeContractTypeProvider extends TypeProvider {\n  output: this['input'] extends BaseTypeAny\n    ? t.infer.decoded<this['input']>\n    : never\n}\n\nexport type ResolveAPIContract<\n  C extends TAnyAPIContract = TAnyAPIContract,\n  T extends TypeProvider = TypeProvider,\n> = {\n  [N in keyof C['namespaces'] as C['namespaces'][N]['name']]: {\n    procedures: {\n      [P in keyof C['namespaces'][N]['procedures'] as C['namespaces'][N]['procedures'][P]['name']]: {\n        contract: C['namespaces'][N]['procedures'][P]\n        input: InputType<\n          CallTypeProvider<T, C['namespaces'][N]['procedures'][P]['input']>\n        >\n        output: C['namespaces'][N]['procedures'][P]['stream'] extends NeverType\n          ? OutputType<\n              CallTypeProvider<T, C['namespaces'][N]['procedures'][P]['output']>\n            >\n          : {\n              response: OutputType<\n                CallTypeProvider<\n                  T,\n                  C['namespaces'][N]['procedures'][P]['output']\n                >\n              >\n              stream: ProtocolServerStreamInterface<\n                CallTypeProvider<\n                  T,\n                  C['namespaces'][N]['procedures'][P]['stream']\n                >\n              >\n            }\n      }\n    }\n    events: {\n      [KE in keyof C['namespaces'][N]['events'] as C['namespaces'][N]['events'][KE]['name']]: {\n        payload: OutputType<\n          CallTypeProvider<T, C['namespaces'][N]['events'][KE]['payload']>\n        >\n      }\n    }\n  }\n}\n\nexport type ResolveClientEvents<\n  C extends ResolveAPIContract = ResolveAPIContract,\n> = {\n  [N in keyof C]: {\n    [KE in keyof C[N]['events']]: C[N]['events'][KE]['payload']\n  }\n}\n\nexport type ClientCallers<Resolved extends ResolveAPIContract> = {\n  [N in keyof Resolved]: {\n    [P in keyof Resolved[N]['procedures']]: (\n      ...args: Resolved[N]['procedures'][P]['input'] extends NeverType\n        ? [options?: ProtocolBaseClientCallOptions]\n        : t.infer.input.encoded<\n              Resolved[N]['procedures'][P]['contract']['input']\n            > extends undefined\n          ? [\n              data?: Resolved[N]['procedures'][P]['input'],\n              options?: ProtocolBaseClientCallOptions,\n            ]\n          : [\n              data: Resolved[N]['procedures'][P]['input'],\n              options?: ProtocolBaseClientCallOptions,\n            ]\n    ) => Promise<Resolved[N]['procedures'][P]['output']>\n  }\n}\n"],"names":[],"mappings":"AAsEA,WAkBC"}

package/lib/runtime.ts

@@ -117,10 +117,16 @@ export class RuntimeClient<
 
   constructor(
     contract: APIContract,
-    transport: ProtocolTransport,
-    format: BaseClientFormat,
+    options: {
+      transport: ProtocolTransport
+      format: BaseClientFormat
+      timeout?: number
+    },
   ) {
-    super(transport, format, new RuntimeContractTransformer(contract))
+    super({
+      ...options,
+      transformer: new RuntimeContractTransformer(contract),
+    })
 
     const callers = {} as any
 

package/lib/static.ts

@@ -23,26 +23,31 @@ export class StaticClient<
 
   #callers: ClientCallers<ResolvedAPIContract>
 
-  constructor(transport: ProtocolTransport, format: BaseClientFormat) {
-    super(transport, format)
+  constructor(options: {
+    transport: ProtocolTransport
+    format: BaseClientFormat
+    timeout?: number
+  }) {
+    super(options)
 
     this.#callers = new Proxy(Object(), {
-      get: (target, namespaceProp, receiver) => {
+      get: (target, namespace) => {
         // `await client.call.namespaceName` or `await client.call.namespaceName.procedureName`
         // without explicitly calling a function implicitly calls .then() on target
         // FIXME: this basically makes "then" a reserved word
-        if (namespaceProp === 'then') return target
+        if (namespace === 'then') return target
         return new Proxy(Object(), {
-          get: (target, procedureProp, receiver) => {
+          get: (target, procedure) => {
             // `await client.call.namespaceName` or `await client.call.namespaceName.procedureName`
             // without explicitly calling a function implicitly calls .then() on target
             // FIXME: this basically makes "then" a reserved word
-            if (procedureProp === 'then') return target
+            if (procedure === 'then') return target
             return (payload, options) =>
               this._call(
-                namespaceProp as string,
-                procedureProp as string,
+                namespace as string,
+                procedure as string,
                 payload,
+                options,
               )
           },
         })

package/lib/types.ts

@@ -1,6 +1,9 @@
 import type { CallTypeProvider, TypeProvider } from '@nmtjs/common'
 import type { TAnyAPIContract } from '@nmtjs/contract'
-import type { ProtocolServerStream } from '@nmtjs/protocol/client'
+import type {
+  ProtocolBaseClientCallOptions,
+  ProtocolServerStreamInterface,
+} from '@nmtjs/protocol/client'
 import type { InputType, OutputType } from '@nmtjs/protocol/common'
 import type { BaseTypeAny, NeverType, t } from '@nmtjs/type'
 
@@ -31,20 +34,20 @@ export type ResolveAPIContract<
           ? OutputType<
               CallTypeProvider<T, C['namespaces'][N]['procedures'][P]['output']>
             >
-          : [
-              result: OutputType<
+          : {
+              response: OutputType<
                 CallTypeProvider<
                   T,
                   C['namespaces'][N]['procedures'][P]['output']
                 >
-              >,
-              stream: ProtocolServerStream<
+              >
+              stream: ProtocolServerStreamInterface<
                 CallTypeProvider<
                   T,
                   C['namespaces'][N]['procedures'][P]['stream']
                 >
-              >,
-            ]
+              >
+            }
       }
     }
     events: {
@@ -65,25 +68,21 @@ export type ResolveClientEvents<
   }
 }
 
-export type ClientCallOptions = {
-  signal?: AbortSignal
-}
-
 export type ClientCallers<Resolved extends ResolveAPIContract> = {
   [N in keyof Resolved]: {
     [P in keyof Resolved[N]['procedures']]: (
       ...args: Resolved[N]['procedures'][P]['input'] extends NeverType
-        ? [options?: ClientCallOptions]
+        ? [options?: ProtocolBaseClientCallOptions]
         : t.infer.input.encoded<
               Resolved[N]['procedures'][P]['contract']['input']
             > extends undefined
           ? [
               data?: Resolved[N]['procedures'][P]['input'],
-              options?: ClientCallOptions,
+              options?: ProtocolBaseClientCallOptions,
             ]
           : [
               data: Resolved[N]['procedures'][P]['input'],
-              options?: ClientCallOptions,
+              options?: ProtocolBaseClientCallOptions,
             ]
     ) => Promise<Resolved[N]['procedures'][P]['output']>
   }

package/package.json

@@ -19,10 +19,10 @@
     }
   },
   "dependencies": {
-    "@nmtjs/contract": "0.6.0",
-    "@nmtjs/common": "0.6.0",
-    "@nmtjs/type": "0.6.0",
-    "@nmtjs/protocol": "0.6.0"
+    "@nmtjs/type": "0.6.2",
+    "@nmtjs/contract": "0.6.2",
+    "@nmtjs/common": "0.6.2",
+    "@nmtjs/protocol": "0.6.2"
   },
   "files": [
     "index.ts",
@@ -32,7 +32,7 @@
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.6.0",
+  "version": "0.6.2",
   "scripts": {
     "build": "neemata-build -p neutral --root=./lib './**/*.ts'",
     "type-check": "tsc --noEmit"