vovk 3.0.0-draft.277 → 3.0.0-draft.279

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 (7) hide show
  1. package/cjs/JSONLinesResponse.d.ts +1 -2
  2. package/cjs/JSONLinesResponse.js +11 -7
  3. package/cjs/VovkApp.js +1 -4
  4. package/mjs/JSONLinesResponse.d.ts +1 -2
  5. package/mjs/JSONLinesResponse.js +11 -7
  6. package/mjs/VovkApp.js +1 -4
  7. package/package.json +1 -1
package/cjs/JSONLinesResponse.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { headers } from 'next/headers';
2
1
  import type { KnownAny, StreamAbortMessage } from './types.js';
3
2
  import './utils/shim.js';
4
3
  export declare class JSONLinesResponse<T> extends Response {
@@ -8,7 +7,7 @@ export declare class JSONLinesResponse<T> extends Response {
8
7
  readonly readableStream: ReadableStream;
9
8
  private iteratorQueue;
10
9
  private iteratorResolvers;
11
- constructor(requestHeaders: Awaited<ReturnType<typeof headers>>, init?: ResponseInit);
10
+ constructor(request: Request, init?: ResponseInit);
12
11
  send: (data: T | StreamAbortMessage) => void;
13
12
  close: () => void;
14
13
  throw: (e: KnownAny) => void;
package/cjs/JSONLinesResponse.js CHANGED
@@ -9,7 +9,10 @@ class JSONLinesResponse extends Response {
9
9
  readableStream;
10
10
  iteratorQueue = [];
11
11
  iteratorResolvers = [];
12
- constructor(requestHeaders, init) {
12
+ constructor(request, init) {
13
+ if (!request) {
14
+ throw new Error('Request arg is required for JSONLinesResponse');
15
+ }
13
16
  const encoder = new TextEncoder();
14
17
  let readableController;
15
18
  const readableStream = new ReadableStream({
@@ -20,24 +23,25 @@ class JSONLinesResponse extends Response {
20
23
  readableController = controller;
21
24
  },
22
25
  });
23
- if (!requestHeaders) {
24
- throw new Error('Request headers are required');
25
- }
26
- const accept = requestHeaders.get('accept');
26
+ const accept = request.headers.get('accept');
27
27
  super(readableStream, {
28
28
  ...init,
29
29
  headers: {
30
- ...init?.headers,
31
- 'Content-Type': accept?.includes('application/jsonl')
30
+ 'content-type': accept?.includes('application/jsonl')
32
31
  ? 'application/jsonl; charset=utf-8'
33
32
  : 'text/plain; charset=utf-8',
33
+ ...init?.headers,
34
34
  },
35
35
  });
36
36
  this.readableStream = readableStream;
37
37
  this.encoder = encoder;
38
38
  this.controller = readableController;
39
+ request.signal.addEventListener('abort', () => {
40
+ console.log('ABORTED');
41
+ });
39
42
  }
40
43
  send = (data) => {
44
+ console.log('SEND', data);
41
45
  const { controller, encoder } = this;
42
46
  if (this.isClosed)
43
47
  return;
package/cjs/VovkApp.js CHANGED
@@ -147,9 +147,6 @@ class VovkApp {
147
147
  form: () => (0, reqForm_1.default)(req),
148
148
  params: () => methodParams,
149
149
  };
150
- req.signal.addEventListener('abort', () => {
151
- console.log('ABORTED');
152
- });
153
150
  try {
154
151
  await staticMethod._options?.before?.call(controller, req);
155
152
  const result = await staticMethod.call(controller, req, methodParams);
@@ -163,7 +160,7 @@ class VovkApp {
163
160
  (Reflect.has(result, Symbol.asyncIterator) &&
164
161
  typeof result[Symbol.asyncIterator] === 'function'));
165
162
  if (isIterator && !(result instanceof Array)) {
166
- const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(headersList, {
163
+ const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(req, {
167
164
  headers: {
168
165
  ..._a.getHeadersFromOptions(staticMethod._options),
169
166
  },
package/mjs/JSONLinesResponse.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { headers } from 'next/headers';
2
1
  import type { KnownAny, StreamAbortMessage } from './types.js';
3
2
  import './utils/shim.js';
4
3
  export declare class JSONLinesResponse<T> extends Response {
@@ -8,7 +7,7 @@ export declare class JSONLinesResponse<T> extends Response {
8
7
  readonly readableStream: ReadableStream;
9
8
  private iteratorQueue;
10
9
  private iteratorResolvers;
11
- constructor(requestHeaders: Awaited<ReturnType<typeof headers>>, init?: ResponseInit);
10
+ constructor(request: Request, init?: ResponseInit);
12
11
  send: (data: T | StreamAbortMessage) => void;
13
12
  close: () => void;
14
13
  throw: (e: KnownAny) => void;
package/mjs/JSONLinesResponse.js CHANGED
@@ -9,7 +9,10 @@ class JSONLinesResponse extends Response {
9
9
  readableStream;
10
10
  iteratorQueue = [];
11
11
  iteratorResolvers = [];
12
- constructor(requestHeaders, init) {
12
+ constructor(request, init) {
13
+ if (!request) {
14
+ throw new Error('Request arg is required for JSONLinesResponse');
15
+ }
13
16
  const encoder = new TextEncoder();
14
17
  let readableController;
15
18
  const readableStream = new ReadableStream({
@@ -20,24 +23,25 @@ class JSONLinesResponse extends Response {
20
23
  readableController = controller;
21
24
  },
22
25
  });
23
- if (!requestHeaders) {
24
- throw new Error('Request headers are required');
25
- }
26
- const accept = requestHeaders.get('accept');
26
+ const accept = request.headers.get('accept');
27
27
  super(readableStream, {
28
28
  ...init,
29
29
  headers: {
30
- ...init?.headers,
31
- 'Content-Type': accept?.includes('application/jsonl')
30
+ 'content-type': accept?.includes('application/jsonl')
32
31
  ? 'application/jsonl; charset=utf-8'
33
32
  : 'text/plain; charset=utf-8',
33
+ ...init?.headers,
34
34
  },
35
35
  });
36
36
  this.readableStream = readableStream;
37
37
  this.encoder = encoder;
38
38
  this.controller = readableController;
39
+ request.signal.addEventListener('abort', () => {
40
+ console.log('ABORTED');
41
+ });
39
42
  }
40
43
  send = (data) => {
44
+ console.log('SEND', data);
41
45
  const { controller, encoder } = this;
42
46
  if (this.isClosed)
43
47
  return;
package/mjs/VovkApp.js CHANGED
@@ -147,9 +147,6 @@ class VovkApp {
147
147
  form: () => (0, reqForm_1.default)(req),
148
148
  params: () => methodParams,
149
149
  };
150
- req.signal.addEventListener('abort', () => {
151
- console.log('ABORTED');
152
- });
153
150
  try {
154
151
  await staticMethod._options?.before?.call(controller, req);
155
152
  const result = await staticMethod.call(controller, req, methodParams);
@@ -163,7 +160,7 @@ class VovkApp {
163
160
  (Reflect.has(result, Symbol.asyncIterator) &&
164
161
  typeof result[Symbol.asyncIterator] === 'function'));
165
162
  if (isIterator && !(result instanceof Array)) {
166
- const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(headersList, {
163
+ const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(req, {
167
164
  headers: {
168
165
  ..._a.getHeadersFromOptions(staticMethod._options),
169
166
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk",
3
- "version": "3.0.0-draft.277",
3
+ "version": "3.0.0-draft.279",
4
4
  "main": "./cjs/index.js",
5
5
  "module": "./mjs/index.js",
6
6
  "types": "./mjs/index.d.ts",