From e43c19121825f09126f6e06089d015fc571290a7 Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Fri, 4 Aug 2023 12:57:04 -0300 Subject: [PATCH 1/3] feat: add about endpoint --- src/Project/Project.router.ts | 50 ++++++++++++++++++++++++++++++++++- src/Scene/utils.ts | 1 + 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/Scene/utils.ts diff --git a/src/Project/Project.router.ts b/src/Project/Project.router.ts index 2ec19d29..73f95ca1 100644 --- a/src/Project/Project.router.ts +++ b/src/Project/Project.router.ts @@ -17,6 +17,10 @@ import { Ownable } from '../Ownable' import { Project } from './Project.model' import { ProjectAttributes, projectSchema } from './Project.types' import { SearchableProject } from './SearchableProject' +import { PREVIEW_HASH } from '../Scene/utils' + +const BUILDER_SERVER_URL = process.env.BUILDER_SERVER_URL +const PEER_URL = process.env.PEER_URL export const THUMBNAIL_FILE_NAME = 'thumbnail' const FILE_NAMES = [ @@ -30,7 +34,6 @@ const FILE_NAMES = [ const MIME_TYPES = ['image/png', 'image/jpeg'] const validator = getValidator() - export class ProjectRouter extends Router { mount() { const withProjectExists = withModelExists(Project, 'id', { @@ -137,6 +140,12 @@ export class ProjectRouter extends Router { ), server.handleRequest(this.uploadFiles) ) + + this.router.get( + '/projects/:id/about', + withProjectExists, + this.getPreviewAbout + ) } async getProjects(req: AuthRequest) { @@ -258,4 +267,43 @@ export class ProjectRouter extends Router { return true } + + async getPreviewAbout(req: Request, res: Response) { + const projectId = server.extractFromReq(req, 'id') + return res.json({ + healthy: true, + acceptingUsers: true, + configurations: { + networkId: 1, + globalScenesUrn: [], + scenesUrn: [ + `urn:decentraland:entity:${PREVIEW_HASH}?=&baseUrl=${BUILDER_SERVER_URL}/projects/${projectId}/contents/` + ], + minimap: { + enabled: false, + dataImage: "https://worlds-content-server.decentraland.org/contents/bafkreidduubi76bntd27dewz4cvextrfl3qyd4td6mtztuisxi26q64dnq", + estateImage: "https://worlds-content-server.decentraland.org/contents/bafkreidduubi76bntd27dewz4cvextrfl3qyd4td6mtztuisxi26q64dnq" + }, + skybox: { + textures: [ + "https://worlds-content-server.decentraland.org/contents/bafkreidduubi76bntd27dewz4cvextrfl3qyd4td6mtztuisxi26q64dnq" + ] + }, + realmName: "preview" + }, + content: { + healthy: true, + publicUrl: `${PEER_URL}/content` + }, + lambdas: { + healthy: true, + publicUrl: `${PEER_URL}/lambdas` + }, + comms: { + healthy: true, + protocol: "v3", + fixedAdapter: "offline" + } + }) + } } diff --git a/src/Scene/utils.ts b/src/Scene/utils.ts new file mode 100644 index 00000000..6b23cfc0 --- /dev/null +++ b/src/Scene/utils.ts @@ -0,0 +1 @@ +export const PREVIEW_HASH = 'bafkreiczoxhrxosdeoi4srth6wegejpwsn34bkult6rb7xp3ehejxt4qsi' From 11ea6d9dac6929fa6a05c9cf02fa9ff4be9dd6d9 Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Tue, 8 Aug 2023 01:07:44 -0300 Subject: [PATCH 2/3] feat: add about endpoint --- src/Project/Project.router.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Project/Project.router.ts b/src/Project/Project.router.ts index 73f95ca1..8129127b 100644 --- a/src/Project/Project.router.ts +++ b/src/Project/Project.router.ts @@ -274,10 +274,9 @@ export class ProjectRouter extends Router { healthy: true, acceptingUsers: true, configurations: { - networkId: 1, globalScenesUrn: [], scenesUrn: [ - `urn:decentraland:entity:${PREVIEW_HASH}?=&baseUrl=${BUILDER_SERVER_URL}/projects/${projectId}/contents/` + `urn:decentraland:entity:${PREVIEW_HASH}?=&baseUrl=${BUILDER_SERVER_URL}v1/projects/${projectId}/contents/` ], minimap: { enabled: false, @@ -288,8 +287,7 @@ export class ProjectRouter extends Router { textures: [ "https://worlds-content-server.decentraland.org/contents/bafkreidduubi76bntd27dewz4cvextrfl3qyd4td6mtztuisxi26q64dnq" ] - }, - realmName: "preview" + } }, content: { healthy: true, @@ -302,7 +300,7 @@ export class ProjectRouter extends Router { comms: { healthy: true, protocol: "v3", - fixedAdapter: "offline" + fixedAdapter: "offline:offline" } }) } From 15c43dbede8fef055c23e01bdbd5354e2d9bd184 Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Wed, 9 Aug 2023 17:18:35 -0300 Subject: [PATCH 3/3] remove unused variables --- src/Project/Project.router.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/Project/Project.router.ts b/src/Project/Project.router.ts index 8129127b..513dac53 100644 --- a/src/Project/Project.router.ts +++ b/src/Project/Project.router.ts @@ -277,17 +277,7 @@ export class ProjectRouter extends Router { globalScenesUrn: [], scenesUrn: [ `urn:decentraland:entity:${PREVIEW_HASH}?=&baseUrl=${BUILDER_SERVER_URL}v1/projects/${projectId}/contents/` - ], - minimap: { - enabled: false, - dataImage: "https://worlds-content-server.decentraland.org/contents/bafkreidduubi76bntd27dewz4cvextrfl3qyd4td6mtztuisxi26q64dnq", - estateImage: "https://worlds-content-server.decentraland.org/contents/bafkreidduubi76bntd27dewz4cvextrfl3qyd4td6mtztuisxi26q64dnq" - }, - skybox: { - textures: [ - "https://worlds-content-server.decentraland.org/contents/bafkreidduubi76bntd27dewz4cvextrfl3qyd4td6mtztuisxi26q64dnq" - ] - } + ] }, content: { healthy: true,