@ossy/platform 1.14.0 → 1.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -22,8 +22,8 @@
   "author": "Ossy <yourfriends@ossy.se> (https://ossy.se)",
   "license": "MIT",
   "dependencies": {
-    "@ossy/router": "^1.15.0",
-    "@ossy/sdk": "^1.15.0",
+    "@ossy/router": "^1.15.1",
+    "@ossy/sdk": "^1.15.1",
     "cookie-parser": "^1.4.7",
     "express": ">=5.0.0 <6.0.0",
     "morgan": ">=1.10.1 <2.0.0",
@@ -33,5 +33,5 @@
   "files": [
     "src"
   ],
-  "gitHead": "6a7aac8937521487dc9a032a8fe71f02f2a86367"
+  "gitHead": "6476ba57e0bdf65f55dfd6671a59c7a7ad773327"
 }

package/src/server.js

@@ -1,70 +1,53 @@
 import fs from 'node:fs'
 import path from 'path'
-import url from 'url'
-import { pathToFileURL } from 'node:url'
+import { fileURLToPath, pathToFileURL } from 'node:url'
 import express from 'express'
 import morgan from 'morgan'
 import { Router as OssyRouter } from '@ossy/router'
 import cookieParser from 'cookie-parser'
 import { ProxyInternal } from './proxy-internal.js'
 
