@phystack/screen-phyos 4.5.1-dev → 4.5.3-dev

package/dist/index.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -37,7 +14,6 @@ const fs_1 = __importDefault(require("fs"));
 // import { Settings } from './schema.js';
 const screenshot_js_1 = require("./screenshot.js");
 const sway_js_1 = require("./sway.js");
-const sound = __importStar(require("./sound.js"));
 const udev_js_1 = __importDefault(require("./udev.js"));
 const browser_js_1 = __importDefault(require("./browser.js"));
 const proxy_js_1 = __importDefault(require("./proxy.js"));
@@ -115,10 +91,6 @@ const logger = new phy_logger_1.PhyLogger({
         properties.desired.screenResolution = 'default';
     if (!properties.desired.screenOrientation)
         properties.desired.screenOrientation = 'landscape';
-    if (!properties.desired.soundOutput)
-        properties.desired.soundOutput = 'hdmi1';
-    if (!properties.desired.soundInput)
-        properties.desired.soundInput = 'default';
     if (!properties.desired.scale)
         properties.desired.scale = '1.0';
     logger.info('Desired settings retrieved', { desiredSettings: properties.desired });
@@ -129,15 +101,6 @@ const logger = new phy_logger_1.PhyLogger({
         scale: properties.desired.scale,
         headless: !(0, sway_js_1.isDrmAvailable)(),
     });
-    sound.onDevices((devices) => {
-        const sound = devices.reduce((prev, { device, card, name }) => ({
-            ...prev,
-            [`${card}:${device}`]: name,
-        }), {});
-        emitReportedProperties({ sound });
-    });
-    logger.info('Setting up sound output');
-    await sound.setup(properties.desired.soundOutput, properties.desired.soundInput);
     // const onIoUpdated = async ({ inputs, outputs }: { inputs: any[]; outputs: any[] }) => {
     //   await mirror.activate(
     //     ScreenTransforms(module.settings.screen_orientation),
@@ -240,11 +203,6 @@ const logger = new phy_logger_1.PhyLogger({
     //     throw new Error('Failed to process screenshot');
     //   }
     // });
-    // module.onMethod('sound_test', async (params) => {
-    //   const { output = module.settings.sound_output } = params;
-    //   const success = await sound.test(output);
-    //   return success ? 'Success' : 'Failed';
-    // });
     const checkHeartbeats = async () => {
         while (true) {
             await delay(60 * 1000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phystack/screen-phyos",
-  "version": "4.5.1-dev",
+  "version": "4.5.3-dev",
   "description": "PhyOS Screen",
   "license": "MIT",
   "publishConfig": {
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@azure/storage-blob": "^12.23.0",
-    "@phystack/axios-proxy": "4.5.1-dev",
-    "@phystack/hub-client": "4.5.1-dev",
-    "@phystack/phy-logger": "4.5.1-dev",
+    "@phystack/axios-proxy": "4.5.3-dev",
+    "@phystack/hub-client": "4.5.3-dev",
+    "@phystack/phy-logger": "4.5.3-dev",
     "@vercel/ncc": "^0.38.1",
     "get-image-colors": "^4.0.0",
     "global-agent": "^3.0.0",
@@ -59,5 +59,5 @@
     "lint": "eslint --ext .js,.ts src",
     "lint-fix": "tsc --noEmit && eslint --ext .js,.ts src --fix && prettier --write ."
   },
-  "gitHead": "b203d5bdf7959f22557b2d7ce633a72bcfaf1c6a"
+  "gitHead": "982cfdf11a3589ca7620afd6613863af27204366"
 }

package/dist/sound.js

@@ -1,83 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.test = exports.onDevices = exports.setup = void 0;
-const fs_1 = __importDefault(require("fs"));
-const child_process_1 = __importDefault(require("child_process"));
-let onDevicesHandler = () => { };
-async function setup(output, input) {
-    let cardId = 0;
-    let deviceId = 0;
-    const devices = child_process_1.default.execSync("aplay -l")
-        .toString().trim().split("\n")
-        .map(line => /^card ([0-9]+): .+, device ([0-9]+): (.+) \[(.+)\]$/.exec(line))
-        .filter(info => info)
-        .map(([_, card, device, name, displayName]) => ({
-        card: parseInt(card, 10),
-        device: parseInt(device, 10),
-        name,
-        displayName,
-    }));
-    onDevicesHandler(devices);
-    let device = null;
-    if (output === 'default') {
-        cardId = 0;
-        deviceId = 0;
-    }
-    else if (output === 'hdmi1') {
-        device = devices.find(({ name }) => name === 'HDMI 0')
-            || devices.find(({ displayName }) => displayName === 'HDMI 0')
-            || devices.find(({ name }) => name.indexOf('HDMI 0') >= 0)
-            || devices.find(({ name }) => name.indexOf('HDMI') >= 0);
-    }
-    else if (output === 'hdmi2') {
-        device = devices.find(({ name }) => name === 'HDMI 1')
-            || devices.find(({ displayName }) => displayName === 'HDMI 1')
-            || devices.find(({ name }) => /HDMI 1/i.test(name))
-            || devices.find(({ name }) => /HDMI/i.test(name));
-    }
-    else if (output === 'jack') {
-        device = devices.find(({ name }) => /headphones/i.test(name));
-    }
-    if (device) {
-        cardId = device.card;
-        deviceId = device.device;
-    }
-    const inputDeviceId = input === 'default' ? '0,0' : '1,0';
-    const cfg = [
-        `defaults.pcm.card ${cardId}`,
-        `defaults.pcm.device ${deviceId}`,
-        `defaults.ctl.card ${cardId}`,
-        `pcm.!default {`,
-        `  type asym`,
-        `  playback.pcm`,
-        `  {`,
-        `    type plug`,
-        `    slave.pcm "plughw:${cardId},${deviceId}"`,
-        `  }`,
-        `  capture.pcm`,
-        `  {`,
-        `    type plug`,
-        `    slave.pcm "plughw:${inputDeviceId}"`,
-        `  }`,
-        `}`,
-    ].join('\n');
-    await fs_1.default.promises.writeFile("/etc/asound.conf", cfg);
-}
-exports.setup = setup;
-const onDevices = (handler) => { onDevicesHandler = handler; };
-exports.onDevices = onDevices;
-const test = async (output) => {
-    let out = output;
-    if (out === "jack")
-        out = "front";
-    if (/^hdmi[0-9]/.test(out))
-        out = 'hdmi';
-    const code = await new Promise(resolve => child_process_1.default
-        .spawn("speaker-test", ["-D", `plug:${out} `, "-c2", "-l", "1", "-t", "wav"], { stdio: 'inherit' })
-        .on('exit', resolve));
-    return code === 0;
-};
-exports.test = test;