@tak-ps/node-tak 11.17.4 → 11.18.1

package/.github/workflows/release.yml

@@ -5,31 +5,25 @@ on:
     tags:
       - '*'
 
+permissions:
+  id-token: write  # Required for OIDC
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 22
-          registry-url: https://registry.npmjs.org/
+
+      - name: Update npm
+        run: npm install -g npm@latest
 
       - name: npm install
         run: npm install
 
-      - name: npm run build
-        run: npm run build
-
       - name: npm publish
-        run: npm publish
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Github Release
-        uses: softprops/action-gh-release@v2
+        run: npm publish --provenance --access public

package/CHANGELOG.md

@@ -10,6 +10,14 @@
 
 ## Version History
 
+### v11.18.1 - 2025-12-15
+
+- :rocket: Update Release Process
+
+### v11.18.0 - 2025-12-04
+
+- :rocket: Update Mission type to require description
+
 ### v11.17.4 - 2025-12-03
 
 - :bug: Update Mission must occur via `guid`

package/lib/api/mission.ts

@@ -28,9 +28,29 @@ export const MissionContent = Type.Object({
     expiration: Type.Integer()
 });
 
+export const MissionChange = Type.Object({
+    isFederatedChange: Type.Boolean(),
+    type: Type.String(),
+    missionName: Type.String(),
+    timestamp: Type.String(),
+    serverTime: Type.String(),
+    creatorUid: Type.Optional(Type.String()),
+    contentUid: Type.Optional(Type.String()),
+    details: Type.Optional(Type.Object({
+        type: Type.String(),
+        callsign: Type.String(),
+        color: Type.Optional(Type.String()),
+        location: Type.Object({
+            lat: Type.Number(),
+            lon: Type.Number()
+        })
+    })),
+    contentResource: Type.Optional(MissionContent)
+});
+
 export const Mission = Type.Object({
     name: Type.String(),
-    description: Type.Optional(Type.String()),
+    description: Type.String(),
     chatRoom: Type.Optional(Type.String()),
     baseLayer: Type.Optional(Type.String()),
     bbox: Type.Optional(Type.String()),
@@ -60,27 +80,7 @@ export const Mission = Type.Object({
     passwordProtected: Type.Boolean(),
     token: Type.Optional(Type.String()),                        // Only present when mission created
     groups: Type.Optional(Type.Union([Type.String(), Type.Array(Type.String())])),           // Only present on Mission.get()
-    missionChanges: Type.Optional(Type.Array(Type.Unknown()))   // Only present on Mission.get()
-});
-
-export const MissionChange = Type.Object({
-    isFederatedChange: Type.Boolean(),
-    type: Type.String(),
-    missionName: Type.String(),
-    timestamp: Type.String(),
-    serverTime: Type.String(),
-    creatorUid: Type.Optional(Type.String()),
-    contentUid: Type.Optional(Type.String()),
-    details: Type.Optional(Type.Object({
-        type: Type.String(),
-        callsign: Type.String(),
-        color: Type.Optional(Type.String()),
-        location: Type.Object({
-            lat: Type.Number(),
-            lon: Type.Number()
-        })
-    })),
-    contentResource: Type.Optional(MissionContent)
+    missionChanges: Type.Optional(Type.Array(MissionChange))   // Only present on Mission.get()
 });
 
 export const MissionRole = Type.Object({
@@ -245,6 +245,17 @@ export default class MissionCommands extends Commands {
         return encodeURIComponent(name.trim())
     }
 
+    /*
+     * The Mission type is currently cast from an unknown to a Mission
+     * from the fetch call from the server. There are a few standardizations
+     * we make for better usability.
+     */
+    #stdMission(mission: Static<typeof Mission>): Static<typeof Mission> {
+        if (mission.description === undefined) mission.description = '';
+
+        return mission;
+    }
+
     #headers(opts?: Static<typeof MissionOptions>): object {
         if (opts && opts.token) {
             return {
@@ -645,7 +656,8 @@ export default class MissionCommands extends Commands {
         });
 
         if (!missions.data.length) throw new Err(404, null, `No Mission for GUID: ${guid}`);
-        return missions.data[0];
+
+        return this.#stdMission(missions.data[0]);
     }
 
     /**
@@ -724,7 +736,7 @@ export default class MissionCommands extends Commands {
             });
         }
 
-        return mission;
+        return this.#stdMission(mission);
     }
 
     /**
@@ -755,7 +767,7 @@ export default class MissionCommands extends Commands {
 
         if (!missions.data.length) throw new Err(404, null, `No Mission for Name: ${name}`);
 
-        return missions.data[0];
+        return this.#stdMission(missions.data[0]);
     }
 
     /**
@@ -780,6 +792,8 @@ export default class MissionCommands extends Commands {
             throw new Err(400, null, 'Mission Name cannot contain forward slashes');
         }
 
+        if (body.description === undefined) body.description = '';
+
         if (body.group && Array.isArray(body.group)) body.group = body.group.join(',');
 
         let q: keyof Static<typeof MissionCreateInput>;
@@ -803,7 +817,7 @@ export default class MissionCommands extends Commands {
             });
         }
 
-        return mission;
+        return this.#stdMission(mission);
     }
 
     /**
@@ -826,7 +840,7 @@ export default class MissionCommands extends Commands {
 
         const mission = missions.data[0];
 
-        return mission;
+        return this.#stdMission(mission);
     }
 
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@tak-ps/node-tak",
     "type": "module",
-    "version": "11.17.4",
+    "version": "11.18.1",
     "description": "Lightweight JavaScript library for communicating with TAK Server",
     "author": "Nick Ingalls <nick@ingalls.ca>",
     "main": "dist/index.js",
@@ -44,7 +44,7 @@
     "devDependencies": {
         "@inquirer/prompts": "^8.0.1",
         "@types/minimist": "^1.2.5",
-        "@types/node": "^24.0.0",
+        "@types/node": "^25.0.0",
         "@types/pem": "^1.14.4",
         "@types/tape": "^5.6.0",
         "c8": "^10.1.3",
@@ -58,7 +58,7 @@
     },
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/dfpc-coe/node-tak.git"
+        "url": "https://github.com/dfpc-coe/node-tak"
     },
     "keywords": [
         "tak",

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env tsx
-export {};

package/dist/cli.js

@@ -1,183 +0,0 @@
-#!/usr/bin/env tsx
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-import minimist from 'minimist';
-import { CoTParser } from '@tak-ps/node-cot';
-import TAK from './index.js';
-import { getPemFromP12 } from 'p12-pem';
-import TAKAPI, { CommandList } from './lib/api.js';
-import { APIAuthPassword, APIAuthCertificate } from './lib/auth.js';
-import Commands from './lib/commands.js';
-import { select, confirm, number, input, password, Separator } from '@inquirer/prompts';
-const args = minimist(process.argv, {
-    string: ['profile', 'format', 'auth'],
-});
-const configPath = path.resolve(os.homedir(), './.tak.json');
-let config;
-try {
-    config = JSON.parse(String(await fs.readFile(configPath)));
-}
-catch (err) {
-    if (err instanceof Error && err.message.includes('no such file or directory')) {
-        const answer = await confirm({
-            message: 'No TAK Config file Detected, create one?'
-        });
-        if (!answer) {
-            throw new Error('No config file and not creating one');
-        }
-        config = {
-            version: 1,
-            profiles: {}
-        };
-        await fs.writeFile(configPath, JSON.stringify(config, null, 4));
-    }
-    else {
-        throw err;
-    }
-}
-if (!args.profile && config.profiles && Object.keys(config.profiles).length) {
-    args.profile = await select({
-        message: 'Choose a profile',
-        choices: [
-            { name: 'New Profile', value: '' },
-            new Separator(),
-        ].concat(Object.keys(config.profiles).map((profile) => {
-            return {
-                name: profile,
-                value: profile
-            };
-        }))
-    });
-}
-if (!args.profile) {
-    console.error('Create new TAK Server Profile:');
-    args.profile = await input({ message: 'Enter a name for this profile' });
-    const host = await input({ message: 'Server hostname', default: 'ops.example.com' });
-    let marti = 8443;
-    let webtak = 443;
-    let stream = 8089;
-    do {
-        marti = await number({ message: 'Marti API Port', default: marti });
-    } while (!marti || isNaN(marti));
-    do {
-        webtak = await number({ message: 'WebTAK API Port', default: webtak });
-    } while (!webtak || isNaN(webtak));
-    do {
-        stream = await number({ message: 'Streaming Port', default: stream });
-    } while (!stream || isNaN(stream));
-    if (!config.profiles)
-        config.profiles = {};
-    config.profiles[args.profile] = {
-        host,
-        ports: { webtak, marti, stream }
-    };
-}
-if (args.profile && !config.profiles[args.profile]) {
-    throw new Error(`Profile "${args.profile}" is not defined in config file`);
-}
-else if (!args.auth && !config.profiles[args.profile].auth) {
-    const user = await input({ message: 'TAK Username' });
-    const pass = await password({ message: 'TAK Password' });
-    const api = await TAKAPI.init(new URL('https://' + config.profiles[args.profile].host + ':' + config.profiles[args.profile].ports.webtak), new APIAuthPassword(user, pass));
-    const auth = await api.Credentials.generate();
-    config.profiles[args.profile].auth = {
-        cert: auth.cert,
-        key: auth.key,
-        ca: auth.ca[0]
-    };
-}
-let command = args._[2];
-if (!command) {
-    command = await select({
-        message: 'Choose a Command Group',
-        choices: [{
-                name: 'stream',
-                value: 'stream'
-            }].concat(Object.keys(CommandList).map((profile) => {
-            return {
-                name: profile,
-                value: profile
-            };
-        }))
-    });
-}
-await fs.writeFile(configPath, JSON.stringify(config, null, 4));
-let auth = config.profiles[args.profile].auth;
-if (args.auth) {
-    const password = process.env.TAK_P12_PASSWORD || await input({ message: 'P12 Container Password' });
-    const certs = getPemFromP12(args.auth, password);
-    const cert = certs.pemCertificate
-        .split('-----BEGIN CERTIFICATE-----')
-        .join('-----BEGIN CERTIFICATE-----\n')
-        .split('-----END CERTIFICATE-----')
-        .join('\n-----END CERTIFICATE-----');
-    const key = certs.pemKey
-        .split('-----BEGIN RSA PRIVATE KEY-----')
-        .join('-----BEGIN RSA PRIVATE KEY-----\n')
-        .split('-----END RSA PRIVATE KEY-----')
-        .join('\n-----END RSA PRIVATE KEY-----');
-    auth = { cert, key };
-}
-if (!auth)
-    throw new Error(`No Auth in ${args.profile} profile`);
-if (command === 'stream') {
-    const tak = await TAK.connect(new URL('ssl://' + config.profiles[args.profile].host + ':' + config.profiles[args.profile].ports.stream), auth);
-    tak.on('cot', (cot) => {
-        console.log(JSON.stringify(CoTParser.to_geojson(cot)));
-    });
-}
-else {
-    if (!config.profiles[args.profile].auth) {
-        throw new Error(`No Auth in ${args.profile} profile`);
-    }
-    const tak = new TAKAPI(new URL('https://' + config.profiles[args.profile].host + ':' + config.profiles[args.profile].ports.marti), new APIAuthCertificate(auth.cert, auth.key));
-    const invokeTest = tak[CommandList[command]];
-    if (!invokeTest || !(invokeTest instanceof Commands)) {
-        throw new Error(`${command} not found`);
-    }
-    const invoke = invokeTest;
-    let subcommand = args._[3];
-    const subcommands = (obj) => Object.keys(obj);
-    if (subcommand === 'help') {
-        console.log(([
-            'Command:',
-            `    tak ${command} <subcommand>`,
-            'SubCommands:',
-        ].concat(subcommands(invoke.schema).map((subcommand) => {
-            return `    ${String(subcommand)} - ${invoke.schema[subcommand].description}`;
-        }))).join('\n'));
-        process.exit(0);
-    }
-    else if (!subcommand) {
-        subcommand = await select({
-            message: 'Choose an action',
-            choices: subcommands(invoke.schema).map((subcommand) => {
-                return {
-                    name: subcommand,
-                    value: subcommand
-                };
-            })
-        });
-    }
-    if (!invoke.schema[subcommand]) {
-        throw new Error(`Unsupported Subcommand: ${subcommand}`);
-    }
-    else if (args.format && !invoke.schema[subcommand].formats.includes(args.format)) {
-        throw new Error(`tak ${command} ${subcommand} does not support --format ${args.format}. Supported formats are: ${invoke.schema[subcommand].formats.join(",")}`);
-    }
-    try {
-        args._[3] = subcommand;
-        const res = await invoke.cli(args);
-        if (typeof res === 'string') {
-            console.log(res);
-        }
-        else {
-            console.log(JSON.stringify(res, null, 4));
-        }
-    }
-    catch (err) {
-        console.error(err);
-    }
-}
-//# sourceMappingURL=cli.js.map

package/dist/cli.js.map

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

package/dist/index.d.ts

@@ -1,59 +0,0 @@
-import EventEmitter from 'node:events';
-import type { Static } from '@sinclair/typebox';
-import CoT from '@tak-ps/node-cot';
-import type { CoTOptions } from '@tak-ps/node-cot';
-import type { TLSSocket } from 'node:tls';
-import TAKAPI from './lib/api.js';
-import { TAKAuth } from './lib/auth.js';
-export * from './lib/auth.js';
-export declare const REGEX_CONTROL: RegExp;
-export declare const REGEX_EVENT: RegExp;
-export interface PartialCoT {
-    event: string;
-    remainder: string;
-}
-export type TAKOptions = {
-    id?: number | string;
-    type?: string;
-    cot?: CoTOptions;
-};
-export default class TAK extends EventEmitter {
-    id: number | string;
-    type: string;
-    url: URL;
-    auth: Static<typeof TAKAuth>;
-    open: boolean;
-    destroyed: boolean;
-    queue: string[];
-    writing: boolean;
-    cotOptions: CoTOptions;
-    pingInterval?: ReturnType<typeof setTimeout>;
-    client?: TLSSocket;
-    version?: string;
-    /**
-     * @constructor
-     *
-     * @param url   - Full URL of Streaming COT Endpoint IE: "https://ops.cotak.gov:8089"
-     * @param auth  - TAK Certificate Pair
-     * @param opts  - Options Object
-     * @param opts.id   - When using multiple connections in a script, allows a unique ID per connection
-     * @param opts.type - When using multiple connections in a script, allows specifying a script provided connection type
-     */
-    constructor(url: URL, auth: Static<typeof TAKAuth>, opts?: TAKOptions);
-    static connect(url: URL, auth: Static<typeof TAKAuth>, opts?: TAKOptions): Promise<TAK>;
-    connect_ssl(): Promise<TAK>;
-    reconnect(): Promise<void>;
-    destroy(): void;
-    ping(): Promise<void>;
-    writer(body: string): Promise<boolean>;
-    process(): Promise<void>;
-    /**
-     * Write a CoT to the TAK Connection
-     *
-     * @param {CoT} cot CoT Object
-     */
-    write(cots: CoT[]): Promise<void>;
-    write_xml(body: string): void;
-    static findCoT(str: string): null | PartialCoT;
-}
-export { TAKAPI, CoT, };

package/dist/index.js

@@ -1,204 +0,0 @@
-import EventEmitter from 'node:events';
-import tls from 'node:tls';
-import CoT, { CoTParser } from '@tak-ps/node-cot';
-import TAKAPI from './lib/api.js';
-export * from './lib/auth.js';
-/* eslint-disable no-control-regex */
-export const REGEX_CONTROL = /[\u000B-\u001F\u007F-\u009F]/g;
-// Match <event .../> or <event> but not <events>
-export const REGEX_EVENT = /(<event[ >][\s\S]*?<\/event>)([\s\S]*)/;
-export default class TAK extends EventEmitter {
-    id;
-    type;
-    url;
-    auth;
-    open;
-    destroyed;
-    queue;
-    writing;
-    cotOptions;
-    pingInterval;
-    client;
-    version;
-    /**
-     * @constructor
-     *
-     * @param url   - Full URL of Streaming COT Endpoint IE: "https://ops.cotak.gov:8089"
-     * @param auth  - TAK Certificate Pair
-     * @param opts  - Options Object
-     * @param opts.id   - When using multiple connections in a script, allows a unique ID per connection
-     * @param opts.type - When using multiple connections in a script, allows specifying a script provided connection type
-     */
-    constructor(url, auth, opts = {}) {
-        super();
-        if (!opts)
-            opts = {};
-        this.id = opts.id || crypto.randomUUID();
-        this.type = opts.type || 'unknown';
-        this.url = url;
-        this.auth = auth;
-        this.writing = false;
-        this.cotOptions = opts.cot || {};
-        this.open = false;
-        this.destroyed = false;
-        this.queue = [];
-    }
-    static async connect(url, auth, opts = {}) {
-        const tak = new TAK(url, auth, opts);
-        if (url.protocol === 'ssl:') {
-            if (!tak.auth.cert)
-                throw new Error('auth.cert required');
-            if (!tak.auth.key)
-                throw new Error('auth.key required');
-            return await tak.connect_ssl();
-        }
-        else {
-            throw new Error('Unknown TAK Server Protocol');
-        }
-    }
-    connect_ssl() {
-        return new Promise((resolve) => {
-            this.destroyed = false;
-            this.client = tls.connect({
-                host: this.url.hostname,
-                port: parseInt(this.url.port),
-                rejectUnauthorized: this.auth.rejectUnauthorized ?? false,
-                cert: this.auth.cert,
-                key: this.auth.key,
-                passphrase: this.auth.passphrase,
-                ca: this.auth.ca,
-            });
-            this.client.setNoDelay();
-            this.client.on('connect', () => {
-                console.error(`ok - ${this.id} @ connect:${this.client ? this.client.authorized : 'NO CLIENT'} - ${this.client ? this.client.authorizationError : 'NO CLIENT'}`);
-            });
-            this.client.on('secureConnect', () => {
-                console.error(`ok - ${this.id} @ secure:${this.client ? this.client.authorized : 'NO CLIENT'} - ${this.client ? this.client.authorizationError : 'NO CLIENT'}`);
-                this.emit('secureConnect');
-                this.ping();
-            });
-            let buff = '';
-            this.client.on('data', async (data) => {
-                // Eventually Parse ProtoBuf
-                buff = buff + data.toString();
-                let result = TAK.findCoT(buff);
-                while (result && result.event) {
-                    try {
-                        const cot = await CoTParser.from_xml(result.event, this.cotOptions);
-                        if (cot.raw.event._attributes.type === 't-x-c-t-r') {
-                            this.open = true;
-                            this.emit('ping');
-                        }
-                        else if (cot.raw.event._attributes.type === 't-x-takp-v'
-                            && cot.raw.event.detail
-                            && cot.raw.event.detail.TakControl
-                            && cot.raw.event.detail.TakControl.TakServerVersionInfo
-                            && cot.raw.event.detail.TakControl.TakServerVersionInfo._attributes) {
-                            this.version = cot.raw.event.detail.TakControl.TakServerVersionInfo._attributes.serverVersion;
-                        }
-                        else {
-                            this.emit('cot', cot);
-                        }
-                    }
-                    catch (e) {
-                        console.error('Error parsing', e, data.toString());
-                    }
-                    buff = result.remainder;
-                    result = TAK.findCoT(buff);
-                }
-            }).on('timeout', () => {
-                this.emit('timeout');
-            }).on('error', (err) => {
-                this.emit('error', err);
-            }).on('end', () => {
-                this.open = false;
-                this.emit('end');
-            });
-            this.pingInterval = setInterval(() => {
-                this.ping();
-            }, 5000);
-            return resolve(this);
-        });
-    }
-    async reconnect() {
-        if (this.destroyed) {
-            await this.connect_ssl();
-        }
-        else {
-            this.destroy();
-            await this.connect_ssl();
-        }
-    }
-    destroy() {
-        this.destroyed = true;
-        if (this.client) {
-            this.client.destroy();
-        }
-        if (this.pingInterval) {
-            clearInterval(this.pingInterval);
-            this.pingInterval = undefined;
-        }
-    }
-    async ping() {
-        this.write([CoT.ping()]);
-    }
-    writer(body) {
-        return new Promise((resolve, reject) => {
-            if (!this.client)
-                return reject(new Error('A Connection Client must first be created before it can be written'));
-            const res = this.client.write(body + '\n', () => {
-                return resolve(res);
-            });
-        });
-    }
-    async process() {
-        this.writing = true;
-        while (this.queue.length) {
-            const body = this.queue.shift();
-            if (!body)
-                continue;
-            await this.writer(body);
-        }
-        await this.writer('');
-        if (this.queue.length) {
-            process.nextTick(() => {
-                this.process();
-            });
-        }
-        else {
-            this.writing = false;
-        }
-    }
-    /**
-     * Write a CoT to the TAK Connection
-     *
-     * @param {CoT} cot CoT Object
-     */
-    async write(cots) {
-        for (const cot of cots) {
-            this.queue.push(await CoTParser.to_xml(cot));
-        }
-        if (this.queue.length && !this.writing) {
-            this.process();
-        }
-    }
-    write_xml(body) {
-        this.queue.push(body);
-        if (this.queue.length && !this.writing) {
-            this.process();
-        }
-    }
-    // https://github.com/vidterra/multitak/blob/main/app/lib/helper.js#L4
-    static findCoT(str) {
-        str = str.replace(REGEX_CONTROL, "");
-        const match = str.match(REGEX_EVENT); // find first CoT
-        if (!match)
-            return null;
-        return {
-            event: match[1],
-            remainder: match[2],
-        };
-    }
-}
-export { TAKAPI, CoT, };
-//# sourceMappingURL=index.js.map