jinrai 1.1.3 → 1.1.5

package/vite/plugin.ts

@@ -2,21 +2,26 @@ import { createServer, type Plugin, type ViteDevServer } from "vite"
 
 import { AsyncLocalStorage } from "async_hooks"
 import { type BrowserContext, chromium, Page } from "playwright"
-import { pageCollector } from "../src/bin/playwright/pageCollector"
-// import { getRoutesAndTemplates } from "../src/bin/routes/getRoutes"
-
-// import { writeFile } from "fs/promises"
-import { JinraiAgent } from "../src/bin/agent/agent"
+import { ViteAgent } from "../src/bin/agent/agent"
+import { pageTestCollector } from "../src/bin/playwright/pageTestCollector"
 
 const urlStorage = new AsyncLocalStorage<string>()
 
+interface CasheItem {
+    state: any,
+    root: string,
+}
+
+const cashe = new Map<string, CasheItem>()
+
+
+
 export function hydration(): Plugin {
     if (process.env.CHILD_JINRAI_DEV_SERVER) {
         return { name: "vite-jinrai-dummy" }
     }
     process.env.CHILD_JINRAI_DEV_SERVER = "true"
 
-    console.log("create mirror")
     let mirrorServer: ViteDevServer | undefined = undefined
     let context: BrowserContext | undefined = undefined
     let page: Page | undefined = undefined
@@ -33,10 +38,10 @@ export function hydration(): Plugin {
 
         debugUrl = mirrorServer.resolvedUrls?.local[0].slice(0, -1)
 
-        chromium.launch({ headless: false, devtools: false, channel: "chrome" }).then(async browser => {
-            console.log("create context")
+        chromium.launch({ headless: true, devtools: false, channel: "chrome" }).then(async browser => {
+
             context = await browser.newContext({
-                // userAgent: JinraiAgent,
+                userAgent: ViteAgent,
                 locale: "ru-RU",
             })
 
@@ -46,7 +51,7 @@ export function hydration(): Plugin {
 
     return {
         name: "vite-jinrai",
-
+        
         configureServer(server: ViteDevServer) {
             server.middlewares.use((req, _res, next) => {
                 if (req.url?.startsWith("/@")) {
@@ -61,29 +66,36 @@ export function hydration(): Plugin {
         async transformIndexHtml(html: string) {
             const currentUrl = urlStorage.getStore()
             if (currentUrl && page) {
+                const data = cashe.get(currentUrl)
+                if (data) {
+                    return print(html, data.root, data.state)
+                }
+
                 await page.goto(debugUrl + currentUrl)
                 await page.waitForLoadState("networkidle")
 
-                const { state } = await pageCollector(page)
-                // const { routes } = getRoutesAndTemplates([{ id: 1, state: {}, mask: currentUrl, root }], true, false)
+                await page.waitForTimeout(2000)
 
-                // console.log({ routes })
-                // writeFile("./routs.json", JSON.stringify(routes, null, 2))
+                const { root, state } = await pageTestCollector(page)
+                cashe.set(currentUrl, { root, state })
 
-                // html = html.replace("<!--app-html-->", root)
-                html = html.replace("<!--app-head-->", JSON.stringify(state, null, 2))
-
-                return html
+                return print(html, root, state)
             }
             return html
         },
 
         closeWatcher() {
-            console.log("Stop server")
-
             page?.close()
             mirrorServer?.close()
             context?.close()
         },
     }
 }
+
+
+const print = (html: string, root: string, state: any) => {
+    html = html.replace("<!--app-html-->", root)
+    html = html.replace("<!--app-head-->", `<script>window.__appc__ = ${JSON.stringify({state})}</script>`)
+
+    return html
+}

package/lib/src/front/server-state/real.d.ts

@@ -1 +0,0 @@
-export declare function real<T>(value: T): T;