-import buildTimeConfig from './.ossy/server-config.runtime.mjs'
-import { BuildPage, buildPrerenderAppConfig } from './.ossy/render-page.task.js'
-import Middleware from './.ossy/middleware.runtime.js'
-
-const __ossyDir = path.dirname(url.fileURLToPath(import.meta.url)) + '/.ossy'
-
-function readOssyJson (name) {
-  return JSON.parse(fs.readFileSync(path.join(__ossyDir, name), 'utf8'))
-}
-
-const apiRouteList = readOssyJson('api.generated.json') ?? []
-const sitePageList = readOssyJson('pages.generated.json') ?? []
-
-function pageRouterLanguageOptions (config, pages) {
-  let supported = config?.supportedLanguages
-  let defaultLanguage = config?.defaultLanguage
-  if ((!supported || supported.length <= 1) && pages.length > 0) {
-    const p0 = pages[0]
-    if (p0 && typeof p0.path === 'object' && p0.path != null) {
-      supported = Object.keys(p0.path)
-      defaultLanguage = defaultLanguage || supported[0]
-    }
-  }
-  return {
-    supportedLanguages: Array.isArray(supported) ? supported : [],
-    defaultLanguage,
+const currentDir = path.dirname(fileURLToPath(import.meta.url))
+const ossyDir = path.join(currentDir, '.ossy')
+const readJson = (name, fallback) => {
+  try {
+    return JSON.parse(fs.readFileSync(path.join(ossyDir, name), 'utf8'))
+  } catch {
+    return fallback
   }
 }
 
-const app = express()
-
-const currentDir = path.dirname(url.fileURLToPath(import.meta.url))
-const ROOT_PATH = path.resolve(currentDir, 'public')
-
-function parsePortFromArgv (argv) {
-  const idx = argv.findIndex((a) => a === '--port' || a === '-p')
-  if (idx !== -1 && argv[idx + 1]) return argv[idx + 1]
-
-  const eq = argv.find((a) => a.startsWith('--port='))
-  if (eq) return eq.split('=')[1]
-
-  return undefined
+const loadDefaultFromRef = async (runtimeRefJson) => {
+  const modulePath = readJson(runtimeRefJson, null)?.modulePath
+  if (!modulePath || typeof modulePath !== 'string') return undefined
+  try {
+    const mod = await import(pathToFileURL(path.resolve(modulePath)).href)
+    return mod?.default
+  } catch {
+    return undefined
+  }
 }
 
-function normalizePort (value, fallback) {
-  if (value === undefined || value === null || value === '') return fallback
-  const n = Number.parseInt(String(value), 10)
-  if (!Number.isFinite(n) || n <= 0) return fallback
-  return n
+const apiRouteList = readJson('api.generated.json', [])
+const sitePageList = readJson('pages.generated.json', [])
+const buildTimeConfig = (await loadDefaultFromRef('server-config.runtime.json')) || {}
+const Middleware = (await loadDefaultFromRef('middleware.runtime.json')) || []
+let ssrRender = null
+try {
+  ssrRender = (await import(pathToFileURL(path.resolve(currentDir, 'ssr', 'app.mjs')).href)).renderPage
+} catch {
+  // SSR is optional at startup; page requests return 503 when unavailable.
 }
 
-const DEFAULT_PORT = 3000
-const port = normalizePort(parsePortFromArgv(process.argv) ?? process.env.PORT, DEFAULT_PORT)
-
-if (Middleware !== undefined) {
-  console.log(`[@ossy/platform][server] ${Middleware?.length || 0} custom middleware loaded`)
-}
+const app = express()
+const ROOT_PATH = path.resolve(currentDir, 'public')
+const explicitPortArgIdx = process.argv.findIndex((a) => a === '--port' || a === '-p')
+const explicitPortArg =
+  explicitPortArgIdx !== -1
+    ? process.argv[explicitPortArgIdx + 1]
+    : process.argv.find((a) => a.startsWith('--port='))?.split('=')[1]
+const parsedPort = Number.parseInt(String(explicitPortArg ?? process.env.PORT ?? '3000'), 10)
+const port = Number.isFinite(parsedPort) && parsedPort > 0 ? parsedPort : 3000
 
 const middleware = [
   morgan('tiny'),
@@ -80,26 +63,28 @@ const middleware = [
     req.isAuthenticated = cookieHeader ? cookieHeader.includes('auth=') : false
     next()
   },
-  ...(Middleware || []),
+  ...(Array.isArray(Middleware) ? Middleware : []),
   express.static(ROOT_PATH),
   ProxyInternal(),
 ]
 
 app.use(middleware)
 
-const apiRouter = OssyRouter.of({
-  pages: apiRouteList,
-})
-
-const { supportedLanguages, defaultLanguage } = pageRouterLanguageOptions(
-  buildTimeConfig,
-  sitePageList
-)
+let supportedLanguages = buildTimeConfig?.supportedLanguages
+let defaultLanguage = buildTimeConfig?.defaultLanguage
+if ((!supportedLanguages || supportedLanguages.length <= 1) && sitePageList.length > 0) {
+  const firstPage = sitePageList[0]
+  if (firstPage && typeof firstPage.path === 'object' && firstPage.path != null) {
+    supportedLanguages = Object.keys(firstPage.path)
+    defaultLanguage = defaultLanguage || supportedLanguages[0]
+  }
+}
 
+const apiRouter = OssyRouter.of({ pages: apiRouteList })
 const pageRouter = OssyRouter.of({
   pages: sitePageList,
+  supportedLanguages: Array.isArray(supportedLanguages) ? supportedLanguages : [],
   defaultLanguage,
-  supportedLanguages,
 })
 
 app.all('*all', async (req, res) => {
@@ -107,7 +92,7 @@ app.all('*all', async (req, res) => {
   try {
     const apiRoute = apiRouter.getPageByUrl(requestUrl)
     if (apiRoute?.module) {
-      const mod = await import(pathToFileURL(path.resolve(__ossyDir, apiRoute.module)).href)
+      const mod = await import(pathToFileURL(path.resolve(ossyDir, apiRoute.module)).href)
       await mod.default(req, res)
       return
     }
@@ -117,14 +102,30 @@ app.all('*all', async (req, res) => {
     }
     const pageRoute = pageRouter.getPageByUrl(requestUrl)
     if (pageRoute) {
-      const appConfig = buildPrerenderAppConfig({
-        buildTimeConfig,
-        pageList: sitePageList,
-        activeRouteId: pageRoute.id,
-        urlPath: requestUrl,
+      if (typeof ssrRender !== 'function') {
+        res.status(503).type('text').send('SSR runtime unavailable')
+        return
+      }
+      const appConfig = {
+        ...buildTimeConfig,
+        url: requestUrl,
+        theme: buildTimeConfig?.theme || 'light',
         isAuthenticated: !!req.isAuthenticated,
-      })
-      const html = await BuildPage.handle({ route: pageRoute, appConfig })
+        workspaceId: buildTimeConfig?.workspaceId,
+        apiUrl: buildTimeConfig?.apiUrl,
+        pages: sitePageList.map((page) => ({ id: page?.id, path: page?.path })),
+        pageId: pageRoute.id,
+        sidebarPrimaryCollapsed: false,
+      }
+      const html = await ssrRender(pageRoute.id, {
+        ...appConfig,
+        theme: appConfig?.theme == null ? appConfig?.theme : JSON.parse(JSON.stringify(appConfig.theme)),
+        themes: appConfig?.themes == null ? appConfig?.themes : JSON.parse(JSON.stringify(appConfig.themes)),
+        resourceTemplates:
+          appConfig?.resourceTemplates == null
+            ? appConfig?.resourceTemplates
+            : JSON.parse(JSON.stringify(appConfig.resourceTemplates)),
+      }, {})
       res.status(200).type('html').send(html)
       return
     }