@ossy/resources 1.11.7 → 1.12.1

package/src/update-location.action.js

@@ -1,18 +1 @@
-import { Aggregate } from '@ossy/event-store'
-import { Resource, ResourcesEvents } from '@ossy/resources'
-
-export const id = 'resources/update-location'
-export const access = 'workspace'
-
-export async function run({ payload, req }) {
-  const createdBy = payload?.userId ?? req?.userId
-  const resourceId = payload?.resourceId ?? req?.params?.resourceId
-  const location = payload?.target ?? payload?.location
-
-  if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
-  if (!location) throw Object.assign(new Error('target location is required'), { status: 400 })
-
-  return Aggregate.Of(Resource, resourceId)
-    .then(Aggregate.Add(ResourcesEvents.LocationUpdated({ createdBy, location })))
-    .then(Aggregate.View())
-}
+export const metadata = { id: 'resources/update-location', access: 'workspace' }

package/src/update-location.task.js

@@ -0,0 +1,20 @@
+import { Aggregate } from '@ossy/event-store'
+import { Resource } from './resource.aggregate.js'
+import { ResourcesEvents } from './resources.events.js'
+import { mediaContextFromRun, withResourceMedia } from './resources.action-media.js'
+
+export const metadata = { id: 'resources/update-location' }
+
+export async function run({ payload, req }) {
+  const createdBy = payload?.userId ?? req?.userId
+  const resourceId = payload?.resourceId ?? req?.params?.resourceId
+  const location = payload?.target ?? payload?.location
+
+  if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
+  if (!location) throw Object.assign(new Error('target location is required'), { status: 400 })
+
+  const resource = await Aggregate.Of(Resource, resourceId)
+    .then(Aggregate.Add(ResourcesEvents.LocationUpdated({ createdBy, location })))
+    .then(Aggregate.View())
+  return withResourceMedia(resource, mediaContextFromRun({ payload, req }))
+}

package/src/update-name.action.js

@@ -1,18 +1 @@
-import { Aggregate } from '@ossy/event-store'
-import { Resource, ResourcesEvents } from '@ossy/resources'
-
-export const id = 'resources/update-name'
-export const access = 'workspace'
-
-export async function run({ payload, req }) {
-  const createdBy = payload?.userId ?? req?.userId
-  const resourceId = payload?.resourceId ?? req?.params?.resourceId
-  const name = payload?.name
-
-  if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
-  if (!name) throw Object.assign(new Error('name is required'), { status: 400 })
-
-  return Aggregate.Of(Resource, resourceId)
-    .then(Aggregate.Add(ResourcesEvents.NameUpdated({ createdBy, name })))
-    .then(Aggregate.View())
-}
+export const metadata = { id: 'resources/update-name', access: 'workspace' }

package/src/update-name.task.js

@@ -0,0 +1,20 @@
+import { Aggregate } from '@ossy/event-store'
+import { Resource } from './resource.aggregate.js'
+import { ResourcesEvents } from './resources.events.js'
+import { mediaContextFromRun, withResourceMedia } from './resources.action-media.js'
+
+export const metadata = { id: 'resources/update-name' }
+
+export async function run({ payload, req }) {
+  const createdBy = payload?.userId ?? req?.userId
+  const resourceId = payload?.resourceId ?? req?.params?.resourceId
+  const name = payload?.name
+
+  if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
+  if (!name) throw Object.assign(new Error('name is required'), { status: 400 })
+
+  const resource = await Aggregate.Of(Resource, resourceId)
+    .then(Aggregate.Add(ResourcesEvents.NameUpdated({ createdBy, name })))
+    .then(Aggregate.View())
+  return withResourceMedia(resource, mediaContextFromRun({ payload, req }))
+}

package/src/upload-named-version.action.js

@@ -1,42 +1 @@
-import { Aggregate } from '@ossy/event-store'
-import { Resource, ResourcesEvents } from '@ossy/resources'
-import { Workspace } from '@ossy/workspaces'
-
-export const id = 'resources/upload-named-version'
-export const access = 'workspace'
-
-export async function run({ payload, integrations, req }) {
-  const createdBy = payload?.userId ?? req?.userId
-  const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  const resourceId = payload?.resourceId ?? req?.params?.resourceId
-  const namedVersion = payload?.namedVersion ?? req?.params?.namedVersion
-  const type = payload?.type
-  const size = payload?.size
-
-  if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
-  if (!namedVersion) throw Object.assign(new Error('namedVersion is required'), { status: 400 })
-
-  const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
-
-  const event = ResourcesEvents.NamedVersionUploaded({
-    createdBy,
-    namedVersion,
-    Key: `media/${workspace.id}/${resourceId}/${namedVersion}.${type.replace('image/', '')}`,
-    ContentLength: size,
-    ContentType: type,
-  })
-
-  const storageClient = integrations?.get?.('storage')
-  const uploadHeaders = {
-    ContentLength: event.payload.ContentLength,
-    ContentType: event.payload.ContentType,
-    Key: event.payload.Key,
-  }
-  const uploadUrl = storageClient ? await storageClient.createUploadUrl(uploadHeaders) : null
-  const resource = await Aggregate.Of(Resource, resourceId)
-    .then(Aggregate.Add(event))
-    .then(Aggregate.View())
-  return uploadUrl
-    ? { ...resource, content: { ...resource.content, uploadUrl } }
-    : resource
-}
+export const metadata = { id: 'resources/upload-named-version', access: 'workspace' }

