@ossy/platform 3.24.0 → 3.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -49,18 +49,18 @@
     "@aws-sdk/util-format-url": "^3.972.17",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "@ossy/config": "^3.0.9",
-    "@ossy/email": "^3.24.0",
-    "@ossy/event-store": "^3.20.1",
+    "@ossy/email": "^3.25.0",
+    "@ossy/event-store": "^3.24.1",
     "@ossy/locale": "^3.4.0",
     "@ossy/manifest": "^3.24.0",
-    "@ossy/observability": "^3.0.9",
-    "@ossy/policies": "^3.0.9",
-    "@ossy/router": "^3.0.9",
+    "@ossy/observability": "^3.24.1",
+    "@ossy/policies": "^3.24.1",
+    "@ossy/router": "^3.25.0",
     "@ossy/schema": "^3.24.0",
     "@ossy/sdk": "^3.24.0",
-    "@ossy/tokens": "^3.11.1",
-    "@ossy/users": "^3.24.0",
-    "@ossy/workspaces": "^3.24.0",
+    "@ossy/tokens": "^3.24.1",
+    "@ossy/users": "^3.24.1",
+    "@ossy/workspaces": "^3.25.0",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -81,5 +81,5 @@
     "Dockerfile",
     "docker-healthcheck.js"
   ],
-  "gitHead": "bd8186b5123999b338ce09aa04cd75d7deb0427a"
+  "gitHead": "00dd4b51a94de7e0399c9dfa59380a53e58c8523"
 }

package/src/proxy-internal.js

