Extensive work on building, wearables, assets, inventory, attachments, serialization, etc.
Resolves #36
This commit is contained in:
Casper Warden
@@ -6,6 +6,22 @@ import * as LLSD from '@caspertech/llsd';
|
||||
import { InventorySortOrder } from '../enums/InventorySortOrder';
|
||||
import { Agent } from './Agent';
|
||||
import { FolderType } from '../enums/FolderType';
|
||||
import { CreateInventoryFolderMessage } from './messages/CreateInventoryFolder';
|
||||
import { Utils } from './Utils';
|
||||
import { PacketFlags } from '../enums/PacketFlags';
|
||||
import { Message } from '../enums/Message';
|
||||
import { FilterResponse } from '../enums/FilterResponse';
|
||||
import { UpdateCreateInventoryItemMessage } from './messages/UpdateCreateInventoryItem';
|
||||
import { LLMesh } from '..';
|
||||
import { CreateInventoryItemMessage } from './messages/CreateInventoryItem';
|
||||
import { WearableType } from '../enums/WearableType';
|
||||
import { PermissionMask } from '../enums/PermissionMask';
|
||||
import { AssetType } from '../enums/AssetType';
|
||||
import { LLWearable } from './LLWearable';
|
||||
import { InventoryType } from '../enums/InventoryType';
|
||||
import { AssetUploadRequestMessage } from './messages/AssetUploadRequest';
|
||||
import { RequestXferMessage } from './messages/RequestXfer';
|
||||
import { Logger } from './Logger';
|
||||
|
||||
export class InventoryFolder
|
||||
{
|
||||
@@ -15,9 +31,12 @@ export class InventoryFolder
|
||||
folderID: UUID;
|
||||
parentID: UUID;
|
||||
items: InventoryItem[] = [];
|
||||
folders: InventoryFolder[] = [];
|
||||
cacheDir: string;
|
||||
agent: Agent;
|
||||
|
||||
private callbackID = 1;
|
||||
|
||||
private inventoryBase: {
|
||||
skeleton: {[key: string]: InventoryFolder},
|
||||
root?: UUID
|
||||
@@ -57,6 +76,57 @@ export class InventoryFolder
|
||||
return children;
|
||||
}
|
||||
|
||||
async createFolder(name: string, type: FolderType)
|
||||
{
|
||||
const msg = new CreateInventoryFolderMessage();
|
||||
msg.AgentData = {
|
||||
AgentID: this.agent.agentID,
|
||||
SessionID: this.agent.currentRegion.circuit.sessionID
|
||||
};
|
||||
msg.FolderData = {
|
||||
FolderID: UUID.random(),
|
||||
ParentID: this.folderID,
|
||||
Type: type,
|
||||
Name: Utils.StringToBuffer(name),
|
||||
};
|
||||
const ack = this.agent.currentRegion.circuit.sendMessage(msg, PacketFlags.Reliable);
|
||||
await this.agent.currentRegion.circuit.waitForAck(ack, 10000);
|
||||
|
||||
const requestFolder = {
|
||||
folder_id: new LLSD.UUID(this.folderID),
|
||||
owner_id: new LLSD.UUID(this.agent.agentID),
|
||||
fetch_folders: true,
|
||||
fetch_items: false,
|
||||
sort_order: InventorySortOrder.ByName
|
||||
};
|
||||
const requestedFolders = {
|
||||
'folders': [
|
||||
requestFolder
|
||||
]
|
||||
};
|
||||
|
||||
const folderContents: any = await this.agent.currentRegion.caps.capsPostXML('FetchInventoryDescendents2', requestedFolders);
|
||||
if (folderContents['folders'] && folderContents['folders'][0] && folderContents['folders'][0]['categories'] && folderContents['folders'][0]['categories'].length > 0)
|
||||
{
|
||||
for (const folder of folderContents['folders'][0]['categories'])
|
||||
{
|
||||
const foundFolderID = new UUID(folder['folder_id'].toString());
|
||||
if (foundFolderID.equals(msg.FolderData.FolderID))
|
||||
{
|
||||
const newFolder = new InventoryFolder(this.agent.inventory.main, this.agent);
|
||||
newFolder.typeDefault = parseInt(folder['type_default'], 10);
|
||||
newFolder.version = parseInt(folder['version'], 10);
|
||||
newFolder.name = String(folder['name']);
|
||||
newFolder.folderID = new UUID(folder['folder_id']);
|
||||
newFolder.parentID = new UUID(folder['parent_id']);
|
||||
this.folders.push(newFolder);
|
||||
return newFolder;
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new Error('Failed to create inventory folder');
|
||||
}
|
||||
|
||||
private saveCache(): Promise<void>
|
||||
{
|
||||
return new Promise((resolve, reject) =>
|
||||
@@ -111,10 +181,7 @@ export class InventoryFolder
|
||||
item.permissions.owner = new UUID(item.permissions.owner.mUUID);
|
||||
item.permissions.creator = new UUID(item.permissions.creator.mUUID);
|
||||
item.permissions.group = new UUID(item.permissions.group.mUUID);
|
||||
this.addItem(item).catch((error) =>
|
||||
{
|
||||
console.error(error);
|
||||
});
|
||||
this.addItem(item, false);
|
||||
}
|
||||
resolve();
|
||||
}
|
||||
@@ -167,8 +234,83 @@ export class InventoryFolder
|
||||
}
|
||||
}
|
||||
|
||||
populate()
|
||||
private populateInternal(): Promise<void>
|
||||
{
|
||||
return new Promise<void>((resolve, reject) =>
|
||||
{
|
||||
const requestFolder = {
|
||||
folder_id: new LLSD.UUID(this.folderID),
|
||||
owner_id: new LLSD.UUID(this.agent.agentID),
|
||||
fetch_folders: true,
|
||||
fetch_items: true,
|
||||
sort_order: InventorySortOrder.ByName
|
||||
};
|
||||
const requestedFolders = {
|
||||
'folders': [
|
||||
requestFolder
|
||||
]
|
||||
};
|
||||
this.agent.currentRegion.caps.capsPostXML('FetchInventoryDescendents2', requestedFolders).then((folderContents: any) =>
|
||||
{
|
||||
if (folderContents['folders'] && folderContents['folders'][0] && folderContents['folders'][0]['items'])
|
||||
{
|
||||
this.version = folderContents['folders'][0]['version'];
|
||||
this.items = [];
|
||||
for (const item of folderContents['folders'][0]['items'])
|
||||
{
|
||||
const invItem = new InventoryItem(this, this.agent);
|
||||
invItem.assetID = new UUID(item['asset_id'].toString());
|
||||
invItem.inventoryType = item['inv_type'];
|
||||
invItem.name = item['name'];
|
||||
invItem.salePrice = item['sale_info']['sale_price'];
|
||||
invItem.saleType = item['sale_info']['sale_type'];
|
||||
invItem.created = new Date(item['created_at'] * 1000);
|
||||
invItem.parentID = new UUID(item['parent_id'].toString());
|
||||
invItem.flags = item['flags'];
|
||||
invItem.itemID = new UUID(item['item_id'].toString());
|
||||
invItem.description = item['desc'];
|
||||
invItem.type = item['type'];
|
||||
if (item['permissions']['last_owner_id'] === undefined)
|
||||
{
|
||||
// TODO: OpenSim Glitch;
|
||||
item['permissions']['last_owner_id'] = item['permissions']['owner_id'];
|
||||
}
|
||||
invItem.permissions = {
|
||||
baseMask: item['permissions']['base_mask'],
|
||||
groupMask: item['permissions']['group_mask'],
|
||||
nextOwnerMask: item['permissions']['next_owner_mask'],
|
||||
ownerMask: item['permissions']['owner_mask'],
|
||||
everyoneMask: item['permissions']['everyone_mask'],
|
||||
lastOwner: new UUID(item['permissions']['last_owner_id'].toString()),
|
||||
owner: new UUID(item['permissions']['owner_id'].toString()),
|
||||
creator: new UUID(item['permissions']['creator_id'].toString()),
|
||||
group: new UUID(item['permissions']['group_id'].toString())
|
||||
};
|
||||
this.addItem(invItem, false);
|
||||
}
|
||||
this.saveCache().then(() =>
|
||||
{
|
||||
resolve();
|
||||
}).catch(() =>
|
||||
{
|
||||
// Resolve anyway
|
||||
resolve();
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
populate(useCached = true)
|
||||
{
|
||||
if (!useCached)
|
||||
{
|
||||
return this.populateInternal();
|
||||
}
|
||||
return new Promise((resolve, reject) =>
|
||||
{
|
||||
this.loadCache().then(() =>
|
||||
@@ -176,71 +318,514 @@ export class InventoryFolder
|
||||
resolve();
|
||||
}).catch((err) =>
|
||||
{
|
||||
const requestFolder = {
|
||||
folder_id: new LLSD.UUID(this.folderID),
|
||||
owner_id: new LLSD.UUID(this.agent.agentID),
|
||||
fetch_folders: true,
|
||||
fetch_items: true,
|
||||
sort_order: InventorySortOrder.ByName
|
||||
};
|
||||
const requestedFolders = {
|
||||
'folders': [
|
||||
requestFolder
|
||||
]
|
||||
};
|
||||
this.agent.currentRegion.caps.capsPostXML('FetchInventoryDescendents2', requestedFolders).then((folderContents: any) =>
|
||||
this.populateInternal().then(() =>
|
||||
{
|
||||
if (folderContents['folders'] && folderContents['folders'][0] && folderContents['folders'][0]['items'])
|
||||
{
|
||||
this.version = folderContents['folders'][0]['version'];
|
||||
this.items = [];
|
||||
for (const item of folderContents['folders'][0]['items'])
|
||||
{
|
||||
const invItem = new InventoryItem();
|
||||
invItem.assetID = new UUID(item['asset_id'].toString());
|
||||
invItem.inventoryType = item['inv_type'];
|
||||
invItem.name = item['name'];
|
||||
invItem.salePrice = item['sale_info']['sale_price'];
|
||||
invItem.saleType = item['sale_info']['sale_type'];
|
||||
invItem.created = new Date(item['created_at'] * 1000);
|
||||
invItem.parentID = new UUID(item['parent_id'].toString());
|
||||
invItem.flags = item['flags'];
|
||||
invItem.itemID = new UUID(item['item_id'].toString());
|
||||
invItem.description = item['desc'];
|
||||
invItem.type = item['type'];
|
||||
if (item['permissions']['last_owner_id'] === undefined)
|
||||
{
|
||||
// TODO: OpenSim Glitch;
|
||||
item['permissions']['last_owner_id'] = item['permissions']['owner_id'];
|
||||
}
|
||||
invItem.permissions = {
|
||||
baseMask: item['permissions']['base_mask'],
|
||||
groupMask: item['permissions']['group_mask'],
|
||||
nextOwnerMask: item['permissions']['next_owner_mask'],
|
||||
ownerMask: item['permissions']['owner_mask'],
|
||||
everyoneMask: item['permissions']['everyone_mask'],
|
||||
lastOwner: new UUID(item['permissions']['last_owner_id'].toString()),
|
||||
owner: new UUID(item['permissions']['owner_id'].toString()),
|
||||
creator: new UUID(item['permissions']['creator_id'].toString()),
|
||||
group: new UUID(item['permissions']['group_id'].toString())
|
||||
};
|
||||
this.addItem(invItem);
|
||||
}
|
||||
this.saveCache().then(() =>
|
||||
{
|
||||
resolve();
|
||||
}).catch(() =>
|
||||
{
|
||||
// Resolve anyway
|
||||
resolve();
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
resolve();
|
||||
}
|
||||
resolve();
|
||||
}).catch((erro: Error) =>
|
||||
{
|
||||
reject(erro);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private uploadInventoryAssetLegacy(assetType: AssetType, inventoryType: InventoryType, data: Buffer, name: string, description: string): Promise<UUID>
|
||||
{
|
||||
return new Promise<UUID>(async (resolve, reject) =>
|
||||
{
|
||||
// Send an AssetUploadRequest and a CreateInventoryRequest simultaneously
|
||||
const msg = new AssetUploadRequestMessage();
|
||||
const transactionID = UUID.random();
|
||||
msg.AssetBlock = {
|
||||
StoreLocal: false,
|
||||
Type: assetType,
|
||||
Tempfile: false,
|
||||
TransactionID: transactionID,
|
||||
AssetData: Buffer.allocUnsafe(0)
|
||||
};
|
||||
|
||||
const callbackID = ++this.callbackID;
|
||||
|
||||
|
||||
const createMsg = new CreateInventoryItemMessage();
|
||||
|
||||
let wearableType = WearableType.Shape;
|
||||
if (inventoryType === InventoryType.Wearable)
|
||||
{
|
||||
const wearable = new LLWearable(data.toString('utf-8'));
|
||||
wearableType = wearable.type;
|
||||
}
|
||||
|
||||
createMsg.AgentData = {
|
||||
AgentID: this.agent.agentID,
|
||||
SessionID: this.agent.currentRegion.circuit.sessionID
|
||||
};
|
||||
createMsg.InventoryBlock = {
|
||||
CallbackID: callbackID,
|
||||
FolderID: this.folderID,
|
||||
TransactionID: transactionID,
|
||||
NextOwnerMask: (1 << 13) | (1 << 14) | (1 << 15) | (1 << 19),
|
||||
Type: assetType,
|
||||
InvType: inventoryType,
|
||||
WearableType: wearableType,
|
||||
Name: Utils.StringToBuffer(name),
|
||||
Description: Utils.StringToBuffer(description)
|
||||
};
|
||||
|
||||
|
||||
if (data.length + 100 < 1200)
|
||||
{
|
||||
msg.AssetBlock.AssetData = data;
|
||||
this.agent.currentRegion.circuit.sendMessage(msg, PacketFlags.Reliable);
|
||||
this.agent.currentRegion.circuit.sendMessage(createMsg, PacketFlags.Reliable);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.agent.currentRegion.circuit.sendMessage(msg, PacketFlags.Reliable);
|
||||
this.agent.currentRegion.circuit.sendMessage(createMsg, PacketFlags.Reliable);
|
||||
this.agent.currentRegion.circuit.waitForMessage<RequestXferMessage>(Message.RequestXfer, 10000).then((result: RequestXferMessage) =>
|
||||
{
|
||||
this.agent.currentRegion.circuit.XferFileUp(result.XferID.ID, data).then(() =>
|
||||
{
|
||||
console.log('Xfer finished');
|
||||
resolve();
|
||||
}).catch((err: Error) =>
|
||||
{
|
||||
console.error('Error with transfer');
|
||||
console.error(err);
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
}
|
||||
this.agent.currentRegion.circuit.waitForMessage<UpdateCreateInventoryItemMessage>(Message.UpdateCreateInventoryItem, 10000, (message: UpdateCreateInventoryItemMessage) =>
|
||||
{
|
||||
if (message.InventoryData[0].CallbackID === callbackID)
|
||||
{
|
||||
return FilterResponse.Finish;
|
||||
}
|
||||
else
|
||||
{
|
||||
return FilterResponse.NoMatch;
|
||||
}
|
||||
}).then((result: UpdateCreateInventoryItemMessage) =>
|
||||
{
|
||||
if (!result.InventoryData || result.InventoryData.length < 1)
|
||||
{
|
||||
reject('Failed to create inventory item for wearable');
|
||||
}
|
||||
resolve(result.InventoryData[0].ItemID);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private uploadInventoryItem(assetType: AssetType, inventoryType: InventoryType, data: Buffer, name: string, description: string): Promise<UUID>
|
||||
{
|
||||
return new Promise<UUID>((resolve, reject) =>
|
||||
{
|
||||
const wearableType = WearableType.Shape;
|
||||
|
||||
const transactionID = UUID.zero();
|
||||
const callbackID = ++this.callbackID;
|
||||
const msg = new CreateInventoryItemMessage();
|
||||
msg.AgentData = {
|
||||
AgentID: this.agent.agentID,
|
||||
SessionID: this.agent.currentRegion.circuit.sessionID
|
||||
};
|
||||
msg.InventoryBlock = {
|
||||
CallbackID: callbackID,
|
||||
FolderID: this.folderID,
|
||||
TransactionID: transactionID,
|
||||
NextOwnerMask: (1 << 13) | (1 << 14) | (1 << 15) | (1 << 19),
|
||||
Type: assetType,
|
||||
InvType: inventoryType,
|
||||
WearableType: wearableType,
|
||||
Name: Utils.StringToBuffer(name),
|
||||
Description: Utils.StringToBuffer(description)
|
||||
};
|
||||
this.agent.currentRegion.circuit.waitForMessage<UpdateCreateInventoryItemMessage>(Message.UpdateCreateInventoryItem, 10000, (message: UpdateCreateInventoryItemMessage) =>
|
||||
{
|
||||
if (message.InventoryData[0].CallbackID === callbackID)
|
||||
{
|
||||
return FilterResponse.Finish;
|
||||
}
|
||||
else
|
||||
{
|
||||
return FilterResponse.NoMatch;
|
||||
}
|
||||
}).then((createInventoryMsg: UpdateCreateInventoryItemMessage) =>
|
||||
{
|
||||
switch (inventoryType)
|
||||
{
|
||||
case InventoryType.Notecard:
|
||||
{
|
||||
this.agent.currentRegion.caps.capsPostXML('UpdateNotecardAgentInventory', {
|
||||
'item_id': new LLSD.UUID(createInventoryMsg.InventoryData[0].ItemID.toString()),
|
||||
}).then((result: any) =>
|
||||
{
|
||||
if (result['uploader'])
|
||||
{
|
||||
const uploader = result['uploader'];
|
||||
this.agent.currentRegion.caps.capsRequestUpload(uploader, data).then((uploadResult: any) =>
|
||||
{
|
||||
if (uploadResult['state'] && uploadResult['state'] === 'complete')
|
||||
{
|
||||
const itemID: UUID = createInventoryMsg.InventoryData[0].ItemID;
|
||||
resolve(itemID);
|
||||
}
|
||||
else
|
||||
{
|
||||
reject(new Error('Asset upload failed'))
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
reject(new Error('Invalid response when attempting to request upload URL for notecard'));
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
break;
|
||||
}
|
||||
case InventoryType.Gesture:
|
||||
{
|
||||
this.agent.currentRegion.caps.isCapAvailable('UpdateGestureAgentInventory').then((available) =>
|
||||
{
|
||||
if (available)
|
||||
{
|
||||
this.agent.currentRegion.caps.capsPostXML('UpdateGestureAgentInventory', {
|
||||
'item_id': new LLSD.UUID(createInventoryMsg.InventoryData[0].ItemID.toString()),
|
||||
}).then((result: any) =>
|
||||
{
|
||||
if (result['uploader'])
|
||||
{
|
||||
const uploader = result['uploader'];
|
||||
this.agent.currentRegion.caps.capsRequestUpload(uploader, data).then((uploadResult: any) =>
|
||||
{
|
||||
if (uploadResult['state'] && uploadResult['state'] === 'complete')
|
||||
{
|
||||
const itemID: UUID = createInventoryMsg.InventoryData[0].ItemID;
|
||||
resolve(itemID);
|
||||
}
|
||||
else
|
||||
{
|
||||
reject(new Error('Asset upload failed'))
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
reject(new Error('Invalid response when attempting to request upload URL for notecard'));
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
this.uploadInventoryAssetLegacy(assetType, inventoryType, data, name, description).then((invItemID: UUID) =>
|
||||
{
|
||||
resolve(invItemID);
|
||||
}).catch((err: Error) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}
|
||||
});
|
||||
break;
|
||||
}
|
||||
case InventoryType.Script:
|
||||
{
|
||||
this.agent.currentRegion.caps.capsPostXML('UpdateScriptAgent', {
|
||||
'item_id': new LLSD.UUID(createInventoryMsg.InventoryData[0].ItemID.toString()),
|
||||
'target': 'mono'
|
||||
}).then((result: any) =>
|
||||
{
|
||||
if (result['uploader'])
|
||||
{
|
||||
const uploader = result['uploader'];
|
||||
this.agent.currentRegion.caps.capsRequestUpload(uploader, data).then((uploadResult: any) =>
|
||||
{
|
||||
if (uploadResult['state'] && uploadResult['state'] === 'complete')
|
||||
{
|
||||
const itemID: UUID = createInventoryMsg.InventoryData[0].ItemID;
|
||||
resolve(itemID);
|
||||
}
|
||||
else
|
||||
{
|
||||
reject(new Error('Asset upload failed'))
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
reject(new Error('Invalid response when attempting to request upload URL for notecard'));
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
reject(new Error('Currently unsupported CreateInventoryType: ' + inventoryType));
|
||||
}
|
||||
}
|
||||
}).catch(() =>
|
||||
{
|
||||
reject(new Error('Timed out waiting for UpdateCreateInventoryItem'));
|
||||
});
|
||||
this.agent.currentRegion.circuit.sendMessage(msg, PacketFlags.Reliable);
|
||||
});
|
||||
}
|
||||
|
||||
uploadAsset(type: AssetType, inventoryType: InventoryType, data: Buffer, name: string, description: string): Promise<InventoryItem>
|
||||
{
|
||||
return new Promise<InventoryItem>((resolve, reject) =>
|
||||
{
|
||||
switch (inventoryType)
|
||||
{
|
||||
case InventoryType.Wearable:
|
||||
// Wearables have to be uploaded using the legacy method and then created
|
||||
this.uploadInventoryAssetLegacy(type, inventoryType, data, name, description).then((invItemID: UUID) =>
|
||||
{
|
||||
this.agent.inventory.fetchInventoryItem(invItemID).then((item: InventoryItem | null) =>
|
||||
{
|
||||
if (item === null)
|
||||
{
|
||||
reject(new Error('Unable to get inventory item'));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.addItem(item, false).then(() =>
|
||||
{
|
||||
resolve(item);
|
||||
});
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
return;
|
||||
case InventoryType.Landmark:
|
||||
case InventoryType.Notecard:
|
||||
case InventoryType.Gesture:
|
||||
case InventoryType.Script:
|
||||
// These types must be created first and then modified
|
||||
this.uploadInventoryItem(type, inventoryType, data, name, description).then((invItemID: UUID) =>
|
||||
{
|
||||
this.agent.inventory.fetchInventoryItem(invItemID).then((item: InventoryItem | null) =>
|
||||
{
|
||||
if (item === null)
|
||||
{
|
||||
reject(new Error('Unable to get inventory item'));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.addItem(item, false).then(() =>
|
||||
{
|
||||
resolve(item);
|
||||
});
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
return;
|
||||
}
|
||||
Logger.Info('[' + name + ']');
|
||||
const httpType = Utils.AssetTypeToHTTPAssetType(type);
|
||||
this.agent.currentRegion.caps.capsPostXML('NewFileAgentInventory', {
|
||||
'folder_id': new LLSD.UUID(this.folderID.toString()),
|
||||
'asset_type': httpType,
|
||||
'inventory_type': Utils.HTTPAssetTypeToCapInventoryType(httpType),
|
||||
'name': name,
|
||||
'description': description,
|
||||
'everyone_mask': PermissionMask.All,
|
||||
'group_mask': PermissionMask.All,
|
||||
'next_owner_mask': PermissionMask.All,
|
||||
'expected_upload_cost': 0
|
||||
}).then((response: any) =>
|
||||
{
|
||||
if (response['state'] === 'upload')
|
||||
{
|
||||
const uploadURL = response['uploader'];
|
||||
this.agent.currentRegion.caps.capsRequestUpload(uploadURL, data).then((responseUpload: any) =>
|
||||
{
|
||||
if (responseUpload['new_inventory_item'] !== undefined)
|
||||
{
|
||||
const invItemID = new UUID(responseUpload['new_inventory_item'].toString());
|
||||
this.agent.inventory.fetchInventoryItem(invItemID).then((item: InventoryItem | null) =>
|
||||
{
|
||||
if (item === null)
|
||||
{
|
||||
reject(new Error('Unable to get inventory item'));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.addItem(item, false).then(() =>
|
||||
{
|
||||
resolve(item);
|
||||
});
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
reject(err);
|
||||
});
|
||||
}
|
||||
else if (response['error'])
|
||||
{
|
||||
reject(response['error']['message']);
|
||||
}
|
||||
else
|
||||
{
|
||||
reject('Unable to upload asset');
|
||||
}
|
||||
}).catch((err) =>
|
||||
{
|
||||
console.log('Got err');
|
||||
console.log(err);
|
||||
reject(err);
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
checkCopyright(creatorID: UUID)
|
||||
{
|
||||
if (!creatorID.equals(this.agent.agentID) && !creatorID.isZero())
|
||||
{
|
||||
throw new Error('Unable to upload - copyright violation');
|
||||
}
|
||||
}
|
||||
|
||||
findFolder(id: UUID): InventoryFolder | null
|
||||
{
|
||||
for (const folder of this.folders)
|
||||
{
|
||||
if (folder.folderID.equals(id))
|
||||
{
|
||||
return folder;
|
||||
}
|
||||
const result = folder.findFolder(id);
|
||||
if (result !== null)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async uploadMesh(name: string, description: string, mesh: Buffer, confirmCostCallback: (cost: number) => Promise<boolean>): Promise<InventoryItem>
|
||||
{
|
||||
const decodedMesh = await LLMesh.from(mesh);
|
||||
|
||||
this.checkCopyright(decodedMesh.creatorID);
|
||||
|
||||
const faces = [];
|
||||
const faceCount = decodedMesh.lodLevels['high_lod'].length;
|
||||
for (let x = 0; x < faceCount; x++)
|
||||
{
|
||||
faces.push({
|
||||
'diffuse_color': [1.000000000000001, 1.000000000000001, 1.000000000000001, 1.000000000000001],
|
||||
'fullbright': false
|
||||
});
|
||||
}
|
||||
const prim = {
|
||||
'face_list': faces,
|
||||
'position': [0.000000000000001, 0.000000000000001, 0.000000000000001],
|
||||
'rotation': [0.000000000000001, 0.000000000000001, 0.000000000000001, 1.000000000000001],
|
||||
'scale': [2.000000000000001, 2.000000000000001, 2.000000000000001],
|
||||
'material': 3,
|
||||
'physics_shape_type': 2,
|
||||
'mesh': 0
|
||||
};
|
||||
const assetResources = {
|
||||
'instance_list': [prim],
|
||||
'mesh_list': [new LLSD.Binary(Array.from(mesh))],
|
||||
'texture_list': [],
|
||||
'metric': 'MUT_Unspecified'
|
||||
};
|
||||
const uploadMap = {
|
||||
'name': String(name),
|
||||
'description': String(description),
|
||||
'asset_resources': assetResources,
|
||||
'asset_type': 'mesh',
|
||||
'inventory_type': 'object',
|
||||
'folder_id': new LLSD.UUID(this.folderID.toString()),
|
||||
'texture_folder_id': new LLSD.UUID(await this.agent.inventory.findFolderForType(FolderType.Texture)),
|
||||
'everyone_mask': PermissionMask.All,
|
||||
'group_mask': PermissionMask.All,
|
||||
'next_owner_mask': PermissionMask.All
|
||||
};
|
||||
let result;
|
||||
try
|
||||
{
|
||||
result = await this.agent.currentRegion.caps.capsPostXML('NewFileAgentInventory', uploadMap);
|
||||
}
|
||||
catch (error)
|
||||
{
|
||||
console.error(error);
|
||||
}
|
||||
if (result['state'] === 'upload' && result['upload_price'] !== undefined)
|
||||
{
|
||||
const cost = result['upload_price'];
|
||||
if (await confirmCostCallback(cost))
|
||||
{
|
||||
const uploader = result['uploader'];
|
||||
const uploadResult = await this.agent.currentRegion.caps.capsPerformXMLPost(uploader, assetResources);
|
||||
if (uploadResult['new_inventory_item'] && uploadResult['new_asset'])
|
||||
{
|
||||
const inventoryItem = new UUID(uploadResult['new_inventory_item'].toString());
|
||||
const item = await this.agent.inventory.fetchInventoryItem(inventoryItem);
|
||||
if (item !== null)
|
||||
{
|
||||
item.assetID = new UUID(uploadResult['new_asset'].toString());
|
||||
await this.addItem(item, false);
|
||||
return item;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Error('Unable to locate inventory item following mesh upload');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
throw new Error('Upload failed - no new inventory item returned');
|
||||
}
|
||||
}
|
||||
throw new Error('Upload cost declined')
|
||||
}
|
||||
else
|
||||
{
|
||||
console.log(result);
|
||||
console.log(JSON.stringify(result.error));
|
||||
throw new Error('Upload failed');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user