@milaboratories/pl-client 2.16.12 → 2.16.13

package/dist/proto-rest/index.cjs

@@ -14,9 +14,23 @@ function createClient(opts) {
     const client = createOpenApiClient({
         baseUrl: `${scheme}${opts.hostAndPort}`,
         fetch: (input) => {
-            return undici.fetch(input.url, {
-                ...input,
+            // If body has already been consumed, clone the request
+            const request = input.bodyUsed ? input.clone() : input;
+            return undici.fetch(request.url, {
+                body: request.body,
+                cache: request.cache,
+                credentials: request.credentials,
                 dispatcher: opts.dispatcher,
+                duplex: request.duplex,
+                headers: request.headers,
+                integrity: request.integrity,
+                keepalive: request.keepalive,
+                method: request.method,
+                mode: request.mode,
+                redirect: request.redirect,
+                referrer: request.referrer,
+                referrerPolicy: request.referrerPolicy,
+                signal: request.signal,
             });
         },
     });

package/dist/proto-rest/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../src/proto-rest/index.ts"],"sourcesContent":["//\n// This file is NOT autogenerated!\n//\n// After generating new clients from openapi specifications, add client types here.\n//\n\nimport type { paths as PlApiPaths } from './plapi';\nimport { default as createOpenApiClient, type Middleware, type Client } from 'openapi-fetch';\nimport { Dispatcher, fetch as undiciFetch } from 'undici';\nimport { rethrowMeaningfulError } from '../core/errors';\nimport { Code } from '../proto-grpc/google/rpc/code';\n\nexport { PlApiPaths };\nexport type PlRestClientType = Client<PlApiPaths>;\n\nexport type RestClientConfig = {\n  hostAndPort: string;\n  ssl: boolean;\n  dispatcher: Dispatcher;\n  middlewares: Middleware[];\n}\n\nexport function createClient<Paths extends {}>(opts: RestClientConfig): Client<Paths> {\n  const scheme = opts.ssl ? 'https://' : 'http://';\n  const client = createOpenApiClient<Paths>({\n    baseUrl: `${scheme}${opts.hostAndPort}`,\n    fetch: (input: Request): Promise<Response> => {\n      return undiciFetch(input.url, {\n        ...input,\n        dispatcher: opts.dispatcher,\n      });\n    },\n  });\n  client.use(errorHandlerMiddleware(), ...opts.middlewares);\n  return client;\n}\n\nexport type ErrorResponse = {\n  code: Code,\n  message: string,\n  details: any[],\n}\nexport async function parseResponseError(response: Response): Promise<{\n  error?: ErrorResponse | string,\n  origBody?: string,\n}>{\n  if (response.status < 400) {\n    return {};\n  }\n\n  let error: any = await response.clone().text();\n  const origBody = error;\n  try {\n    error = JSON.parse(error) as ErrorResponse;\n  } catch {\n  }\n  return {\n    error: error,\n    origBody\n  };\n}\n\n/**\n * Parses all API responses and thrown error in case of error response.\n * Allows all callers to not bother about .error response field checking.\n */\nfunction errorHandlerMiddleware(): Middleware {\n  return {\n    onResponse: async ({ request: _request, response, options: _options }) => {\n      const respErr = await parseResponseError(response);\n      if (!respErr.error) {\n        const { body, ...resOptions } = response;\n        return new Response(body, { ...resOptions, status: response.status });\n      }\n\n      if (typeof respErr.error === 'string') {\n        throw new Error(respErr.error);\n      }\n\n      rethrowMeaningfulError(respErr.error);\n    },\n  };\n}\n"],"names":["undiciFetch","rethrowMeaningfulError"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAkBM,SAAU,YAAY,CAAmB,IAAsB,EAAA;AACnE,IAAA,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,UAAU,GAAG,SAAS;IAChD,MAAM,MAAM,GAAG,mBAAmB,CAAQ;AACxC,QAAA,OAAO,EAAE,CAAA,EAAG,MAAM,GAAG,IAAI,CAAC,WAAW,CAAA,CAAE;AACvC,QAAA,KAAK,EAAE,CAAC,KAAc,KAAuB;AAC3C,YAAA,OAAOA,YAAW,CAAC,KAAK,CAAC,GAAG,EAAE;AAC5B,gBAAA,GAAG,KAAK;gBACR,UAAU,EAAE,IAAI,CAAC,UAAU;AAC5B,aAAA,CAAC;QACJ,CAAC;AACF,KAAA,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;AACzD,IAAA,OAAO,MAAM;AACf;AAOO,eAAe,kBAAkB,CAAC,QAAkB,EAAA;AAIzD,IAAA,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;AACzB,QAAA,OAAO,EAAE;IACX;IAEA,IAAI,KAAK,GAAQ,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE;IAC9C,MAAM,QAAQ,GAAG,KAAK;AACtB,IAAA,IAAI;AACF,QAAA,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAkB;IAC5C;AAAE,IAAA,MAAM;IACR;IACA,OAAO;AACL,QAAA,KAAK,EAAE,KAAK;QACZ;KACD;AACH;AAEA;;;AAGG;AACH,SAAS,sBAAsB,GAAA;IAC7B,OAAO;AACL,QAAA,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAI;AACvE,YAAA,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC;AAClD,YAAA,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBAClB,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,QAAQ;AACxC,gBAAA,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvE;AAEA,YAAA,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE;AACrC,gBAAA,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAChC;AAEA,YAAAC,6BAAsB,CAAC,OAAO,CAAC,KAAK,CAAC;QACvC,CAAC;KACF;AACH;;;;;"}
+{"version":3,"file":"index.cjs","sources":["../../src/proto-rest/index.ts"],"sourcesContent":["//\n// This file is NOT autogenerated!\n//\n// After generating new clients from openapi specifications, add client types here.\n//\n\nimport type { paths as PlApiPaths } from './plapi';\nimport { default as createOpenApiClient, type Middleware, type Client } from 'openapi-fetch';\nimport { Dispatcher, fetch as undiciFetch } from 'undici';\nimport { rethrowMeaningfulError } from '../core/errors';\nimport { Code } from '../proto-grpc/google/rpc/code';\n\nexport { PlApiPaths };\nexport type PlRestClientType = Client<PlApiPaths>;\n\nexport type RestClientConfig = {\n  hostAndPort: string;\n  ssl: boolean;\n  dispatcher: Dispatcher;\n  middlewares: Middleware[];\n}\n\nexport function createClient<Paths extends {}>(opts: RestClientConfig): Client<Paths> {\n  const scheme = opts.ssl ? 'https://' : 'http://';\n  const client = createOpenApiClient<Paths>({\n    baseUrl: `${scheme}${opts.hostAndPort}`,\n    fetch: (input: Request): Promise<Response> => {\n      // If body has already been consumed, clone the request\n      const request = input.bodyUsed ? input.clone() : input;\n\n      return undiciFetch(request.url, {\n        body: request.body,\n        cache: request.cache,\n        credentials: request.credentials,\n        dispatcher: opts.dispatcher,\n        duplex: request.duplex,\n        headers: request.headers,\n        integrity: request.integrity,\n        keepalive: request.keepalive,\n        method: request.method,\n        mode: request.mode,\n        redirect: request.redirect,\n        referrer: request.referrer,\n        referrerPolicy: request.referrerPolicy,\n        signal: request.signal,\n      });\n    },\n  });\n  client.use(errorHandlerMiddleware(), ...opts.middlewares);\n  return client;\n}\n\nexport type ErrorResponse = {\n  code: Code,\n  message: string,\n  details: any[],\n}\nexport async function parseResponseError(response: Response): Promise<{\n  error?: ErrorResponse | string,\n  origBody?: string,\n}>{\n  if (response.status < 400) {\n    return {};\n  }\n\n  let error: any = await response.clone().text();\n  const origBody = error;\n  try {\n    error = JSON.parse(error) as ErrorResponse;\n  } catch {\n  }\n  return {\n    error: error,\n    origBody\n  };\n}\n\n/**\n * Parses all API responses and thrown error in case of error response.\n * Allows all callers to not bother about .error response field checking.\n */\nfunction errorHandlerMiddleware(): Middleware {\n  return {\n    onResponse: async ({ request: _request, response, options: _options }) => {\n      const respErr = await parseResponseError(response);\n      if (!respErr.error) {\n        const { body, ...resOptions } = response;\n        return new Response(body, { ...resOptions, status: response.status });\n      }\n\n      if (typeof respErr.error === 'string') {\n        throw new Error(respErr.error);\n      }\n\n      rethrowMeaningfulError(respErr.error);\n    },\n  };\n}\n"],"names":["undiciFetch","rethrowMeaningfulError"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAkBM,SAAU,YAAY,CAAmB,IAAsB,EAAA;AACnE,IAAA,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,UAAU,GAAG,SAAS;IAChD,MAAM,MAAM,GAAG,mBAAmB,CAAQ;AACxC,QAAA,OAAO,EAAE,CAAA,EAAG,MAAM,GAAG,IAAI,CAAC,WAAW,CAAA,CAAE;AACvC,QAAA,KAAK,EAAE,CAAC,KAAc,KAAuB;;AAE3C,YAAA,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK;AAEtD,YAAA,OAAOA,YAAW,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,MAAM,EAAE,OAAO,CAAC,MAAM;AACvB,aAAA,CAAC;QACJ,CAAC;AACF,KAAA,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;AACzD,IAAA,OAAO,MAAM;AACf;AAOO,eAAe,kBAAkB,CAAC,QAAkB,EAAA;AAIzD,IAAA,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;AACzB,QAAA,OAAO,EAAE;IACX;IAEA,IAAI,KAAK,GAAQ,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE;IAC9C,MAAM,QAAQ,GAAG,KAAK;AACtB,IAAA,IAAI;AACF,QAAA,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAkB;IAC5C;AAAE,IAAA,MAAM;IACR;IACA,OAAO;AACL,QAAA,KAAK,EAAE,KAAK;QACZ;KACD;AACH;AAEA;;;AAGG;AACH,SAAS,sBAAsB,GAAA;IAC7B,OAAO;AACL,QAAA,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAI;AACvE,YAAA,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC;AAClD,YAAA,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBAClB,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,QAAQ;AACxC,gBAAA,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvE;AAEA,YAAA,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE;AACrC,gBAAA,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAChC;AAEA,YAAAC,6BAAsB,CAAC,OAAO,CAAC,KAAK,CAAC;QACvC,CAAC;KACF;AACH;;;;;"}

package/dist/proto-rest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/proto-rest/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAkC,KAAK,UAAU,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAwB,MAAM,QAAQ,CAAC;AAE1D,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,CAAC;AACtB,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAElD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAA;AAED,wBAAgB,YAAY,CAAC,KAAK,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,CAapF;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB,CAAA;AACD,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;IACpE,KAAK,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC,CAeD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/proto-rest/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAkC,KAAK,UAAU,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAwB,MAAM,QAAQ,CAAC;AAE1D,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,CAAC;AACtB,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAElD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAA;AAED,wBAAgB,YAAY,CAAC,KAAK,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,CA4BpF;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB,CAAA;AACD,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;IACpE,KAAK,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC,CAeD"}

package/dist/proto-rest/index.js

@@ -12,9 +12,23 @@ function createClient(opts) {
     const client = createOpenApiClient({
         baseUrl: `${scheme}${opts.hostAndPort}`,
         fetch: (input) => {
-            return fetch(input.url, {
-                ...input,
+            // If body has already been consumed, clone the request
+            const request = input.bodyUsed ? input.clone() : input;
+            return fetch(request.url, {
+                body: request.body,
+                cache: request.cache,
+                credentials: request.credentials,
                 dispatcher: opts.dispatcher,
+                duplex: request.duplex,
+                headers: request.headers,
+                integrity: request.integrity,
+                keepalive: request.keepalive,
+                method: request.method,
+                mode: request.mode,
+                redirect: request.redirect,
+                referrer: request.referrer,
+                referrerPolicy: request.referrerPolicy,
+                signal: request.signal,
             });
         },
     });

package/dist/proto-rest/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/proto-rest/index.ts"],"sourcesContent":["//\n// This file is NOT autogenerated!\n//\n// After generating new clients from openapi specifications, add client types here.\n//\n\nimport type { paths as PlApiPaths } from './plapi';\nimport { default as createOpenApiClient, type Middleware, type Client } from 'openapi-fetch';\nimport { Dispatcher, fetch as undiciFetch } from 'undici';\nimport { rethrowMeaningfulError } from '../core/errors';\nimport { Code } from '../proto-grpc/google/rpc/code';\n\nexport { PlApiPaths };\nexport type PlRestClientType = Client<PlApiPaths>;\n\nexport type RestClientConfig = {\n  hostAndPort: string;\n  ssl: boolean;\n  dispatcher: Dispatcher;\n  middlewares: Middleware[];\n}\n\nexport function createClient<Paths extends {}>(opts: RestClientConfig): Client<Paths> {\n  const scheme = opts.ssl ? 'https://' : 'http://';\n  const client = createOpenApiClient<Paths>({\n    baseUrl: `${scheme}${opts.hostAndPort}`,\n    fetch: (input: Request): Promise<Response> => {\n      return undiciFetch(input.url, {\n        ...input,\n        dispatcher: opts.dispatcher,\n      });\n    },\n  });\n  client.use(errorHandlerMiddleware(), ...opts.middlewares);\n  return client;\n}\n\nexport type ErrorResponse = {\n  code: Code,\n  message: string,\n  details: any[],\n}\nexport async function parseResponseError(response: Response): Promise<{\n  error?: ErrorResponse | string,\n  origBody?: string,\n}>{\n  if (response.status < 400) {\n    return {};\n  }\n\n  let error: any = await response.clone().text();\n  const origBody = error;\n  try {\n    error = JSON.parse(error) as ErrorResponse;\n  } catch {\n  }\n  return {\n    error: error,\n    origBody\n  };\n}\n\n/**\n * Parses all API responses and thrown error in case of error response.\n * Allows all callers to not bother about .error response field checking.\n */\nfunction errorHandlerMiddleware(): Middleware {\n  return {\n    onResponse: async ({ request: _request, response, options: _options }) => {\n      const respErr = await parseResponseError(response);\n      if (!respErr.error) {\n        const { body, ...resOptions } = response;\n        return new Response(body, { ...resOptions, status: response.status });\n      }\n\n      if (typeof respErr.error === 'string') {\n        throw new Error(respErr.error);\n      }\n\n      rethrowMeaningfulError(respErr.error);\n    },\n  };\n}\n"],"names":["undiciFetch"],"mappings":";;;;AAAA;AACA;AACA;AACA;AACA;AAkBM,SAAU,YAAY,CAAmB,IAAsB,EAAA;AACnE,IAAA,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,UAAU,GAAG,SAAS;IAChD,MAAM,MAAM,GAAG,mBAAmB,CAAQ;AACxC,QAAA,OAAO,EAAE,CAAA,EAAG,MAAM,GAAG,IAAI,CAAC,WAAW,CAAA,CAAE;AACvC,QAAA,KAAK,EAAE,CAAC,KAAc,KAAuB;AAC3C,YAAA,OAAOA,KAAW,CAAC,KAAK,CAAC,GAAG,EAAE;AAC5B,gBAAA,GAAG,KAAK;gBACR,UAAU,EAAE,IAAI,CAAC,UAAU;AAC5B,aAAA,CAAC;QACJ,CAAC;AACF,KAAA,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;AACzD,IAAA,OAAO,MAAM;AACf;AAOO,eAAe,kBAAkB,CAAC,QAAkB,EAAA;AAIzD,IAAA,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;AACzB,QAAA,OAAO,EAAE;IACX;IAEA,IAAI,KAAK,GAAQ,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE;IAC9C,MAAM,QAAQ,GAAG,KAAK;AACtB,IAAA,IAAI;AACF,QAAA,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAkB;IAC5C;AAAE,IAAA,MAAM;IACR;IACA,OAAO;AACL,QAAA,KAAK,EAAE,KAAK;QACZ;KACD;AACH;AAEA;;;AAGG;AACH,SAAS,sBAAsB,GAAA;IAC7B,OAAO;AACL,QAAA,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAI;AACvE,YAAA,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC;AAClD,YAAA,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBAClB,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,QAAQ;AACxC,gBAAA,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvE;AAEA,YAAA,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE;AACrC,gBAAA,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAChC;AAEA,YAAA,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC;QACvC,CAAC;KACF;AACH;;;;"}
+{"version":3,"file":"index.js","sources":["../../src/proto-rest/index.ts"],"sourcesContent":["//\n// This file is NOT autogenerated!\n//\n// After generating new clients from openapi specifications, add client types here.\n//\n\nimport type { paths as PlApiPaths } from './plapi';\nimport { default as createOpenApiClient, type Middleware, type Client } from 'openapi-fetch';\nimport { Dispatcher, fetch as undiciFetch } from 'undici';\nimport { rethrowMeaningfulError } from '../core/errors';\nimport { Code } from '../proto-grpc/google/rpc/code';\n\nexport { PlApiPaths };\nexport type PlRestClientType = Client<PlApiPaths>;\n\nexport type RestClientConfig = {\n  hostAndPort: string;\n  ssl: boolean;\n  dispatcher: Dispatcher;\n  middlewares: Middleware[];\n}\n\nexport function createClient<Paths extends {}>(opts: RestClientConfig): Client<Paths> {\n  const scheme = opts.ssl ? 'https://' : 'http://';\n  const client = createOpenApiClient<Paths>({\n    baseUrl: `${scheme}${opts.hostAndPort}`,\n    fetch: (input: Request): Promise<Response> => {\n      // If body has already been consumed, clone the request\n      const request = input.bodyUsed ? input.clone() : input;\n\n      return undiciFetch(request.url, {\n        body: request.body,\n        cache: request.cache,\n        credentials: request.credentials,\n        dispatcher: opts.dispatcher,\n        duplex: request.duplex,\n        headers: request.headers,\n        integrity: request.integrity,\n        keepalive: request.keepalive,\n        method: request.method,\n        mode: request.mode,\n        redirect: request.redirect,\n        referrer: request.referrer,\n        referrerPolicy: request.referrerPolicy,\n        signal: request.signal,\n      });\n    },\n  });\n  client.use(errorHandlerMiddleware(), ...opts.middlewares);\n  return client;\n}\n\nexport type ErrorResponse = {\n  code: Code,\n  message: string,\n  details: any[],\n}\nexport async function parseResponseError(response: Response): Promise<{\n  error?: ErrorResponse | string,\n  origBody?: string,\n}>{\n  if (response.status < 400) {\n    return {};\n  }\n\n  let error: any = await response.clone().text();\n  const origBody = error;\n  try {\n    error = JSON.parse(error) as ErrorResponse;\n  } catch {\n  }\n  return {\n    error: error,\n    origBody\n  };\n}\n\n/**\n * Parses all API responses and thrown error in case of error response.\n * Allows all callers to not bother about .error response field checking.\n */\nfunction errorHandlerMiddleware(): Middleware {\n  return {\n    onResponse: async ({ request: _request, response, options: _options }) => {\n      const respErr = await parseResponseError(response);\n      if (!respErr.error) {\n        const { body, ...resOptions } = response;\n        return new Response(body, { ...resOptions, status: response.status });\n      }\n\n      if (typeof respErr.error === 'string') {\n        throw new Error(respErr.error);\n      }\n\n      rethrowMeaningfulError(respErr.error);\n    },\n  };\n}\n"],"names":["undiciFetch"],"mappings":";;;;AAAA;AACA;AACA;AACA;AACA;AAkBM,SAAU,YAAY,CAAmB,IAAsB,EAAA;AACnE,IAAA,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,UAAU,GAAG,SAAS;IAChD,MAAM,MAAM,GAAG,mBAAmB,CAAQ;AACxC,QAAA,OAAO,EAAE,CAAA,EAAG,MAAM,GAAG,IAAI,CAAC,WAAW,CAAA,CAAE;AACvC,QAAA,KAAK,EAAE,CAAC,KAAc,KAAuB;;AAE3C,YAAA,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK;AAEtD,YAAA,OAAOA,KAAW,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,MAAM,EAAE,OAAO,CAAC,MAAM;AACvB,aAAA,CAAC;QACJ,CAAC;AACF,KAAA,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;AACzD,IAAA,OAAO,MAAM;AACf;AAOO,eAAe,kBAAkB,CAAC,QAAkB,EAAA;AAIzD,IAAA,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;AACzB,QAAA,OAAO,EAAE;IACX;IAEA,IAAI,KAAK,GAAQ,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE;IAC9C,MAAM,QAAQ,GAAG,KAAK;AACtB,IAAA,IAAI;AACF,QAAA,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAkB;IAC5C;AAAE,IAAA,MAAM;IACR;IACA,OAAO;AACL,QAAA,KAAK,EAAE,KAAK;QACZ;KACD;AACH;AAEA;;;AAGG;AACH,SAAS,sBAAsB,GAAA;IAC7B,OAAO;AACL,QAAA,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAI;AACvE,YAAA,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC;AAClD,YAAA,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBAClB,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,QAAQ;AACxC,gBAAA,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvE;AAEA,YAAA,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE;AACrC,gBAAA,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YAChC;AAEA,YAAA,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC;QACvC,CAAC;KACF;AACH;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-client",
-  "version": "2.16.12",
+  "version": "2.16.13",
   "engines": {
     "node": ">=22.19.0"
   },
@@ -36,8 +36,8 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.8.0",
     "@milaboratories/pl-http": "1.2.0",
-    "@milaboratories/pl-model-common": "1.21.9",
-    "@milaboratories/ts-helpers": "1.5.4"
+    "@milaboratories/ts-helpers": "1.5.4",
+    "@milaboratories/pl-model-common": "1.21.10"
   },
   "devDependencies": {
     "@protobuf-ts/plugin": "2.11.1",
@@ -47,9 +47,9 @@
     "@vitest/coverage-v8": "^4.0.7",
     "vitest": "^4.0.7",
     "typescript": "~5.6.3",
-    "@milaboratories/ts-builder": "1.0.5",
-    "@milaboratories/ts-configs": "1.0.6",
-    "@milaboratories/build-configs": "1.0.8"
+    "@milaboratories/ts-builder": "1.0.6",
+    "@milaboratories/build-configs": "1.0.9",
+    "@milaboratories/ts-configs": "1.0.6"
   },
   "scripts": {
     "type-check": "ts-builder types --target node",

package/src/core/driver.ts

@@ -36,6 +36,6 @@ export function addRTypeToMetadata(rType: ResourceType, options?: RpcOptions) {
  */
 export function createRTypeRoutingHeader(rType: ResourceType): Record<string, string> {
   return {
-    resourcetype: `${rType.name}:${rType.version}`,
+    resourceType: `${rType.name}:${rType.version}`,
   };
 }

package/src/core/ll_client.ts

@@ -29,6 +29,7 @@ import { type PlApiPaths, type PlRestClientType, createClient, parseResponseErro
 import { notEmpty } from '@milaboratories/ts-helpers';
 import { Code } from '../proto-grpc/google/rpc/code';
 import { WebSocketBiDiStream } from './websocket_stream';
+import { TxAPI_ClientMessage, TxAPI_ServerMessage } from '../proto-grpc/github.com/milaboratory/pl/plapi/plapiproto/api';
 
 export interface PlCallOps {
   timeout?: number;
@@ -162,7 +163,7 @@ export class LLPlClient implements WireClientProviderFactory {
   }
 
   private initRestConnection(): void {
-    const dispatcher = defaultHttpDispatcher(this.conf.httpProxy, this._restInterceptors);
+    const dispatcher = defaultHttpDispatcher(this.conf.grpcProxy, this._restInterceptors);
     this._replaceWireConnection({ type: 'rest', Config: this.conf, Dispatcher: dispatcher, Middlewares: this._restMiddlewares });
   }
 
@@ -490,22 +491,38 @@ export class LLPlClient implements WireClientProviderFactory {
         });
       }
 
-      if (this._wireProto === 'rest') {
+      const wireConn = this.wireConnection;
+      if (wireConn.type === 'rest') {
         // For REST/WebSocket protocol, timeout needs to be converted to AbortSignal
         if (timeout !== undefined) {
           totalAbortSignal = AbortSignal.any([totalAbortSignal, AbortSignal.timeout(timeout)]);
         }
+
+        // The gRPC transport has the auth interceptor that already handles it, but here we need to refresh the auth information to be safe.
+        this.refreshAuthInformationIfNeeded();
+
         const wsUrl = this.conf.ssl
           ? `wss://${this.conf.hostAndPort}/v1/ws/tx`
           : `ws://${this.conf.hostAndPort}/v1/ws/tx`;
 
-        // The gRPC transport has the auth interceptor that already handles it, so we need to refresh the auth information here.
-        this.refreshAuthInformationIfNeeded();
-        const jwtToken = this.authInformation?.jwtToken;
-
-        return new WebSocketBiDiStream(wsUrl, totalAbortSignal, jwtToken);
+        return new WebSocketBiDiStream(wsUrl,
+          (msg) => TxAPI_ClientMessage.toBinary(msg),
+          (data) => TxAPI_ServerMessage.fromBinary(new Uint8Array(data)),
+          {
+            abortSignal: totalAbortSignal,
+            jwtToken: this.authInformation?.jwtToken,
+            dispatcher: wireConn.Dispatcher,
+
+            onComplete: async (stream) => stream.requests.send({
+              // Ask server to gracefully close the stream on its side, if not done yet.
+              requestId: 0,
+              request: { oneofKind: 'streamClose', streamClose: {} },
+            }),
+          },
+        );
       }
-      throw new Error('tx is not supported for this wire protocol');
+
+      throw new Error(`transactions are not supported for wire protocol ${this._wireProto}`);
     });
   }
 

package/src/core/websocket_stream.test.ts

@@ -82,7 +82,7 @@ import type { RetryConfig } from '../helpers/retry_strategy';
 type MockWS = InstanceType<typeof MockWebSocket>;
 
 interface StreamContext {
-  stream: WebSocketBiDiStream;
+  stream: WebSocketBiDiStream<ClientMessageType, ServerMessageType>;
   ws: MockWS;
   controller: AbortController;
 }
@@ -91,9 +91,13 @@ function createStream(token?: string, retryConfig?: Partial<RetryConfig>): Strea
   const controller = new AbortController();
   const stream = new WebSocketBiDiStream(
     'ws://localhost:8080',
-    controller.signal,
-    token,
-    retryConfig,
+    (message: ClientMessageType) => ClientMessageType.toBinary(message),
+    (data) => ServerMessageType.fromBinary(data),
+    {
+      abortSignal: controller.signal,
+      jwtToken: token,
+      retryConfig: retryConfig,
+    },
   );
   const ws = MockWebSocket.instances[MockWebSocket.instances.length - 1];
   return { stream, ws, controller };
@@ -115,7 +119,7 @@ function createClientMessage(): ClientMessageType {
 }
 
 async function collectMessages(
-  stream: WebSocketBiDiStream,
+  stream: WebSocketBiDiStream<ClientMessageType, ServerMessageType>,
   count: number,
 ): Promise<ServerMessageType[]> {
   const messages: ServerMessageType[] = [];
@@ -149,7 +153,14 @@ describe('WebSocketBiDiStream', () => {
       const controller = new AbortController();
       controller.abort();
 
-      new WebSocketBiDiStream('ws://localhost:8080', controller.signal);
+      new WebSocketBiDiStream(
+        'ws://localhost:8080', 
+        (message: ClientMessageType) => ClientMessageType.toBinary(message),
+        (data) => ServerMessageType.fromBinary(data),
+        {
+          abortSignal: controller.signal,
+        },
+      );
 
       expect(MockWebSocket.instances).toHaveLength(0);
     });
@@ -332,7 +343,7 @@ describe('WebSocketBiDiStream', () => {
       maxAttempts: 5,
     };
 
-    test('should attempt reconnection on unexpected close', async () => {
+    test('should not attempt reconnection on unexpected close', async () => {
       const { ws } = createStream(undefined, retryConfig);
 
       await openConnection(ws);
@@ -341,7 +352,7 @@ describe('WebSocketBiDiStream', () => {
       ws.emit('close');
       await vi.advanceTimersByTimeAsync(150);
 
-      expect(MockWebSocket.instances.length).toBeGreaterThan(1);
+      expect(MockWebSocket.instances.length).toBe(1);
     });
 
     test('should stop reconnecting after max attempts', async () => {