@caspertech/node-metaverse 0.7.50 → 0.7.52

package/dist/lib/LoginHandler.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoginHandler = void 0;
 const validator_1 = require("validator");
@@ -28,120 +19,119 @@ class LoginHandler {
         this.clientEvents = ce;
         this.options = options;
     }
-    Login(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const loginURI = new url_1.URL(params.url);
-            let secure = false;
-            if (loginURI.protocol !== null && loginURI.protocol.trim().toLowerCase() === 'https:') {
-                secure = true;
+    async Login(params) {
+        const loginURI = new url_1.URL(params.url);
+        let secure = false;
+        if (loginURI.protocol !== null && loginURI.protocol.trim().toLowerCase() === 'https:') {
+            secure = true;
+        }
+        let port = loginURI.port;
+        if (port === null) {
+            port = secure ? '443' : '80';
+        }
+        const secureClientOptions = {
+            host: loginURI.hostname || undefined,
+            port: parseInt(port, 10),
+            path: loginURI.pathname || undefined,
+            rejectUnauthorized: false,
+            timeout: 60000
+        };
+        const viewerDigest = 'ce50e500-e6f0-15ab-4b9d-0591afb91ffe';
+        const client = (secure) ? xmlrpc.createSecureClient(secureClientOptions) : xmlrpc.createClient(secureClientOptions);
+        const nameHash = Utils_1.Utils.SHA1String(params.firstName + params.lastName + viewerDigest);
+        const macAddress = [];
+        for (let i = 0; i < 12; i = i + 2) {
+            macAddress.push(nameHash.substring(i, i + 2));
+        }
+        let hardwareID = null;
+        const hardwareIDFile = path.resolve(__dirname, 'deviceToken.json');
+        try {
+            const hwID = await fs.promises.readFile(hardwareIDFile);
+            const data = JSON.parse(hwID.toString('utf-8'));
+            hardwareID = data.id0;
+        }
+        catch (_e) {
+        }
+        if (hardwareID === null || !validator_1.default.isUUID(String(hardwareID))) {
+            hardwareID = UUID_1.UUID.random().toString();
+            await fs.promises.writeFile(hardwareIDFile, JSON.stringify({ id0: hardwareID }));
+        }
+        const mfaToken = params.token ?? '';
+        const mfaHash = params.mfa_hash ?? '';
+        return new Promise((resolve, reject) => {
+            let password = params.password;
+            if (params.getHashedPassword) {
+                password = params.getHashedPassword();
             }
-            let port = loginURI.port;
-            if (port === null) {
-                port = secure ? '443' : '80';
+            let platform = '???';
+            switch (os.platform()) {
+                case 'darwin':
+                    platform = 'mac';
+                    break;
+                case 'linux':
+                    platform = 'lnx';
+                    break;
+                case 'win32':
+                    platform = 'win';
+                    break;
+                default:
+                    throw new Error('Unsupported platform');
             }
-            const secureClientOptions = {
-                host: loginURI.hostname || undefined,
-                port: parseInt(port, 10),
-                path: loginURI.pathname || undefined,
-                rejectUnauthorized: false,
-                timeout: 60000
-            };
-            const viewerDigest = 'ce50e500-e6f0-15ab-4b9d-0591afb91ffe';
-            const client = (secure) ? xmlrpc.createSecureClient(secureClientOptions) : xmlrpc.createClient(secureClientOptions);
-            const nameHash = Utils_1.Utils.SHA1String(params.firstName + params.lastName + viewerDigest);
-            const macAddress = [];
-            for (let i = 0; i < 12; i = i + 2) {
-                macAddress.push(nameHash.substring(i, i + 2));
-            }
-            let hardwareID = null;
-            const hardwareIDFile = path.resolve(__dirname, 'deviceToken.json');
-            try {
-                const hwID = yield fs.promises.readFile(hardwareIDFile);
-                const data = JSON.parse(hwID.toString('utf-8'));
-                hardwareID = data.id0;
-            }
-            catch (e) {
-            }
-            if (hardwareID === null || !validator_1.default.isUUID(String(hardwareID))) {
-                hardwareID = UUID_1.UUID.random().toString();
-                yield fs.promises.writeFile(hardwareIDFile, JSON.stringify({ id0: hardwareID }));
-            }
-            const mfaToken = (_a = params.token) !== null && _a !== void 0 ? _a : '';
-            const mfaHash = (_b = params.mfa_hash) !== null && _b !== void 0 ? _b : '';
-            return new Promise((resolve, reject) => {
-                let password = params.password;
-                if (params.getHashedPassword) {
-                    password = params.getHashedPassword();
+            const versions = version.split('.');
+            const major = versions.length > 0 ? versions[0] : '0';
+            const minor = versions.length > 1 ? versions[1] : '0';
+            const patch = versions.length > 2 ? versions[2] : '0';
+            let build = major.padStart(2, '0') + minor.padStart(2, '0') + patch.padStart(2, '0');
+            build = build.replace(/^0+/, '');
+            client.methodCall('login_to_simulator', [
+                {
+                    first: params.firstName,
+                    last: params.lastName,
+                    passwd: password,
+                    start: params.start,
+                    channel: 'libnmv',
+                    major,
+                    minor,
+                    patch,
+                    build,
+                    platform,
+                    version: version + '.' + build,
+                    token: mfaToken,
+                    mfa_hash: mfaHash,
+                    id0: Utils_1.Utils.MD5String(String(hardwareID)),
+                    mac: macAddress.join(':'),
+                    viewer_digest: viewerDigest,
+                    agree_to_tos: params.agreeToTOS,
+                    read_critical: params.readCritical,
+                    options: [
+                        'inventory-root',
+                        'inventory-skeleton',
+                        'inventory-lib-root',
+                        'inventory-lib-owner',
+                        'inventory-skel-lib',
+                        'gestures',
+                        'event_categories',
+                        'event_notifications',
+                        'classified_categories',
+                        'buddy-list',
+                        'ui-config',
+                        'login-flags',
+                        'global-textures'
+                    ]
                 }
-                let platform = '???';
-                switch (os.platform()) {
-                    case 'darwin':
-                        platform = 'mac';
-                        break;
-                    case 'linux':
-                        platform = 'lnx';
-                        break;
-                    case 'win32':
-                        platform = 'win';
-                        break;
+            ], (error, value) => {
+                if (error) {
+                    reject(error);
                 }
-                const versions = version.split('.');
-                const major = versions.length > 0 ? versions[0] : '0';
-                const minor = versions.length > 1 ? versions[1] : '0';
-                const patch = versions.length > 2 ? versions[2] : '0';
-                let build = major.padStart(2, '0') + minor.padStart(2, '0') + patch.padStart(2, '0');
-                build = build.replace(/^0+/, '');
-                client.methodCall('login_to_simulator', [
-                    {
-                        first: params.firstName,
-                        last: params.lastName,
-                        passwd: password,
-                        start: params.start,
-                        channel: 'libnmv',
-                        major,
-                        minor,
-                        patch,
-                        build,
-                        platform,
-                        version: version + '.' + build,
-                        token: mfaToken,
-                        mfa_hash: mfaHash,
-                        id0: Utils_1.Utils.MD5String(String(hardwareID)),
-                        mac: macAddress.join(':'),
-                        viewer_digest: viewerDigest,
-                        agree_to_tos: params.agreeToTOS,
-                        read_critical: params.readCritical,
-                        options: [
-                            'inventory-root',
-                            'inventory-skeleton',
-                            'inventory-lib-root',
-                            'inventory-lib-owner',
-                            'inventory-skel-lib',
-                            'gestures',
-                            'event_categories',
-                            'event_notifications',
-                            'classified_categories',
-                            'buddy-list',
-                            'ui-config',
-                            'login-flags',
-                            'global-textures'
-                        ]
-                    }
-                ], (error, value) => {
-                    if (error) {
-                        reject(error);
+                else {
+                    if (!value.login || value.login === 'false') {
+                        reject(new LoginError_1.LoginError(value));
                     }
                     else {
-                        if (!value['login'] || value['login'] === 'false') {
-                            reject(new LoginError_1.LoginError(value));
-                        }
-                        else {
-                            const response = new LoginResponse_1.LoginResponse(value, this.clientEvents, this.options);
-                            resolve(response);
-                        }
+                        const response = new LoginResponse_1.LoginResponse(value, this.clientEvents, this.options);
+                        resolve(response);
                     }
-                });
+                }
             });
         });
     }

package/dist/lib/LoginHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoginHandler.js","sourceRoot":"","sources":["../../lib/LoginHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LoginHandler.js","sourceRoot":"","sources":["../../lib/LoginHandler.ts"],"names":[],"mappings":"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"}

package/dist/lib/classes/Agent.d.ts

@@ -1,12 +1,9 @@
 import { UUID } from './UUID';
 import { Vector3 } from './Vector3';
 import { Inventory } from './Inventory';
-import { Wearable } from './Wearable';
-import { Region } from './Region';
-import { Packet } from './Packet';
-import { Quaternion } from './Quaternion';
-import { ClientEvents } from './ClientEvents';
-import * as Long from 'long';
+import type { Region } from './Region';
+import type { ClientEvents } from './ClientEvents';
+import type * as Long from 'long';
 import { ControlFlags } from '../enums/ControlFlags';
 import { Subject } from 'rxjs';
 import { InventoryFolder } from './InventoryFolder';
@@ -20,14 +17,6 @@ export declare class Agent {
     regionAccess: string;
     agentAccess: string;
     currentRegion: Region;
-    chatSessions: Map<string, {
-        agents: Map<string, {
-            hasVoice: boolean;
-            isModerator: boolean;
-        }>;
-        timeout?: NodeJS.Timeout;
-    }>;
-    controlFlags: ControlFlags;
     openID: {
         'token'?: string;
         'url'?: string;
@@ -41,13 +30,6 @@ export declare class Agent {
     uiFlags: {
         'allowFirstLife'?: boolean;
     };
-    headRotation: Quaternion;
-    bodyRotation: Quaternion;
-    cameraLookAt: Vector3;
-    cameraCenter: Vector3;
-    cameraLeftAxis: Vector3;
-    cameraUpAxis: Vector3;
-    cameraFar: number;
     maxGroups: number;
     agentFlags: number;
     startLocation: string;
@@ -58,38 +40,44 @@ export declare class Agent {
         'lookAt'?: Vector3;
     };
     snapshotConfigURL: string;
-    inventory: Inventory;
+    readonly inventory: Inventory;
     gestures: {
         assetID: UUID;
         itemID: UUID;
     }[];
-    agentAppearanceService: string;
-    wearables?: {
-        attachments: Wearable[];
-        serialNumber: number;
-    };
-    agentUpdateTimer: NodeJS.Timeout | null;
     estateManager: boolean;
     appearanceComplete: boolean;
-    appearanceCompleteEvent: Subject<void>;
-    private clientEvents;
-    private animSubscription?;
+    agentAppearanceService: string;
     onGroupChatExpired: Subject<UUID>;
+    cameraLookAt: Vector3;
+    cameraCenter: Vector3;
+    cameraLeftAxis: Vector3;
+    cameraUpAxis: Vector3;
+    cameraFar: number;
+    readonly appearanceCompleteEvent: Subject<void>;
+    private readonly headRotation;
+    private readonly bodyRotation;
+    private wearables?;
+    private agentUpdateTimer;
+    private controlFlags;
+    private readonly clientEvents;
+    private animSubscription?;
+    private readonly chatSessions;
     constructor(clientEvents: ClientEvents);
     updateLastMessage(groupID: UUID): void;
     setIsEstateManager(is: boolean): void;
     getSessionAgentCount(uuid: UUID): number;
     addChatSession(uuid: UUID, timeout: boolean): boolean;
-    private groupChatExpired;
+    groupChatExpired(groupID: UUID): void;
     hasChatSession(uuid: UUID): boolean;
     deleteChatSession(uuid: UUID): boolean;
     setCurrentRegion(region: Region): void;
     circuitActive(): void;
-    sendAgentUpdate(): void;
     shutdown(): void;
-    onMessage(packet: Packet): void;
-    getWearables(): Promise<InventoryFolder>;
     setInitialAppearance(): Promise<void>;
     setControlFlag(flag: ControlFlags): void;
     clearControlFlag(flag: ControlFlags): void;
+    getWearables(): Promise<InventoryFolder>;
+    sendAgentUpdate(): void;
+    private onMessage;
 }

package/dist/lib/classes/Agent.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Agent = void 0;
 const UUID_1 = require("./UUID");
@@ -31,30 +22,31 @@ const InventoryFolder_1 = require("./InventoryFolder");
 const BulkUpdateInventoryEvent_1 = require("../events/BulkUpdateInventoryEvent");
 const InventoryItem_1 = require("./InventoryItem");
 const InventoryLibrary_1 = require("../enums/InventoryLibrary");
+const AssetType_1 = require("../enums/AssetType");
 class Agent {
     constructor(clientEvents) {
         this.localID = 0;
         this.activeGroupID = UUID_1.UUID.zero();
-        this.chatSessions = new Map();
-        this.controlFlags = 0;
         this.openID = {};
         this.buddyList = [];
         this.uiFlags = {};
-        this.headRotation = Quaternion_1.Quaternion.getIdentity();
-        this.bodyRotation = Quaternion_1.Quaternion.getIdentity();
+        this.home = {};
+        this.gestures = [];
+        this.estateManager = false;
+        this.appearanceComplete = false;
+        this.onGroupChatExpired = new rxjs_1.Subject();
         this.cameraLookAt = new Vector3_1.Vector3([0.979546, 0.105575, -0.171303]);
         this.cameraCenter = new Vector3_1.Vector3([199.58, 203.95, 24.304]);
         this.cameraLeftAxis = new Vector3_1.Vector3([-1.0, 0.0, 0]);
         this.cameraUpAxis = new Vector3_1.Vector3([0.0, 0.0, 1.0]);
         this.cameraFar = 1;
-        this.home = {};
-        this.gestures = [];
-        this.agentUpdateTimer = null;
-        this.estateManager = false;
-        this.appearanceComplete = false;
         this.appearanceCompleteEvent = new rxjs_1.Subject();
-        this.onGroupChatExpired = new rxjs_1.Subject();
-        this.inventory = new Inventory_1.Inventory(clientEvents, this);
+        this.headRotation = Quaternion_1.Quaternion.getIdentity();
+        this.bodyRotation = Quaternion_1.Quaternion.getIdentity();
+        this.agentUpdateTimer = null;
+        this.controlFlags = 0;
+        this.chatSessions = new Map();
+        this.inventory = new Inventory_1.Inventory(this);
         this.clientEvents = clientEvents;
         this.clientEvents.onGroupChatAgentListUpdate.subscribe((event) => {
             const str = event.groupID.toString();
@@ -98,7 +90,7 @@ class Agent {
             return 0;
         }
         else {
-            return Object.keys(session.agents).length;
+            return session.agents.size;
         }
     }
     addChatSession(uuid, timeout) {
@@ -141,6 +133,88 @@ class Agent {
     circuitActive() {
         this.agentUpdateTimer = setInterval(this.sendAgentUpdate.bind(this), 1000);
     }
+    shutdown() {
+        if (this.agentUpdateTimer !== null) {
+            clearInterval(this.agentUpdateTimer);
+            this.agentUpdateTimer = null;
+        }
+    }
+    async setInitialAppearance() {
+        const circuit = this.currentRegion.circuit;
+        const wearablesRequest = new AgentWearablesRequest_1.AgentWearablesRequestMessage();
+        wearablesRequest.AgentData = {
+            AgentID: this.agentID,
+            SessionID: circuit.sessionID
+        };
+        circuit.sendMessage(wearablesRequest, PacketFlags_1.PacketFlags.Reliable);
+        const wearables = await circuit.waitForMessage(Message_1.Message.AgentWearablesUpdate, 30000);
+        if (!this.wearables || wearables.AgentData.SerialNum > this.wearables.serialNumber) {
+            this.wearables = {
+                serialNumber: wearables.AgentData.SerialNum,
+                attachments: []
+            };
+            for (const wearable of wearables.WearableData) {
+                if (this.wearables.attachments) {
+                    this.wearables.attachments.push({
+                        itemID: wearable.ItemID,
+                        assetID: wearable.AssetID,
+                        wearableType: wearable.WearableType
+                    });
+                }
+            }
+        }
+        const currentOutfitFolder = await this.getWearables();
+        const wornObjects = this.currentRegion.objects.getObjectsByParent(this.localID);
+        for (const item of currentOutfitFolder.items) {
+            if (item.type === AssetType_1.AssetType.Notecard) {
+                let found = false;
+                for (const obj of wornObjects) {
+                    if (obj.hasNameValueEntry('AttachItemID')) {
+                        if (item.itemID.toString() === obj.getNameValueEntry('AttachItemID')) {
+                            found = true;
+                        }
+                    }
+                }
+                if (!found) {
+                    const rsafi = new RezSingleAttachmentFromInv_1.RezSingleAttachmentFromInvMessage();
+                    rsafi.AgentData = {
+                        AgentID: this.agentID,
+                        SessionID: circuit.sessionID
+                    };
+                    rsafi.ObjectData = {
+                        ItemID: new UUID_1.UUID(item.itemID.toString()),
+                        OwnerID: this.agentID,
+                        AttachmentPt: 0x80 | AttachmentPoint_1.AttachmentPoint.Default,
+                        ItemFlags: item.flags,
+                        GroupMask: item.permissions.groupMask,
+                        EveryoneMask: item.permissions.everyoneMask,
+                        NextOwnerMask: item.permissions.nextOwnerMask,
+                        Name: Utils_1.Utils.StringToBuffer(item.name),
+                        Description: Utils_1.Utils.StringToBuffer(item.description)
+                    };
+                    circuit.sendMessage(rsafi, PacketFlags_1.PacketFlags.Reliable);
+                }
+            }
+        }
+        this.appearanceComplete = true;
+        this.appearanceCompleteEvent.next();
+    }
+    setControlFlag(flag) {
+        this.controlFlags = this.controlFlags | flag;
+    }
+    clearControlFlag(flag) {
+        this.controlFlags = this.controlFlags & ~flag;
+    }
+    async getWearables() {
+        for (const uuid of this.inventory.main.skeleton.keys()) {
+            const folder = this.inventory.main.skeleton.get(uuid);
+            if (folder && folder.typeDefault === FolderType_1.FolderType.CurrentOutfit) {
+                await folder.populate(false);
+                return folder;
+            }
+        }
+        throw new Error('Unable to get wearables from inventory');
+    }
     sendAgentUpdate() {
         if (!this.currentRegion) {
             return;
@@ -163,12 +237,6 @@ class Agent {
         };
         circuit.sendMessage(agentUpdate, 0);
     }
-    shutdown() {
-        if (this.agentUpdateTimer !== null) {
-            clearInterval(this.agentUpdateTimer);
-            this.agentUpdateTimer = null;
-        }
-    }
     onMessage(packet) {
         if (packet.message.id === Message_1.Message.AgentDataUpdate) {
             const msg = packet.message;
@@ -179,7 +247,7 @@ class Agent {
             const evt = new BulkUpdateInventoryEvent_1.BulkUpdateInventoryEvent();
             for (const newItem of msg.ItemData) {
                 const folder = this.inventory.findFolder(newItem.FolderID);
-                const item = new InventoryItem_1.InventoryItem(folder || undefined, this);
+                const item = new InventoryItem_1.InventoryItem(folder ?? undefined, this);
                 item.assetID = newItem.AssetID;
                 item.inventoryType = newItem.InvType;
                 item.name = Utils_1.Utils.BufferToStringSimple(newItem.Name);
@@ -232,86 +300,6 @@ class Agent {
             }
         }
     }
-    getWearables() {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const uuid of Object.keys(this.inventory.main.skeleton)) {
-                const folder = this.inventory.main.skeleton[uuid];
-                if (folder.typeDefault === FolderType_1.FolderType.CurrentOutfit) {
-                    yield folder.populate(false);
-                    return folder;
-                }
-            }
-            throw new Error('Unable to get wearables from inventory');
-        });
-    }
-    setInitialAppearance() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const circuit = this.currentRegion.circuit;
-            const wearablesRequest = new AgentWearablesRequest_1.AgentWearablesRequestMessage();
-            wearablesRequest.AgentData = {
-                AgentID: this.agentID,
-                SessionID: circuit.sessionID
-            };
-            circuit.sendMessage(wearablesRequest, PacketFlags_1.PacketFlags.Reliable);
-            const wearables = yield circuit.waitForMessage(Message_1.Message.AgentWearablesUpdate, 10000);
-            if (!this.wearables || wearables.AgentData.SerialNum > this.wearables.serialNumber) {
-                this.wearables = {
-                    serialNumber: wearables.AgentData.SerialNum,
-                    attachments: []
-                };
-                for (const wearable of wearables.WearableData) {
-                    if (this.wearables && this.wearables.attachments) {
-                        this.wearables.attachments.push({
-                            itemID: wearable.ItemID,
-                            assetID: wearable.AssetID,
-                            wearableType: wearable.WearableType
-                        });
-                    }
-                }
-            }
-            const currentOutfitFolder = yield this.getWearables();
-            const wornObjects = this.currentRegion.objects.getObjectsByParent(this.localID);
-            for (const item of currentOutfitFolder.items) {
-                if (item.type === 6) {
-                    let found = false;
-                    for (const obj of wornObjects) {
-                        if (obj.hasNameValueEntry('AttachItemID')) {
-                            if (item.itemID.toString() === obj.getNameValueEntry('AttachItemID')) {
-                                found = true;
-                            }
-                        }
-                    }
-                    if (!found) {
-                        const rsafi = new RezSingleAttachmentFromInv_1.RezSingleAttachmentFromInvMessage();
-                        rsafi.AgentData = {
-                            AgentID: this.agentID,
-                            SessionID: circuit.sessionID
-                        };
-                        rsafi.ObjectData = {
-                            ItemID: new UUID_1.UUID(item.itemID.toString()),
-                            OwnerID: this.agentID,
-                            AttachmentPt: 0x80 | AttachmentPoint_1.AttachmentPoint.Default,
-                            ItemFlags: item.flags,
-                            GroupMask: item.permissions.groupMask,
-                            EveryoneMask: item.permissions.everyoneMask,
-                            NextOwnerMask: item.permissions.nextOwnerMask,
-                            Name: Utils_1.Utils.StringToBuffer(item.name),
-                            Description: Utils_1.Utils.StringToBuffer(item.description)
-                        };
-                        circuit.sendMessage(rsafi, PacketFlags_1.PacketFlags.Reliable);
-                    }
-                }
-            }
-            this.appearanceComplete = true;
-            this.appearanceCompleteEvent.next();
-        });
-    }
-    setControlFlag(flag) {
-        this.controlFlags = this.controlFlags | flag;
-    }
-    clearControlFlag(flag) {
-        this.controlFlags = this.controlFlags & ~flag;
-    }
 }
 exports.Agent = Agent;
 //# sourceMappingURL=Agent.js.map