@assethub/cli 0.1.4 → 0.1.6

package/dist/index.js

@@ -14,26 +14,32 @@ const defaultPartExtractorName = 'V1.5';
 const partExtractorOptions = [
     {
         publicName: 'Part Extractor V3',
+        apiValue: 'ah_part_extractor_v3',
         aliases: ['part extractor v3', 'v3'],
     },
     {
         publicName: 'V1',
+        apiValue: 'ah_part_extractor_v5',
         aliases: ['v1', '1'],
     },
     {
         publicName: 'V1.5 alpha',
+        apiValue: 'ah_part_extractor_v55',
         aliases: ['v1.5 alpha', 'v1.5-alpha', '1.5 alpha', '1.5-alpha'],
     },
     {
         publicName: 'V1.5',
+        apiValue: 'ah_part_extractor_v65',
         aliases: ['v1.5', '1.5', 'latest', 'default'],
     },
     {
         publicName: 'V2.0 alpha',
+        apiValue: 'ah_part_extractor_v20_alpha',
         aliases: ['v2.0 alpha', 'v2 alpha', 'v2.0-alpha', 'v2-alpha', '2.0 alpha'],
     },
     {
         publicName: 'V2.1 alpha',
+        apiValue: 'ah_part_extractor_v21_alpha',
         aliases: ['v2.1 alpha', 'v2.1-alpha', '2.1 alpha'],
     },
 ];
@@ -41,13 +47,14 @@ const partExtractorPublicNames = partExtractorOptions
     .map(option => option.publicName)
     .join(', ');
 const normalizePartExtractorName = (value) => value.trim().toLowerCase().replace(/\s+/g, ' ');
