@feralfile/cli 2.2.0 → 2.2.1

package/README.md

@@ -119,7 +119,6 @@ npm run dev -- setup
 npm run dev -- find https://objkt.com/tokens/hicetnunc/111068 --play
 npm run dev -- play "https://example.com/video.mp4" --skip-verify
 ```
-
 ## Documentation
 
 - Getting started and usage: `./docs/README.md`

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@feralfile/cli",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "description": "CLI for building, signing, and playing DP-1 playlists of digital art on Feral File devices",
     "repository": {
         "type": "git",
@@ -59,7 +59,7 @@
     "license": "MIT",
     "dependencies": {
         "@napi-rs/keyring": "1.3.0",
-        "@feralfile/source-resolver": "git+https://github.com/feral-file/ff-source-resolver.git#54be943014c8cf7860114510257cdd713bbf4e79",
+        "@feralfile/source-resolver": "^1.0.0",
         "axios": "^1.6.2",
         "bonjour-service": "^1.3.0",
         "chalk": "^4.1.2",

package/dist/src/commands/device.js

@@ -207,8 +207,10 @@ deviceCommand
         // existingIndex === -1 (no confirmed match, e.g. manual IP → .local migration),
         // a same-name entry is the upsertDevice case-3 migration path — blocking it would
         // prevent the user from retaining their existing device name during host migration.
+        // Case-insensitive: lookups everywhere else ignore case, so "Kitchen"
+        // alongside "kitchen" would make one of them unreachable by name.
         const nameConflict = existingIndex !== -1
-            ? existingDevices.find((d, i) => d.name === deviceName && i !== existingIndex)
+            ? existingDevices.find((d, i) => d.name?.toLowerCase() === deviceName.toLowerCase() && i !== existingIndex)
             : undefined;
         if (nameConflict) {
             if (options.name) {
@@ -221,7 +223,7 @@ deviceCommand
             const retryAnswer = await ask('Device name: ');
             deviceName = retryAnswer || 'ff1';
             const retryConflict = existingIndex !== -1
-                ? existingDevices.find((d, i) => d.name === deviceName && i !== existingIndex)
+                ? existingDevices.find((d, i) => d.name?.toLowerCase() === deviceName.toLowerCase() && i !== existingIndex)
                 : undefined;
             if (retryConflict) {
                 console.error(chalk_1.default.red(`\nName "${deviceName}" is also taken. No changes made.`));
@@ -255,21 +257,7 @@ deviceCommand
         }
         const config = await (0, config_files_1.readConfigFile)(configPath);
         const existingDevices = config.ff1Devices?.devices || [];
-        // Match by name (case-insensitive) or by host URL so unnamed legacy/manual
-        // entries (stored without a name field) can still be targeted and removed.
-        const normalizedArg = name.toLowerCase();
-        let normalizedArgHost = '';
-        try {
-            normalizedArgHost = (0, device_normalize_1.normalizeDeviceHost)(name).toLowerCase();
-        }
-        catch {
-            // not a valid URL — host matching will not apply
-        }
-        const deviceIndex = existingDevices.findIndex((d) => (d.name && d.name.toLowerCase() === normalizedArg) ||
-            (d.host && d.host.toLowerCase() === normalizedArg) ||
-            (normalizedArgHost &&
-                d.host &&
-                (0, device_normalize_1.normalizeDeviceHost)(d.host).toLowerCase() === normalizedArgHost));
+        const deviceIndex = (0, device_lookup_1.findConfiguredDeviceIndex)(existingDevices, name);
         if (deviceIndex === -1) {
             console.error(chalk_1.default.red(`\nDevice "${name}" not found`));
             if (existingDevices.length > 0) {

package/dist/src/utilities/device-default.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promoteDeviceToDefault = promoteDeviceToDefault;
-const device_normalize_1 = require("./device-normalize");
+const device_lookup_1 = require("./device-lookup");
 /**
  * Move the named device to index 0 so it becomes the implicit default.
  *
@@ -11,19 +11,7 @@ const device_normalize_1 = require("./device-normalize");
  * @throws {Error} When no device matches the identifier
  */
 function promoteDeviceToDefault(devices, identifier) {
-    const normalizedArg = identifier.toLowerCase();
-    let normalizedArgHost = '';
-    try {
-        normalizedArgHost = (0, device_normalize_1.normalizeDeviceHost)(identifier).toLowerCase();
-    }
-    catch {
-        // not a valid URL — host matching will not apply
-    }
-    const index = devices.findIndex((d) => (d.name && d.name.toLowerCase() === normalizedArg) ||
-        (d.host && d.host.toLowerCase() === normalizedArg) ||
-        (normalizedArgHost &&
-            d.host &&
-            (0, device_normalize_1.normalizeDeviceHost)(d.host).toLowerCase() === normalizedArgHost));
+    const index = (0, device_lookup_1.findConfiguredDeviceIndex)(devices, identifier);
     if (index === -1) {
         throw new Error(`Device "${identifier}" not found`);
     }

package/dist/src/utilities/device-lookup.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findExistingDeviceEntry = findExistingDeviceEntry;
+exports.findConfiguredDeviceIndex = findConfiguredDeviceIndex;
+const device_normalize_1 = require("./device-normalize");
 /**
  * Find an existing configured device that corresponds to a newly discovered host.
  *
@@ -106,3 +108,29 @@ function findExistingDeviceEntry(existingDevices, newHost, discoveredName, disco
     }
     return undefined;
 }
+/**
+ * Find the index of a configured device by a user-supplied identifier.
+ *
+ * Matches by friendly name (case-insensitive) or by host URL — raw or
+ * normalized — so unnamed legacy/manual entries (stored without a name field)
+ * can still be targeted. Shared by `device remove`, `device default`,
+ * `device rename`, and runtime `-d` resolution so every surface answers to
+ * the same identifier the same way.
+ *
+ * Returns -1 when nothing matches.
+ */
+function findConfiguredDeviceIndex(devices, identifier) {
+    const normalizedArg = identifier.toLowerCase();
+    let normalizedArgHost = '';
+    try {
+        normalizedArgHost = (0, device_normalize_1.normalizeDeviceHost)(identifier).toLowerCase();
+    }
+    catch {
+        // not a valid URL — host matching will not apply
+    }
+    return devices.findIndex((d) => (d.name && d.name.toLowerCase() === normalizedArg) ||
+        (d.host && d.host.toLowerCase() === normalizedArg) ||
+        (normalizedArgHost &&
+            d.host &&
+            (0, device_normalize_1.normalizeDeviceHost)(d.host).toLowerCase() === normalizedArgHost));
+}

package/dist/src/utilities/device-rename.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renameDevice = renameDevice;
-const device_normalize_1 = require("./device-normalize");
+const device_lookup_1 = require("./device-lookup");
 /**
  * Rename a configured device without touching host, apiKey, topicID, or list
  * position — a pure config edit that needs no discovery or network access
@@ -20,19 +20,7 @@ function renameDevice(devices, identifier, newName) {
     if (!trimmedName) {
         throw new Error('New device name must not be empty');
     }
-    const normalizedArg = identifier.toLowerCase();
-    let normalizedArgHost = '';
-    try {
-        normalizedArgHost = (0, device_normalize_1.normalizeDeviceHost)(identifier).toLowerCase();
-    }
-    catch {
-        // not a valid URL — host matching will not apply
-    }
-    const index = devices.findIndex((d) => (d.name && d.name.toLowerCase() === normalizedArg) ||
-        (d.host && d.host.toLowerCase() === normalizedArg) ||
-        (normalizedArgHost &&
-            d.host &&
-            (0, device_normalize_1.normalizeDeviceHost)(d.host).toLowerCase() === normalizedArgHost));
+    const index = (0, device_lookup_1.findConfiguredDeviceIndex)(devices, identifier);
     if (index === -1) {
         throw new Error(`Device "${identifier}" not found`);
     }

package/dist/src/utilities/ff1-compatibility.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveConfiguredDevice = resolveConfiguredDevice;
 exports.assertFF1CommandCompatibility = assertFF1CommandCompatibility;
 const config_1 = require("../config");
+const device_lookup_1 = require("./device-lookup");
 const logger = __importStar(require("../logger"));
 const FF1_COMMAND_POLICIES = {
     displayPlaylist: {
@@ -51,7 +52,8 @@ const FF1_COMMAND_POLICIES = {
 /**
  * Load and validate the configured FF1 device selected by name.
  *
- * @param {string} [deviceName] - Optional device name, exact match required
+ * @param {string} [deviceName] - Optional device name (case-insensitive) or host URL,
+ *   resolved with the same matching rules as `device remove`/`default`/`rename`
  * @param {Object} [options] - Optional dependency overrides
  * @param {Function} [options.getFF1DeviceConfigFn] - Optional config loader override
  * @returns {FF1DeviceSelectionResult} Selected device or reason for failure
@@ -70,7 +72,8 @@ function resolveConfiguredDevice(deviceName, options = {}) {
     }
     let device = deviceConfig.devices[0];
     if (deviceName) {
-        device = deviceConfig.devices.find((item) => item.name === deviceName);
+        const index = (0, device_lookup_1.findConfiguredDeviceIndex)(deviceConfig.devices, deviceName);
+        device = index === -1 ? undefined : deviceConfig.devices[index];
         if (!device) {
             const availableNames = deviceConfig.devices
                 .map((item) => item.name)

package/docs/CONFIGURATION.md

@@ -151,7 +151,7 @@ Setup and `device add` both preserve existing devices. Adding a device with the
 Selection rules when sending:
 
 - If you omit `-d`, the first configured device is used.
-- If you pass `-d <name>`, the CLI matches the device by `name` (exact match). If not found, you’ll see an error listing available devices.
+- If you pass `-d <name>`, the CLI matches the device by `name` (case-insensitive) or by host URL — the same rules as `device remove`/`default`/`rename`, so unnamed entries can be targeted by host. If not found, you’ll see an error listing available devices.
 
 Device cast contract:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feralfile/cli",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CLI for building, signing, and playing DP-1 playlists of digital art on Feral File devices",
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
   "license": "MIT",
   "dependencies": {
     "@napi-rs/keyring": "1.3.0",
-    "@feralfile/source-resolver": "git+https://github.com/feral-file/ff-source-resolver.git#54be943014c8cf7860114510257cdd713bbf4e79",
+    "@feralfile/source-resolver": "^1.0.0",
     "axios": "^1.6.2",
     "bonjour-service": "^1.3.0",
     "chalk": "^4.1.2",