package/src/upload-named-version.task.js

@@ -0,0 +1,46 @@
+import { Aggregate } from '@ossy/event-store'
+import { Resource } from './resource.aggregate.js'
+import { ResourcesEvents } from './resources.events.js'
+import { Workspace } from '@ossy/workspaces/server'
+import { mediaContextFromRun, withResourceMedia } from './resources.action-media.js'
+
+export const metadata = { id: 'resources/upload-named-version' }
+
+// TODO: remove named version concept
+
+export async function run({ payload, integrations, req }) {
+  const createdBy = payload?.userId ?? req?.userId
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+  const resourceId = payload?.resourceId ?? req?.params?.resourceId
+  const namedVersion = payload?.namedVersion ?? req?.params?.namedVersion
+  const type = payload?.type
+  const size = payload?.size
+
+  if (!resourceId) throw Object.assign(new Error('resourceId is required'), { status: 400 })
+  if (!namedVersion) throw Object.assign(new Error('namedVersion is required'), { status: 400 })
+
+  const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
+
+  const event = ResourcesEvents.NamedVersionUploaded({
+    createdBy,
+    namedVersion,
+    Key: `media/${workspace.id}/${resourceId}/${namedVersion}.${type.replace('image/', '')}`,
+    ContentLength: size,
+    ContentType: type,
+  })
+
+  const storageClient = integrations?.get?.('storage')
+  const uploadHeaders = {
+    ContentLength: event.payload.ContentLength,
+    ContentType: event.payload.ContentType,
+    Key: event.payload.Key,
+  }
+  const uploadUrl = storageClient ? await storageClient.createUploadUrl(uploadHeaders) : null
+  const resource = await Aggregate.Of(Resource, resourceId)
+    .then(Aggregate.Add(event))
+    .then(Aggregate.View())
+  const withUpload = uploadUrl
+    ? { ...resource, content: { ...resource.content, uploadUrl } }
+    : resource
+  return withResourceMedia(withUpload, mediaContextFromRun({ payload, req }))
+}

package/src/item-access.api.js

@@ -1,34 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-const pathRe = /^\/api\/v0\/resources\/([^/]+)\/access$/
-
-export const metadata = {
-  id: 'resources.item.access',
-  path: '/api/v0/resources/:resourceId/access',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'PUT') {
-    res.setHeader('Allow', 'PUT')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  const pathname = (req.path || new URL(req.originalUrl, 'http://localhost').pathname).replace(/\/+$/, '')
-  const m = pathname.match(pathRe)
-  if (!m) {
-    res.status(404).json('')
-    return
-  }
-  const resourceId = decodeURIComponent(m[1])
-  try {
-    const resource = await ActionService.invoke('resources/update-access', {
-      payload: { resourceId, access: req.body?.access, userId: req.userId },
-      req,
-    })
-    const withUrls = await attachResourceMediaUrls(resource, { userId: req.userId, workspaceId: req.workspaceId })
-    res.json(withUrls)
-  } catch (err) {
-    res.status(err?.status ?? 500).json({ error: err?.message })
-  }
-}

package/src/item-content.api.js

@@ -1,35 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-const pathRe = /^\/api\/v0\/resources\/([^/]+)\/content$/
-
-export const metadata = {
-  id: 'resources.item.content',
-  path: '/api/v0/resources/:resourceId/content',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'PUT') {
-    res.setHeader('Allow', 'PUT')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  const pathname = (req.path || new URL(req.originalUrl, 'http://localhost').pathname).replace(/\/+$/, '')
-  const m = pathname.match(pathRe)
-  if (!m) {
-    res.status(404).json('')
-    return
-  }
-  const resourceId = decodeURIComponent(m[1])
-  try {
-    const resource = await ActionService.invoke('resources/update-content', {
-      payload: { resourceId, content: req.body?.content, userId: req.userId, workspaceId: req.workspaceId },
-      req,
-    })
-    if (resource === null || resource === undefined) return
-    const withUrls = await attachResourceMediaUrls(resource, { userId: req.userId, workspaceId: req.workspaceId })
-    res.json(withUrls)
-  } catch (err) {
-    res.status(err?.status ?? 400).json({ type: err?.type, message: err?.message })
-  }
-}