-const partExtractorPublicNameByInput = new Map(partExtractorOptions.flatMap(option => [
-    [normalizePartExtractorName(option.publicName), option.publicName],
+const partExtractorByInput = new Map(partExtractorOptions.flatMap(option => [
+    [normalizePartExtractorName(option.publicName), option],
     ...option.aliases.map(alias => [
         normalizePartExtractorName(alias),
-        option.publicName,
+        option,
     ]),
 ]));
+const partExtractorPublicNameByApiValue = new Map(partExtractorOptions.map(option => [option.apiValue, option.publicName]));
 const isInternalPartExtractorId = (value) => value.trim().includes('_');
 const execFileAsync = promisify(execFile);
 const usage = `AssetHub CLI
@@ -173,18 +180,29 @@ const resolvePartExtractorPublicName = (value) => {
     if (isInternalPartExtractorId(value)) {
         throw new Error(`Internal part extractor IDs are not accepted by the public CLI. Use one of: ${partExtractorPublicNames}.`);
     }
-    const publicName = partExtractorPublicNameByInput.get(normalizePartExtractorName(value));
-    if (publicName == null) {
+    const option = partExtractorByInput.get(normalizePartExtractorName(value));
+    if (option == null) {
         throw new Error(`Unknown part extractor: ${value}. Use one of: ${partExtractorPublicNames}.`);
     }
-    return publicName;
+    return option.publicName;
 };
-const resolvePartExtractorForAnalyze = (flags) => resolvePartExtractorPublicName(getPartExtractorFlag(flags) ?? defaultPartExtractorName);
+const resolvePartExtractorApiValue = (value) => {
+    if (isInternalPartExtractorId(value)) {
+        throw new Error(`Internal part extractor IDs are not accepted by the public CLI. Use one of: ${partExtractorPublicNames}.`);
+    }
+    const option = partExtractorByInput.get(normalizePartExtractorName(value));
+    if (option == null) {
+        throw new Error(`Unknown part extractor: ${value}. Use one of: ${partExtractorPublicNames}.`);
+    }
+    return option.apiValue;
+};
+const resolvePartExtractorForAnalyze = (flags) => resolvePartExtractorApiValue(getPartExtractorFlag(flags) ?? defaultPartExtractorName);
 const publicPartExtractorName = (value) => {
     if (value == null) {
         return null;
     }
-    return (isInternalPartExtractorId(value) ? 'Unknown' : value);
+    return (partExtractorPublicNameByApiValue.get(value) ??
+        (isInternalPartExtractorId(value) ? 'Unknown' : value));
 };
 const sanitizeProductionOutput = (value) => {
     if (Array.isArray(value)) {
@@ -419,6 +437,61 @@ const extensionFromMimeType = (mimeType, mediaType) => {
         return 'gltf';
     return mediaType === 'image' ? 'png' : 'glb';
 };
+const contentTypeFromExtension = (extension) => {
+    switch (extension.toLowerCase()) {
+        case 'png':
+            return 'image/png';
+        case 'jpg':
+        case 'jpeg':
+            return 'image/jpeg';
+        case 'webp':
+            return 'image/webp';
+        case 'gif':
+            return 'image/gif';
+        case 'bmp':
+            return 'image/bmp';
+        case 'tif':
+        case 'tiff':
+            return 'image/tiff';
+        case 'glb':
+            return 'model/gltf-binary';
+        case 'gltf':
+            return 'model/gltf+json';
+        case 'obj':
+            return 'model/obj';
+        case 'fbx':
+            return 'application/fbx';
+        case 'stl':
+            return 'model/stl';
+        case 'ply':
+            return 'text/plain';
+        case 'usdz':
+            return 'model/vnd.usdz+zip';
+        case 'usd':
+        case 'usdc':
+            return 'model/vnd.usd';
+        default:
+            return undefined;
+    }
+};
+const isNonspecificContentType = (contentType) => {
+    const clean = contentType?.split(';')[0]?.trim().toLowerCase() ?? '';
+    return (clean === '' ||
+        clean === 'application/octet-stream' ||
+        clean === 'binary/octet-stream');
+};
+const inferContentTypeFromFileName = (fileName) => {
+    const extension = extname(fileName).replace(/^\./, '');
+    if (extension === '')
+        return undefined;
+    return contentTypeFromExtension(extension);
+};
+const resolveUploadContentType = (fileName, explicitContentType) => {
+    if (!isNonspecificContentType(explicitContentType)) {
+        return explicitContentType;
+    }
+    return inferContentTypeFromFileName(fileName);
+};
 const ensureFileNameExtension = (fileName, mediaType, mimeType) => {
     if (extname(fileName) !== '') {
         return fileName;
@@ -681,15 +754,19 @@ const uploadSourceDescriptor = async ({ descriptor, client, mediaType, }) => {
     if (descriptor.kind === 'source') {
         return descriptor.source;
     }
-    const file = descriptor.kind === 'file'
-        ? await readBlob(descriptor.path, descriptor.contentType)
-        : descriptor.blob;
     const fileName = descriptor.kind === 'file'
         ? basename(descriptor.path)
         : descriptor.fileName;
+    const fileNameWithExtension = ensureFileNameExtension(fileName, mediaType, descriptor.contentType);
+    const contentType = resolveUploadContentType(fileNameWithExtension, descriptor.contentType);
+    const file = descriptor.kind === 'file'
+        ? await readBlob(descriptor.path, contentType)
+        : isNonspecificContentType(descriptor.blob.type) && contentType != null
+            ? new Blob([descriptor.blob], { type: contentType })
+            : descriptor.blob;
     const upload = await client.v2.uploadFile({
         file,
-        fileName: ensureFileNameExtension(fileName, mediaType, descriptor.contentType),
+        fileName: fileNameWithExtension,
         mediaType,
     });
     return { fileRef: upload.fileRef };
@@ -1131,11 +1208,12 @@ const resolvePartExtractorFromMission = async (ctx, orderId, missionId) => {
         throw new Error('Could not infer the part extractor from the mission. Pass --part-extractor with one of: ' +
             partExtractorPublicNames);
     }
-    if (isInternalPartExtractorId(mission.agentVersion)) {
+    const publicName = publicPartExtractorName(mission.agentVersion);
+    if (publicName == null || publicName === 'Unknown') {
         throw new Error('Could not infer the public part extractor from the mission. Pass --part-extractor with one of: ' +
             partExtractorPublicNames);
     }
-    return resolvePartExtractorPublicName(mission.agentVersion);
+    return resolvePartExtractorApiValue(publicName);
 };
 const redactUrl = (value) => {
     try {
@@ -1444,7 +1522,7 @@ const commandProduction = async (subcommand, positionals, ctx) => {
         const partExtractorFlag = getPartExtractorFlag(ctx.flags);
         const agentVersion = partExtractorFlag == null
             ? await resolvePartExtractorFromMission(ctx, orderId, missionId)
-            : resolvePartExtractorPublicName(partExtractorFlag);
+            : resolvePartExtractorApiValue(partExtractorFlag);
         const executed = await ctx.client.v1.executeProduction({
             orderId,
             missionId,
@@ -1515,7 +1593,7 @@ const commandParts = async (subcommand, ctx) => {
             const partExtractorFlag = getPartExtractorFlag(ctx.flags);
             const agentVersion = partExtractorFlag == null
                 ? await resolvePartExtractorFromMission(ctx, orderId, missionId)
-                : resolvePartExtractorPublicName(partExtractorFlag);
+                : resolvePartExtractorApiValue(partExtractorFlag);
             const partExtractionMode = getFlag(ctx.flags, 'part-extraction-mode');
             if (partExtractionMode != null &&
                 partExtractionMode !== 'fast' &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assethub/cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Command line interface for AssetHub.",
   "type": "module",
   "bin": {