@ossy/app 1.13.5 → 1.15.0

package/cli/build.js

@@ -2,6 +2,7 @@ import path from 'path';
 import url from 'url';
 import fs from 'fs';
 import { pathToFileURL } from 'node:url'
+import { createRequire } from 'node:module'
 import { rollup } from 'rollup';
 import babel from '@rollup/plugin-babel';
 import { nodeResolve as resolveDependencies } from '@rollup/plugin-node-resolve'
@@ -265,8 +266,13 @@ export function writeAppRuntimeShims ({ middlewareSourcePath, configSourcePath,
  * Middleware loads via `./.ossy/middleware.runtime.js`.
  */
 export function copyOssyAppRuntime ({ scriptDir, buildPath }) {
+  const require = createRequire(import.meta.url)
+  const platformServerPath = require.resolve('@ossy/platform/server')
+  const platformWorkerPath = require.resolve('@ossy/platform/worker')
+  const platformDir = path.dirname(platformServerPath)
+  const platformWorkerDir = path.dirname(platformWorkerPath)
   for (const name of ['server.js', 'proxy-internal.js']) {
-    fs.copyFileSync(path.join(scriptDir, name), path.join(buildPath, name))
+    fs.copyFileSync(path.join(platformDir, name), path.join(buildPath, name))
   }
   const taskRuntimeFiles = fs
     .readdirSync(scriptDir, { withFileTypes: true })
@@ -275,8 +281,8 @@ export function copyOssyAppRuntime ({ scriptDir, buildPath }) {
   for (const name of taskRuntimeFiles) {
     fs.copyFileSync(path.join(scriptDir, name), path.join(buildPath, name))
   }
-  fs.copyFileSync(path.join(scriptDir, 'worker-entry.js'), path.join(buildPath, 'worker.js'))
-  fs.copyFileSync(path.join(scriptDir, 'worker-runtime.js'), path.join(buildPath, 'worker-runtime.js'))
+  fs.copyFileSync(path.join(platformWorkerDir, 'worker-entry.js'), path.join(buildPath, 'worker.js'))
+  fs.copyFileSync(path.join(platformWorkerDir, 'worker-runtime.js'), path.join(buildPath, 'worker-runtime.js'))
   const ossyOut = ossyGeneratedDir(buildPath)
   fs.copyFileSync(
     path.join(scriptDir, OSSY_RENDER_PAGE_RUNTIME_BASENAME),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.13.5",
+  "version": "1.15.0",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -27,14 +27,15 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.13.5",
-    "@ossy/design-system": "^1.13.5",
-    "@ossy/pages": "^1.13.5",
-    "@ossy/router": "^1.13.5",
-    "@ossy/router-react": "^1.13.5",
-    "@ossy/sdk": "^1.13.5",
-    "@ossy/sdk-react": "^1.13.5",
-    "@ossy/themes": "^1.13.5",
+    "@ossy/connected-components": "^1.15.0",
+    "@ossy/design-system": "^1.15.0",
+    "@ossy/pages": "^1.15.0",
+    "@ossy/platform": "^1.14.0",
+    "@ossy/router": "^1.15.0",
+    "@ossy/router-react": "^1.15.0",
+    "@ossy/sdk": "^1.15.0",
+    "@ossy/sdk-react": "^1.15.0",
+    "@ossy/themes": "^1.15.0",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "6.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -67,5 +68,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "6c3b6ef26328e2227ee96f830138250fc1db1126"
+  "gitHead": "6a7aac8937521487dc9a032a8fe71f02f2a86367"
 }

package/cli/proxy-internal.js

@@ -1,121 +0,0 @@
-/** Node/Express can join duplicate workspace headers as `id, id` — API expects a single id. */
-function normalizeWorkspaceIdHeader (value) {
-    if (!value || value === 'undefined') return undefined
-    const first = String(value).split(',')[0]?.trim()
-    return first || undefined
-}
-
-export function ProxyInternal() {
-    return (req, res, next) => {
-
-        if (!req.originalUrl.startsWith('/@ossy')) {
-            return next()
-        }
-
-        if (req.originalUrl.startsWith('/@ossy/users/me/app-settings') && req.method === 'PATCH') {
-        
-            if (!req.body) {
-                res.status(400)
-                res.json("Invalid request body")
-                return
-            }
-    
-            const requestedSettings = req.body
-    
-    
-            const expiresMaxAge = 2147483647 // Max age for cookies in milliseconds
-    
-            const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
-            
-            const updatedSettings = {
-                ...userSettings,
-                ...requestedSettings
-            }
-    
-            res.cookie('x-ossy-user-settings', JSON.stringify(updatedSettings), {
-            httpOnly: true,
-            signed: true,
-            expires: new Date(Date.now() + expiresMaxAge)
-            })
-    
-            res.status(201)
-            res.json("")
-            return
-        }
-    
-        if (req.originalUrl.startsWith('/@ossy/users/me/app-settings') && req.method === 'GET') {
-            console.log(`[@ossy/app][proxy] GET /@ossy/users/me/app-settings`)
-            const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
-            res.status(200)
-            res.json(userSettings)
-            return
-        }
-        
-        console.log(`[@ossy/app][proxy] ${req.method} ${req.originalUrl}`)
-
-        const domain = process.env.OSSY_API_URL || 'https://api.ossy.se'
-        const url = `${domain}${req.originalUrl?.replace('/@ossy', '/api/v0')}`
-        const forwardedHeaders = JSON.parse(JSON.stringify(req.headers))
-        const workspaceId = normalizeWorkspaceIdHeader(req.get('workspaceId'))
-
-        if (workspaceId) {
-            forwardedHeaders['workspaceid'] = workspaceId
-        }
-
-        console.log(`[@ossy/app][proxy] workspaceId ${workspaceId}`)
-
-        const request = {
-            method: req.method,
-            headers: forwardedHeaders
-        }
-    
-        if (!['GET', 'HEAD'].includes(req.method)) {
-            request.body = JSON.stringify(req.body)
-        }
-    
-        fetch(url, request)
-            .then((response) => {
-                // Forward headers from the proxy response
-                response.headers.forEach((value, name) => {
-                    res.setHeader(name, value);
-                });
-
-                if (response.headers.get('content-type')?.includes('application/json')) {
-                    return response.text().then((text) => {
-                        const trimmed = text?.trim() ?? ''
-                        let data
-                        try {
-                            data = trimmed === '' ? null : JSON.parse(trimmed)
-                        } catch (e) {
-                            console.log(`[@ossy/app][proxy][error]`, e)
-                            res.removeHeader('content-length')
-                            const st = response.status
-                            if (st === 401 || st === 403 || st === 404) {
-                                res.status(st)
-                                res.json(null)
-                                return
-                            }
-                            res.status(502)
-                            res.json({ message: 'Upstream returned invalid JSON' })
-                            return
-                        }
-                        res.removeHeader('content-length')
-                        res.status(response.status)
-                        res.json(data)
-                    })
-                }
-
-                return response.arrayBuffer().then((buffer) => {
-                    res.status(response.status)
-                    res.send(Buffer.from(buffer))
-                })
-            })
-            .catch((error) => {
-                console.log(`[@ossy/app][proxy][error]`, error)
-                const status = error.status
-                res.status(status || 500)
-                res.json({ message: error.message || 'Internal Server Error' })
-            })
-    
-    }
-}

package/cli/server.js

@@ -1,157 +0,0 @@
-import fs from 'node:fs'
-import path from 'path';
-import url from 'url'
-import { pathToFileURL } from 'node:url'
-import express from 'express'
-import morgan from 'morgan'
-import { Router as OssyRouter } from '@ossy/router'
-import { ProxyInternal } from './proxy-internal.js'
-import cookieParser from 'cookie-parser'
-
-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') ?? []
-
-/** When `src/config.js` is minimal, infer language list from the first multi-path page. */
-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 app = express();
-
-const currentDir = path.dirname(url.fileURLToPath(import.meta.url))
-const ROOT_PATH = path.resolve(currentDir, 'public')
-
-function parsePortFromArgv(argv) {
-  // Supports: --port 4000, --port=4000, -p 4000
-  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
-}
-
-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 DEFAULT_PORT = 3000
-const port = normalizePort(parsePortFromArgv(process.argv) ?? process.env.PORT, DEFAULT_PORT)
-
-if (Middleware !== undefined) {
-  console.log(`[@ossy/app][server] ${Middleware?.length || 0} custom middleware loaded`)
-}
-
-
-const middleware = [
-  morgan('tiny'),
-  express.json({ strict: false }),
-  cookieParser(process.env.OSSY_COOKIE_SECRET || 'default_secret'),
-  (req, res, next) => {
-    const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
-    req.userAppSettings = userSettings
-
-    // Incoming headers live on lowercase keys (`workspaceid`). Do not use
-    // `req.headers.workspaceId` — it misses the client header and duplicates
-    // the id (Node then surfaces `id, id` from req.get('workspaceId')).
-    if (userSettings.workspaceId && !req.get('workspaceId')) {
-      req.headers['workspaceid'] = userSettings.workspaceId
-    }
-
-    // Check for auth cookie
-    const cookieHeader = req.headers.cookie
-    req.isAuthenticated = cookieHeader ? cookieHeader.includes('auth=') : false
-
-    next()
-  },
-  ...(Middleware || []),
-  express.static(ROOT_PATH),
-  ProxyInternal(),
-]
-
-app.use(middleware)
-
-const apiRouter = OssyRouter.of({
-  pages: apiRouteList,
-})
-
-const { supportedLanguages, defaultLanguage } = pageRouterLanguageOptions(
-  buildTimeConfig,
-  sitePageList
-)
-
-const pageRouter = OssyRouter.of({
-  pages: sitePageList,
-  defaultLanguage,
-  supportedLanguages,
-})
-
-app.all('*all', async (req, res) => {
-  const requestUrl = req.originalUrl || '/'
-
-  try {
-    const apiRoute = apiRouter.getPageByUrl(requestUrl)
-    if (apiRoute?.module) {
-      console.log(`[@ossy/app][server] Handling API route: ${requestUrl}`)
-      const mod = await import(pathToFileURL(path.resolve(__ossyDir, apiRoute.module)).href)
-      await mod.default(req, res)
-      return
-    }
-
-    if (req.method !== 'GET' && req.method !== 'HEAD') {
-      res.status(404).send('Not found')
-      return
-    }
-
-    const pageRoute = pageRouter.getPageByUrl(requestUrl)
-    if (pageRoute) {
-      const appConfig = buildPrerenderAppConfig({
-        buildTimeConfig,
-        pageList: sitePageList,
-        activeRouteId: pageRoute.id,
-        urlPath: requestUrl,
-        isAuthenticated: !!req.isAuthenticated,
-      })
-      const html = await BuildPage.handle({ route: pageRoute, appConfig })
-      res.status(200).type('html').send(html)
-      return
-    }
-
-    res.status(404).send('Not found')
-  } catch (err) {
-    console.error('[@ossy/app][server] Request handling failed:', err)
-    if (!res.headersSent) {
-      res.status(500).type('text').send('Internal Server Error')
-    }
-  }
-})
-
-app.listen(port, () => {
-  console.log(`[@ossy/app][server] Running on http://localhost:${port}`);
-});

package/cli/worker-entry.js

@@ -1,10 +0,0 @@
-import 'dotenv/config'
-import fs from 'node:fs'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { runWorkerScheduler } from './worker-runtime.js'
-
-const __ossyDir = path.dirname(fileURLToPath(import.meta.url)) + '/.ossy'
-const tasks = JSON.parse(fs.readFileSync(path.join(__ossyDir, 'tasks.generated.json'), 'utf8')) ?? []
-
-runWorkerScheduler(tasks, __ossyDir)

package/cli/worker-runtime.js

@@ -1,121 +0,0 @@
-import path from 'node:path'
-import { pathToFileURL } from 'node:url'
-import { SDK } from '@ossy/sdk'
-
-/**
- * @param {Array<{ type: string, module: string }>} tasks
- * @param {string} ossyDir - absolute path to the .ossy directory
- */
-export function runWorkerScheduler(tasks, ossyDir) {
-  const sdk = SDK.of({
-    workspaceId: process.env.OSSY_WORKSPACE_ID,
-    apiUrl: process.env.OSSY_API_URL,
-    authorization: process.env.OSSY_API_TOKEN,
-  })
-
-  const jobsClient = /** @type {{ getUnprocessed: () => Promise<unknown[]> }} */ (sdk.jobs)
-
-  let status = 'running'
-
-  console.log('Starting scheduler')
-
-  main()
-
-  setInterval(() => {
-    if (status === 'running') return
-    status = 'running'
-    try {
-      main()
-    } catch (error) {
-      console.log('Error running main')
-      console.error(error)
-      status = 'idle'
-    }
-  }, 3000)
-
-  function main() {
-    console.log('Looking for jobs')
-    jobsClient
-      .getUnprocessed()
-      .then(async (jobs) => {
-        if (!jobs || !jobs.length) {
-          console.log('No jobs found, going idle')
-          status = 'idle'
-          return
-        }
-
-        const jobsGroupedByResourceId = groupJobsByResourceId(jobs)
-
-        console.log(`Found ${jobs.length} jobs between ${jobsGroupedByResourceId.length} resources`)
-
-        const processedGroups = jobsGroupedByResourceId.map(([resourceId, groupJobs]) => {
-          console.log(`Processing group for resourceId ${resourceId}`)
-          return processJobsSequentially(groupJobs)
-            .then(() => console.log(`Completed group for resourceId ${resourceId}`))
-            .catch((err) => {
-              console.log(`Failed to process group for resourceId ${resourceId}`)
-              console.error(err)
-            })
-        })
-
-        try {
-          await Promise.allSettled(processedGroups)
-
-          console.log(`Finished processing of groups...`)
-          console.log('Going idle')
-          status = 'idle'
-          console.log('----------------------------------')
-          console.groupEnd()
-        } catch (error) {
-          console.log('Error processing groups')
-          console.error(error)
-          status = 'idle'
-        }
-      })
-      .catch((error) => {
-        console.log('Error getting jobs')
-        console.error(error)
-        status = 'idle'
-      })
-  }
-
-  function groupJobsByResourceId(jobList) {
-    return Object.entries(
-      jobList.reduce((acc, job) => {
-        const content = /** @type {{ resourceId?: string }} */ (job.content || {})
-        const rid = content.resourceId
-        return {
-          ...acc,
-          [rid]: [...(acc[rid] || []), job],
-        }
-      }, /** @type {Record<string, unknown[]>} */ ({}))
-    )
-  }
-
-  async function processJobsSequentially(jobList) {
-    console.log(`Processing ${jobList.length} jobs`)
-    for (const job of jobList) {
-      console.log(`Processing job ${job.id}`)
-      const task = tasks.find((t) => t.type === job.type)
-
-      if (!task) {
-        console.log('No handler found for job', job.id)
-        continue
-      }
-
-      console.log(`Handler found for ${task.type}`)
-
-      try {
-        const mod = await import(pathToFileURL(path.resolve(ossyDir, task.module)).href)
-        const jobSdk = SDK.of({
-          workspaceId: job.belongsTo,
-          authorization: process.env.OSSY_API_TOKEN,
-        })
-        await mod.default({ sdk: jobSdk, job }).catch(() => {})
-      } catch (error) {
-        console.error(error)
-        console.log('Failed to processing job')
-      }
-    }
-  }
-}