vovk 3.0.0-draft.273 → 3.0.0-draft.275

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 (9) hide show
  1. package/cjs/client/defaultStreamHandler.d.ts +1 -1
  2. package/cjs/client/defaultStreamHandler.js +5 -5
  3. package/cjs/client/fetcher.js +3 -1
  4. package/cjs/client/types.d.ts +5 -3
  5. package/mjs/client/defaultStreamHandler.d.ts +1 -1
  6. package/mjs/client/defaultStreamHandler.js +5 -5
  7. package/mjs/client/fetcher.js +3 -1
  8. package/mjs/client/types.d.ts +5 -3
  9. package/package.json +1 -1
package/cjs/client/defaultStreamHandler.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import type { VovkStreamAsyncIterable } from './types';
2
2
  import '../utils/shim';
3
3
  export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at defaultStreamHandler";
4
- export declare const defaultStreamHandler: (response: Response) => Promise<VovkStreamAsyncIterable<unknown>>;
4
+ export declare const defaultStreamHandler: (response: Response, controller: AbortController) => Promise<VovkStreamAsyncIterable<unknown>>;
package/cjs/client/defaultStreamHandler.js CHANGED
@@ -5,7 +5,7 @@ const types_1 = require("../types");
5
5
  const HttpException_1 = require("../HttpException");
6
6
  require("../utils/shim");
7
7
  exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at defaultStreamHandler';
