vovk 0.2.3-beta.9 → 0.2.3-beta.91
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.
- package/Segment.d.ts +1 -0
- package/Segment.js +29 -4
- package/StreamResponse.js +1 -1
- package/cli/.eslintrc.js +10 -2
- package/cli/generateClient.js +94 -30
- package/cli/getVars.js +44 -0
- package/cli/index.js +52 -41
- package/cli/lib/getAvailablePort.js +31 -0
- package/cli/lib/getReturnPath.js +28 -0
- package/cli/lib/isEqual.js +28 -0
- package/cli/lib/parallel.js +50 -0
- package/cli/postinstall.js +22 -0
- package/cli/server.js +73 -36
- package/client/clientizeController.d.ts +19 -1
- package/client/clientizeController.js +10 -13
- package/client/defaultFetcher.d.ts +1 -1
- package/client/defaultFetcher.js +17 -21
- package/client/defaultHandler.d.ts +2 -0
- package/client/defaultHandler.js +21 -0
- package/client/defaultStreamHandler.d.ts +3 -0
- package/client/{defaultStreamFetcher.js → defaultStreamHandler.js} +22 -36
- package/client/types.d.ts +13 -4
- package/config.d.ts +1 -0
- package/config.js +27 -0
- package/createSegment.d.ts +16 -20
- package/createSegment.js +28 -51
- package/index.d.ts +18 -23
- package/index.js +1 -2
- package/package.json +5 -4
- package/tsconfig.tsbuildinfo +1 -1
- package/types.d.ts +35 -1
- package/worker/promisifyWorker.d.ts +1 -1
- package/worker/promisifyWorker.js +26 -8
- package/worker/types.d.ts +8 -2
- package/cli/getVovkrc.js +0 -28
- package/cli/watchMetadata.js +0 -34
- package/client/defaultStreamFetcher.d.ts +0 -5
package/Segment.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { NextRequest } from 'next/server';
|
|
|
2
2
|
import { _HttpMethod as HttpMethod, type _RouteHandler as RouteHandler } from './types';
|
|
3
3
|
export declare class _Segment {
|
|
4
4
|
#private;
|
|
5
|
+
private static getHeadersFromOptions;
|
|
5
6
|
_routes: Record<HttpMethod, Map<{
|
|
6
7
|
name?: string;
|
|
7
8
|
_prefix?: string;
|
package/Segment.js
CHANGED
|
@@ -1,10 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
exports._Segment = void 0;
|
|
4
5
|
const types_1 = require("./types");
|
|
5
6
|
const HttpException_1 = require("./HttpException");
|
|
6
7
|
const StreamResponse_1 = require("./StreamResponse");
|
|
7
8
|
class _Segment {
|
|
9
|
+
static getHeadersFromOptions(options) {
|
|
10
|
+
const corsHeaders = {
|
|
11
|
+
'Access-Control-Allow-Origin': '*',
|
|
12
|
+
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS, HEAD',
|
|
13
|
+
'Access-Control-Allow-Headers': 'Content-Type, Authorization',
|
|
14
|
+
};
|
|
15
|
+
const headers = {
|
|
16
|
+
...(options?.cors ? corsHeaders : {}),
|
|
17
|
+
...(options?.headers ?? {}),
|
|
18
|
+
};
|
|
19
|
+
return headers;
|
|
20
|
+
}
|
|
8
21
|
_routes = {
|
|
9
22
|
GET: new Map(),
|
|
10
23
|
POST: new Map(),
|
|
@@ -14,18 +27,21 @@ class _Segment {
|
|
|
14
27
|
HEAD: new Map(),
|
|
15
28
|
OPTIONS: new Map(),
|
|
16
29
|
};
|
|
17
|
-
GET = (req, data) =>
|
|
30
|
+
GET = (req, data) => {
|
|
31
|
+
return this.#callMethod(types_1._HttpMethod.GET, req, data.params);
|
|
32
|
+
};
|
|
18
33
|
POST = (req, data) => this.#callMethod(types_1._HttpMethod.POST, req, data.params);
|
|
19
34
|
PUT = (req, data) => this.#callMethod(types_1._HttpMethod.PUT, req, data.params);
|
|
20
35
|
PATCH = (req, data) => this.#callMethod(types_1._HttpMethod.PATCH, req, data.params);
|
|
21
36
|
DELETE = (req, data) => this.#callMethod(types_1._HttpMethod.DELETE, req, data.params);
|
|
22
37
|
HEAD = (req, data) => this.#callMethod(types_1._HttpMethod.HEAD, req, data.params);
|
|
23
38
|
OPTIONS = (req, data) => this.#callMethod(types_1._HttpMethod.OPTIONS, req, data.params);
|
|
24
|
-
#respond = (status, body) => {
|
|
39
|
+
#respond = (status, body, options) => {
|
|
25
40
|
return new Response(JSON.stringify(body), {
|
|
26
41
|
status,
|
|
27
42
|
headers: {
|
|
28
43
|
'Content-Type': 'application/json',
|
|
44
|
+
..._a.getHeadersFromOptions(options),
|
|
29
45
|
},
|
|
30
46
|
});
|
|
31
47
|
};
|
|
@@ -39,6 +55,9 @@ class _Segment {
|
|
|
39
55
|
#callMethod = async (httpMethod, req, params) => {
|
|
40
56
|
const controllers = this._routes[httpMethod];
|
|
41
57
|
const methodParams = {};
|
|
58
|
+
if (params[Object.keys(params)[0]]?.[0] === '__ping') {
|
|
59
|
+
return this.#respond(200, { message: 'pong' });
|
|
60
|
+
}
|
|
42
61
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
43
62
|
const handlers = Object.fromEntries([...controllers.entries()]
|
|
44
63
|
.map(([controller, staticMethods]) => {
|
|
@@ -113,7 +132,12 @@ class _Segment {
|
|
|
113
132
|
(Reflect.has(result, Symbol.asyncIterator) &&
|
|
114
133
|
typeof result[Symbol.asyncIterator] === 'function'));
|
|
115
134
|
if (isIterator && !(result instanceof Array)) {
|
|
116
|
-
const streamResponse = new StreamResponse_1._StreamResponse(
|
|
135
|
+
const streamResponse = new StreamResponse_1._StreamResponse({
|
|
136
|
+
headers: {
|
|
137
|
+
...StreamResponse_1._StreamResponse.defaultHeaders,
|
|
138
|
+
..._a.getHeadersFromOptions(staticMethod._options),
|
|
139
|
+
},
|
|
140
|
+
});
|
|
117
141
|
void (async () => {
|
|
118
142
|
try {
|
|
119
143
|
for await (const chunk of result) {
|
|
@@ -130,7 +154,7 @@ class _Segment {
|
|
|
130
154
|
if (result instanceof Response) {
|
|
131
155
|
return result;
|
|
132
156
|
}
|
|
133
|
-
return this.#respond(200, result ?? null);
|
|
157
|
+
return this.#respond(200, result ?? null, staticMethod._options);
|
|
134
158
|
}
|
|
135
159
|
catch (e) {
|
|
136
160
|
const err = e;
|
|
@@ -150,3 +174,4 @@ class _Segment {
|
|
|
150
174
|
};
|
|
151
175
|
}
|
|
152
176
|
exports._Segment = _Segment;
|
|
177
|
+
_a = _Segment;
|
package/StreamResponse.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports._StreamResponse = void 0;
|
|
4
4
|
class _StreamResponse extends Response {
|
|
5
|
-
static JSON_DIVIDER = '__##DIV123##__'; // protects collisions
|
|
5
|
+
static JSON_DIVIDER = '__##DIV123##__'; // protects collisions of JSON data
|
|
6
6
|
static defaultHeaders = {
|
|
7
7
|
'Content-Type': 'text/event-stream',
|
|
8
8
|
Connection: 'keep-alive',
|
package/cli/.eslintrc.js
CHANGED
|
@@ -7,6 +7,14 @@ module.exports = {
|
|
|
7
7
|
'@typescript-eslint/no-unsafe-call': 'off',
|
|
8
8
|
'@typescript-eslint/no-unsafe-member-access': 'off',
|
|
9
9
|
'@typescript-eslint/no-unsafe-return': 'off',
|
|
10
|
-
'no-console': ['error', { allow: ['info', 'error'] }]
|
|
11
|
-
}
|
|
10
|
+
'no-console': ['error', { allow: ['info', 'error', 'warn'] }]
|
|
11
|
+
},
|
|
12
|
+
parserOptions: {
|
|
13
|
+
ecmaVersion: 2022,
|
|
14
|
+
sourceType: 'module',
|
|
15
|
+
project: '../tsconfig.cli.json',
|
|
16
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
17
|
+
tsconfigRootDir: __dirname,
|
|
18
|
+
createDefaultProgram: true,
|
|
19
|
+
},
|
|
12
20
|
}
|
package/cli/generateClient.js
CHANGED
|
@@ -1,54 +1,118 @@
|
|
|
1
|
+
// @ts-check
|
|
1
2
|
const fs = require('fs/promises');
|
|
2
3
|
const path = require('path');
|
|
3
|
-
const
|
|
4
|
+
const getReturnPath = require('./lib/getReturnPath');
|
|
5
|
+
|
|
6
|
+
/** @type {(moduleName: string) => boolean} */
|
|
7
|
+
function canRequire(moduleName) {
|
|
8
|
+
try {
|
|
9
|
+
require.resolve(moduleName);
|
|
10
|
+
return true; // The module exists and can be required
|
|
11
|
+
} catch (e) {
|
|
12
|
+
return false; // The module does not exist
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
4
16
|
/**
|
|
5
|
-
* Generates client code with string concatenation so it should be
|
|
6
|
-
*
|
|
17
|
+
* Generates client code with string concatenation so it should be much faster than using AST
|
|
18
|
+
* TODO: Check fetcher for existence
|
|
19
|
+
* @type {(rcPath: import('../src').VovkEnv) => Promise<{ written: boolean; path: string }>}
|
|
7
20
|
*/
|
|
8
|
-
async function generateClient(
|
|
9
|
-
const
|
|
21
|
+
async function generateClient({ ...env }) {
|
|
22
|
+
const outDir = env.VOVK_CLIENT_OUT;
|
|
23
|
+
const returnDir = getReturnPath(outDir, process.cwd());
|
|
24
|
+
const jsonPath = path.join(returnDir, '.vovk.json');
|
|
25
|
+
const localJsonPath = path.join(process.cwd(), '.vovk.json');
|
|
26
|
+
const fetcherPath = env.VOVK_FETCHER.startsWith('.') ? path.join(returnDir, env.VOVK_FETCHER) : env.VOVK_FETCHER;
|
|
27
|
+
const validatePath = env.VOVK_VALIDATE_ON_CLIENT.startsWith('.')
|
|
28
|
+
? path.join(returnDir, env.VOVK_VALIDATE_ON_CLIENT)
|
|
29
|
+
: env.VOVK_VALIDATE_ON_CLIENT;
|
|
30
|
+
const localValidatePath = env.VOVK_VALIDATE_ON_CLIENT.startsWith('.') ? path.join('..', validatePath) : validatePath;
|
|
10
31
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
32
|
+
if (!env.VOVK_VALIDATE_ON_CLIENT) {
|
|
33
|
+
env.VOVK_VALIDATE_ON_CLIENT = canRequire('vovk-zod/zodValidateOnClient') ? 'vovk-zod/zodValidateOnClient' : '';
|
|
34
|
+
} else if (env.VOVK_VALIDATE_ON_CLIENT && !canRequire(localValidatePath)) {
|
|
35
|
+
throw new Error(
|
|
36
|
+
`Unble to generate Vovk Client: cannot find "validateOnClient" module '${env.VOVK_VALIDATE_ON_CLIENT}'. Check your .vovkrc.js file`
|
|
37
|
+
);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
if (!canRequire(localJsonPath)) {
|
|
41
|
+
throw new Error(`Unble to generate Vovk Client: cannot find ".vovk.json" file '${jsonPath}'.`);
|
|
42
|
+
}
|
|
15
43
|
|
|
16
|
-
const controllersPath = path.join(
|
|
17
|
-
let
|
|
44
|
+
const controllersPath = path.join(returnDir, env.VOVK_ROUTE).replace(/\.ts$/, '');
|
|
45
|
+
let dts = `// auto-generated
|
|
46
|
+
/* eslint-disable */
|
|
47
|
+
import type { Controllers, Workers } from "${controllersPath}";
|
|
18
48
|
import type { clientizeController } from 'vovk/client';
|
|
19
49
|
import type { promisifyWorker } from 'vovk/worker';
|
|
20
|
-
import type {
|
|
50
|
+
import type { VovkClientFetcher } from 'vovk/client';
|
|
21
51
|
import type fetcher from '${fetcherPath}';
|
|
22
52
|
|
|
23
|
-
type Options = typeof fetcher extends
|
|
53
|
+
type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
|
|
24
54
|
`;
|
|
25
|
-
let js =
|
|
55
|
+
let js = `// auto-generated
|
|
56
|
+
/* eslint-disable */
|
|
57
|
+
const { clientizeController } = require('vovk/client');
|
|
26
58
|
const { promisifyWorker } = require('vovk/worker');
|
|
27
|
-
const metadata = require('
|
|
28
|
-
const fetcher = require('${fetcherPath}');
|
|
29
|
-
const
|
|
30
|
-
const
|
|
31
|
-
const validateOnClient = ${vovkrc.validateOnClient ? `require('${vovkrc.validateOnClient}')` : 'null'};
|
|
59
|
+
const metadata = require('${jsonPath}');
|
|
60
|
+
const { default: fetcher } = require('${fetcherPath}');
|
|
61
|
+
const prefix = '${env.VOVK_PREFIX ?? '/api'}';
|
|
62
|
+
const { default: validateOnClient = null } = ${validatePath ? `require('${validatePath}')` : '{}'};
|
|
32
63
|
|
|
33
64
|
`;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
65
|
+
let ts = `// auto-generated
|
|
66
|
+
/* eslint-disable */
|
|
67
|
+
import type { Controllers, Workers } from "${controllersPath}";
|
|
68
|
+
import { clientizeController } from 'vovk/client';
|
|
69
|
+
import { promisifyWorker } from 'vovk/worker';
|
|
70
|
+
import type { VovkClientFetcher } from 'vovk/client';
|
|
71
|
+
import fetcher from '${fetcherPath}';
|
|
72
|
+
import metadata from '${jsonPath}';
|
|
73
|
+
${validatePath ? `import validateOnClient from '${validatePath}';\n` : '\nconst validateOnClient = undefined;'}
|
|
74
|
+
const prefix = '${env.VOVK_PREFIX ?? '/api'}';
|
|
75
|
+
type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
|
|
76
|
+
`;
|
|
77
|
+
const metadataJson = await fs.readFile(localJsonPath, 'utf-8').catch(() => null);
|
|
78
|
+
|
|
79
|
+
if (!metadataJson) console.warn(` 🐺 No .vovk.json file found in ${localJsonPath}`);
|
|
80
|
+
|
|
37
81
|
const metadata = JSON.parse(metadataJson || '{}');
|
|
38
82
|
|
|
39
83
|
for (const key of Object.keys(metadata)) {
|
|
40
84
|
if (key !== 'workers') {
|
|
41
|
-
|
|
42
|
-
js += `exports.${key} = clientizeController(metadata.${key}, { fetcher,
|
|
85
|
+
dts += `export const ${key}: ReturnType<typeof clientizeController<Controllers["${key}"], Options>>;\n`;
|
|
86
|
+
js += `exports.${key} = clientizeController(metadata.${key}, { fetcher, validateOnClient, defaultOptions: { prefix } });\n`;
|
|
87
|
+
ts += `export const ${key} = clientizeController<Controllers["${key}"], Options>(metadata.${key}, { fetcher, validateOnClient, defaultOptions: { prefix } });\n`;
|
|
43
88
|
}
|
|
44
89
|
}
|
|
45
90
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
91
|
+
for (const key of Object.keys(metadata.workers ?? {})) {
|
|
92
|
+
dts += `export const ${key}: ReturnType<typeof promisifyWorker<Workers["${key}"]>>;\n`;
|
|
93
|
+
js += `exports.${key} = promisifyWorker(null, metadata.workers.${key});\n`;
|
|
94
|
+
ts += `export const ${key} = promisifyWorker<Workers["${key}"]>(null, metadata.workers.${key});\n`;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/* js += `
|
|
98
|
+
if(typeof window !== 'undefined') fetch(prefix + '/__ping', { method: 'POST' });
|
|
99
|
+
`; */
|
|
100
|
+
|
|
101
|
+
const localJsPath = path.join(outDir, 'client.js');
|
|
102
|
+
const localDtsPath = path.join(outDir, 'client.d.ts');
|
|
103
|
+
const localTsPath = path.join(outDir, 'index.ts');
|
|
104
|
+
const existingJs = await fs.readFile(localJsPath, 'utf-8').catch(() => '');
|
|
105
|
+
const existingDts = await fs.readFile(localDtsPath, 'utf-8').catch(() => '');
|
|
106
|
+
const existingTs = await fs.readFile(localTsPath, 'utf-8').catch(() => '');
|
|
107
|
+
|
|
108
|
+
if (existingJs === js && existingDts === dts && existingTs === ts) return { written: false, path: outDir };
|
|
109
|
+
|
|
110
|
+
await fs.mkdir(outDir, { recursive: true });
|
|
111
|
+
await fs.writeFile(localJsPath, js);
|
|
112
|
+
await fs.writeFile(localDtsPath, dts);
|
|
113
|
+
await fs.writeFile(localTsPath, ts);
|
|
114
|
+
|
|
115
|
+
return { written: true, path: outDir };
|
|
52
116
|
}
|
|
53
117
|
|
|
54
118
|
module.exports = generateClient;
|
package/cli/getVars.js
ADDED
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
|
|
3
|
+
const path = require('path');
|
|
4
|
+
|
|
5
|
+
/** @type {import('../src').VovkEnv} */
|
|
6
|
+
let vars;
|
|
7
|
+
/** @type {(rcPath: string, options?: { warn?: boolean; VOVK_CLIENT_OUT?: string; }) => import('../src').VovkEnv} */
|
|
8
|
+
function getVars(rcPath, options = {}) {
|
|
9
|
+
if (vars) return vars;
|
|
10
|
+
/** @type {Required<import('../src').VovkRc>} */
|
|
11
|
+
const vovkRc = {
|
|
12
|
+
out: './node_modules/.vovk',
|
|
13
|
+
route: './src/app/api/[[...slug]]/route.ts',
|
|
14
|
+
fetcher: 'vovk/client/defaultFetcher',
|
|
15
|
+
prefix: '/api',
|
|
16
|
+
validateOnClient: '',
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
try {
|
|
20
|
+
Object.assign(vovkRc, require(rcPath));
|
|
21
|
+
} catch {
|
|
22
|
+
if (options.warn) console.info(` 🐺 No .vovkrc.js file found in ${rcPath}`);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
vars = {
|
|
26
|
+
VOVK_CLIENT_OUT:
|
|
27
|
+
process.env.VOVK_CLIENT_OUT ||
|
|
28
|
+
(options.VOVK_CLIENT_OUT?.startsWith('/')
|
|
29
|
+
? options.VOVK_CLIENT_OUT
|
|
30
|
+
: options.VOVK_CLIENT_OUT
|
|
31
|
+
? path.join(process.cwd(), options.VOVK_CLIENT_OUT)
|
|
32
|
+
: null) ||
|
|
33
|
+
vovkRc.out,
|
|
34
|
+
VOVK_PORT: process.env.VOVK_PORT || '3420',
|
|
35
|
+
VOVK_ROUTE: process.env.VOVK_ROUTE || vovkRc.route,
|
|
36
|
+
VOVK_FETCHER: process.env.VOVK_FETCHER || vovkRc.fetcher,
|
|
37
|
+
VOVK_PREFIX: process.env.VOVK_PREFIX || vovkRc.prefix,
|
|
38
|
+
VOVK_VALIDATE_ON_CLIENT: process.env.VOVK_VALIDATE_ON_CLIENT || vovkRc.validateOnClient,
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
return vars;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
module.exports = getVars;
|
package/cli/index.js
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
// @ts-check
|
|
2
3
|
const yargs = require('yargs/yargs');
|
|
3
4
|
const { hideBin } = require('yargs/helpers');
|
|
4
|
-
const { concurrently } = require('concurrently');
|
|
5
5
|
const generateClient = require('./generateClient');
|
|
6
6
|
const path = require('path');
|
|
7
|
+
const parallel = require('./lib/parallel');
|
|
8
|
+
const getAvailablePort = require('./lib/getAvailablePort');
|
|
9
|
+
const getVars = require('./getVars');
|
|
7
10
|
|
|
8
11
|
const builder = {
|
|
9
|
-
|
|
12
|
+
vovkrc: {
|
|
10
13
|
type: 'string',
|
|
11
14
|
default: path.join(process.cwd(), '.vovkrc.js'),
|
|
12
15
|
describe: 'Path to .vovkrc.js',
|
|
@@ -18,60 +21,68 @@ const builder = {
|
|
|
18
21
|
describe: 'Path to Next.js project',
|
|
19
22
|
},
|
|
20
23
|
|
|
21
|
-
|
|
24
|
+
clientOut: {
|
|
22
25
|
type: 'string',
|
|
23
|
-
default: path.join(
|
|
24
|
-
describe: 'Path to
|
|
26
|
+
default: path.join(process.cwd(), './node_modules/.vovk'),
|
|
27
|
+
describe: 'Path to output directory',
|
|
25
28
|
},
|
|
26
29
|
};
|
|
27
30
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
/** @type {{ rc: string, project: string, output: string }} */
|
|
34
|
-
const argv = yargs(hideBin(process.argv))
|
|
35
|
-
.command('dev', 'Run development server', builder)
|
|
36
|
-
.command('build', 'Build the app', builder)
|
|
31
|
+
/** @type {{ vovkrc: string, project: string, clientOut: string }} */
|
|
32
|
+
// @ts-expect-error yargs
|
|
33
|
+
const argv = yargs(hideBin(process.argv)) // @ts-expect-error yargs
|
|
34
|
+
.command('dev', 'Run development server', builder) // @ts-expect-error yargs
|
|
35
|
+
.command('build', 'Build the app', builder) // @ts-expect-error yargs
|
|
37
36
|
.command('generate', 'Generate client', builder).argv;
|
|
38
37
|
|
|
39
38
|
const nextArgs = process.argv.join(' ').split(' -- ')[1] ?? '';
|
|
40
39
|
|
|
41
|
-
|
|
42
|
-
const { result } = concurrently(
|
|
43
|
-
[
|
|
44
|
-
{ command: `node ${__dirname}/server.js`, name: 'Vovk' },
|
|
45
|
-
{ command: `node ${__dirname}/watchMetadata.js --rc ${argv.rc} --output ${argv.output}`, name: 'Watch metadata' },
|
|
46
|
-
{ command: `cd ${argv.project} && npx next dev ${nextArgs}`, name: 'Next' },
|
|
47
|
-
],
|
|
48
|
-
options
|
|
49
|
-
);
|
|
40
|
+
const env = getVars(argv.vovkrc, { VOVK_CLIENT_OUT: argv.clientOut });
|
|
50
41
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
42
|
+
let VOVK_PORT = parseInt(env.VOVK_PORT);
|
|
43
|
+
|
|
44
|
+
// @ts-expect-error yargs
|
|
45
|
+
if (argv._.includes('dev')) {
|
|
46
|
+
void (async () => {
|
|
47
|
+
env.VOVK_PORT = await getAvailablePort(VOVK_PORT, 20).catch(() => {
|
|
48
|
+
throw new Error(' 🐺 Failed to find available port');
|
|
49
|
+
});
|
|
50
|
+
await parallel(
|
|
51
|
+
[
|
|
52
|
+
{
|
|
53
|
+
command: `node ${__dirname}/server.js`,
|
|
54
|
+
name: 'Vovk',
|
|
55
|
+
},
|
|
56
|
+
{ command: `cd ${argv.project} && npx next dev ${nextArgs}`, name: 'Next' },
|
|
57
|
+
],
|
|
58
|
+
env
|
|
59
|
+
).catch((e) => console.error(e));
|
|
60
|
+
console.info(' 🐺 All processes have completed');
|
|
61
|
+
})();
|
|
54
62
|
}
|
|
55
63
|
|
|
64
|
+
// @ts-expect-error yargs
|
|
56
65
|
if (argv._.includes('build')) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
{ command: `cd ${argv.project} && npx next build ${nextArgs}`, name: 'Next' },
|
|
61
|
-
],
|
|
62
|
-
options
|
|
63
|
-
);
|
|
64
|
-
|
|
65
|
-
void result
|
|
66
|
-
.catch((e) => console.error(e))
|
|
67
|
-
.then(async () => {
|
|
68
|
-
await generateClient(argv.rc, argv.output);
|
|
69
|
-
console.info(' 🐺 Both processes have completed and the client is generated.');
|
|
66
|
+
void (async () => {
|
|
67
|
+
env.VOVK_PORT = await getAvailablePort(VOVK_PORT, 20).catch(() => {
|
|
68
|
+
throw new Error(' 🐺 Failed to find available port');
|
|
70
69
|
});
|
|
70
|
+
await parallel(
|
|
71
|
+
[
|
|
72
|
+
{
|
|
73
|
+
command: `node ${__dirname}/server.js --once`,
|
|
74
|
+
name: 'Vovk',
|
|
75
|
+
},
|
|
76
|
+
{ command: `cd ${argv.project} && npx next build ${nextArgs}`, name: 'Next' },
|
|
77
|
+
],
|
|
78
|
+
env
|
|
79
|
+
).catch((e) => console.error(e));
|
|
80
|
+
})();
|
|
71
81
|
}
|
|
72
82
|
|
|
83
|
+
// @ts-expect-error yargs
|
|
73
84
|
if (argv._.includes('generate')) {
|
|
74
|
-
void generateClient(
|
|
75
|
-
console.info(
|
|
85
|
+
void generateClient(env).then(({ path }) => {
|
|
86
|
+
console.info(` 🐺 Client generated in ${path}`);
|
|
76
87
|
});
|
|
77
88
|
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
const net = require('net');
|
|
2
|
+
|
|
3
|
+
function checkPort(port, callback) {
|
|
4
|
+
const server = net.createServer();
|
|
5
|
+
|
|
6
|
+
server.listen(port, () => {
|
|
7
|
+
server.close(() => {
|
|
8
|
+
callback(true); // Port is available
|
|
9
|
+
});
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
server.on('error', () => {
|
|
13
|
+
callback(false);
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function getAvailablePort(startPort, maxAttempts, attempt = 1) {
|
|
18
|
+
return new Promise((resolve, reject) => {
|
|
19
|
+
checkPort(startPort, (isAvailable) => {
|
|
20
|
+
if (isAvailable) {
|
|
21
|
+
resolve(startPort); // Found an available port
|
|
22
|
+
} else if (attempt < maxAttempts) {
|
|
23
|
+
getAvailablePort(startPort + 1, maxAttempts, attempt + 1).then(resolve, reject);
|
|
24
|
+
} else {
|
|
25
|
+
reject(null);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
module.exports = getAvailablePort;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
/** @type {(fromPath: string, toPath: string) => string} */
|
|
3
|
+
function getReturnPath(fromPath, toPath) {
|
|
4
|
+
// Split the paths into components
|
|
5
|
+
const fromParts = fromPath.replace(/^\.?\/|\/$/g, '').split('/');
|
|
6
|
+
const toParts = toPath.replace(/^\.?\/|\/$/g, '').split('/');
|
|
7
|
+
|
|
8
|
+
// Find the common base path length
|
|
9
|
+
const length = Math.min(fromParts.length, toParts.length);
|
|
10
|
+
let commonBaseLength = 0;
|
|
11
|
+
for (let i = 0; i < length; i++) {
|
|
12
|
+
if (fromParts[i] !== toParts[i]) break;
|
|
13
|
+
commonBaseLength++;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
// Calculate steps up to the common base
|
|
17
|
+
const stepsUp = '../'.repeat(fromParts.length - commonBaseLength);
|
|
18
|
+
|
|
19
|
+
// Calculate steps down to the target path
|
|
20
|
+
const stepsDown = toParts.slice(commonBaseLength).join('/');
|
|
21
|
+
|
|
22
|
+
// Combine steps up and steps down
|
|
23
|
+
const result = stepsUp + stepsDown;
|
|
24
|
+
|
|
25
|
+
return result;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
module.exports = getReturnPath;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
/** @type {(obj1: any, obj2: any) => boolean} */
|
|
3
|
+
const isEqual = (obj1, obj2) => {
|
|
4
|
+
if (obj1 === obj2) {
|
|
5
|
+
return true;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
if (typeof obj1 !== 'object' || typeof obj2 !== 'object' || obj1 == null || obj2 == null) {
|
|
9
|
+
return false;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
const keys1 = Object.keys(obj1);
|
|
13
|
+
const keys2 = Object.keys(obj2);
|
|
14
|
+
|
|
15
|
+
if (keys1.length !== keys2.length) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
for (const key of keys1) {
|
|
20
|
+
if (!keys2.includes(key) || !isEqual(obj1[key], obj2[key])) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return true;
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
module.exports = isEqual;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
const { spawn } = require('child_process');
|
|
3
|
+
|
|
4
|
+
/** @type {(commands: { command: string; name: string; }[], env: import('../../src').VovkEnv) => Promise<void>} */
|
|
5
|
+
function parallel(commands, env) {
|
|
6
|
+
return new Promise((resolve, reject) => {
|
|
7
|
+
/** @type {{ name: string; process: import('child_process').ChildProcess; }[]} */
|
|
8
|
+
let processes = [];
|
|
9
|
+
|
|
10
|
+
commands.forEach((cmd) => {
|
|
11
|
+
const processObj = {
|
|
12
|
+
name: cmd.name,
|
|
13
|
+
process: runCommand(
|
|
14
|
+
cmd.command,
|
|
15
|
+
cmd.name,
|
|
16
|
+
/** @type {(code: number) => void} */
|
|
17
|
+
(code) => handleProcessExit(code, cmd.name)
|
|
18
|
+
),
|
|
19
|
+
};
|
|
20
|
+
processes.push(processObj);
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
/** @type {(command: string, name: string, onExit: (code: number) => void) => import('child_process').ChildProcess} */
|
|
24
|
+
function runCommand(command, name, onExit) {
|
|
25
|
+
const proc = spawn(command, { shell: true, env: { ...env, ...process.env }, stdio: 'inherit' });
|
|
26
|
+
|
|
27
|
+
proc.on('exit', onExit);
|
|
28
|
+
|
|
29
|
+
return proc;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/** @type {(code: number, name: string) => void} */
|
|
33
|
+
function handleProcessExit(code, name) {
|
|
34
|
+
processes = processes.filter((p) => p.name !== name);
|
|
35
|
+
|
|
36
|
+
if (code !== 0) {
|
|
37
|
+
processes.forEach((p) => p.name !== name && p.process.kill('SIGINT'));
|
|
38
|
+
processes = [];
|
|
39
|
+
process.stdout.write('\n');
|
|
40
|
+
return reject(new Error(`Process ${name} exited with code ${code}`));
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
if (!processes.length) {
|
|
44
|
+
resolve();
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
module.exports = parallel;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
const fs = require('fs/promises');
|
|
3
|
+
const path = require('path');
|
|
4
|
+
|
|
5
|
+
/** @type {(path: string) => Promise<boolean>} */
|
|
6
|
+
const fileExists = async (path) => !!(await fs.stat(path).catch(() => false));
|
|
7
|
+
|
|
8
|
+
async function postinstall() {
|
|
9
|
+
const vovk = path.join(__dirname, '../../.vovk');
|
|
10
|
+
const js = path.join(vovk, 'index.js');
|
|
11
|
+
const ts = path.join(vovk, 'index.d.ts');
|
|
12
|
+
|
|
13
|
+
if ((await fileExists(js)) || (await fileExists(ts))) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
await fs.mkdir(vovk, { recursive: true });
|
|
18
|
+
await fs.writeFile(js, '/* postinstall */');
|
|
19
|
+
await fs.writeFile(ts, '/* postinstall */');
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
void postinstall();
|