vovk 3.0.0-draft.280 → 3.0.0-draft.282

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/cjs/JSONLinesResponse.js +0 -1
  2. package/cjs/VovkApp.js +2 -1
  3. package/cjs/client/defaultStreamHandler.js +13 -0
  4. package/cjs/client/fetcher.d.ts +2 -1
  5. package/cjs/client/types.d.ts +1 -0
  6. package/mjs/JSONLinesResponse.js +0 -1
  7. package/mjs/VovkApp.js +2 -1
  8. package/mjs/client/defaultStreamHandler.js +13 -0
  9. package/mjs/client/fetcher.d.ts +2 -1
  10. package/mjs/client/types.d.ts +1 -0
  11. package/package.json +1 -1
package/cjs/JSONLinesResponse.js CHANGED
@@ -39,7 +39,6 @@ class JSONLinesResponse extends Response {
39
39
  request.signal.addEventListener('abort', this.close, { once: true });
40
40
  }
41
41
  send = (data) => {
42
- console.log('SENDX', data);
43
42
  const { controller, encoder } = this;
44
43
  if (this.isClosed)
45
44
  return;
package/cjs/VovkApp.js CHANGED
@@ -155,11 +155,12 @@ class VovkApp {
155
155
  }
156
156
  const isIterator = typeof result === 'object' &&
157
157
  !!result &&
158
+ !(result instanceof Array) &&
158
159
  ((Reflect.has(result, Symbol.iterator) &&
159
160
  typeof result[Symbol.iterator] === 'function') ||
160
161
  (Reflect.has(result, Symbol.asyncIterator) &&
161
162
  typeof result[Symbol.asyncIterator] === 'function'));
162
- if (isIterator && !(result instanceof Array)) {
163
+ if (isIterator) {
163
164
  const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(req, {
164
165
  headers: {
165
166
  ..._a.getHeadersFromOptions(staticMethod._options),
package/cjs/client/defaultStreamHandler.js CHANGED
@@ -22,6 +22,7 @@ const defaultStreamHandler = async (response, controller) => {
22
22
  const reader = response.body.getReader();
23
23
  // if streaming is too rapid, we need to make sure that the loop is stopped
24
24
  let canceled = false;
25
+ const subscribers = new Set();
25
26
  async function* asyncIterator() {
26
27
  let prepend = '';
27
28
  while (true) {
@@ -52,6 +53,10 @@ const defaultStreamHandler = async (response, controller) => {
52
53
  break;
53
54
  }
54
55
  if (data) {
56
+ subscribers.forEach((cb) => {
57
+ if (!canceled)
58
+ cb(data);
59
+ });
55
60
  if ('isError' in data && 'reason' in data) {
56
61
  const upcomingError = data.reason;
57
62
  await reader.cancel();
@@ -72,6 +77,14 @@ const defaultStreamHandler = async (response, controller) => {
72
77
  [Symbol.asyncIterator]: asyncIterator,
73
78
  [Symbol.dispose]: () => controller.abort(),
74
79
  [Symbol.asyncDispose]: () => controller.abort(),
80
+ onIterate: (cb) => {
81
+ if (canceled)
82
+ return () => { };
83
+ subscribers.add(cb);
84
+ return () => {
85
+ subscribers.delete(cb);
86
+ };
87
+ },
75
88
  abort: () => {
76
89
  canceled = true;
77
90
  return controller.abort();
package/cjs/client/fetcher.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  import type { VovkDefaultFetcherOptions, VovkClientFetcher } from './types';
2
+ import { KnownAny } from '../types';
2
3
  export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at default fetcher";
3
4
  export declare function createFetcher<T>({ prepareRequestInit, transformResponse, }?: {
4
5
  prepareRequestInit?: (init: RequestInit, options: VovkDefaultFetcherOptions<T>) => RequestInit | Promise<RequestInit> | void | Promise<void>;
5
- transformResponse?: (resp: unknown, response: Response, options: VovkDefaultFetcherOptions<T>, init: RequestInit) => unknown;
6
+ transformResponse?: (respData: KnownAny, response: Response, options: VovkDefaultFetcherOptions<T>, init: RequestInit) => unknown;
6
7
  }): VovkClientFetcher<VovkDefaultFetcherOptions<T>>;
7
8
  export declare const fetcher: VovkClientFetcher<{
8
9
  apiRoot?: string;
package/cjs/client/types.d.ts CHANGED
@@ -30,6 +30,7 @@ export type VovkStreamAsyncIterable<T> = {
30
30
  [Symbol.dispose](): Promise<void> | void;
31
31
  [Symbol.asyncDispose](): Promise<void> | void;
32
32
  [Symbol.asyncIterator](): AsyncIterator<T>;
33
+ onIterate: (cb: (data: T) => void) => () => void;
33
34
  abort: () => Promise<void> | void;
34
35
  };
35
36
  type StaticMethodReturn<T extends ControllerStaticMethod> = ReturnType<T> extends NextResponse<infer U> | Promise<NextResponse<infer U>> ? U : ReturnType<T> extends Response | Promise<Response> ? Awaited<ReturnType<T>> : ReturnType<T>;
package/mjs/JSONLinesResponse.js CHANGED
@@ -39,7 +39,6 @@ class JSONLinesResponse extends Response {
39
39
  request.signal.addEventListener('abort', this.close, { once: true });
40
40
  }
41
41
  send = (data) => {
42
- console.log('SENDX', data);
43
42
  const { controller, encoder } = this;
44
43
  if (this.isClosed)
45
44
  return;
package/mjs/VovkApp.js CHANGED
@@ -155,11 +155,12 @@ class VovkApp {
155
155
  }
156
156
  const isIterator = typeof result === 'object' &&
157
157
  !!result &&
158
+ !(result instanceof Array) &&
158
159
  ((Reflect.has(result, Symbol.iterator) &&
159
160
  typeof result[Symbol.iterator] === 'function') ||
160
161
  (Reflect.has(result, Symbol.asyncIterator) &&
161
162
  typeof result[Symbol.asyncIterator] === 'function'));
162
- if (isIterator && !(result instanceof Array)) {
163
+ if (isIterator) {
163
164
  const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(req, {
164
165
  headers: {
165
166
  ..._a.getHeadersFromOptions(staticMethod._options),
package/mjs/client/defaultStreamHandler.js CHANGED
@@ -22,6 +22,7 @@ const defaultStreamHandler = async (response, controller) => {
22
22
  const reader = response.body.getReader();
23
23
  // if streaming is too rapid, we need to make sure that the loop is stopped
24
24
  let canceled = false;
25
+ const subscribers = new Set();
25
26
  async function* asyncIterator() {
26
27
  let prepend = '';
27
28
  while (true) {
@@ -52,6 +53,10 @@ const defaultStreamHandler = async (response, controller) => {
52
53
  break;
53
54
  }
54
55
  if (data) {
56
+ subscribers.forEach((cb) => {
57
+ if (!canceled)
58
+ cb(data);
59
+ });
55
60
  if ('isError' in data && 'reason' in data) {
56
61
  const upcomingError = data.reason;
57
62
  await reader.cancel();
@@ -72,6 +77,14 @@ const defaultStreamHandler = async (response, controller) => {
72
77
  [Symbol.asyncIterator]: asyncIterator,
73
78
  [Symbol.dispose]: () => controller.abort(),
74
79
  [Symbol.asyncDispose]: () => controller.abort(),
80
+ onIterate: (cb) => {
81
+ if (canceled)
82
+ return () => { };
83
+ subscribers.add(cb);
84
+ return () => {
85
+ subscribers.delete(cb);
86
+ };
87
+ },
75
88
  abort: () => {
76
89
  canceled = true;
77
90
  return controller.abort();
package/mjs/client/fetcher.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  import type { VovkDefaultFetcherOptions, VovkClientFetcher } from './types';
2
+ import { KnownAny } from '../types';
2
3
  export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at default fetcher";
3
4
  export declare function createFetcher<T>({ prepareRequestInit, transformResponse, }?: {
4
5
  prepareRequestInit?: (init: RequestInit, options: VovkDefaultFetcherOptions<T>) => RequestInit | Promise<RequestInit> | void | Promise<void>;
5
- transformResponse?: (resp: unknown, response: Response, options: VovkDefaultFetcherOptions<T>, init: RequestInit) => unknown;
6
+ transformResponse?: (respData: KnownAny, response: Response, options: VovkDefaultFetcherOptions<T>, init: RequestInit) => unknown;
6
7
  }): VovkClientFetcher<VovkDefaultFetcherOptions<T>>;
7
8
  export declare const fetcher: VovkClientFetcher<{
8
9
  apiRoot?: string;
package/mjs/client/types.d.ts CHANGED
@@ -30,6 +30,7 @@ export type VovkStreamAsyncIterable<T> = {
30
30
  [Symbol.dispose](): Promise<void> | void;
31
31
  [Symbol.asyncDispose](): Promise<void> | void;
32
32
  [Symbol.asyncIterator](): AsyncIterator<T>;
33
+ onIterate: (cb: (data: T) => void) => () => void;
33
34
  abort: () => Promise<void> | void;
34
35
  };
35
36
  type StaticMethodReturn<T extends ControllerStaticMethod> = ReturnType<T> extends NextResponse<infer U> | Promise<NextResponse<infer U>> ? U : ReturnType<T> extends Response | Promise<Response> ? Awaited<ReturnType<T>> : ReturnType<T>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk",
3
- "version": "3.0.0-draft.280",
3
+ "version": "3.0.0-draft.282",
4
4
  "main": "./cjs/index.js",
5
5
  "module": "./mjs/index.js",
6
6
  "types": "./mjs/index.d.ts",