@signalk/freeboard-sk 2.2.1 → 2.2.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG: Freeboard
 
+### v2.2.2
+
+- **Fixed**: Update Anchor Watch to use `signalk-anchor-alarm` REST API to resolve incorrect state being displayed.
+- **Fixed**: Switching to fixed location did not update map until a delta update had been parsed.
+
 ### v2.2.1
 
 - **Fixed**: Issue where waypoint was not centered on the screen when the center waypoint button was clicked from the entry in the waypoint list.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/freeboard-sk",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Openlayers chart plotter implementation for Signal K",
   "keywords": [
     "signalk-webapp",

package/plugin/anchor/anchor-api.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initAnchorApi = void 0;
+const fetch_1 = require("../lib/fetch");
+let server;
+let hostPath;
+const apiBasePath = '/signalk/v2/api/vessels/self/navigation/anchor';
+const anchorPlugin = {
+    has: false,
+    enabled: false,
+    version: ''
+};
+let pluginPath;
+const msgPluginNotFound = 'signalk-anchor-alarm is not installed!';
+const initAnchorApi = async (app) => {
+    server = app;
+    server.debug(`** initAnchorApi() **`);
+    // detect signalk-anchor-alarm plugin
+    let port = 3000;
+    if (typeof server.config?.getExternalPort === 'function') {
+        server.debug('*** getExternalPort()', server.config.getExternalPort());
+        port = server.config.getExternalPort();
+    }
+    hostPath = `${server.config.ssl ? 'https' : 'http'}://localhost:${port}`;
+    const url = `${hostPath}/plugins`;
+    const r = await (0, fetch_1.fetch)(url);
+    r.forEach((plugin) => {
+        if (plugin.id === 'anchoralarm') {
+            pluginPath = `/plugins/${plugin.id}`;
+            anchorPlugin.has = true;
+            anchorPlugin.version = plugin.version;
+            anchorPlugin.enabled = plugin.data.enabled;
+        }
+    });
+    server.debug('*** Anchor Alarm Plugin detected:', anchorPlugin.has);
+    server.debug('*** Anchor Alarm Plugin enabled:', anchorPlugin.enabled);
+    server.debug('*** Anchor Alarm Plugin API Path', `${hostPath}${pluginPath}`);
+    if (anchorPlugin.has) {
+        initApiEndpoints();
+    }
+};
+exports.initAnchorApi = initAnchorApi;
+const initApiEndpoints = () => {
+    server.debug(`** Registering Anchor API endpoint(s) **`);
+    server.post(`${apiBasePath}/drop`, async (req, res) => {
+        server.debug(`** POST ${apiBasePath}/drop`);
+        if (!anchorPlugin.has) {
+            res.status(400).json({
+                state: 'COMPLETED',
+                statusCode: 400,
+                message: msgPluginNotFound
+            });
+            return;
+        }
+        try {
+            const r = await (0, fetch_1.post)(`${hostPath}${pluginPath}/dropAnchor`, '{}');
+            res.status(r.statusCode).json(r);
+        }
+        catch (e) {
+            res.status(e.statusCode).json(e);
+        }
+    });
+    server.post(`${apiBasePath}/raise`, async (req, res) => {
+        server.debug(`** POST ${apiBasePath}/raise`);
+        if (!anchorPlugin.has) {
+            res.status(400).json({
+                state: 'COMPLETED',
+                statusCode: 400,
+                message: msgPluginNotFound
+            });
+            return;
+        }
+        try {
+            const r = await (0, fetch_1.post)(`${hostPath}${pluginPath}/raiseAnchor`, '{}');
+            res.status(r.statusCode).json(r);
+        }
+        catch (e) {
+            res.status(e.statusCode).json(e);
+        }
+    });
+    server.post(`${apiBasePath}/radius`, async (req, res) => {
+        server.debug(`** POST ${apiBasePath}/radius`);
+        if (!anchorPlugin.has) {
+            res.status(400).json({
+                state: 'COMPLETED',
+                statusCode: 400,
+                message: msgPluginNotFound
+            });
+            return;
+        }
+        try {
+            const val = req.body.value && typeof req.body.value === 'number'
+                ? { radius: req.body.value }
+                : {};
+            const r = await (0, fetch_1.post)(`${hostPath}${pluginPath}/setRadius`, JSON.stringify(val));
+            res.status(r.statusCode).json(r);
+        }
+        catch (e) {
+            res.status(e.statusCode).json(e);
+        }
+    });
+};

package/plugin/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const alarms_1 = require("./alarms/alarms");
+const anchor_api_1 = require("./anchor/anchor-api");
 const weather_1 = require("./weather");
 const pypilot_1 = require("./pypilot");
 const openapi = require("./openApi.json");
@@ -162,6 +163,8 @@ module.exports = (server) => {
             if (settings.pypilot.enable) {
                 (0, pypilot_1.initPyPilot)(server, plugin.id, settings.pypilot);
             }
+            // Anchor API facade
+            (0, anchor_api_1.initAnchorApi)(server);
             server.setPluginStatus(msg);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
         }

package/plugin/lib/fetch.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetch = void 0;
+exports.post = exports.fetch = void 0;
 const https = require("https");
 const url = require("url");
+const http = require("http");
+// HTTP GET
 const fetch = (href) => {
     const opt = url.parse(href);
     opt.headers = { 'User-Agent': 'Mozilla/5.0' };
+    const req = href.indexOf('https') !== -1 ? https : http;
     return new Promise((resolve, reject) => {
-        https
+        req
             .get(opt, (res) => {
             let data = '';
             res.on('data', (chunk) => {
@@ -29,3 +32,46 @@ const fetch = (href) => {
     });
 };
 exports.fetch = fetch;
+// HTTP POST
+const post = (href, data) => {
+    const opt = url.parse(href);
+    (opt.method = 'POST'),
+        (opt.headers = {
+            'Content-Type': 'application/json'
+        });
+    const req = href.indexOf('https') !== -1 ? https : http;
+    return new Promise((resolve, reject) => {
+        const postReq = req
+            .request(opt, (res) => {
+            let resText = '';
+            res.on('data', (chunk) => {
+                resText += chunk;
+            });
+            res.on('end', () => {
+                if (Math.floor(res.statusCode / 100) === 2) {
+                    resolve({
+                        statusCode: res.statusCode,
+                        state: 'COMPLETED'
+                    });
+                }
+                else {
+                    reject({
+                        statusCode: res.statusCode,
+                        state: 'FAILED',
+                        message: resText
+                    });
+                }
+            });
+        })
+            .on('error', (error) => {
+            reject({
+                statusCode: 400,
+                state: 'FAILED',
+                message: error.message
+            });
+        });
+        postReq.write(data);
+        postReq.end();
+    });
+};
+exports.post = post;

package/public/index.html

@@ -74,5 +74,5 @@
         </div>
       </div>
     </app-root>
-  <script src="runtime.d3c37bb0c0c8df86.js" type="module"></script><script src="polyfills.61cfd308b28d8fe0.js" type="module"></script><script src="main.5461196ce3d0ae77.js" type="module"></script></body>
+  <script src="runtime.d3c37bb0c0c8df86.js" type="module"></script><script src="polyfills.61cfd308b28d8fe0.js" type="module"></script><script src="main.b1d3ce26b87acfb4.js" type="module"></script></body>
 </html>