Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions packages/brick-container/build.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,27 +118,12 @@ export default {
mockdate: {
test: /[\\/]node_modules[\\/]mockdate[\\/]/,
priority: -5,
reuseExistingChunk: true,
name: "mockdate",
minSize: 100,
},
defaultVendors: {
test: /[\\/]node_modules[\\/]/,
all: {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

目标:通过合并 JS 输出,减少请求数。 副作用:请求体积增大;失去拆分 JS 分块缓存带来的的好处。

priority: -10,
reuseExistingChunk: true,
name: "vendors",
},
core: {
// Make it compatible with EasyOps CI.
test: /[\\/](?:next-core|data[\\/]easyops)[\\/](?:packages|sdk)[\\/](?!theme[\\/])/,
priority: -10,
reuseExistingChunk: true,
name: "core",
},
default: {
minChunks: 2,
priority: -20,
reuseExistingChunk: true,
name: "all",
},
},
},
Expand Down
22 changes: 10 additions & 12 deletions packages/brick-container/serve/middlewares/getMiddlewares.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import express from "express";
import jsYaml from "js-yaml";
import bootstrapJson from "./bootstrapJson.js";
import mockAuth from "./mockAuth.js";
import singleAppBootstrapJson from "./singleAppBootstrapJson.js";
import standaloneBootstrapJson from "./standaloneBootstrapJson.js";
import serveBricksWithVersions from "./serveBricksWithVersions.js";
import { serveBricks } from "@next-core/serve-helpers";

const { safeDump, JSON_SCHEMA } = jsYaml;