8
- const defaultStreamHandler = async (response) => {
8
+ const defaultStreamHandler = async (response, controller) => {
9
9
  if (!response.ok) {
10
10
  let result;
11
11
  try {
@@ -70,11 +70,11 @@ const defaultStreamHandler = async (response) => {
70
70
  return {
71
71
  status: response.status,
72
72
  [Symbol.asyncIterator]: asyncIterator,
73
- [Symbol.dispose]: () => reader.cancel(),
74
- [Symbol.asyncDispose]: () => reader.cancel(),
75
- cancel: () => {
73
+ [Symbol.dispose]: () => controller.abort(),
74
+ [Symbol.asyncDispose]: () => controller.abort(),
75
+ abort: () => {
76
76
  canceled = true;
77
- return reader.cancel();
77
+ return controller.abort();
78
78
  },
79
79
  };
80
80
  };
package/cjs/client/fetcher.js CHANGED
@@ -57,6 +57,8 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
57
57
  ? ((await prepareRequestInit(requestInit, options)) ?? requestInit)
58
58
  : requestInit;
59
59
  let response;
60
+ const controller = new AbortController();
61
+ requestInit.signal = controller.signal;
60
62
  try {
61
63
  response = await fetch(endpoint, requestInit);
62
64
  }
@@ -72,7 +74,7 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
72
74
  const contentType = interpretAs ?? response.headers.get('content-type');
73
75
  let resp;
74
76
  if (contentType?.startsWith('application/jsonl')) {
75
- resp = defaultStreamHandler(response);
77
+ resp = defaultStreamHandler(response, controller);
76
78
  }
77
79
  else if (contentType?.startsWith('application/json')) {
78
80
  resp = defaultHandler(response);
package/cjs/client/types.d.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkHandlerSchema, VovkControllerSchema, VovkSegmentSchema, VovkSchema, VovkRequest } from '../types';
2
2
  import type { JSONLinesResponse } from '../JSONLinesResponse';
3
3
  import type { NextResponse } from 'next/server';
4
+ import type { defaultStreamHandler } from './defaultStreamHandler';
5
+ import type { defaultHandler } from './defaultHandler';
4
6
  type OmitNullable<T> = {
5
7
  [K in keyof T as T[K] extends null | undefined ? never : K]: T[K];
6
8
  };
@@ -28,7 +30,7 @@ export type VovkStreamAsyncIterable<T> = {
28
30
  [Symbol.dispose](): Promise<void> | void;
29
31
  [Symbol.asyncDispose](): Promise<void> | void;
30
32
  [Symbol.asyncIterator](): AsyncIterator<T>;
31
- cancel: () => Promise<void> | void;
33
+ abort: () => Promise<void> | void;
32
34
  };
33
35
  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>;
34
36
  type StaticMethodReturnPromise<T extends ControllerStaticMethod> = ToPromise<StaticMethodReturn<T>>;
@@ -83,8 +85,8 @@ export type VovkClientFetcher<OPTS> = (options: {
83
85
  params?: unknown;
84
86
  endpoint: string;
85
87
  }) => void | Promise<void>;
86
- defaultStreamHandler: (response: Response) => Promise<VovkStreamAsyncIterable<unknown>>;
87
- defaultHandler: (response: Response) => Promise<unknown>;
88
+ defaultStreamHandler: typeof defaultStreamHandler;
89
+ defaultHandler: typeof defaultHandler;
88
90
  }, input: {
89
91
  body: unknown;
90
92
  query: {
package/mjs/client/defaultStreamHandler.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import type { VovkStreamAsyncIterable } from './types';
2
2
  import '../utils/shim';
3
3
  export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at defaultStreamHandler";
4
- export declare const defaultStreamHandler: (response: Response) => Promise<VovkStreamAsyncIterable<unknown>>;
4
+ export declare const defaultStreamHandler: (response: Response, controller: AbortController) => Promise<VovkStreamAsyncIterable<unknown>>;
package/mjs/client/defaultStreamHandler.js CHANGED
@@ -5,7 +5,7 @@ const types_1 = require("../types");
5
5
  const HttpException_1 = require("../HttpException");
6
6
  require("../utils/shim");
7
7
  exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at defaultStreamHandler';
8
- const defaultStreamHandler = async (response) => {
8
+ const defaultStreamHandler = async (response, controller) => {
9
9
  if (!response.ok) {
10
10
  let result;
11
11
  try {
@@ -70,11 +70,11 @@ const defaultStreamHandler = async (response) => {
70
70
  return {
71
71
  status: response.status,
72
72
  [Symbol.asyncIterator]: asyncIterator,
73
- [Symbol.dispose]: () => reader.cancel(),
74
- [Symbol.asyncDispose]: () => reader.cancel(),
75
- cancel: () => {
73
+ [Symbol.dispose]: () => controller.abort(),
74
+ [Symbol.asyncDispose]: () => controller.abort(),
75
+ abort: () => {
76
76
  canceled = true;
77
- return reader.cancel();
77
+ return controller.abort();
78
78
  },
79
79
  };
80
80
  };
package/mjs/client/fetcher.js CHANGED
@@ -57,6 +57,8 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
57
57
  ? ((await prepareRequestInit(requestInit, options)) ?? requestInit)
58
58
  : requestInit;
59
59
  let response;
60
+ const controller = new AbortController();
61
+ requestInit.signal = controller.signal;
60
62
  try {
61
63
  response = await fetch(endpoint, requestInit);
62
64
  }
@@ -72,7 +74,7 @@ function createFetcher({ prepareRequestInit, transformResponse, } = {}) {
72
74
  const contentType = interpretAs ?? response.headers.get('content-type');
73
75
  let resp;
74
76
  if (contentType?.startsWith('application/jsonl')) {
75
- resp = defaultStreamHandler(response);
77
+ resp = defaultStreamHandler(response, controller);
76
78
  }
77
79
  else if (contentType?.startsWith('application/json')) {
78
80
  resp = defaultHandler(response);
package/mjs/client/types.d.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  import type { KnownAny, HttpMethod, ControllerStaticMethod, VovkHandlerSchema, VovkControllerSchema, VovkSegmentSchema, VovkSchema, VovkRequest } from '../types';
2
2
  import type { JSONLinesResponse } from '../JSONLinesResponse';
3
3
  import type { NextResponse } from 'next/server';
4
+ import type { defaultStreamHandler } from './defaultStreamHandler';
5
+ import type { defaultHandler } from './defaultHandler';
4
6
  type OmitNullable<T> = {
5
7
  [K in keyof T as T[K] extends null | undefined ? never : K]: T[K];
6
8
  };
@@ -28,7 +30,7 @@ export type VovkStreamAsyncIterable<T> = {
28
30
  [Symbol.dispose](): Promise<void> | void;
29
31
  [Symbol.asyncDispose](): Promise<void> | void;
30
32
  [Symbol.asyncIterator](): AsyncIterator<T>;
31
- cancel: () => Promise<void> | void;
33
+ abort: () => Promise<void> | void;
32
34
  };
33
35
  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>;
34
36
  type StaticMethodReturnPromise<T extends ControllerStaticMethod> = ToPromise<StaticMethodReturn<T>>;
@@ -83,8 +85,8 @@ export type VovkClientFetcher<OPTS> = (options: {
83
85
  params?: unknown;
84
86
  endpoint: string;
85
87
  }) => void | Promise<void>;
86
- defaultStreamHandler: (response: Response) => Promise<VovkStreamAsyncIterable<unknown>>;
87
- defaultHandler: (response: Response) => Promise<unknown>;
88
+ defaultStreamHandler: typeof defaultStreamHandler;
89
+ defaultHandler: typeof defaultHandler;
88
90
  }, input: {
89
91
  body: unknown;
90
92
  query: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk",
3
- "version": "3.0.0-draft.273",
3
+ "version": "3.0.0-draft.275",
4
4
  "main": "./cjs/index.js",
5
5
  "module": "./mjs/index.js",
6
6
  "types": "./mjs/index.d.ts",