@plurid/plurid-react-server 0.0.0-2 → 0.0.0-5

package/distribution/data/constants/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./general/index";
-export * from "./stiller/index";
+export * from './general';
+export * from './stiller';

package/distribution/data/constants/stiller/index.d.ts

@@ -1,2 +1,2 @@
-import { PluridStillerOptions } from "../../interfaces/index";
+import { PluridStillerOptions } from "../../interfaces";
 export declare const defaultStillerOptions: PluridStillerOptions;

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 & {
@@ -70,7 +69,7 @@ export interface PluridServerService<P = any> {
 export interface PluridServerConfiguration {
     routes: PluridRoute<PluridReactComponent>[];
     planes?: PluridRoutePlane<PluridReactComponent>[];
-    preserves: PluridPreserve<routing.IsoMatcherRouteResult<PluridReactComponent<any>> | undefined, express.Request, express.Response>[];
+    preserves: PluridPreserveReact[];
     helmet: Helmet;
     styles?: string[];
     middleware?: PluridServerMiddleware[];
@@ -141,3 +140,7 @@ export interface PluridStillerOptions {
      */
     ignore: string[];
 }
+export declare type PluridPreserveReact = PluridPreserve<IsoMatcherRouteResult<PluridReactComponent<any>> | undefined, express.Request, express.Response>;
+export interface PluridLiveServerOptions {
+    server: string;
+}

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

@@ -1,2 +1,2 @@
-export * from "./external/index";
-export * from "./internal/index";
+export * from './external';
+export * from './internal';

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

@@ -2,7 +2,7 @@ import { Helmet } from 'react-helmet-async';
 import { ServerStyleSheet } from 'styled-components';
 import { Indexed, PluridRoute, PluridRoutePlane, PluridPreserveResponse } from '@plurid/plurid-data';
 import { PluridReactComponent } from '@plurid/plurid-react';
-import { PluridServerService, PluridStillerOptions } from "../external/index";
+import { PluridServerService, PluridStillerOptions } from '../external';
 export interface PluridRendererConfiguration {
     htmlLanguage: string | undefined;
     htmlAttributes: string;

package/distribution/index.d.ts

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

package/distribution/index.es.js

@@ -24,12 +24,12 @@ 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";
 
-import puppeteer from "puppeteer";
-
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) {
         return value instanceof P ? value : new P((function(resolve) {
@@ -440,8 +440,7 @@ class PluridServer {
                 if (this.debugAllows("info")) {
                     console.info(`[${time.stamp()} :: ${requestID}] (000 Start) Handling GET ${request.path}`);
                 }
-                const path = request.originalUrl;
-                const ignorable = this.ignoreGetRequest(path);
+                const ignorable = this.ignoreGetRequest(request.path);
                 if (ignorable) {
                     if (this.debugAllows("info")) {
                         const requestTime = this.computeRequestTime(request);
@@ -458,7 +457,7 @@ class PluridServer {
                     }
                     return;
                 }
-                const {externalRedirect: externalRedirect, matchingPath: matchingPath} = this.resolveMatchingPath(preserveResult, path);
+                const {externalRedirect: externalRedirect, matchingPath: matchingPath} = this.resolveMatchingPath(preserveResult, request.originalUrl);
                 if (externalRedirect) {
                     if (this.debugAllows("info")) {
                         const requestTime = this.computeRequestTime(request);
@@ -916,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;";
@@ -924,7 +954,7 @@ const replacePluridResolution = html => {
 
 const isCurrentUserRoot = () => process.getuid() == 0;
 
-const render = (host, route, configuration) => __awaiter(void 0, void 0, void 0, (function*() {
+const render = (puppeteer, host, route, configuration) => __awaiter(void 0, void 0, void 0, (function*() {
     const start = Date.now();
     const browser = yield puppeteer.launch({
         defaultViewport: {
@@ -958,6 +988,11 @@ const render = (host, route, configuration) => __awaiter(void 0, void 0, void 0,
 
 class Stiller {
     constructor(options) {
+        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;
@@ -966,7 +1001,7 @@ class Stiller {
     still() {
         return __asyncGenerator(this, arguments, (function* still_1() {
             for (const route of this.routes) {
-                yield yield __await(yield __await(render(this.host, route, this.configuration)));
+                yield yield __await(yield __await(render(this.puppeteer, this.host, route, this.configuration)));
             }
         }));
     }
@@ -1063,6 +1098,4 @@ class StillsGenerator {
     }
 }
 
-export default PluridServer;
-
-export { StillsGenerator as PluridStillsGenerator };
+export { LiveServer as PluridLiveServer, StillsGenerator as PluridStillsGenerator, PluridServer as default };

package/distribution/index.js

@@ -30,12 +30,12 @@ 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");
 
-var puppeteer = require("puppeteer");
-
 function _interopDefaultLegacy(e) {
     return e && typeof e === "object" && "default" in e ? e : {
         default: e
@@ -74,9 +74,9 @@ var open__default = _interopDefaultLegacy(open);
 
 var React__default = _interopDefaultLegacy(React);
 
-var detectPort__default = _interopDefaultLegacy(detectPort);
+var http__default = _interopDefaultLegacy(http);
 
-var puppeteer__default = _interopDefaultLegacy(puppeteer);
+var detectPort__default = _interopDefaultLegacy(detectPort);
 
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) {
@@ -359,9 +359,11 @@ class PluridContentGenerator {
             const providers = {};
             for (const service of this.data.services) {
                 try {
-                    const importedService = yield Promise.resolve().then((function() {
-                        return _interopNamespace(require(service.package));
-                    }));
+                    const importedService = yield function(t) {
+                        return Promise.resolve().then((function() {
+                            return _interopNamespace(require(t));
+                        }));
+                    }(service.package);
                     const ImportedServiceProvider = service.provider === "default" ? importedService : importedService[service.provider];
                     providers[service.name] = ImportedServiceProvider;
                 } catch (error) {
@@ -490,8 +492,7 @@ class PluridServer {
                 if (this.debugAllows("info")) {
                     console.info(`[${pluridFunctions.time.stamp()} :: ${requestID}] (000 Start) Handling GET ${request.path}`);
                 }
-                const path = request.originalUrl;
-                const ignorable = this.ignoreGetRequest(path);
+                const ignorable = this.ignoreGetRequest(request.path);
                 if (ignorable) {
                     if (this.debugAllows("info")) {
                         const requestTime = this.computeRequestTime(request);
@@ -508,7 +509,7 @@ class PluridServer {
                     }
                     return;
                 }
-                const {externalRedirect: externalRedirect, matchingPath: matchingPath} = this.resolveMatchingPath(preserveResult, path);
+                const {externalRedirect: externalRedirect, matchingPath: matchingPath} = this.resolveMatchingPath(preserveResult, request.originalUrl);
                 if (externalRedirect) {
                     if (this.debugAllows("info")) {
                         const requestTime = this.computeRequestTime(request);
@@ -966,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;";
@@ -974,9 +1006,9 @@ const replacePluridResolution = html => {
 
 const isCurrentUserRoot = () => process.getuid() == 0;
 
-const render = (host, route, configuration) => __awaiter(void 0, void 0, void 0, (function*() {
+const render = (puppeteer, host, route, configuration) => __awaiter(void 0, void 0, void 0, (function*() {
     const start = Date.now();
-    const browser = yield puppeteer__default["default"].launch({
+    const browser = yield puppeteer.launch({
         defaultViewport: {
             width: 1366,
             height: 768
@@ -1008,6 +1040,11 @@ const render = (host, route, configuration) => __awaiter(void 0, void 0, void 0,
 
 class Stiller {
     constructor(options) {
+        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;
@@ -1016,7 +1053,7 @@ class Stiller {
     still() {
         return __asyncGenerator(this, arguments, (function* still_1() {
             for (const route of this.routes) {
-                yield yield __await(yield __await(render(this.host, route, this.configuration)));
+                yield yield __await(yield __await(render(this.puppeteer, this.host, route, this.configuration)));
             }
         }));
     }
@@ -1113,6 +1150,8 @@ class StillsGenerator {
     }
 }
 
+exports.PluridLiveServer = LiveServer;
+
 exports.PluridStillsGenerator = StillsGenerator;
 
-exports.default = PluridServer;
+exports["default"] = PluridServer;

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

@@ -1,4 +1,4 @@
-import { PluridContentGeneratorData } from "../../data/interfaces/index";
+import { PluridContentGeneratorData } from "../../data/interfaces";
 declare class PluridContentGenerator {
     private data;
     private providers;

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/Renderer/index.d.ts

@@ -1,4 +1,4 @@
-import { PluridRendererConfiguration } from "../../data/interfaces/index";
+import { PluridRendererConfiguration } from "../../data/interfaces";
 declare class PluridRenderer {
     private htmlLanguage;
     private head;

package/distribution/objects/Renderer/template/index.d.ts

@@ -1,3 +1,3 @@
-import { RendererTemplateData } from "../../../data/interfaces/index";
+import { RendererTemplateData } from "../../../data/interfaces";
 declare const template: (data: RendererTemplateData) => string;
 export default template;

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

@@ -3,7 +3,7 @@ import { Server } from 'http';
 import express from 'express';
 import { PluridRoute } from '@plurid/plurid-data';
 import { PluridReactComponent } from '@plurid/plurid-react';
-import { PluridServerOptions, PluridServerConfiguration } from "../../data/interfaces/index";
+import { PluridServerOptions, PluridServerConfiguration } from "../../data/interfaces";
 declare class PluridServer {
     private routes;
     private planes;

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

@@ -1,4 +1,4 @@
-import { StillerOptions } from "../../data/interfaces/index";
+import { StillerOptions } from "../../data/interfaces";
 /**
  * The Server will parse the given application routes,
  * and will decide which ones to send to the Stiller.
@@ -10,6 +10,7 @@ import { StillerOptions } from "../../data/interfaces/index";
  * to serve the adequate plurid space structure when asked for the given route.
  */
 declare class Stiller {
+    private puppeteer;
     private host;
     private routes;
     private configuration;

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

@@ -1,4 +1,4 @@
-import { StillsGeneratorOptions } from "../../data/interfaces/index";
+import { StillsGeneratorOptions } from "../../data/interfaces";
 declare class StillsGenerator {
     private options;
     constructor(options?: Partial<StillsGeneratorOptions>);

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

@@ -1,4 +1,4 @@
-import { PluridServerOptions } from "../../data/interfaces/index";
+import { PluridServerOptions } from "../../data/interfaces";
 declare class StillsManager {
     private options;
     private stills;

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@plurid/plurid-react-server",
-    "version": "0.0.0-2",
+    "version": "0.0.0-5",
     "description": "React implementation of Plurid to view and explore the web in three dimensions with server-side rendering",
     "keywords": [
         "plurid",
@@ -60,7 +60,6 @@
         "@plurid/plurid-ui-components-react": "*",
         "@plurid/plurid-ui-state-react": "*",
         "cross-fetch": ">=3.1",
-        "puppeteer": ">=2.1",
         "react": ">=16.8",
         "react-dom": ">=16.8",
         "react-helmet-async": ">=1",
@@ -69,66 +68,65 @@
         "styled-components": ">=5"
     },
     "dependencies": {
-        "body-parser": "^1.19.0",
+        "body-parser": "^1.19.2",
         "compression": "^1.7.4",
         "detect-port": "^1.3.0",
-        "express": "^4.17.1",
-        "open": "^8.0.9"
+        "express": "^4.17.3",
+        "open": "^8.4.0"
     },
     "devDependencies": {
-        "@apollo/client": "^3.3.18",
-        "@babel/core": "^7.14.3",
+        "@apollo/client": "^3.5.9",
+        "@babel/core": "^7.17.5",
         "@plurid/elementql": "^0.0.0-1",
         "@plurid/elementql-client-react": "^0.0.0-1",
-        "@plurid/plurid-data": "0.0.0-4",
-        "@plurid/plurid-engine": "0.0.0-3",
-        "@plurid/plurid-functions": "0.0.0-3",
-        "@plurid/plurid-functions-react": "0.0.0-1",
-        "@plurid/plurid-icons-react": "0.0.0-0",
-        "@plurid/plurid-pubsub": "0.0.0-4",
-        "@plurid/plurid-react": "0.0.0-4",
-        "@plurid/plurid-themes": "0.0.0-0",
-        "@plurid/plurid-ui-components-react": "0.0.0-1",
-        "@plurid/plurid-ui-state-react": "0.0.0-0",
-        "@rollup/plugin-node-resolve": "^13.0.0",
-        "@types/body-parser": "^1.19.0",
-        "@types/compression": "^1.7.0",
-        "@types/detect-port": "^1.3.0",
-        "@types/express": "^4.17.11",
-        "@types/hammerjs": "^2.0.39",
-        "@types/jest": "^26.0.23",
-        "@types/puppeteer": "^5.4.3",
-        "@types/react": "^17.0.5",
-        "@types/react-dom": "^17.0.5",
-        "@types/react-redux": "^7.1.16",
-        "@types/react-stripe-elements": "^6.0.4",
-        "@types/styled-components": "^5.1.9",
-        "@typescript-eslint/eslint-plugin": "^4.24.0",
-        "@typescript-eslint/parser": "^4.24.0",
+        "@plurid/plurid-data": "0.0.0-11",
+        "@plurid/plurid-engine": "0.0.0-9",
+        "@plurid/plurid-functions": "0.0.0-21",
+        "@plurid/plurid-functions-react": "0.0.0-4",
+        "@plurid/plurid-icons-react": "0.0.0-3",
+        "@plurid/plurid-pubsub": "0.0.0-5",
+        "@plurid/plurid-react": "0.0.0-17",
+        "@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",
+        "@rollup/plugin-node-resolve": "^13.1.3",
+        "@types/body-parser": "^1.19.2",
+        "@types/compression": "^1.7.2",
+        "@types/detect-port": "^1.3.2",
+        "@types/express": "^4.17.13",
+        "@types/hammerjs": "^2.0.41",
+        "@types/jest": "^27.4.1",
+        "@types/node": "^17.0.21",
+        "@types/react": "^17.0.39",
+        "@types/react-dom": "^17.0.11",
+        "@types/react-redux": "^7.1.22",
+        "@types/react-stripe-elements": "^6.0.6",
+        "@types/styled-components": "^5.1.23",
+        "@typescript-eslint/eslint-plugin": "^5.13.0",
+        "@typescript-eslint/parser": "^5.13.0",
         "@zerollup/ts-transform-paths": "^1.7.18",
-        "cross-fetch": "^3.1.4",
-        "eslint": "^7.26.0",
-        "graphql": "^15.5.0",
+        "cross-fetch": "^3.1.5",
+        "eslint": "^8.10.0",
+        "graphql": "^16.3.0",
         "hammerjs": "^2.0.8",
-        "jest": "^26.6.3",
-        "jest-config": "^26.6.3",
-        "puppeteer": "^9.1.1",
+        "jest": "^27.5.1",
+        "jest-config": "^27.5.1",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "react-helmet-async": "^1.0.9",
-        "react-redux": "^7.2.4",
-        "redux": "^4.1.0",
+        "react-helmet-async": "^1.2.3",
+        "react-redux": "^7.2.6",
+        "redux": "^4.1.2",
         "redux-devtools-extension": "^2.13.9",
-        "redux-thunk": "^2.3.0",
-        "rollup": "^2.48.0",
+        "redux-thunk": "^2.4.1",
+        "rollup": "^2.68.0",
         "rollup-plugin-peer-deps-external": "^2.2.4",
         "rollup-plugin-terser": "^7.0.2",
-        "rollup-plugin-typescript2": "^0.30.0",
-        "styled-components": "^5.3.0",
-        "ts-jest": "^26.5.6",
-        "ts-node": "^9.1.1",
-        "ttypescript": "^1.5.12",
-        "typescript": "^4.2.4",
-        "typescript-transform-paths": "^2.2.3"
+        "rollup-plugin-typescript2": "^0.31.2",
+        "styled-components": "^5.3.3",
+        "ts-jest": "^27.1.3",
+        "ts-node": "^10.5.0",
+        "ttypescript": "^1.5.13",
+        "typescript": "^4.6.2",
+        "typescript-transform-paths": "^3.3.1"
     }
 }