@@ -58,7 +58,7 @@ export function ProxyInternal () {
     }
 
     if (req.originalUrl.startsWith('/@ossy/users/me/app-settings') && req.method === 'GET') {
-      log.info('[@ossy/platform][proxy] GET /@ossy/users/me/app-settings')
+      log.debug('[@ossy/platform][proxy] GET /@ossy/users/me/app-settings')
       const userSettings = readUserAppSettings(req)
       const workspaceId = readWorkspaceIdFromCookies(req)
       res.status(200)
@@ -68,13 +68,13 @@ export function ProxyInternal () {
 
     if (!isRemoteOssyApiUrl()) {
       const dest = ossyProxyLocalPath(req.originalUrl)
-      log.info(`[@ossy/platform][proxy] ${req.method} ${req.originalUrl} → ${dest} (same origin)`)
+      log.debug(`[@ossy/platform][proxy] ${req.method} ${req.originalUrl} → ${dest} (same origin)`)
       req.url = dest
       req.originalUrl = dest
       return next()
     }
 
-    log.info(`[@ossy/platform][proxy] ${req.method} ${req.originalUrl}`)
+    log.debug(`[@ossy/platform][proxy] ${req.method} ${req.originalUrl}`)
 
     const domain = String(process.env.OSSY_API_URL).trim()
       .replace(/\/api\/v0\/?$/, '')

package/src/runtime.js

@@ -187,7 +187,8 @@ export async function startRuntime ({ port } = {}) {
       const { language, messages, fallbackMessages } = resolveRequestLocale(pageRouter, requestUrl, buildDir, config)
       if (typeof pageEntry.redirect === 'string' && pageEntry.redirect.trim()) {
         const targetId = pageEntry.redirect.trim().replace(/^@/, '')
-        const targetPath = pageRouter.getPathname({ id: targetId, language })
+        const params = pageRouter.getParamsFromUrl(requestUrl)
+        const targetPath = pageRouter.getPathname({ id: targetId, language, params })
         if (targetPath) {
           const search = new URL(requestUrl, 'http://localhost').search || ''
           res.redirect(302, `${targetPath}${search}`)

package/src/server.js

@@ -530,7 +530,8 @@ export async function startServer (options = {}) {
         if (typeof pageEntry.redirect === 'string' && pageEntry.redirect.trim()) {
           const { language } = resolveRequestLocale(pageRouter, requestUrl, buildDir, config)
           const targetId = pageEntry.redirect.trim().replace(/^@/, '')
-          const targetPath = pageRouter.getPathname({ id: targetId, language })
+          const params = pageRouter.getParamsFromUrl(requestUrl)
+          const targetPath = pageRouter.getPathname({ id: targetId, language, params })
           if (targetPath) {
             const search = new URL(requestUrl, 'http://localhost').search || ''
             res.redirect(302, `${targetPath}${search}`)

package/src/ses/poll-inbound-mail.js

@@ -1,6 +1,7 @@
 import { DeleteMessageCommand, ReceiveMessageCommand, SQSClient } from '@aws-sdk/client-sqs'
 import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3'
 import { fileSesReceipt, sesReceiptFromBody } from '@ossy/email/ses-inbound'
+import { canonicalWorkspaceId } from '@ossy/workspaces/server'
 import { createInProcessSdk } from '../tasks/in-process-sdk.js'
 import { inboundAwsClientConfig } from './inbound-aws-credentials.js'
 
@@ -21,7 +22,7 @@ export async function ackInboundMessages (messages, { file, deleteMessage, log }
   for (const message of messages ?? []) {
     try {
       const result = await file(message.Body)
-      if (result?.skipped) log?.info('[ses/inbound] skipped receipt', result)
+      if (result?.skipped) log?.debug('[ses/inbound] skipped receipt', result)
       await deleteMessage(message)
     } catch (error) {
       if (error?.name === 'NoSuchKey') {
@@ -47,9 +48,12 @@ export function startInboundMailPoller ({ queueUrl, bucket, log } = {}) {
   const file = (body) => fileSesReceipt(sesReceiptFromBody(body), {
     bucket,
     getObject: (location) => readObject(objects, location),
-    invoke: ({ mime, workspaceId }) => createInProcessSdk()
-      .forWorkspace(workspaceId)
-      .invoke(ReceiveInbound, { mime, workspaceId }),
+    invoke: async ({ mime, workspaceId }) => {
+      const canonical = await canonicalWorkspaceId(workspaceId)
+      return createInProcessSdk()
+        .forWorkspace(canonical)
+        .invoke(ReceiveInbound, { mime, workspaceId: canonical })
+    },
   })
 
   const run = (async () => {

package/src/site-loader.js

@@ -128,7 +128,7 @@ export async function loadSite (domain) {
   const buildDir = path.join(BASE_DIR, domain)
   const cmsLocation = `/@ossy/apps/${domain}`
 
-  log.info(`[@ossy/platform] Loading site for ${domain} (workspace ${workspaceId}) from CMS ${cmsLocation}…`)
+  log.debug(`[@ossy/platform] Loading site for ${domain} (workspace ${workspaceId}) from CMS ${cmsLocation}…`)
 
   const sdk = SDK.of({
     apiUrl: API_URL,
@@ -149,7 +149,7 @@ export async function loadSite (domain) {
 
   await runWithConcurrency(tasks, DOWNLOAD_CONCURRENCY)
 
-  log.info(`[@ossy/platform] Site ${domain} ready — ${files.length} file(s) in ${buildDir}`)
+  log.debug(`[@ossy/platform] Site ${domain} ready — ${files.length} file(s) in ${buildDir}`)
 
   cache.set(domain, { buildDir, workspaceId, loadedAt: Date.now() })
   return buildDir
@@ -161,5 +161,5 @@ export async function loadSite (domain) {
  */
 export function invalidateSite (domain) {
   cache.delete(domain)
-  log.info(`[@ossy/platform] Cache invalidated for ${domain}`)
+  log.debug(`[@ossy/platform] Cache invalidated for ${domain}`)
 }

package/src/storage/s3-storage.client.js

@@ -57,7 +57,7 @@ export function createS3StorageClient ({
     },
 
     createUploadUrl ({ ContentType, ContentLength, Key, expiresIn = 60 * 60 * 24 }) {
-      log.info('[S3Storage][createUploadUrl] Creating upload URL')
+      log.debug('[S3Storage][createUploadUrl] Creating upload URL')
 
       const clientParams = {
         Bucket: bucket,
@@ -88,7 +88,7 @@ export function createS3StorageClient ({
       const Key = toS3Key(logicalKey)
       const s3Client = createAwsClient()
       const Body = Buffer.isBuffer(body) ? body : Buffer.from(body)
-      log.info('[S3Storage][save] Putting object', { key: logicalKey, bytes: Body.length })
+      log.debug('[S3Storage][save] Putting object', { key: logicalKey, bytes: Body.length })
       await s3Client.send(new PutObjectCommand({
         Bucket: bucket,
         Key,

package/src/storage/s3.client.js

@@ -46,7 +46,7 @@ export class S3Client {
   }
 
   static createUploadUrl({ ContentType, ContentLength, Key, Bucket, expiresIn = 60 * 60 * 24 }) {
-    log.info('[S3Client][createUploadUrl()] Creating upload URL')
+    log.debug('[S3Client][createUploadUrl()] Creating upload URL')
 
     const bucket = Bucket ?? ConfigService.MediaRepository
     if (!bucket) {

package/src/tasks/change-stream.js

@@ -157,7 +157,7 @@ export class ChangeStream {
     })
 
     changeStream.on('change', (change) => {
-      log.info('[ChangeStream] Change detected')
+      log.debug('[ChangeStream] Change detected')
       const event = change.fullDocument
       if (event) {
         ProjectionRebuild.dispatch(event).catch((error) => {

package/src/tasks/task-service.js

@@ -370,20 +370,27 @@ export class TaskService {
     if (!event) return
     if (AUDIT_DISPATCH_TYPES.has(event.type)) return
 
-    const baseSdk = sdk ?? await sdkBoundTo()
-    const effectiveSdk = typeof baseSdk?.withEventContext === 'function'
-      ? baseSdk.withEventContext(event)
-      : baseSdk
-
     const workspaceId = event.payload?.belongsTo ?? event.belongsTo ?? null
+    const matches = []
 
-    for (const { metadata, handler } of TaskService._tasks) {
-      const { triggers, armed } = await TaskService._eventTriggersForDispatch(metadata, workspaceId)
+    for (const task of TaskService._tasks) {
+      const { triggers, armed } = await TaskService._eventTriggersForDispatch(task.metadata, workspaceId)
       if (!armed) continue
 
       const matchedTrigger = triggers.find((trigger) => TaskService._matchesEventTrigger(trigger, event))
       if (!matchedTrigger) continue
+      matches.push({ ...task, matchedTrigger })
+    }
+
+    // Loading the bot reads the user aggregate. Do that only when a task will run.
+    if (matches.length === 0) return
+
+    const baseSdk = sdk ?? await sdkBoundTo()
+    const effectiveSdk = typeof baseSdk?.withEventContext === 'function'
+      ? baseSdk.withEventContext(event)
+      : baseSdk
 
+    for (const { metadata, handler, matchedTrigger } of matches) {
       const _taskId = metadata.id
       const claimKey = buildEventClaimKey(_taskId, event.id)
 
@@ -391,11 +398,11 @@ export class TaskService {
       void (async () => {
         const won = await tryClaimDispatch(claimKey)
         if (!won) {
-          _serviceLog.info(`Skipping task "${_taskId}" — dispatch claim lost`)
+          _serviceLog.debug(`Skipping task "${_taskId}" — dispatch claim lost`)
           return
         }
 
-        _serviceLog.info(`Dispatching task "${_taskId}"`)
+        _serviceLog.debug(`Dispatching task "${_taskId}"`)
 
         const taskContext = buildTaskContext(
           { sdk: effectiveSdk, integrations: IntegrationService, log: createLogger(_taskId) },
@@ -470,11 +477,11 @@ export class TaskService {
       void (async () => {
         const won = await tryClaimDispatch(claimKey)
         if (!won) {
-          _serviceLog.info(`Skipping on_action task "${_taskId}" — dispatch claim lost`)
+          _serviceLog.debug(`Skipping on_action task "${_taskId}" — dispatch claim lost`)
           return
         }
 
-        _serviceLog.info(`Dispatching on_action task "${_taskId}" for action "${actionId}"`)
+        _serviceLog.debug(`Dispatching on_action task "${_taskId}" for action "${actionId}"`)
 
         const taskContext = buildTaskContext(
           {
@@ -587,14 +594,14 @@ export class TaskService {
             void (async () => {
               const won = await tryClaimDispatch(claimKey)
               if (!won) {
-                _serviceLog.info(
+                _serviceLog.debug(
                   `Skipping schedule for task "${metadata.id}" — dispatch claim lost`
                   + (job.workspaceId ? ` (workspace ${job.workspaceId})` : ''),
                 )
                 return
               }
 
-              _serviceLog.info(
+              _serviceLog.debug(
                 `Schedule fired for task "${metadata.id}"`
                 + (job.workspaceId ? ` (workspace ${job.workspaceId})` : ''),
               )

package/src/token.service.js

@@ -40,7 +40,7 @@ export class TokenService {
           }))
         }
 
-        log.info('[TokenService]: Token verified')
+        log.debug('[TokenService]: Token verified')
         resolve(payload)
       })
 

package/src/users.middleware.js

@@ -71,7 +71,7 @@ export class UsersMiddleware {
       return asAnonymous()
     }
 
-    log.info('[UsersMiddleware] Authenticating')
+    log.debug('[UsersMiddleware] Authenticating')
     log.debug('[UsersMiddleware] authToken', { authToken })
 
     const authStarted = performance.now()
@@ -98,7 +98,7 @@ export class UsersMiddleware {
           return PoliciesQueries.GetPoliciesForUser(user.id)
             .then(policies => {
               finishAuth(() => {
-                log.info('[UsersMiddleware] Resolved user', {
+                log.debug('[UsersMiddleware] Resolved user', {
                   elapsedMs: Math.round(performance.now() - authStarted),
                 })
                 req.userId = user.id