package/src/item-location.api.js

@@ -1,34 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-const pathRe = /^\/api\/v0\/resources\/([^/]+)\/location$/
-
-export const metadata = {
-  id: 'resources.item.location',
-  path: '/api/v0/resources/:resourceId/location',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'PUT') {
-    res.setHeader('Allow', 'PUT')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  const pathname = (req.path || new URL(req.originalUrl, 'http://localhost').pathname).replace(/\/+$/, '')
-  const m = pathname.match(pathRe)
-  if (!m) {
-    res.status(404).json('')
-    return
-  }
-  const resourceId = decodeURIComponent(m[1])
-  try {
-    const resource = await ActionService.invoke('resources/update-location', {
-      payload: { resourceId, target: req.body?.target, userId: req.userId },
-      req,
-    })
-    const withUrls = await attachResourceMediaUrls(resource, { userId: req.userId, workspaceId: req.workspaceId })
-    res.json(withUrls)
-  } catch (err) {
-    res.status(err?.status ?? 500).json({ error: err?.message })
-  }
-}

package/src/item-name.api.js

@@ -1,34 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-const pathRe = /^\/api\/v0\/resources\/([^/]+)\/name$/
-
-export const metadata = {
-  id: 'resources.item.name',
-  path: '/api/v0/resources/:resourceId/name',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'PUT') {
-    res.setHeader('Allow', 'PUT')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  const pathname = (req.path || new URL(req.originalUrl, 'http://localhost').pathname).replace(/\/+$/, '')
-  const m = pathname.match(pathRe)
-  if (!m) {
-    res.status(404).json('')
-    return
-  }
-  const resourceId = decodeURIComponent(m[1])
-  try {
-    const resource = await ActionService.invoke('resources/update-name', {
-      payload: { resourceId, name: req.body?.name, userId: req.userId },
-      req,
-    })
-    const withUrls = await attachResourceMediaUrls(resource, { userId: req.userId, workspaceId: req.workspaceId })
-    res.json(withUrls)
-  } catch (err) {
-    res.status(err?.status ?? 500).json({ error: err?.message })
-  }
-}

package/src/item-version.api.js

@@ -1,48 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-const pathRe = /^\/api\/v0\/resources\/([^/]+)\/([^/]+)$/
-const reservedSecond = new Set(['name', 'location', 'content', 'access'])
-
-export const metadata = {
-  id: 'resources.item.version',
-  path: '/api/v0/resources/:resourceId/:namedVersion',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'PUT') {
-    res.setHeader('Allow', 'PUT')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  const pathname = (req.path || new URL(req.originalUrl, 'http://localhost').pathname).replace(/\/+$/, '')
-  const m = pathname.match(pathRe)
-  if (!m) {
-    res.status(404).json('')
-    return
-  }
-  const namedVersion = decodeURIComponent(m[2])
-  if (reservedSecond.has(namedVersion)) {
-    res.status(404).json('')
-    return
-  }
-  const resourceId = decodeURIComponent(m[1])
-  try {
-    const resource = await ActionService.invoke('resources/upload-named-version', {
-      payload: {
-        resourceId,
-        namedVersion,
-        type: req.body?.type,
-        size: req.body?.size,
-        userId: req.userId,
-        workspaceId: req.workspaceId,
-      },
-      integrations: req.integrations,
-      req,
-    })
-    const withUrls = await attachResourceMediaUrls(resource, { userId: req.userId, workspaceId: req.workspaceId })
-    res.json(withUrls)
-  } catch (err) {
-    res.status(err?.status ?? 400).json({ error: err?.message })
-  }
-}

package/src/item.api.js

