diff --git a/README.md b/README.md index 528ecdc..8b691b2 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,13 @@ npx @dcl/opscli queue-ab-conversion \ --pointer="110,10" \ --cid "110,10" \ --token \ - [--platform webgl] \ [--platform mac] \ [--platform windows] \ [--ab-server https://ab-admin.decentraland.org] \ [--content-server https://peer.decentraland.org/content] ``` -> If no platform is specified, it runs for all platforms. Also, more than one can be specified at a time. +> **Note:** WebGL has been decommissioned and is no longer a valid platform target. Valid platforms are `windows` and `mac`. +> If no platform is specified, it runs for all platforms (`windows`, `mac`). More than one can be specified at a time. > For dev, use `--ab-server https://ab-admin.decentraland.zone`. @@ -52,7 +52,6 @@ npx @dcl/opscli queue-ab-conversion \ ``` npx @dcl/opscli queue-ab-conversion-snapshot \ --snapshot worlds \ - [--platform webgl] \ [--platform mac] \ [--platform windows] \ --token \ @@ -63,7 +62,6 @@ npx @dcl/opscli queue-ab-conversion-snapshot \ ``` npx @dcl/opscli queue-ab-conversion-snapshot \ --snapshot worlds \ - [--platform webgl] \ [--platform mac] \ [--platform windows] \ --token \ @@ -76,7 +74,6 @@ npx @dcl/opscli queue-ab-conversion-snapshot \ ``` npx @dcl/opscli queue-ab-conversion-about \ --token \ - [--platform webgl] \ [--platform mac] \ [--platform windows] \ --about-url https://sdk-team-cdn.decentraland.org/ipfs/goerli-plaza-main/about \ diff --git a/index.html b/index.html index 67cb973..31cea56 100644 --- a/index.html +++ b/index.html @@ -162,13 +162,9 @@

Enter Coordinates:

for (const { entityId, pointers } of entityIdsToConvert) { appendLog(container, 'Pointers\n' + pointers.join(' ; ')) - const result = await fetch(`${abServer}/manifest/${entityId}.json?timestamp=${new Date().getTime()}`, { cache: "no-store" }) const resultWindows = await fetch(`${abServer}/manifest/${entityId}_windows.json?timestamp=${new Date().getTime()}`, { cache: "no-store" }) const resultMac = await fetch(`${abServer}/manifest/${entityId}_mac.json?timestamp=${new Date().getTime()}`, { cache: "no-store" }) - appendLog(container, 'WEBGL') - await check(entityId, pointers, result) - appendLog(container, 'WINDOWS') await check(entityId, pointers, resultWindows) @@ -187,13 +183,9 @@

Enter Coordinates:

const entity = await getWorldsActiveEntity(world, worldsServer) entityId = entity.configurations.scenesUrn[0].split(':')[3].split('?')[0] appendLog(container, 'World ' + world) - const result = await fetch(`${abServer}/manifest/${entityId}.json?timestamp=${new Date().getTime()}`, { cache: "no-store" }) const resultWindows = await fetch(`${abServer}/manifest/${entityId}_windows.json?timestamp=${new Date().getTime()}`, { cache: "no-store" }) const resultMac = await fetch(`${abServer}/manifest/${entityId}_mac.json?timestamp=${new Date().getTime()}`, { cache: "no-store" }) - appendLog(container, 'WEBGL') - await check(entityId, [world], result) - appendLog(container, 'WINDOWS') await check(entityId, [world], resultWindows) diff --git a/src/commands/check-ab-conversion.ts b/src/commands/check-ab-conversion.ts index d863494..1761dfc 100644 --- a/src/commands/check-ab-conversion.ts +++ b/src/commands/check-ab-conversion.ts @@ -56,13 +56,9 @@ export default async () => { } for (const { entityId, pointers } of entityIdsToConvert) { - const result = await fetch(`${abServer}/manifest/${entityId}.json`) const resultWindows = await fetch(`${abServer}/manifest/${entityId}_windows.json`) const resultMac = await fetch(`${abServer}/manifest/${entityId}_mac.json`) - console.log('WEBGL') - await check(entityId, pointers, result) - console.log('WINDOWS') await check(entityId, pointers, resultWindows) diff --git a/src/commands/pointer-consistency.ts b/src/commands/pointer-consistency.ts index 164e3b0..0e31a74 100644 --- a/src/commands/pointer-consistency.ts +++ b/src/commands/pointer-consistency.ts @@ -97,7 +97,7 @@ async function checkAssetBundleStatus( console.log(` Global status: ${statusLabel(entry.status)}`) console.log(' Platform status:') - const platforms = ['windows', 'mac', 'webgl'] + const platforms = ['windows', 'mac'] for (const platform of platforms) { const assetStatus = entry.bundles?.assets?.[platform] || 'unknown' const version = entry.versions?.assets?.[platform] diff --git a/src/commands/queue-ab-conversion-about.ts b/src/commands/queue-ab-conversion-about.ts index 633c3c4..c58862f 100644 --- a/src/commands/queue-ab-conversion-about.ts +++ b/src/commands/queue-ab-conversion-about.ts @@ -25,7 +25,12 @@ export default async () => { const shouldPrioritize = !!args['--prioritize'] assert(!!token, '--token is missing') - platforms.forEach((platform) => assert(Object.values(Platform).includes(platform), `Invalid platform: ${platform}`)) + platforms.forEach((platform) => + assert( + Object.values(Platform).includes(platform), + `Invalid platform: ${platform}. Valid platforms: ${Object.values(Platform).join(', ')}` + ) + ) console.log(`> Parameters:`) console.log(` Platform(s): ${platforms.join(',')}`) diff --git a/src/commands/queue-ab-conversion-snapshot.ts b/src/commands/queue-ab-conversion-snapshot.ts index 8aba04f..3b0d84d 100644 --- a/src/commands/queue-ab-conversion-snapshot.ts +++ b/src/commands/queue-ab-conversion-snapshot.ts @@ -31,7 +31,12 @@ export default async () => { assert(!!snapshot, '--snapshot is missing') assert(!!token, '--token is missing') - platforms.forEach((platform) => assert(Object.values(Platform).includes(platform), `Invalid platform: ${platform}`)) + platforms.forEach((platform) => + assert( + Object.values(Platform).includes(platform), + `Invalid platform: ${platform}. Valid platforms: ${Object.values(Platform).join(', ')}` + ) + ) console.log(`> Parameters:`) const contentUrl = (args['--content-server'] || 'https://peer.decentraland.org/content').replace(/\/$/, '') diff --git a/src/commands/queue-ab-conversion.ts b/src/commands/queue-ab-conversion.ts index a143c9a..6c2a061 100644 --- a/src/commands/queue-ab-conversion.ts +++ b/src/commands/queue-ab-conversion.ts @@ -31,7 +31,12 @@ export default async () => { assert(!!token, '--token is missing') assert(pointers.length > 0 || cids.length > 0, '--pointer or --cid are required') - platforms.forEach((platform) => assert(Object.values(Platform).includes(platform), `Invalid platform: ${platform}`)) + platforms.forEach((platform) => + assert( + Object.values(Platform).includes(platform), + `Invalid platform: ${platform}. Valid platforms: ${Object.values(Platform).join(', ')}` + ) + ) console.log(`> Parameters:`) pointers.length && console.log(` Pointers: ${pointers.join(',')}`) diff --git a/src/commands/world-ab-status.ts b/src/commands/world-ab-status.ts index cfcb8e4..48ab883 100644 --- a/src/commands/world-ab-status.ts +++ b/src/commands/world-ab-status.ts @@ -129,7 +129,7 @@ export default async function () { console.log(` Entity ID match: ${idMatch ? '✅' : '🚨 STALE — registry has different entity'}`) console.log(` Status: ${statusLabel(registryEntry.status)}`) - const platforms = ['windows', 'mac', 'webgl'] + const platforms = ['windows', 'mac'] console.log(' Versions:') for (const platform of platforms) { const version = registryEntry.versions?.assets?.[platform] diff --git a/src/helpers/asset-bundles.ts b/src/helpers/asset-bundles.ts index d67e8f0..26d7a62 100644 --- a/src/helpers/asset-bundles.ts +++ b/src/helpers/asset-bundles.ts @@ -5,7 +5,6 @@ import { CliError } from '../bin' export const productionAbAdmin = 'https://ab-admin.decentraland.org' export enum Platform { - WEBGL = 'webgl', WINDOWS = 'windows', MAC = 'mac' }