tractive-device-farm 2.1.2 → 2.1.4

package/lib/auth/middleware.js

@@ -5,11 +5,21 @@ const tokens_service_1 = require("../data-service/tokens-service");
 const users_service_1 = require("../data-service/users-service");
 const bootstrap_admin_1 = require("./bootstrap-admin");
 function extractBearer(req) {
+    var _a;
     const header = req.headers['authorization'];
-    if (!header || typeof header !== 'string')
-        return null;
-    const match = header.match(/^Bearer\s+(.+)$/i);
-    return match ? match[1].trim() : null;
+    if (header && typeof header === 'string') {
+        const match = header.match(/^Bearer\s+(.+)$/i);
+        if (match)
+            return match[1].trim();
+    }
+    // Fallback for browser media requests (<video src>, <img src>) which
+    // can't carry custom Authorization headers. The same plaintext token is
+    // accepted as a ?token= query param — still validated against the DB.
+    const queryToken = (_a = req.query) === null || _a === void 0 ? void 0 : _a.token;
+    if (typeof queryToken === 'string' && queryToken.length > 0) {
+        return queryToken.trim();
+    }
+    return null;
 }
 function requireAuth(req, res, next) {
     if (!(0, bootstrap_admin_1.isAuthEnabled)()) {

package/lib/helpers.js

@@ -106,11 +106,11 @@ function isPortBusy(port) {
 }
 exports.isPortBusy = isPortBusy;
 function hasHubArgument(cliArgs) {
-    return lodash_1.default.has(cliArgs, 'plugin["device-farm"].hub');
+    return lodash_1.default.has(cliArgs, 'plugin["tractive-device-farm"].hub');
 }
 exports.hasHubArgument = hasHubArgument;
 function isCloud(cliArgs) {
-    return lodash_1.default.has(cliArgs, 'plugin["device-farm"].cloud');
+    return lodash_1.default.has(cliArgs, 'plugin["tractive-device-farm"].cloud');
 }
 exports.isCloud = isCloud;
 // Standard, non-prefixed capabilities (see https://www.w3.org/TR/webdriver/#dfn-table-of-standard-capabilities)

package/lib/plugin.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DevicePlugin = void 0;
 /* eslint-disable no-prototype-builtins */
 require("reflect-metadata");
-const index_1 = __importDefault(require("./commands/index"));
 const base_plugin_1 = __importDefault(require("@appium/base-plugin"));
 const app_1 = require("./app");
 const async_lock_1 = __importDefault(require("async-lock"));
@@ -155,7 +154,7 @@ class DevicePlugin extends base_plugin_1.default {
         });
     }
     static setIncludeSimulatorState(cliArgs, deviceTypes) {
-        const cloudExists = lodash_1.default.has(cliArgs, 'plugin["device-farm"].cloud');
+        const cloudExists = lodash_1.default.has(cliArgs, 'plugin["tractive-device-farm"].cloud');
         if (cloudExists) {
             deviceTypes = 'real';
             logger_1.default.info('ℹ️ Skipping Simulators as per the configuration ℹ️');
@@ -180,8 +179,11 @@ class DevicePlugin extends base_plugin_1.default {
     }
     handle(next, driver, commandName, ...args) {
         return __awaiter(this, void 0, void 0, function* () {
-            // createSession is intercepted by the specialized method below; everything
-            // else flows through the dashboard's command-tracking handler.
+            // Keep the device-farm idle timer fresh on every command, then route
+            // through the dashboard's command-tracking handler so per-command logs,
+            // dashboard: scripts, and session termination all work. createSession and
+            // deleteSession are intercepted by their specialized methods below.
+            (0, device_service_1.updateCmdExecutedTime)(driver.sessionId);
             return yield (0, session_handler_1.dashboardHandle)(next, driver, commandName, ...args);
         });
     }
@@ -307,7 +309,21 @@ class DevicePlugin extends base_plugin_1.default {
         throw new Error(`"${error}", Please check the remote appium server log to know the reason for failure`);
     }
     deleteSession(next, driver, sessionId) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            // Within a single plugin, Appium routes deleteSession to this dedicated
+            // method instead of handle(), so dashboardHandle never sees it. Invoke
+            // the dashboard's terminate path here BEFORE next() — once next() tears
+            // the driver down, the stop-recording POST returns NoSuchDriverError and
+            // the screen recording is lost. Without this, sessionTerminated only
+            // runs via SessionManager's 5-min idle timer, by which point the session
+            // is gone and video_path stays NULL in the DB.
+            try {
+                yield (0, session_handler_1.dashboardHandle)(() => Promise.resolve(), driver, 'deleteSession', sessionId);
+            }
+            catch (err) {
+                logger_1.default.warn(`Dashboard deleteSession handling failed: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            }
             (0, device_service_1.unblockDevice)({ session_id: sessionId });
             logger_1.default.info(`📱 Unblocking the device that is blocked for session ${sessionId}`);
             return yield next();
@@ -315,4 +331,3 @@ class DevicePlugin extends base_plugin_1.default {
     }
 }
 exports.DevicePlugin = DevicePlugin;
-Object.assign(DevicePlugin.prototype, index_1.default);

package/lib/public/dashboard/asset-manifest.json

@@ -1,8 +1,8 @@
 {
   "files": {
     "main.css": "/device-farm/dashboard/static/css/main.52778f63.chunk.css",
-    "main.js": "/device-farm/dashboard/static/js/main.f68d4156.chunk.js",
-    "main.js.map": "/device-farm/dashboard/static/js/main.f68d4156.chunk.js.map",
+    "main.js": "/device-farm/dashboard/static/js/main.9652282b.chunk.js",
+    "main.js.map": "/device-farm/dashboard/static/js/main.9652282b.chunk.js.map",
     "runtime-main.js": "/device-farm/dashboard/static/js/runtime-main.6dc6563e.js",
     "runtime-main.js.map": "/device-farm/dashboard/static/js/runtime-main.6dc6563e.js.map",
     "static/css/2.58a45539.chunk.css": "/device-farm/dashboard/static/css/2.58a45539.chunk.css",
@@ -20,6 +20,6 @@
     "static/css/2.58a45539.chunk.css",
     "static/js/2.f7672eec.chunk.js",
     "static/css/main.52778f63.chunk.css",
-    "static/js/main.f68d4156.chunk.js"
+    "static/js/main.9652282b.chunk.js"
   ]
 }

package/lib/public/dashboard/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/device-farm/dashboard/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/device-farm/dashboard/logo192.png"/><link rel="manifest" href="/device-farm/dashboard/manifest.json"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/><link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" rel="stylesheet"/><title>Appium Dashboard</title><link href="/device-farm/dashboard/static/css/2.58a45539.chunk.css" rel="stylesheet"><link href="/device-farm/dashboard/static/css/main.52778f63.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,u,i=r[0],c=r[1],l=r[2],p=0,s=[];p<i.length;p++)u=i[p],Object.prototype.hasOwnProperty.call(o,u)&&o[u]&&s.push(o[u][0]),o[u]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);s.length;)s.shift()();return a.push.apply(a,l||[]),t()}function t(){for(var e,r=0;r<a.length;r++){for(var t=a[r],n=!0,i=1;i<t.length;i++){var c=t[i];0!==o[c]&&(n=!1)}n&&(a.splice(r--,1),e=u(u.s=t[0]))}return e}var n={},o={1:0},a=[];function u(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,u),t.l=!0,t.exports}u.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var a,i=document.createElement("script");i.charset="utf-8",i.timeout=120,u.nc&&i.setAttribute("nonce",u.nc),i.src=function(e){return u.p+"static/js/"+({}[e]||e)+"."+{3:"39e9d0dc"}[e]+".chunk.js"}(e);var c=new Error;a=function(r){i.onerror=i.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+a+")",c.name="ChunkLoadError",c.type=n,c.request=a,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){a({type:"timeout",target:i})}),12e4);i.onerror=i.onload=a,document.head.appendChild(i)}return Promise.all(r)},u.m=e,u.c=n,u.d=function(e,r,t){u.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},u.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},u.t=function(e,r){if(1&r&&(e=u(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(u.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)u.d(t,n,function(r){return e[r]}.bind(null,n));return t},u.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return u.d(r,"a",r),r},u.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},u.p="/device-farm/dashboard/",u.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpappium-dashboard-web"]=this["webpackJsonpappium-dashboard-web"]||[],c=i.push.bind(i);i.push=r,i=i.slice();for(var l=0;l<i.length;l++)r(i[l]);var f=c;t()}([])</script><script src="/device-farm/dashboard/static/js/2.f7672eec.chunk.js"></script><script src="/device-farm/dashboard/static/js/main.f68d4156.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/device-farm/dashboard/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/device-farm/dashboard/logo192.png"/><link rel="manifest" href="/device-farm/dashboard/manifest.json"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/><link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap" rel="stylesheet"/><title>Appium Dashboard</title><link href="/device-farm/dashboard/static/css/2.58a45539.chunk.css" rel="stylesheet"><link href="/device-farm/dashboard/static/css/main.52778f63.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,u,i=r[0],c=r[1],l=r[2],p=0,s=[];p<i.length;p++)u=i[p],Object.prototype.hasOwnProperty.call(o,u)&&o[u]&&s.push(o[u][0]),o[u]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);s.length;)s.shift()();return a.push.apply(a,l||[]),t()}function t(){for(var e,r=0;r<a.length;r++){for(var t=a[r],n=!0,i=1;i<t.length;i++){var c=t[i];0!==o[c]&&(n=!1)}n&&(a.splice(r--,1),e=u(u.s=t[0]))}return e}var n={},o={1:0},a=[];function u(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,u),t.l=!0,t.exports}u.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var a,i=document.createElement("script");i.charset="utf-8",i.timeout=120,u.nc&&i.setAttribute("nonce",u.nc),i.src=function(e){return u.p+"static/js/"+({}[e]||e)+"."+{3:"39e9d0dc"}[e]+".chunk.js"}(e);var c=new Error;a=function(r){i.onerror=i.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+a+")",c.name="ChunkLoadError",c.type=n,c.request=a,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){a({type:"timeout",target:i})}),12e4);i.onerror=i.onload=a,document.head.appendChild(i)}return Promise.all(r)},u.m=e,u.c=n,u.d=function(e,r,t){u.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},u.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},u.t=function(e,r){if(1&r&&(e=u(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(u.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)u.d(t,n,function(r){return e[r]}.bind(null,n));return t},u.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return u.d(r,"a",r),r},u.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},u.p="/device-farm/dashboard/",u.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpappium-dashboard-web"]=this["webpackJsonpappium-dashboard-web"]||[],c=i.push.bind(i);i.push=r,i=i.slice();for(var l=0;l<i.length;l++)r(i[l]);var f=c;t()}([])</script><script src="/device-farm/dashboard/static/js/2.f7672eec.chunk.js"></script><script src="/device-farm/dashboard/static/js/main.9652282b.chunk.js"></script></body></html>