Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ npx @dcl/opscli queue-ab-conversion \
[--ab-server https://ab-admin.decentraland.org] \
[--content-server https://peer.decentraland.org/content]
```
> **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.
> **Note:** WebGL has been decommissioned and is no longer a valid platform target. Valid platforms are `windows`, `mac` and `abgen`.
> If no platform is specified, it runs for the default platforms (`windows`, `mac`). More than one can be specified at a time.
>
> `abgen` is not an OS: it routes the job to the abgen generator (the Rust asset-bundle pipeline), which converts every platform it supports in a single job. It is opt-in only — never included by default — and requires the target environment's ab-admin to have the abgen queue configured (currently `org` and `zone`; `today` has no abgen and returns a 400). `--prioritize` is accepted but abgen has a single queue with no priority lane, and `--animation`/`--doISS` are Unity-only and ignored by abgen.

> For dev, use `--ab-server https://ab-admin.decentraland.zone`.

Expand Down
4 changes: 2 additions & 2 deletions src/commands/queue-ab-conversion-about.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AuthLinkType } from '@dcl/schemas'
import arg from 'arg'
import { assert } from '../helpers/assert'
import { productionAbAdmin, Platform, queueConversions } from '../helpers/asset-bundles'
import { productionAbAdmin, DEFAULT_PLATFORMS, Platform, queueConversions } from '../helpers/asset-bundles'
import { fetch } from 'undici'
import { CliError } from '../bin'
import { parseEntityUrn } from '../helpers/parseEntityUrn'
Expand All @@ -19,7 +19,7 @@ export default async () => {
const aboutUrl = args['--about-url']!
const token = args['--token']!
const abServer = args['--ab-server'] || productionAbAdmin
const platforms = (args['--platform'] as Platform[]) || Object.values(Platform)
const platforms = (args['--platform'] as Platform[]) || DEFAULT_PLATFORMS
const force = args['--force'] || false

const shouldPrioritize = !!args['--prioritize']
Expand Down
4 changes: 2 additions & 2 deletions src/commands/queue-ab-conversion-snapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import arg from 'arg'
import { fetch } from 'undici'
import { CliError } from '../bin'
import { assert } from '../helpers/assert'
import { productionAbAdmin, Platform, queueConversions } from '../helpers/asset-bundles'
import { productionAbAdmin, DEFAULT_PLATFORMS, Platform, queueConversions } from '../helpers/asset-bundles'
import { StringDecoder } from 'string_decoder'
import { exit } from 'process'

Expand All @@ -26,7 +26,7 @@ export default async () => {
const snapshot = args['--snapshot'] || 'wearable'
const token = args['--token']!
const abServer = args['--ab-server'] || productionAbAdmin
const platforms = (args['--platform'] as Platform[]) || Object.values(Platform)
const platforms = (args['--platform'] as Platform[]) || DEFAULT_PLATFORMS
const shouldPrioritize = !!args['--prioritize']

assert(!!snapshot, '--snapshot is missing')
Expand Down
4 changes: 2 additions & 2 deletions src/commands/queue-ab-conversion.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AuthLinkType, IPFSv1, IPFSv2 } from '@dcl/schemas'
import arg from 'arg'
import { assert } from '../helpers/assert'
import { productionAbAdmin, Platform, queueConversions } from '../helpers/asset-bundles'
import { productionAbAdmin, DEFAULT_PLATFORMS, Platform, queueConversions } from '../helpers/asset-bundles'
import { getActiveEntities } from '../helpers/downloads'

export default async () => {
Expand All @@ -22,7 +22,7 @@ export default async () => {
const cids = args['--cid'] || []
const token = args['--token']!
const abServer = args['--ab-server'] || productionAbAdmin
const platforms = (args['--platform'] as Platform[]) || Object.values(Platform)
const platforms = (args['--platform'] as Platform[]) || DEFAULT_PLATFORMS
const contentUrl = (args['--content-server'] || 'https://peer.decentraland.org/content').replace(/\/$/, '')
const shouldPrioritize = !!args['--prioritize']
const animation = args['--animation'] || 'legacy'
Expand Down
9 changes: 8 additions & 1 deletion src/helpers/asset-bundles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@ export const productionAbAdmin = 'https://ab-admin.decentraland.org'

export enum Platform {
WINDOWS = 'windows',
MAC = 'mac'
MAC = 'mac',
// Not an OS: routes the job to the abgen generator's queue instead of a Unity
// converter queue (one abgen job converts every platform it supports).
ABGEN = 'abgen'
}

// Used when --platform is omitted. abgen is deliberately excluded so default and
// mass reconversions don't feed it until explicitly requested with --platform abgen.
export const DEFAULT_PLATFORMS = [Platform.WINDOWS, Platform.MAC]

export async function queueConversions(
customABConverterServer: string,
entity: DeploymentToSqs,
Expand Down
Loading