signalk-flags 1.0.0 → 1.0.2

package/package.json

@@ -1,18 +1,13 @@
 {
     "name": "signalk-flags",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "description": "Country Flags plugin for Signal K server.",
     "main": "plugin/index.js",
     "keywords": [
         "signalk-node-server-plugin"
     ],
-    "repository": "https://github.com/panaaj/signalk-icons",
+    "repository": "https://github.com/panaaj/signalk-flags",
     "author": "AdrianP",
-    "contributors": [
-        {
-            "name": "panaaj@hotmail.com"
-        }
-    ],
     "license": "Apache-20",
     "scripts": {
         "build": "tsc",
@@ -23,10 +18,11 @@
         "format": "prettier --write src/*"
     },
     "dependencies": {
-        "@signalk/server-api": "^2.3.0",
+        "@signalk/server-api": "^2.9.0",
         "flag-icons": "^7.3.2"
     },
     "devDependencies": {
+        "@types/baconjs": "^0.7.34",
         "@types/express": "^4.17.6",
         "prettier": "^2.5.1",
         "typescript": "^4.5.4"

package/plugin/index.d.ts

@@ -1,15 +1,4 @@
 import { Application } from 'express';
-import { Delta, ServerAPI } from '@signalk/server-api';
-interface SKDeltaSubscription {
-    context: string;
-    subscribe: Array<{
-        path: string;
-        period: number;
-    }>;
-}
+import { ServerAPI } from '@signalk/server-api';
 export interface FlagsApp extends ServerAPI, Application {
-    subscriptionmanager: {
-        subscribe: (subscribe: SKDeltaSubscription, unsubscribes: Array<any>, errorCallback: (error: any) => void, deltaCallback: (delta: Delta) => void) => void;
-    };
 }
-export {};

package/plugin/index.js

@@ -40,7 +40,6 @@ const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const server_api_1 = require("@signalk/server-api");
 const openapi = __importStar(require("./openApi.json"));
-const mid_1 = require("./mid");
 const CONFIG_SCHEMA = {
     properties: {}
 };
@@ -132,26 +131,30 @@ module.exports = (server) => {
                     return;
                 }
                 u.values.forEach((v) => {
-                    if (v.path === '' && 'mmsi' in v.value) {
-                        const country = countryFromMmsi(v.value.mmsi);
-                        if (country) {
-                            server.handleMessage(plugin.id, {
-                                context: context,
-                                updates: [
-                                    {
-                                        values: [
-                                            {
-                                                path: 'flag',
-                                                value: country[0]
-                                            },
-                                            {
-                                                path: 'port',
-                                                value: country[3]
-                                            }
-                                        ]
-                                    }
-                                ]
-                            });
+                    if (v.path === '' && v.value && 'mmsi' in v.value) {
+                        // if doesn't already have flag property
+                        const vf = server.getPath(`${context}.flag`);
+                        if (!vf) {
+                            const country = countryFromMmsi(v.value.mmsi);
+                            if (country) {
+                                server.handleMessage(plugin.id, {
+                                    context: context,
+                                    updates: [
+                                        {
+                                            values: [
+                                                {
+                                                    path: 'flag',
+                                                    value: country.alpha2
+                                                },
+                                                {
+                                                    path: 'port',
+                                                    value: country.name
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                });
+                            }
                         }
                     }
                 });
@@ -237,7 +240,7 @@ module.exports = (server) => {
     const iconFromMmsi = (mmsi, aspect = '4x3', res) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const country = countryFromMmsi(mmsi);
-            const flag = `${IMG_BASE_PATH}/${aspect}/${country[0].toLowerCase()}.svg`;
+            const flag = `${IMG_BASE_PATH}/${aspect}/${country === null || country === void 0 ? void 0 : country.alpha2.toLowerCase()}.svg`;
             // check flag file exists
             yield (0, promises_1.access)(flag, fs_1.constants.R_OK);
             res.sendFile(flag, (err) => {
@@ -262,14 +265,10 @@ module.exports = (server) => {
     /**
      * Get country details from supplied MMSI
      * @param mmsi Maritime mobile service identifier
-     * @returns Array containing country details
+     * @returns Object containing country details
      */
     const countryFromMmsi = (mmsi) => {
-        if (typeof mmsi === 'number') {
-            mmsi = mmsi.toString();
-        }
-        const mid = mmsi.slice(0, 3);
-        return mid_1.MID[mid];
+        return (0, server_api_1.getFlagCountry)(mmsi);
     };
     return plugin;
 };

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-# CHANGELOG: Signal K Flag Resources - Signal K plugin 
-
-## v1.0.0-beta.1
-
-- Initial beta release.
-
-