oc-server 1.1.5 → 1.1.6

package/dist/cli/oc.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
+import { FastifyRequest } from 'fastify';
 import { PluginMock } from './get-mocked-plugins';
-import type { Request } from 'express';
 interface Package {
     name: string;
     version: string;
@@ -26,7 +26,7 @@ export declare function parsePkg(pkg: Package): {
     appEntry: string;
     templateType: string;
 };
-export declare function getContext(plugins: PluginMock[], req: Request, params: any, action?: any): {
+export declare function getContext(plugins: PluginMock[], req: FastifyRequest, params: any, action?: any): {
     context: {
         action: any;
         acceptLanguage: string | undefined;
@@ -41,7 +41,7 @@ export declare function getContext(plugins: PluginMock[], req: Request, params:
         renderComponent: () => never;
         renderComponents: () => never;
         requestHeaders: import("http").IncomingHttpHeaders;
-        requestIp: string | undefined;
+        requestIp: string;
         setEmptyResponse: null;
         staticPath: string;
         setHeader: (header: string, value: string) => void;

package/dist/cli/server.js

@@ -7,7 +7,8 @@ exports.createServer = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_vm_1 = __importDefault(require("node:vm"));
-const express_1 = __importDefault(require("express"));
+const fastify_1 = __importDefault(require("fastify"));
+const express_1 = __importDefault(require("@fastify/express"));
 const vite_1 = require("vite");
 const esbuild_1 = __importDefault(require("esbuild"));
 const oc_client_browser_1 = __importDefault(require("oc-client-browser"));
@@ -87,13 +88,13 @@ async function getHtmlTemplate(appBlock, filePath = 'index.html') {
 }
 async function createServer({ template, port, }) {
     const { dev: clientJs } = oc_client_browser_1.default.compileSync();
-    const app = (0, express_1.default)();
+    const app = (0, fastify_1.default)({ logger: false });
+    await app.register(express_1.default);
     const dataProvider = getDataProvider();
     const plugins = (0, get_mocked_plugins_1.default)(node_path_1.default.join(process.cwd(), '..'));
     for (const plugin of plugins) {
         plugin.register.register(null, null, () => { });
     }
-    app.use(express_1.default.json());
     const vite = await (0, vite_1.createServer)({
         server: { middlewareMode: true },
         plugins: [(0, cssModulesPlugin_1.default)(), template.plugin?.()].filter(Boolean),
@@ -104,13 +105,15 @@ async function createServer({ template, port, }) {
         appType: 'custom',
     });
     app.use(vite.middlewares);
-    app.get('/oc-client/client.js', (req, res) => {
-        res.status(200).set({ 'Content-Type': 'text/javascript' }).send(clientJs);
+    app.get('/oc-client/client.js', (request, reply) => {
+        reply.status(200);
+        reply.header('Content-Type', 'text/javascript');
+        reply.send(clientJs);
     });
-    app.post('/', async (req, res, next) => {
+    app.post('/', async (request, reply) => {
         try {
-            const { action, parameters } = req.body.components[0];
-            const { context, responseHeaders } = (0, oc_1.getContext)(plugins, req, parameters, action);
+            const { action, parameters } = request.body.components[0];
+            const { context, responseHeaders } = (0, oc_1.getContext)(plugins, request, parameters, action);
             const props = await dataProvider(context);
             const response = [
                 {
@@ -124,39 +127,38 @@ async function createServer({ template, port, }) {
                     },
                 },
             ];
-            if (Object.keys(responseHeaders).length) {
-                res.set(responseHeaders);
+            for (const [key, value] of Object.entries(responseHeaders)) {
+                reply.header(key, value);
             }
-            res
-                .status(200)
-                .set({ 'Content-Type': 'application/json' })
-                .send(response);
+            return response;
         }
         catch (e) {
             vite.ssrFixStacktrace(e);
-            next(e);
+            throw e;
         }
     });
-    app.use('*', async (req, res, next) => {
-        const url = req.originalUrl;
+    app.get('*', async (request, reply) => {
+        const url = request.originalUrl;
         try {
             const params = defaultParams;
-            const { context, responseHeaders } = (0, oc_1.getContext)(plugins, req, params);
+            const { context, responseHeaders } = (0, oc_1.getContext)(plugins, request, params);
             let htmlTemplate = await getHtmlTemplate(template.appBlock);
             const data = await dataProvider(context);
             htmlTemplate = htmlTemplate.replace('__INITIAL_DATA__', JSON.stringify(data));
             htmlTemplate = await vite.transformIndexHtml(url, htmlTemplate);
-            if (Object.keys(responseHeaders).length) {
-                res.set(responseHeaders);
+            for (const [key, value] of Object.entries(responseHeaders)) {
+                reply.header(key, value);
             }
-            res.status(200).set({ 'Content-Type': 'text/html' }).end(htmlTemplate);
+            reply.status(200);
+            reply.header('Content-Type', 'text/html');
+            reply.send(htmlTemplate);
         }
         catch (e) {
             vite.ssrFixStacktrace(e);
-            next(e);
+            throw e;
         }
     });
-    app.listen(port);
+    await app.listen({ port: port });
     console.log(`Listening on: http://localhost:${port}`);
 }
 exports.createServer = createServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-server",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",