@@ -1,58 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-const pathRe = /^\/api\/v0\/resources\/([^/]+)$/
-
-export const metadata = {
-  id: 'resources.item',
-  path: '/api/v0/resources/:resourceId',
-}
-
-function mediaContext(req) {
-  return { userId: req.userId, workspaceId: req.workspaceId }
-}
-
-export default async function handle(req, res) {
-  const pathname = (req.path || new URL(req.originalUrl, 'http://localhost').pathname).replace(/\/+$/, '')
-  const m = pathname.match(pathRe)
-  if (!m) {
-    res.status(404).json('')
-    return
-  }
-  const segment = decodeURIComponent(m[1])
-  const reserved = new Set(['search', 'page-views'])
-  if (reserved.has(segment)) {
-    res.status(404).json('')
-    return
-  }
-
-  req.params = { ...req.params, resourceId: segment }
-
-  if (req.method === 'GET') {
-    try {
-      const resource = await ActionService.invoke('resources/get', {
-        payload: { resourceId: segment },
-        req,
-      })
-      const withUrls = await attachResourceMediaUrls(resource, mediaContext(req))
-      res.json(withUrls)
-    } catch (err) {
-      res.status(err?.status ?? 500).json({ error: err?.message })
-    }
-    return
-  }
-  if (req.method === 'DELETE') {
-    try {
-      await ActionService.invoke('resources/delete', {
-        payload: { resourceId: segment, userId: req.userId },
-        req,
-      })
-      res.status(204).end()
-    } catch (err) {
-      res.status(err?.status ?? 500).json({ error: err?.message })
-    }
-    return
-  }
-  res.setHeader('Allow', 'GET, DELETE')
-  res.status(405).json({ error: 'Method Not Allowed' })
-}

package/src/list.api.js

@@ -1,43 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-export const metadata = {
-  id: 'resources.list',
-  path: '/api/v0/resources',
-}
-
-function mediaContext(req) {
-  return { userId: req.userId, workspaceId: req.workspaceId }
-}
-
-export default async function handle(req, res) {
-  if (req.method === 'POST') {
-    try {
-      const resource = await ActionService.invoke('resources/create', {
-        payload: { ...req.body, userId: req.userId, workspaceId: req.workspaceId },
-        integrations: req.integrations,
-        req,
-      })
-      const withUrls = await attachResourceMediaUrls(resource, mediaContext(req))
-      res.json(withUrls)
-    } catch (err) {
-      res.status(err?.status ?? 500).json({ error: err?.message })
-    }
-    return
-  }
-  if (req.method === 'GET') {
-    try {
-      const resources = await ActionService.invoke('resources/list', {
-        payload: { query: req.query, workspaceId: req.workspaceId, userId: req.userId, user: req.user },
-        req,
-      })
-      const withUrls = await Promise.all(resources.map(r => attachResourceMediaUrls(r, mediaContext(req))))
-      res.json(withUrls)
-    } catch (err) {
-      res.status(err?.status ?? 500).json({ error: err?.message })
-    }
-    return
-  }
-  res.setHeader('Allow', 'GET, POST')
-  res.status(405).json({ error: 'Method Not Allowed' })
-}

package/src/page-views-stats.api.js

@@ -1,23 +0,0 @@
-import { ActionService } from '@ossy/platform'
-
-export const metadata = {
-  id: 'resources.pageViews.stats',
-  path: '/api/v0/resources/page-views/stats',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'GET') {
-    res.setHeader('Allow', 'GET')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  try {
-    const result = await ActionService.invoke('resources/get-page-view-stats', {
-      payload: { workspaceId: req.workspaceId, from: req.query?.from, to: req.query?.to, limit: req.query?.limit },
-      req,
-    })
-    res.json(result)
-  } catch (err) {
-    res.status(err?.status ?? 500).json({ error: err?.message })
-  }
-}

package/src/page-views.api.js

@@ -1,23 +0,0 @@
-import { ActionService } from '@ossy/platform'
-
-export const metadata = {
-  id: 'resources.pageViews',
-  path: '/api/v0/resources/page-views',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'POST') {
-    res.setHeader('Allow', 'POST')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  try {
-    const result = await ActionService.invoke('resources/create-page-view', {
-      payload: { ...req.body, workspaceId: req.workspaceId, userId: req.userId },
-      req,
-    })
-    res.status(201).json(result)
-  } catch (err) {
-    res.status(err?.status ?? 500).json({ error: err?.message })
-  }
-}

package/src/search.api.js

@@ -1,27 +0,0 @@
-import { ActionService } from '@ossy/platform'
-import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
-
-export const metadata = {
-  id: 'resources.search',
-  path: '/api/v0/resources/search',
-}
-
-export default async function handle(req, res) {
-  if (req.method !== 'POST') {
-    res.setHeader('Allow', 'POST')
-    res.status(405).json({ error: 'Method Not Allowed' })
-    return
-  }
-  try {
-    const resources = await ActionService.invoke('resources/search', {
-      payload: { ...req.body, workspaceId: req.workspaceId, user: req.user },
-      req,
-    })
-    const withUrls = await Promise.all(
-      resources.map(r => attachResourceMediaUrls(r, { userId: req.userId, workspaceId: req.workspaceId }))
-    )
-    res.json(withUrls)
-  } catch (err) {
-    res.status(err?.status ?? 500).json({ error: err?.message })
-  }
-}