@tak-ps/node-tak 12.23.1 → 12.25.0

package/dist/test/mission-layer.test.js

@@ -0,0 +1,105 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { Readable } from 'node:stream';
+import { Client } from 'undici';
+import TAKAPI from '../lib/api.js';
+import { APIAuthCertificate } from '../lib/auth.js';
+function mockResponse(statusCode, contentType, body) {
+    return {
+        statusCode,
+        headers: { 'content-type': contentType },
+        body: Readable.from([Buffer.from(body)]),
+        trailers: {}
+    };
+}
+test('MissionLayer.attachUids files UIDs under a layer via the contents paths body', async () => {
+    const originalRequest = Client.prototype.request;
+    let captured;
+    Client.prototype.request = async function (opts) {
+        captured = opts;
+        return mockResponse(200, 'text/plain', '');
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        await api.MissionLayer.attachUids('mission-1', 'layer-1', {
+            uids: ['uid-1', 'uid-2'],
+            creatorUid: 'alice'
+        });
+        assert.ok(captured);
+        assert.equal(captured.method, 'PUT');
+        assert.equal(captured.path, '/Marti/api/missions/mission-1/contents?creatorUid=alice');
+        assert.deepEqual(JSON.parse(String(captured.body)), {
+            paths: {
+                'layer-1': [{ uids: ['uid-1', 'uid-2'] }]
+            }
+        });
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+test('MissionLayer.attachUids uses the guid contents endpoint for GUID missions', async () => {
+    const originalRequest = Client.prototype.request;
+    let captured;
+    Client.prototype.request = async function (opts) {
+        captured = opts;
+        return mockResponse(200, 'text/plain', '');
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        await api.MissionLayer.attachUids('11111111-2222-3333-4444-555555555555', 'layer-1', {
+            uids: ['uid-1'],
+            creatorUid: 'alice'
+        });
+        assert.ok(captured);
+        assert.equal(captured.method, 'PUT');
+        assert.equal(captured.path, '/Marti/api/missions/guid/11111111-2222-3333-4444-555555555555/contents?creatorUid=alice');
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+test('MissionLayer.setParent re-parents layers via query params', async () => {
+    const originalRequest = Client.prototype.request;
+    let captured;
+    Client.prototype.request = async function (opts) {
+        captured = opts;
+        return mockResponse(200, 'text/plain', '');
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        await api.MissionLayer.setParent('mission-1', {
+            layerUids: ['uid-1', 'uid-2'],
+            parentUid: 'layer-2',
+            creatorUid: 'alice'
+        });
+        assert.ok(captured);
+        assert.equal(captured.method, 'PUT');
+        assert.equal(captured.path, '/Marti/api/missions/mission-1/layers/parent?layerUid=uid-1&layerUid=uid-2&parentUid=layer-2&creatorUid=alice');
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+test('MissionLayer.setParent omits parentUid to move a layer to the mission root', async () => {
+    const originalRequest = Client.prototype.request;
+    let captured;
+    Client.prototype.request = async function (opts) {
+        captured = opts;
+        return mockResponse(200, 'text/plain', '');
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        await api.MissionLayer.setParent('11111111-2222-3333-4444-555555555555', {
+            layerUids: ['uid-1'],
+            creatorUid: 'alice'
+        });
+        assert.ok(captured);
+        assert.equal(captured.method, 'PUT');
+        assert.equal(captured.path, '/Marti/api/missions/guid/11111111-2222-3333-4444-555555555555/layers/parent?layerUid=uid-1&creatorUid=alice');
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+//# sourceMappingURL=mission-layer.test.js.map

package/dist/test/mission-layer.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mission-layer.test.js","sourceRoot":"","sources":["../../test/mission-layer.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,MAAM,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIpD,SAAS,YAAY,CAAC,UAAkB,EAAE,WAAmB,EAAE,IAAY;IACvE,OAAO;QACH,UAAU;QACV,OAAO,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE;QACxC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,QAAQ,EAAE,EAAE;KACuB,CAAC;AAC5C,CAAC;AAED,IAAI,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;IAC5F,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;IAEjD,IAAI,QAAiC,CAAC;IAEtC,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,KAAK,WAAU,IAAiB;QACvD,QAAQ,GAAG,IAAI,CAAC;QAChB,OAAO,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,yBAAyB,CAAC,EAAE,IAAI,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAElG,MAAM,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE;YACtD,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;YACxB,UAAU,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,yDAAyD,CAAC,CAAC;QACvF,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YAChD,KAAK,EAAE;gBACH,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;aAC5C;SACJ,CAAC,CAAC;IACP,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC;IAC/C,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;IACzF,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;IAEjD,IAAI,QAAiC,CAAC;IAEtC,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,KAAK,WAAU,IAAiB;QACvD,QAAQ,GAAG,IAAI,CAAC;QAChB,OAAO,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,yBAAyB,CAAC,EAAE,IAAI,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAElG,MAAM,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,sCAAsC,EAAE,SAAS,EAAE;YACjF,IAAI,EAAE,CAAC,OAAO,CAAC;YACf,UAAU,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CACR,QAAQ,CAAC,IAAI,EACb,yFAAyF,CAC5F,CAAC;IACN,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC;IAC/C,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;IACzE,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;IAEjD,IAAI,QAAiC,CAAC;IAEtC,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,KAAK,WAAU,IAAiB;QACvD,QAAQ,GAAG,IAAI,CAAC;QAChB,OAAO,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,yBAAyB,CAAC,EAAE,IAAI,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAElG,MAAM,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,EAAE;YAC1C,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;YAC7B,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CACR,QAAQ,CAAC,IAAI,EACb,8GAA8G,CACjH,CAAC;IACN,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC;IAC/C,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;IAC1F,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;IAEjD,IAAI,QAAiC,CAAC;IAEtC,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,KAAK,WAAU,IAAiB;QACvD,QAAQ,GAAG,IAAI,CAAC;QAChB,OAAO,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,yBAAyB,CAAC,EAAE,IAAI,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAElG,MAAM,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,sCAAsC,EAAE;YACrE,SAAS,EAAE,CAAC,OAAO,CAAC;YACpB,UAAU,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CACR,QAAQ,CAAC,IAAI,EACb,6GAA6G,CAChH,CAAC;IACN,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC;IAC/C,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/test/mission.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/mission.test.js

@@ -0,0 +1,137 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { Readable } from 'node:stream';
+import { Client } from 'undici';
+import TAKAPI from '../lib/api.js';
+import { APIAuthCertificate } from '../lib/auth.js';
+import { MissionSubscriberRole } from '../lib/api/mission.js';
+function mockResponse(statusCode, contentType, body) {
+    return {
+        statusCode,
+        headers: { 'content-type': contentType },
+        body: Readable.from([Buffer.from(body)]),
+        trailers: {}
+    };
+}
+test('Mission.setRole sends role as a bare query param and returns void', async () => {
+    const originalRequest = Client.prototype.request;
+    let captured;
+    Client.prototype.request = async function (opts) {
+        captured = opts;
+        return mockResponse(200, 'text/plain', '');
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        const res = await api.Mission.setRole('mission-1', {
+            clientUid: 'client-1',
+            username: 'alice',
+            role: MissionSubscriberRole.MISSION_OWNER
+        });
+        assert.equal(res, undefined);
+        assert.ok(captured);
+        assert.equal(captured.method, 'PUT');
+        assert.equal(captured.path, '/Marti/api/missions/mission-1/role?clientUid=client-1&username=alice&role=MISSION_OWNER');
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+test('Mission.subscriptionRoles parses a list of subscribers with roles', async () => {
+    const originalRequest = Client.prototype.request;
+    Client.prototype.request = async function () {
+        return mockResponse(200, 'application/json', JSON.stringify({
+            data: [{
+                    clientUid: 'client-1',
+                    username: 'alice',
+                    createTime: '2026-01-01T00:00:00.000Z',
+                    role: {
+                        permissions: ['MISSION_READ', 'MISSION_WRITE'],
+                        type: 'MISSION_SUBSCRIBER'
+                    }
+                }]
+        }));
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        const res = await api.Mission.subscriptionRoles('mission-1');
+        assert.equal(res.data.length, 1);
+        assert.equal(res.data[0].username, 'alice');
+        assert.equal(res.data[0].role.type, 'MISSION_SUBSCRIBER');
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+test('Mission.unsubscribe issues a DELETE with uid query param', async () => {
+    const originalRequest = Client.prototype.request;
+    let captured;
+    Client.prototype.request = async function (opts) {
+        captured = opts;
+        return mockResponse(200, 'text/plain', '');
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        await api.Mission.unsubscribe('mission-1', { uid: 'client-1' });
+        assert.ok(captured);
+        assert.equal(captured.method, 'DELETE');
+        assert.equal(captured.path, '/Marti/api/missions/mission-1/subscription?uid=client-1');
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+test('Mission.latestFeats parses each CoT individually and isolates invalid CoTs', async () => {
+    const originalRequest = Client.prototype.request;
+    let captured;
+    Client.prototype.request = async function (opts) {
+        captured = opts;
+        return mockResponse(200, 'application/xml', `
+            <events>
+                <event version="2.0" uid="uid-valid" type="a-f-G" time="2026-08-11T00:00:00.000Z" start="2026-08-11T00:00:00.000Z" stale="2026-08-11T00:05:00.000Z" how="h-g-i-g-o">
+                    <point lat="1.1" lon="2.2" hae="0.0" ce="9999999.0" le="9999999.0"/>
+                    <detail>
+                        <contact callsign="ALPHA"/>
+                    </detail>
+                </event>
+                <event version="2.0" uid="uid-poisoned" type="a-f-G" time="2026-08-11T00:00:00.000Z" start="2026-08-11T00:00:00.000Z" stale="2026-08-11T00:05:00.000Z" how="h-g-i-g-o">
+                    <detail>
+                        <contact callsign="BRAVO"/>
+                    </detail>
+                </event>
+            </events>
+        `);
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        const res = await api.Mission.latestFeats('mission-1');
+        assert.ok(captured);
+        assert.equal(captured.method, 'GET');
+        assert.equal(captured.path, '/Marti/api/missions/mission-1/cot');
+        assert.equal(res.features.length, 1);
+        assert.equal(res.features[0].id, 'uid-valid');
+        assert.equal(res.features[0].properties.callsign, 'ALPHA');
+        assert.equal(res.invalid.length, 1);
+        assert.ok(res.invalid[0].error.length > 0);
+        const event = res.invalid[0].feature;
+        assert.equal(event._attributes?.uid, 'uid-poisoned');
+        assert.equal(event.detail?.contact?._attributes?.callsign, 'BRAVO');
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+test('Mission.latestFeats returns empty results for an empty document', async () => {
+    const originalRequest = Client.prototype.request;
+    Client.prototype.request = async function () {
+        return mockResponse(200, 'application/xml', '<events></events>');
+    };
+    try {
+        const api = new TAKAPI(new URL('https://tak.example.com'), new APIAuthCertificate('cert', 'key'));
+        const res = await api.Mission.latestFeats('mission-1');
+        assert.deepEqual(res, { features: [], invalid: [] });
+    }
+    finally {
+        Client.prototype.request = originalRequest;
+    }
+});
+//# sourceMappingURL=mission.test.js.map

package/dist/test/mission.test.js.map

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

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../cli.ts","../index.ts","../test/default.test.ts","../test/findCoT.test.ts","../test/pipeline.test.ts","../test/queue.test.ts","../test/uploadPackage.test.ts","../lib/api.ts","../lib/auth.ts","../lib/commands.ts","../lib/fetch.ts","../lib/multipart.ts","../lib/stream.ts","../lib/api/certificate.ts","../lib/api/client.ts","../lib/api/contacts.ts","../lib/api/credentials.ts","../lib/api/export.ts","../lib/api/files.ts","../lib/api/groups.ts","../lib/api/iconsets.ts","../lib/api/injectors.ts","../lib/api/locate.ts","../lib/api/mission-invite.ts","../lib/api/mission-layer.ts","../lib/api/mission-log.ts","../lib/api/mission.ts","../lib/api/oauth.ts","../lib/api/package.ts","../lib/api/profile.ts","../lib/api/query.ts","../lib/api/repeater.ts","../lib/api/security.ts","../lib/api/subscriptions.ts","../lib/api/types.ts","../lib/api/video.ts","../lib/utils/queue.ts"],"version":"6.0.3"}
+{"root":["../cli.ts","../index.ts","../test/default.test.ts","../test/findCoT.test.ts","../test/html-error.test.ts","../test/mission-layer.test.ts","../test/mission.test.ts","../test/pipeline.test.ts","../test/queue.test.ts","../test/uploadPackage.test.ts","../lib/api.ts","../lib/auth.ts","../lib/commands.ts","../lib/fetch.ts","../lib/multipart.ts","../lib/stream.ts","../lib/api/certificate.ts","../lib/api/client.ts","../lib/api/contacts.ts","../lib/api/credentials.ts","../lib/api/export.ts","../lib/api/files.ts","../lib/api/groups.ts","../lib/api/iconsets.ts","../lib/api/injectors.ts","../lib/api/locate.ts","../lib/api/mission-invite.ts","../lib/api/mission-layer.ts","../lib/api/mission-log.ts","../lib/api/mission.ts","../lib/api/oauth.ts","../lib/api/package.ts","../lib/api/profile.ts","../lib/api/query.ts","../lib/api/repeater.ts","../lib/api/security.ts","../lib/api/subscriptions.ts","../lib/api/types.ts","../lib/api/video.ts","../lib/utils/html-error.ts","../lib/utils/queue.ts"],"version":"6.0.3"}

package/index.ts

@@ -9,6 +9,7 @@ import TAKAPI from './lib/api.js';
 import { TAKAuth } from './lib/auth.js';
 import { Queue } from './lib/utils/queue.js';
 export * from './lib/auth.js';
+export * from './lib/utils/html-error.js';
 
 /* eslint-disable no-control-regex */
 export const REGEX_CONTROL = /[\u000B-\u001F\u007F-\u009F]/g;

package/lib/api/credentials.ts

@@ -1,4 +1,4 @@
-import { APIAuthPassword } from '../auth.js';
+import { APIAuthPassword, APIAuthToken } from '../auth.js';
 import { Static, Type } from '@sinclair/typebox';
 import Commands, { CommandOutputFormat, type ParsedArgs } from '../commands.js';
 import pem from 'pem';
@@ -35,8 +35,25 @@ export default class CredentialCommands extends Commands {
         });
     }
 
-    async generate(): Promise<Static<typeof CertificateResponse>> {
-        if (!(this.api.auth instanceof APIAuthPassword)) throw new Error('Must use Password Auth');
+    async generate(opts: {
+        username?: string
+    } = {}): Promise<Static<typeof CertificateResponse>> {
+        let username: string;
+        const headers: Record<string, string> = {
+            Accept: 'application/json'
+        };
+
+        if (this.api.auth instanceof APIAuthPassword) {
+            username = opts.username || this.api.auth.username;
+            headers.Authorization = 'Basic ' + btoa(this.api.auth.username + ":" + this.api.auth.password);
+        } else if (this.api.auth instanceof APIAuthToken) {
+            // TAK Server derives the enrollment username from the token claims and requires
+            // the CSR CN to match it - the caller must supply that username explicitly
+            if (!opts.username) throw new Error('Token Auth requires a username for the Certificate CN');
+            username = opts.username;
+        } else {
+            throw new Error('Must use Password or Token Auth');
+        }
 
         const config: any = xml2js(await this.config(), { compact: true });
 
@@ -58,20 +75,17 @@ export default class CredentialCommands extends Commands {
         } = await createCSR({
             organization,
             organizationUnit,
-            commonName: this.api.auth.username
+            commonName: username
         });
 
         const url = new URL(`/Marti/api/tls/signClient/v2`, this.api.url);
-        url.searchParams.append('clientUid', this.api.auth.username + ' (ETL)');
+        url.searchParams.append('clientUid', username + ' (ETL)');
         url.searchParams.append('version', '3');
 
         const res = await this.api.fetch(url, {
             method: 'POST',
             nocookies: true,
-            headers: {
-                Accept: 'application/json',
-                Authorization: 'Basic ' + btoa(this.api.auth.username + ":" + this.api.auth.password)
-            },
+            headers,
             body: keys.csr
         });
 

package/lib/api/mission-layer.ts

@@ -1,10 +1,9 @@
 import { TAKList, TAKItem } from './types.js';
 import { Type, Static } from '@sinclair/typebox';
-import type { MissionOptions } from './mission.js';
+import type { MissionOptions, MissionLatestFeats } from './mission.js';
 import { GUIDMatch } from './mission.js';
 import Err from '@openaddresses/batch-error';
 import Commands, { CommandOutputFormat } from '../commands.js';
-import type { Feature } from '@tak-ps/node-cot';
 
 export enum MissionLayerType {
     GROUP = 'GROUP',
@@ -180,19 +179,21 @@ export default class MissionLayerCommands extends Commands {
         name: string,
         layerUid: string, // Layer UID
         opts?: Static<typeof MissionOptions>
-    ): Promise<Static<typeof Feature.Feature>[]> {
+    ): Promise<Static<typeof MissionLatestFeats>> {
         const layer = (await this.get(name, layerUid, opts)).data;
-        const feats = await this.api.Mission.latestFeats(name, opts);
+        const res = await this.api.Mission.latestFeats(name, opts);
 
         const layerUids = new Set((layer.uids || []).map((u) => {
             return u.data
         }));
 
-        const filtered = feats.filter((f) => {
+        const features = res.features.filter((f) => {
             return layerUids.has(f.id)
         });
 
-        return filtered;
+        // Invalid CoTs cannot be filtered by layer as their parse failed
+        // so all Mission-wide invalid CoTs are returned
+        return { features, invalid: res.invalid };
     }
 
     async get(

package/lib/api/mission.ts

@@ -1,11 +1,10 @@
-import { xml2js } from '@tak-ps/xml-js';
-import CoT, { CoTParser } from '@tak-ps/node-cot';
+import { CoTParser } from '@tak-ps/node-cot';
 import { Type, Static } from '@sinclair/typebox';
 import Err from '@openaddresses/batch-error';
 import { Readable } from 'node:stream'
 import { TAKItem, TAKList } from './types.js';
 import { MissionLog } from './mission-log.js';
-import type { Feature } from '@tak-ps/node-cot';
+import { Feature } from '@tak-ps/node-cot';
 import Commands, { CommandOutputFormat, type ParsedArgs } from '../commands.js';
 
 export enum MissionSubscriberRole {
@@ -108,6 +107,21 @@ export const MissionOptions = Type.Object({
     token: Type.Optional(Type.String())
 });
 
+/**
+ * A Mission CoT that could not be parsed or failed validation,
+ * with the raw xml-js event included so the caller can extract
+ * whatever context (UID, Callsign, etc.) it needs
+ */
+export const MissionInvalidFeature = Type.Object({
+    error: Type.String(),
+    feature: Type.Unknown()
+});
+
+export const MissionLatestFeats = Type.Object({
+    features: Type.Array(Feature.Feature),
+    invalid: Type.Array(MissionInvalidFeature)
+});
+
 export const AttachContentsInput = Type.Object({
     hashes: Type.Optional(Type.Array(Type.String())),
     uids: Type.Optional(Type.Array(Type.String())),
@@ -324,23 +338,38 @@ export default class MissionCommands extends Commands {
 
     /**
      * Return all current features in the Data Sync as CoT GeoJSON Features
+     *
+     * Each CoT in the TAK Server response is parsed & validated individually -
+     * those that fail are returned in the `invalid` array so a single poisoned
+     * CoT doesn't prevent the valid features from being returned
      */
     async latestFeats(
         name: string,
         opts?: Static<typeof MissionOptions>
-    ): Promise<Static<typeof Feature.Feature>[]> {
-        const feats: Static<typeof Feature.Feature>[] = [];
+    ): Promise<Static<typeof MissionLatestFeats>> {
+        const features: Static<typeof Feature.Feature>[] = [];
 
-        const res: any = xml2js(await this.latestCots(name, opts), { compact: true });
+        const res = CoTParser.from_xml_document(await this.latestCots(name, opts));
 
-        if (!Object.keys(res.events).length) return feats;
-        if (!res.events.event || (Array.isArray(res.events.event) && !res.events.event.length)) return feats;
+        const invalid: Static<typeof MissionInvalidFeature>[] = res.invalid.map((entry) => {
+            return {
+                error: entry.error,
+                feature: entry.event
+            };
+        });
 
-        for (const event of Array.isArray(res.events.event) ? res.events.event : [res.events.event] ) {
-            feats.push(await CoTParser.to_geojson(new CoT({ event })));
+        for (const cot of res.cots) {
+            try {
+                features.push(await CoTParser.to_geojson(cot));
+            } catch (err) {
+                invalid.push({
+                    error: err instanceof Error ? err.message : String(err),
+                    feature: cot.raw.event
+                });
+            }
         }
 
-        return feats;
+        return { features, invalid };
     }
 
     /**

package/lib/api.ts

@@ -21,6 +21,7 @@ import Subscription from './api/subscriptions.js';
 import Video from './api/video.js';
 import Export from './api/export.js';
 import Err from '@openaddresses/batch-error';
+import { TAKServerError, isHTML } from './utils/html-error.js';
 import * as auth from './auth.js';
 
 type ErrorWithCause = Error & {
@@ -210,6 +211,9 @@ export default class TAKAPI {
                     bdy = null;
                 }
 
+                // TAK Server returns HTML error pages
+                if (isHTML(bdy)) throw new TAKServerError(res.status, bdy);
+
                 throw new Err(res.status, null, bdy || `Status Code: ${res.status}`);
             }
 
@@ -219,7 +223,7 @@ export default class TAKAPI {
                 return await res.text();
             }
         } catch (err) {
-            if (err instanceof Error && err.name === 'PublicError') throw err;
+            if (err instanceof Err) throw err;
             throw new Err(400, null, formatFetchError(err));
         }
     }