Expand Down Expand Up @@ -34,7 +34,7 @@ export function getMiddlewares(env) {
});
middlewares.push({
path: `${baseHref}api/v1/runtime_standalone`,
middleware(req, res) {
middleware(_req, res) {
res.send({
code: 0,
data: {
Expand All @@ -45,7 +45,7 @@ export function getMiddlewares(env) {
});
middlewares.push({
path: `${baseHref}api/gateway/micro_app_standalone.runtime.RuntimeMicroAppStandalone/api/v1/micro_app_standalone/runtime/:appId`,
middleware(req, res) {
middleware(_req, res) {
res.send({
code: 0,
data: null,
Expand All @@ -54,7 +54,7 @@ export function getMiddlewares(env) {
});
middlewares.push({
path: `${baseHref}api/gateway/data_exchange.store.ClickHouseInsertData/api/v1/data_exchange/frontend_stat`,
middleware(req, res) {
middleware(_req, res) {
res.send({
code: 0,
data: null,
Expand All @@ -67,7 +67,7 @@ export function getMiddlewares(env) {
}

export function getPreMiddlewares(env) {
const { baseHref, localMicroApps, localBrickFolders, userConfigByApps } = env;
const { baseHref, localMicroApps, userConfigByApps } = env;

/**
* @type {import("webpack-dev-server").Middleware[]}
Expand All @@ -81,7 +81,7 @@ export function getPreMiddlewares(env) {
});
middlewares.push({
path: `${baseHref}sa-static/${appId}/versions/0.0.0/webroot/conf.yaml`,
middleware(req, res) {
middleware(_req, res) {
if (userConfigByApps) {
const conf = {
user_config_by_apps: userConfigByApps,
Expand All @@ -108,12 +108,10 @@ export function getPreMiddlewares(env) {
middleware: serveBricksWithVersions(env),
});

for (const dir of localBrickFolders) {
middlewares.push({
path: `${baseHref}bricks/`,
middleware: express.static(dir),
});
}
middlewares.push({
path: `${baseHref}bricks/`,
middleware: serveBricks(env),
});

return middlewares;
}
12 changes: 5 additions & 7 deletions packages/brick-playground/scripts/start.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from "node:path";
import { existsSync } from "node:fs";
import WebpackDevServer from "webpack-dev-server";
import express from "express";
import glob from "glob";
import { build } from "@next-core/build-next-bricks";
import { serveBricks } from "@next-core/serve-helpers";
import config from "../build.config.js";
import bootstrapJson from "../serve/bootstrapJson.js";
import examplesJson from "../serve/examplesJson.js";
Expand Down Expand Up @@ -52,12 +52,10 @@ const server = new WebpackDevServer(
open: true,
port: 8082,
setupMiddlewares(middlewares) {
for (const folder of localBrickFolders) {
middlewares.push({
path: "/preview/bricks/",
middleware: express.static(folder),
});
}
middlewares.push({
path: "/preview/bricks/",
middleware: serveBricks({ localBrickFolders }),
});

middlewares.push({
path: "/preview/",
Expand Down
5 changes: 2 additions & 3 deletions packages/brick-playground/serve/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { existsSync } from "node:fs";
import express from "express";
import compression from "compression";
import glob from "glob";
import { serveBricks } from "@next-core/serve-helpers";
import bootstrapJson from "./bootstrapJson.js";
import examplesJson from "./examplesJson.js";

Expand Down Expand Up @@ -46,9 +47,7 @@ const localBrickFolders = (
)
).flat();

for (const folder of localBrickFolders) {
app.use("/preview/bricks/", express.static(folder));
}
app.use("/preview/bricks/", serveBricks({ localBrickFolders }));

app.use("/preview/", bootstrapJson(localBrickFolders));
app.use(examplesJson(rootDir));
Expand Down
5 changes: 4 additions & 1 deletion packages/serve-helpers/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Request, Response } from "express";
import type { Request, Response, NextFunction } from "express";

export function getBrickPackages(
localBrickFolders: string[],
Expand All @@ -19,3 +19,6 @@ export function tryServeFiles(
req: Request,
res: Response
): string | undefined;
export function serveBricks(options: {
localBrickFolders: string[];
}): (req: Request, res: Response, next: NextFunction) => void;
1 change: 1 addition & 0 deletions packages/serve-helpers/src/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from "./getBrickPackages.js";
export * from "./tryFiles.js";
export * from "./serveBricks.js";
27 changes: 27 additions & 0 deletions packages/serve-helpers/src/serveBricks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// @ts-check
import path from "node:path";
import { tryServeFiles } from "./tryFiles.js";

/**
* @typedef {import("express").Request} Request
* @typedef {import("express").Response} Response
* @typedef {import("express").NextFunction} NextFunction
*/

/**
* @param {{ localBrickFolders: string[] }} options
* @returns {(req: Request, res: Response, next: NextFunction ) => void}
*/
export function serveBricks({ localBrickFolders }) {
/**
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
*/
return function (req, res, next) {
const files = localBrickFolders.map((dir) =>
path.join(dir, req.path.split("/").join(path.sep))
);
tryServeFiles(files, req, res, next);
};
}
50 changes: 49 additions & 1 deletion packages/serve-helpers/src/tryFiles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { existsSync } from "node:fs";
import { randomUUID } from "node:crypto";
import { createReadStream, existsSync, statSync } from "node:fs";

/**
* @param files {string|string[]}
Expand All @@ -21,8 +22,55 @@ export function tryFiles(files) {
export function tryServeFiles(files, req, res, next) {
const filePath = tryFiles(files);
if (filePath) {
// Express.js doesn't support multiple ranges out of the box.
const range = req.get("range");
if (range) {
const matches = range.match(/bytes=([\d-]+(?:,\s*[\d-]+)+)/);
if (matches) {
const ranges = matches[1].split(/,\s*/g);
if (ranges.length > 1) {
return sendMultiRanges(filePath, ranges, res);
}
}
}
res.sendFile(filePath);
return;
}
next();
}

function sendMultiRanges(filePath, _ranges, res) {
const stat = statSync(filePath);
const fileSize = stat.size;

const ranges = _ranges.map((range) => {
const [start, end] = range.split("-").map(Number);
return {
start: isNaN(start) ? fileSize - end : start,
end: isNaN(end) ? fileSize - 1 : end,
};
});

const boundary = randomUUID().replaceAll("-", "");
res.writeHead(206, {
"Content-Type": `multipart/byteranges; boundary=${boundary}`,
"Last-Modified": stat.mtime.toUTCString(),
"Cache-Control": "max-age=31536000",
// "Expires": "Thu, 12 Feb 2026 09:39:38 GMT",
});

(async () => {
for (const { start, end } of ranges) {
await new Promise((resolve) => {
const stream = createReadStream(filePath, { start, end });
let chunk = `\r\n--${boundary}\r\n`;
chunk += `Content-Range: bytes ${start}-${end}/${fileSize}\r\n\r\n`;
res.write(chunk);
stream.pipe(res, { end: false });
stream.on("end", resolve);
});
}
})().then(() => {
res.end(`\r\n--${boundary}--\r\n`);
});
}
Loading