@plurid/plurid-react-server 0.0.0-4 → 0.0.0-7

package/distribution/data/interfaces/external/index.d.ts

@@ -1,7 +1,6 @@
 import express from 'express';
 import { Helmet } from 'react-helmet-async';
-import { PluridRoute, PluridRoutePlane, PluridPreserve } from '@plurid/plurid-data';
-import { routing } from '@plurid/plurid-engine';
+import { PluridRoute, PluridRoutePlane, PluridPreserve, IsoMatcherRouteResult } from '@plurid/plurid-data';
 import { PluridReactComponent } from '@plurid/plurid-react';
 export declare type PluridServerMiddleware = (request: express.Request, response: express.Response, next: express.NextFunction) => void;
 export declare type ServerRequest = express.Request & {
@@ -141,4 +140,7 @@ export interface PluridStillerOptions {
      */
     ignore: string[];
 }
-export declare type PluridPreserveReact = PluridPreserve<routing.IsoMatcherRouteResult<PluridReactComponent<any>> | undefined, express.Request, express.Response>;
+export declare type PluridPreserveReact = PluridPreserve<IsoMatcherRouteResult<PluridReactComponent<any>> | undefined, express.Request, express.Response>;
+export interface PluridLiveServerOptions {
+    server: string;
+}

package/distribution/index.d.ts

@@ -1,5 +1,6 @@
 import PluridServer from './objects/Server';
+import PluridLiveServer from './objects/LiveServer';
 import PluridStillsGenerator from './objects/StillsGenerator';
 export * from './data/interfaces/external';
-export { PluridStillsGenerator, };
+export { PluridLiveServer, PluridStillsGenerator, };
 export default PluridServer;

package/distribution/index.es.js

@@ -24,6 +24,8 @@ import { renderToString } from "react-dom/server";
 
 import { HelmetProvider } from "react-helmet-async";
 
+import http from "http";
+
 import { fork } from "child_process";
 
 import detectPort from "detect-port";
@@ -722,8 +724,9 @@ class PluridServer {
     renderApplication(isoMatch, preserveResult, matchedPlane) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         return __awaiter(this, void 0, void 0, (function*() {
+            const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
             const mergedHtmlLanguage = ((_a = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _a === void 0 ? void 0 : _a.htmlLanguage) || ((_b = this.template) === null || _b === void 0 ? void 0 : _b.htmlLanguage);
-            const pluridMetastate = serverComputeMetastate(isoMatch, this.routes);
+            const pluridMetastate = serverComputeMetastate(isoMatch, this.routes, globals);
             const {content: content, styles: styles} = yield this.getContentAndStyles(isoMatch, pluridMetastate, preserveResult, matchedPlane);
             const stringedStyles = this.styles.reduce(((accumulator, style) => accumulator + style), "");
             const preserveStyles = ((_d = (_c = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _c === void 0 ? void 0 : _c.styles) === null || _d === void 0 ? void 0 : _d.join(" ")) || "";
@@ -739,7 +742,6 @@ class PluridServer {
             const mergedHeadScripts = [ ...headScripts, ...((_j = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _j === void 0 ? void 0 : _j.headScripts) || [] ];
             const bodyScripts = ((_k = this.template) === null || _k === void 0 ? void 0 : _k.bodyScripts) || [];
             const mergedBodyScripts = [ ...bodyScripts, ...((_l = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _l === void 0 ? void 0 : _l.bodyScripts) || [] ];
-            const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
             const renderer = new PluridRenderer({
                 htmlLanguage: mergedHtmlLanguage,
                 head: head,
@@ -913,6 +915,37 @@ class PluridServer {
     }
 }
 
+class LiveServer {
+    constructor(options) {
+        this.sockets = [];
+        this.resolveOptions = options => {
+            const defaultServerPath = "./source/server/index.ts";
+            const resolvedOptions = {
+                server: (options === null || options === void 0 ? void 0 : options.server) || defaultServerPath
+            };
+            return resolvedOptions;
+        };
+        this.options = this.resolveOptions(options);
+        this.expressServer = express();
+        this.setupExpressServer();
+        this.httpServer = http.createServer(this.expressServer);
+        this.setupHttpServer();
+    }
+    setupExpressServer() {}
+    setupHttpServer() {
+        this.httpServer.on("connection", (socket => {
+            this.sockets.push(socket);
+            socket.once("close", (() => {
+                this.sockets.splice(this.sockets.indexOf(socket), 1);
+            }));
+        }));
+        this.httpServer.on("error", (error => {
+            throw error;
+        }));
+    }
+    start() {}
+}
+
 const replacePluridResolution = html => {
     const normalResolution = "width: 1366px; height: 768px;";
     const zeroResolution = "width: 0px; height: 0px;";
@@ -955,7 +988,11 @@ const render = (puppeteer, host, route, configuration) => __awaiter(void 0, void
 
 class Stiller {
     constructor(options) {
-        this.puppeteer = require("puppeteer");
+        try {
+            this.puppeteer = require("puppeteer");
+        } catch (error) {
+            console.error("could not load puppeteer: check puppeteer is installed");
+        }
         const {host: host, routes: routes, configuration: configuration} = options;
         this.host = host;
         this.routes = routes;
@@ -1061,4 +1098,4 @@ class StillsGenerator {
     }
 }
 
-export { StillsGenerator as PluridStillsGenerator, PluridServer as default };
+export { LiveServer as PluridLiveServer, StillsGenerator as PluridStillsGenerator, PluridServer as default };

package/distribution/index.js

@@ -30,6 +30,8 @@ var server = require("react-dom/server");
 
 var reactHelmetAsync = require("react-helmet-async");
 
+var http = require("http");
+
 var child_process = require("child_process");
 
 var detectPort = require("detect-port");
@@ -72,6 +74,8 @@ var open__default = _interopDefaultLegacy(open);
 
 var React__default = _interopDefaultLegacy(React);
 
+var http__default = _interopDefaultLegacy(http);
+
 var detectPort__default = _interopDefaultLegacy(detectPort);
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -772,8 +776,9 @@ class PluridServer {
     renderApplication(isoMatch, preserveResult, matchedPlane) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         return __awaiter(this, void 0, void 0, (function*() {
+            const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
             const mergedHtmlLanguage = ((_a = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _a === void 0 ? void 0 : _a.htmlLanguage) || ((_b = this.template) === null || _b === void 0 ? void 0 : _b.htmlLanguage);
-            const pluridMetastate = pluridReact.serverComputeMetastate(isoMatch, this.routes);
+            const pluridMetastate = pluridReact.serverComputeMetastate(isoMatch, this.routes, globals);
             const {content: content, styles: styles} = yield this.getContentAndStyles(isoMatch, pluridMetastate, preserveResult, matchedPlane);
             const stringedStyles = this.styles.reduce(((accumulator, style) => accumulator + style), "");
             const preserveStyles = ((_d = (_c = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _c === void 0 ? void 0 : _c.styles) === null || _d === void 0 ? void 0 : _d.join(" ")) || "";
@@ -789,7 +794,6 @@ class PluridServer {
             const mergedHeadScripts = [ ...headScripts, ...((_j = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _j === void 0 ? void 0 : _j.headScripts) || [] ];
             const bodyScripts = ((_k = this.template) === null || _k === void 0 ? void 0 : _k.bodyScripts) || [];
             const mergedBodyScripts = [ ...bodyScripts, ...((_l = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.template) === null || _l === void 0 ? void 0 : _l.bodyScripts) || [] ];
-            const globals = preserveResult === null || preserveResult === void 0 ? void 0 : preserveResult.globals;
             const renderer = new PluridRenderer({
                 htmlLanguage: mergedHtmlLanguage,
                 head: head,
@@ -963,6 +967,37 @@ class PluridServer {
     }
 }
 
+class LiveServer {
+    constructor(options) {
+        this.sockets = [];
+        this.resolveOptions = options => {
+            const defaultServerPath = "./source/server/index.ts";
+            const resolvedOptions = {
+                server: (options === null || options === void 0 ? void 0 : options.server) || defaultServerPath
+            };
+            return resolvedOptions;
+        };
+        this.options = this.resolveOptions(options);
+        this.expressServer = express__default["default"]();
+        this.setupExpressServer();
+        this.httpServer = http__default["default"].createServer(this.expressServer);
+        this.setupHttpServer();
+    }
+    setupExpressServer() {}
+    setupHttpServer() {
+        this.httpServer.on("connection", (socket => {
+            this.sockets.push(socket);
+            socket.once("close", (() => {
+                this.sockets.splice(this.sockets.indexOf(socket), 1);
+            }));
+        }));
+        this.httpServer.on("error", (error => {
+            throw error;
+        }));
+    }
+    start() {}
+}
+
 const replacePluridResolution = html => {
     const normalResolution = "width: 1366px; height: 768px;";
     const zeroResolution = "width: 0px; height: 0px;";
@@ -1005,7 +1040,11 @@ const render = (puppeteer, host, route, configuration) => __awaiter(void 0, void
 
 class Stiller {
     constructor(options) {
-        this.puppeteer = require("puppeteer");
+        try {
+            this.puppeteer = require("puppeteer");
+        } catch (error) {
+            console.error("could not load puppeteer: check puppeteer is installed");
+        }
         const {host: host, routes: routes, configuration: configuration} = options;
         this.host = host;
         this.routes = routes;
@@ -1111,6 +1150,8 @@ class StillsGenerator {
     }
 }
 
+exports.PluridLiveServer = LiveServer;
+
 exports.PluridStillsGenerator = StillsGenerator;
 
 exports["default"] = PluridServer;

package/distribution/objects/LiveServer/index.d.ts

@@ -0,0 +1,13 @@
+import { PluridLiveServerOptions } from "../../data/interfaces";
+declare class LiveServer {
+    private options;
+    private expressServer;
+    private httpServer;
+    private sockets;
+    constructor(options?: Partial<PluridLiveServerOptions>);
+    private resolveOptions;
+    private setupExpressServer;
+    private setupHttpServer;
+    start(): void;
+}
+export default LiveServer;

package/distribution/objects/Server/index.d.ts

@@ -25,7 +25,7 @@ declare class PluridServer {
     private isoMatcher;
     constructor(configuration: PluridServerConfiguration);
     static analysis(pluridServer: PluridServer): {
-        routes: PluridRoute<PluridReactComponent<any, import("@plurid/plurid-data").PluridPlaneComponentProperty | import("@plurid/plurid-data").PluridRouteComponentProperty>>[];
+        routes: PluridRoute<PluridReactComponent<any, import("@plurid/plurid-data").PluridPlaneComponentProperty | import("@plurid/plurid-data").PluridRouteComponentProperty>, any>[];
         options: PluridServerOptions;
     };
     start(port?: string | number): Server;

package/distribution/utilities/pttp/index.d.ts

@@ -1,6 +1,6 @@
-import { routing } from '@plurid/plurid-engine';
+import { IsoMatcherPlaneResult } from '@plurid/plurid-data';
 import { PluridReactComponent } from '@plurid/plurid-react';
-export declare const resolveElementFromPlaneMatch: (planeMatch: routing.IsoMatcherPlaneResult<PluridReactComponent<any>>, elementqlEndpoint: string | undefined) => {
+export declare const resolveElementFromPlaneMatch: (planeMatch: IsoMatcherPlaneResult<PluridReactComponent<any>>, elementqlEndpoint: string | undefined) => {
     name: string;
     url: string | undefined;
 } | undefined;

package/distribution/utilities/wrapping/index.d.ts

@@ -2,12 +2,10 @@ import React from 'react';
 declare const wrapping: (WrappedComponent: any, WrappeeComponent: any, properties: any) => {
     new (props: any): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<{}>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<{}> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<{}>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@plurid/plurid-react-server",
-    "version": "0.0.0-4",
+    "version": "0.0.0-7",
     "description": "React implementation of Plurid to view and explore the web in three dimensions with server-side rendering",
     "keywords": [
         "plurid",
@@ -39,12 +39,12 @@
         "clean": "rm -rf ./distribution",
         "test": "jest ./source --config ./configurations/jest.config.js --rootDir ./",
         "lint": "eslint -c ./configurations/.eslintrc.js ./source --ext .ts,.tsx",
-        "start": "yarn clean && rollup -c ./scripts/rollup.development.js -w --environment ENV_MODE:local",
-        "build.development": "yarn clean && rollup -c ./scripts/rollup.config.js --environment ENV_MODE:development",
-        "build.production": "yarn clean && rollup -c ./scripts/rollup.config.js --environment ENV_MODE:production",
-        "build": "yarn clean && yarn lint && yarn test && yarn build.production",
+        "start": "pnpm clean && rollup -c ./scripts/rollup.development.js -w --environment ENV_MODE:local",
+        "build.development": "pnpm clean && rollup -c ./scripts/rollup.config.js --environment ENV_MODE:development",
+        "build.production": "pnpm clean && rollup -c ./scripts/rollup.config.js --environment ENV_MODE:production",
+        "build": "pnpm clean && pnpm lint && pnpm test && pnpm build.production",
         "esbuild": "esbuild source/index.ts --bundle --platform=node --outfile=distribution/index.js --external:react",
-        "prepublishOnly": "yarn build"
+        "prepublishOnly": "pnpm build"
     },
     "peerDependencies": {
         "@plurid/elementql": "*",
@@ -68,65 +68,66 @@
         "styled-components": ">=5"
     },
     "dependencies": {
-        "body-parser": "^1.19.0",
+        "body-parser": "^1.20.0",
         "compression": "^1.7.4",
         "detect-port": "^1.3.0",
-        "express": "^4.17.1",
-        "open": "^8.2.1"
+        "express": "^4.17.3",
+        "open": "^8.4.0"
     },
     "devDependencies": {
-        "@apollo/client": "^3.4.13",
-        "@babel/core": "^7.15.5",
+        "@apollo/client": "^3.5.10",
+        "@babel/core": "^7.17.9",
         "@plurid/elementql": "^0.0.0-1",
         "@plurid/elementql-client-react": "^0.0.0-1",
-        "@plurid/plurid-data": "0.0.0-5",
-        "@plurid/plurid-engine": "0.0.0-7",
-        "@plurid/plurid-functions": "0.0.0-9",
-        "@plurid/plurid-functions-react": "0.0.0-4",
-        "@plurid/plurid-icons-react": "0.0.0-1",
-        "@plurid/plurid-pubsub": "0.0.0-5",
-        "@plurid/plurid-react": "0.0.0-8",
-        "@plurid/plurid-themes": "0.0.0-0",
-        "@plurid/plurid-ui-components-react": "0.0.0-3",
-        "@plurid/plurid-ui-state-react": "0.0.0-1",
-        "@rollup/plugin-node-resolve": "^13.0.5",
-        "@types/body-parser": "^1.19.1",
+        "@plurid/plurid-data": "0.0.0-13",
+        "@plurid/plurid-engine": "0.0.0-11",
+        "@plurid/plurid-functions": "0.0.0-22",
+        "@plurid/plurid-functions-react": "0.0.0-5",
+        "@plurid/plurid-icons-react": "0.0.0-3",
+        "@plurid/plurid-pubsub": "0.0.0-6",
+        "@plurid/plurid-react": "0.0.0-19",
+        "@plurid/plurid-themes": "0.0.0-2",
+        "@plurid/plurid-ui-components-react": "0.0.0-11",
+        "@plurid/plurid-ui-state-react": "0.0.0-2",
+        "@redux-devtools/extension": "^3.2.2",
+        "@rollup/plugin-node-resolve": "^13.2.1",
+        "@types/body-parser": "^1.19.2",
         "@types/compression": "^1.7.2",
-        "@types/detect-port": "^1.3.1",
+        "@types/detect-port": "^1.3.2",
         "@types/express": "^4.17.13",
-        "@types/hammerjs": "^2.0.40",
-        "@types/jest": "^27.0.2",
-        "@types/node": "^16.9.6",
-        "@types/react": "^17.0.24",
-        "@types/react-dom": "^17.0.9",
-        "@types/react-redux": "^7.1.18",
-        "@types/react-stripe-elements": "^6.0.5",
-        "@types/styled-components": "^5.1.14",
-        "@typescript-eslint/eslint-plugin": "^4.31.2",
-        "@typescript-eslint/parser": "^4.31.2",
+        "@types/hammerjs": "^2.0.41",
+        "@types/jest": "^27.4.1",
+        "@types/node": "^17.0.24",
+        "@types/react": "^18.0.5",
+        "@types/react-dom": "^18.0.1",
+        "@types/react-redux": "^7.1.24",
+        "@types/react-stripe-elements": "^6.0.6",
+        "@types/styled-components": "^5.1.25",
+        "@typescript-eslint/eslint-plugin": "^5.19.0",
+        "@typescript-eslint/parser": "^5.19.0",
         "@zerollup/ts-transform-paths": "^1.7.18",
-        "cross-fetch": "^3.1.4",
-        "eslint": "^7.32.0",
-        "graphql": "^15.6.0",
+        "cross-fetch": "^3.1.5",
+        "eslint": "^8.13.0",
+        "graphql": "^16.3.0",
         "hammerjs": "^2.0.8",
-        "jest": "^27.2.1",
-        "jest-config": "^27.2.1",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
-        "react-helmet-async": "^1.1.2",
-        "react-redux": "^7.2.5",
-        "redux": "^4.1.1",
-        "redux-devtools-extension": "^2.13.9",
-        "redux-thunk": "^2.3.0",
-        "rollup": "^2.57.0",
+        "jest": "^27.5.1",
+        "jest-config": "^27.5.1",
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0",
+        "react-helmet-async": "^1.3.0",
+        "react-redux": "^8.0.0",
+        "redux": "^4.1.2",
+        "redux-thunk": "^2.4.1",
+        "rollup": "^2.70.2",
         "rollup-plugin-peer-deps-external": "^2.2.4",
         "rollup-plugin-terser": "^7.0.2",
-        "rollup-plugin-typescript2": "^0.30.0",
-        "styled-components": "^5.3.1",
-        "ts-jest": "^27.0.5",
-        "ts-node": "^10.2.1",
-        "ttypescript": "^1.5.12",
-        "typescript": "^4.4.3",
+        "rollup-plugin-typescript2": "^0.31.2",
+        "styled-components": "^5.3.5",
+        "ts-jest": "^27.1.4",
+        "ts-node": "^10.7.0",
+        "tslib": "^2.3.1",
+        "ttypescript": "^1.5.13",
+        "typescript": "^4.6.3",
         "typescript-transform-paths": "^3.3.1"
     }
 }