signalk-flags 1.1.1 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "signalk-flags",
-    "version": "1.1.1",
+    "version": "1.1.3",
     "description": "Country Flags plugin for Signal K server.",
     "main": "plugin/index.js",
     "signalk": {
@@ -19,17 +19,17 @@
         "build": "tsc",
         "build-declaration": "tsc --declaration --allowJs false",
         "watch": "npm run build -- -w",
-        "test": "echo \"Error: no test specified\" && exit 1",
+        "test": "mocha",
         "start": "npm run build -- -w",
         "format": "prettier --write src/*",
-        "prepublishOnly": "tsc"
+        "prepublishOnly": "tsc",
+        "prepack": "tsc"
     },
     "dependencies": {
-        "@signalk/server-api": "2.9",
+        "@signalk/server-api": "^2.30.0",
         "flag-icons": "^7.3.2"
     },
     "devDependencies": {
-        "@types/baconjs": "^0.7.34",
         "@types/express": "^5.0.6",
         "prettier": "^3.8.4",
         "typescript": "^6.0.3"

package/plugin/index.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -141,7 +132,10 @@ module.exports = (server) => {
                     return;
                 }
                 u.values.forEach((v) => {
-                    if (v.path === '' && v.value && 'mmsi' in v.value) {
+                    if (v.path === '' &&
+                        v.value !== null &&
+                        typeof v.value === 'object' &&
+                        'mmsi' in v.value) {
                         // if doesn't already have flag property
                         const vf = server.getPath(`${context}.flag`);
                         if (!vf) {
@@ -174,7 +168,7 @@ module.exports = (server) => {
     /**
      * Check filesystem path(s)
      */
-    const initFs = () => __awaiter(void 0, void 0, void 0, function* () {
+    const initFs = async () => {
         const p = path_1.default.resolve(server.getDataDirPath()).split('/');
         const sp = p.slice(0, p.indexOf('.signalk') + 1).join('/');
         // dev env
@@ -182,7 +176,7 @@ module.exports = (server) => {
         // prod env
         const PRD_PATH = path_1.default.join(sp, 'node_modules', 'flag-icons', 'flags');
         try {
-            yield (0, promises_1.access)(PRD_PATH, fs_1.constants.W_OK | fs_1.constants.R_OK);
+            await (0, promises_1.access)(PRD_PATH, fs_1.constants.W_OK | fs_1.constants.R_OK);
             server.debug(`${PRD_PATH} - OK...Flag images found.`);
             IMG_BASE_PATH = PRD_PATH;
         }
@@ -190,7 +184,7 @@ module.exports = (server) => {
             server.debug(`${PRD_PATH} does NOT exist!`);
             server.debug(`Trying secondary path....${DEV_PATH}`);
             try {
-                yield (0, promises_1.access)(DEV_PATH, fs_1.constants.W_OK | fs_1.constants.R_OK);
+                await (0, promises_1.access)(DEV_PATH, fs_1.constants.W_OK | fs_1.constants.R_OK);
                 server.debug(`${DEV_PATH} - OK...Flag images found.`);
                 IMG_BASE_PATH = DEV_PATH;
             }
@@ -198,7 +192,7 @@ module.exports = (server) => {
                 server.debug(`${DEV_PATH} does NOT exist either!`);
             }
         }
-    });
+    };
     /**
      * Initialise flag resource endpoints
      */
@@ -218,11 +212,11 @@ module.exports = (server) => {
      * @param aspect Aspect ratio default= '4x3'
      * @returns svg file contents
      */
-    const iconFromCountryCode = (code_1, ...args_1) => __awaiter(void 0, [code_1, ...args_1], void 0, function* (code, aspect = '4x3', res) {
+    const iconFromCountryCode = async (code, aspect = '4x3', res) => {
         try {
             const flag = `${IMG_BASE_PATH}/${aspect}/${code.toLowerCase()}.svg`;
             // check flag file exists
-            yield (0, promises_1.access)(flag, fs_1.constants.R_OK);
+            await (0, promises_1.access)(flag, fs_1.constants.R_OK);
             res.sendFile(flag, (err) => {
                 if (err) {
                     res.status(400).json({
@@ -241,18 +235,18 @@ module.exports = (server) => {
             });
             return;
         }
-    });
+    };
     /**
      * Send flag derived from the supplied MMSI
      * @param aspect Flag icon aspect ratio '1x1' or '4x3'
      * @returns svg file contents
      */
-    const iconFromMmsi = (mmsi_1, ...args_1) => __awaiter(void 0, [mmsi_1, ...args_1], void 0, function* (mmsi, aspect = '4x3', res) {
+    const iconFromMmsi = async (mmsi, aspect = '4x3', res) => {
         try {
             const country = countryFromMmsi(mmsi);
-            const flag = `${IMG_BASE_PATH}/${aspect}/${country === null || country === void 0 ? void 0 : country.alpha2.toLowerCase()}.svg`;
+            const flag = `${IMG_BASE_PATH}/${aspect}/${country?.alpha2.toLowerCase()}.svg`;
             // check flag file exists
-            yield (0, promises_1.access)(flag, fs_1.constants.R_OK);
+            await (0, promises_1.access)(flag, fs_1.constants.R_OK);
             res.sendFile(flag, (err) => {
                 if (err) {
                     res.status(400).json({
@@ -271,7 +265,7 @@ module.exports = (server) => {
             });
             return;
         }
-    });
+    };
     /**
      * Get country details from supplied MMSI
      * @param mmsi Maritime mobile service identifier