From 1d2cc757ec1a751fb0cfce5bd9faaa600591b225 Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Sat, 25 Jul 2020 11:56:43 -0400 Subject: [PATCH] More explicitly watch for undefined env variables. --- lib/ble/index.js | 8 ++++---- lib/ble/index.js.map | 2 +- src/ble/index.ts | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ble/index.js b/lib/ble/index.js index ea42d5e..7818e06 100644 --- a/lib/ble/index.js +++ b/lib/ble/index.js @@ -11,10 +11,10 @@ const fs_extra_1 = require("fs-extra"); const log = require('../log')('ble'); const wifi_1 = require("../wifi"); const wifi = new wifi_1.Wifi(); -const DEVICE_NAME = process.env.DEVICE_NAME || 'intval3'; -const SERVICE_ID = process.env.SERVICE_ID || 'intval3_ble'; -const CHAR_ID = process.env.CHAR_ID || 'intval3char'; -const WIFI_ID = process.env.WIFI_ID || 'wifichar'; +const DEVICE_NAME = typeof process.env.DEVICE_NAME !== 'undefined' ? process.env.DEVICE_NAME : 'intval3'; +const SERVICE_ID = typeof process.env.SERVICE_ID !== 'undefined' ? process.env.SERVICE_ID : 'intval3_ble'; +const CHAR_ID = typeof process.env.CHAR_ID !== 'undefined' ? process.env.CHAR_ID : 'intval3char'; +const WIFI_ID = typeof process.env.WIFI_ID !== 'undefined' ? process.env.WIFI_ID : 'wifichar'; const NETWORK = os_1.networkInterfaces(); //?type? const MAC = getMac() || spoofMac(); //Give the device a unique device name, needs to be in env diff --git a/lib/ble/index.js.map b/lib/ble/index.js.map index f9b4270..a857839 100644 --- a/lib/ble/index.js.map +++ b/lib/ble/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ble/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ble/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/ble/index.ts b/src/ble/index.ts index 9ae7df6..6c77e50 100644 --- a/src/ble/index.ts +++ b/src/ble/index.ts @@ -11,10 +11,10 @@ const log = require('../log')('ble') import { Wifi } from '../wifi' const wifi = new Wifi() -const DEVICE_NAME : string = process.env.DEVICE_NAME || 'intval3' -const SERVICE_ID : string = process.env.SERVICE_ID || 'intval3_ble' -const CHAR_ID : string = process.env.CHAR_ID || 'intval3char' -const WIFI_ID : string = process.env.WIFI_ID || 'wifichar' +const DEVICE_NAME : string = typeof process.env.DEVICE_NAME !== 'undefined' ? process.env.DEVICE_NAME : 'intval3' +const SERVICE_ID : string = typeof process.env.SERVICE_ID !== 'undefined' ? process.env.SERVICE_ID : 'intval3_ble' +const CHAR_ID : string = typeof process.env.CHAR_ID !== 'undefined' ? process.env.CHAR_ID : 'intval3char' +const WIFI_ID : string = typeof process.env.WIFI_ID !== 'undefined' ? process.env.WIFI_ID : 'wifichar' const NETWORK : any = networkInterfaces() //?type? const MAC : string = getMac() || spoofMac()