@appium/base-driver 10.1.2 → 10.2.1

package/build/lib/express/server.js

@@ -7,13 +7,13 @@ exports.server = server;
 exports.configureServer = configureServer;
 exports.normalizeBasePath = normalizeBasePath;
 const lodash_1 = __importDefault(require("lodash"));
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const express_1 = __importDefault(require("express"));
-const http_1 = __importDefault(require("http"));
+const node_http_1 = __importDefault(require("node:http"));
 const serve_favicon_1 = __importDefault(require("serve-favicon"));
 const body_parser_1 = __importDefault(require("body-parser"));
 const method_override_1 = __importDefault(require("method-override"));
-const logger_1 = __importDefault(require("./logger"));
+const logger_1 = require("./logger");
 const express_logging_1 = require("./express-logging");
 const middleware_1 = require("./middleware");
 const static_1 = require("./static");
@@ -24,12 +24,11 @@ const constants_1 = require("../constants");
 const support_1 = require("@appium/support");
 const KEEP_ALIVE_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
 /**
- *
- * @param {ServerOpts} opts
- * @returns {Promise<AppiumServer>}
+ * @param opts - Server options
+ * @returns Promise resolving to the Appium server instance
  */
 async function server(opts) {
-    const { routeConfiguringFunction, port, hostname, cliArgs = /** @type {import('@appium/types').ServerArgs} */ ({}), allowCors = true, basePath = constants_1.DEFAULT_BASE_PATH, extraMethodMap = {}, serverUpdaters = [], keepAliveTimeout = KEEP_ALIVE_TIMEOUT_MS, requestTimeout, } = opts;
+    const { routeConfiguringFunction, port, hostname, cliArgs = {}, allowCors = true, basePath = constants_1.DEFAULT_BASE_PATH, extraMethodMap = {}, serverUpdaters = [], keepAliveTimeout = KEEP_ALIVE_TIMEOUT_MS, requestTimeout, } = opts;
     const app = (0, express_1.default)();
     const httpServer = await createServer(app, cliArgs);
     return await new bluebird_1.default(async (resolve, reject) => {
@@ -78,21 +77,21 @@ async function server(opts) {
     });
 }
 /**
- * Sets up some Express middleware and stuff
- * @param {ConfigureServerOpts} opts
+ * Sets up Express middleware and routes.
+ *
+ * @param opts - Configuration options
  */
 function configureServer({ app, addRoutes, allowCors = true, basePath = constants_1.DEFAULT_BASE_PATH, extraMethodMap = {}, webSocketsMapping = {}, useLegacyUpgradeHandler = true, }) {
     basePath = normalizeBasePath(basePath);
     app.use(express_logging_1.endLogFormatter);
     app.use(middleware_1.handleLogContext);
     // set up static assets
-    app.use((0, serve_favicon_1.default)(path_1.default.resolve(static_1.STATIC_DIR, 'favicon.ico')));
-    // eslint-disable-next-line import/no-named-as-default-member
+    app.use((0, serve_favicon_1.default)(node_path_1.default.resolve(static_1.STATIC_DIR, 'favicon.ico')));
     app.use(express_1.default.static(static_1.STATIC_DIR));
     // crash routes, for testing
     app.use(`${basePath}/produce_error`, crash_1.produceError);
     app.use(`${basePath}/crash`, crash_1.produceCrash);
-    // Only use legacy Express middleware for WebSocket upgrades if shouldUpgradeCallback is not available
+    // Only use legacy Express middleware for WebSocket upgrades if shouldUpgradeCallback is not available.
     // When shouldUpgradeCallback is available, upgrades are handled directly on the HTTP server
     // to avoid Express middleware timeout issues with long-lived connections
     if (useLegacyUpgradeHandler) {
@@ -121,16 +120,16 @@ function configureServer({ app, addRoutes, allowCors = true, basePath = constant
     app.all('/test/guinea-pig-app-banner', static_1.guineaPigAppBanner);
 }
 /**
- * Normalize base path string
- * @param {string} basePath
- * @returns {string}
+ * Normalize base path string (leading slash, no trailing slash).
+ *
+ * @param basePath - Raw base path
+ * @returns Normalized base path
  */
 function normalizeBasePath(basePath) {
     if (!lodash_1.default.isString(basePath)) {
         throw new Error(`Invalid path prefix ${basePath}`);
     }
-    // ensure the path prefix does not end in '/', since our method map
-    // starts all paths with '/'
+    // ensure the path prefix does not end in '/', since our method map starts all paths with '/'
     basePath = basePath.replace(/\/$/, '');
     // likewise, ensure the path prefix does always START with /, unless the path
     // is empty meaning no base path at all
@@ -139,16 +138,10 @@ function normalizeBasePath(basePath) {
     }
     return basePath;
 }
-/**
- *
- * @param {import('express').Express} app
- * @param {Partial<import('@appium/types').ServerArgs>} [cliArgs]
- * @returns {Promise<http.Server>}
- */
 async function createServer(app, cliArgs) {
     const { sslCertificatePath, sslKeyPath } = cliArgs ?? {};
     if (!sslCertificatePath && !sslKeyPath) {
-        return http_1.default.createServer(app);
+        return node_http_1.default.createServer(app);
     }
     if (!sslCertificatePath || !sslKeyPath) {
         throw new Error(`Both certificate path and key path must be provided to enable TLS`);
@@ -161,43 +154,40 @@ async function createServer(app, cliArgs) {
         }
     }
     const [cert, key] = await bluebird_1.default.all(certKey.map((p) => support_1.fs.readFile(p, 'utf8')));
-    logger_1.default.debug('Enabling TLS/SPDY on the server using the provided certificate');
-    return require('spdy').createServer({
+    logger_1.log.debug('Enabling TLS/SPDY on the server using the provided certificate');
+    const spdy = require('spdy');
+    return spdy.createServer({
         cert,
         key,
         spdy: {
             plain: false,
             ssl: true,
-        }
+        },
     }, app);
 }
 /**
- * Monkeypatches the `http.Server` instance and returns a {@linkcode AppiumServer}.
- * This function _mutates_ the `httpServer` parameter.
- * @param {ConfigureHttpOpts} opts
- * @returns {AppiumServer}
+ * Attaches Appium-specific behavior to the HTTP server and returns it as {@linkcode AppiumServer}.
+ * Mutates the `httpServer` parameter.
+ *
+ * @param opts - Configuration options
+ * @returns The same server instance typed as AppiumServer
  */
-function configureHttp({ httpServer, reject, keepAliveTimeout, gracefulShutdownTimeout }) {
-    /**
-     * @type {AppiumServer}
-     */
-    const appiumServer = /** @type {any} */ (httpServer);
+function configureHttp({ httpServer, reject, keepAliveTimeout, gracefulShutdownTimeout, }) {
+    const appiumServer = httpServer;
     appiumServer.webSocketsMapping = {};
     appiumServer.addWebSocketHandler = websocket_1.addWebSocketHandler;
     appiumServer.removeWebSocketHandler = websocket_1.removeWebSocketHandler;
     appiumServer.removeAllWebSocketHandlers = websocket_1.removeAllWebSocketHandlers;
     appiumServer.getWebSocketHandlers = websocket_1.getWebSocketHandlers;
     appiumServer.isSecure = function isSecure() {
-        // eslint-disable-next-line dot-notation
-        return Boolean(this['_spdyState']?.secure);
+        return Boolean(this._spdyState?.secure);
     };
     // This avoids Express middleware timeout issues with long-lived WebSocket connections
     // See: https://github.com/appium/appium/issues/20760
     // See: https://github.com/nodejs/node/pull/59824
     if (hasShouldUpgradeCallback(httpServer)) {
         // shouldUpgradeCallback only returns a boolean to indicate if the upgrade should proceed
-        // eslint-disable-next-line dot-notation
-        appiumServer['shouldUpgradeCallback'] = (req) => lodash_1.default.toLower(req.headers?.upgrade) === 'websocket';
+        appiumServer.shouldUpgradeCallback = (req) => lodash_1.default.toLower(req.headers?.upgrade) === 'websocket';
         appiumServer.on('upgrade', (req, socket, head) => {
             if (!(0, middleware_1.tryHandleWebSocketUpgrade)(req, socket, head, appiumServer.webSocketsMapping)) {
                 socket.destroy();
@@ -208,35 +198,38 @@ function configureHttp({ httpServer, reject, keepAliveTimeout, gracefulShutdownT
     // all connections are closed and the `close` event is emitted
     const originalClose = appiumServer.close.bind(appiumServer);
     appiumServer.close = async () => await new bluebird_1.default((_resolve, _reject) => {
-        logger_1.default.info('Closing Appium HTTP server');
+        logger_1.log.info('Closing Appium HTTP server');
         const timer = new support_1.timing.Timer().start();
         const onTimeout = setTimeout(() => {
-            if (gracefulShutdownTimeout > 0) {
-                logger_1.default.info(`Not all active connections have been closed within ${gracefulShutdownTimeout}ms. ` +
+            if ((gracefulShutdownTimeout ?? 0) > 0) {
+                logger_1.log.info(`Not all active connections have been closed within ${gracefulShutdownTimeout}ms. ` +
                     `This timeout might be customized by the --shutdown-timeout command line ` +
                     `argument. Closing the server anyway.`);
             }
             process.exit(process.exitCode ?? 0);
-        }, gracefulShutdownTimeout);
-        httpServer.once('close', () => {
-            logger_1.default.info(`Appium HTTP server has been successfully closed after ` +
+        }, gracefulShutdownTimeout ?? 0);
+        const onClose = () => {
+            logger_1.log.info(`Appium HTTP server has been successfully closed after ` +
                 `${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
             clearTimeout(onTimeout);
             _resolve();
-        });
-        originalClose((/** @type {Error|undefined} */ err) => {
+        };
+        httpServer.once('close', onClose);
+        originalClose((err) => {
             if (err) {
+                clearTimeout(onTimeout);
+                httpServer.removeListener('close', onClose);
                 _reject(err);
             }
         });
     });
-    appiumServer.once('error', 
-    /** @param {NodeJS.ErrnoException} err */ (err) => {
+    appiumServer.once('error', (err) => {
         if (err.code === 'EADDRNOTAVAIL') {
-            logger_1.default.error('Could not start REST http interface listener. ' + 'Requested address is not available.');
+            logger_1.log.error('Could not start REST http interface listener. ' +
+                'Requested address is not available.');
         }
         else {
-            logger_1.default.error('Could not start REST http interface listener. The requested ' +
+            logger_1.log.error('Could not start REST http interface listener. The requested ' +
                 'port may already be in use. Please make sure there is no ' +
                 'other instance of this server running already.');
         }
@@ -245,16 +238,11 @@ function configureHttp({ httpServer, reject, keepAliveTimeout, gracefulShutdownT
     appiumServer.on('connection', (socket) => socket.setTimeout(keepAliveTimeout));
     return appiumServer;
 }
-/**
- * Starts an {@linkcode AppiumServer}
- * @param {StartServerOpts} opts
- * @returns {Promise<void>}
- */
 async function startServer({ httpServer, port, hostname, keepAliveTimeout, requestTimeout, }) {
-    // If the hostname is omitted, the server will accept
-    // connections on any IP address
-    /** @type {(port: number, hostname?: string) => B<http.Server>} */
-    const start = bluebird_1.default.promisify(httpServer.listen, { context: httpServer });
+    // If the hostname is omitted, the server will accept connections on any IP address
+    const start = bluebird_1.default.promisify(httpServer.listen, {
+        context: httpServer,
+    });
     const startPromise = start(port, hostname);
     httpServer.keepAliveTimeout = keepAliveTimeout;
     if (lodash_1.default.isInteger(requestTimeout)) {
@@ -265,86 +253,20 @@ async function startServer({ httpServer, port, hostname, keepAliveTimeout, reque
     await startPromise;
 }
 /**
- * Checks if the provided server instance supports `shouldUpgradeCallback`.
- * This feature was added in Node.js v22.21.0 (LTS) and v24.9.0.
- * @param {import('http').Server} server - The HTTP server instance to check
- * @returns {boolean}
+ * Checks if the server supports `shouldUpgradeCallback` (Node.js v22.21.0+ / v24.9.0+).
+ *
+ * @param server - The HTTP server instance
+ * @returns true if shouldUpgradeCallback is available
  */
 function hasShouldUpgradeCallback(server) {
     // Check if shouldUpgradeCallback is available on http.Server
     // This is a runtime check that works regardless of TypeScript types
     try {
-        // Use bracket notation to access property that may not exist in type definitions
-        // eslint-disable-next-line dot-notation
-        return typeof server['shouldUpgradeCallback'] !== 'undefined';
+        return (typeof server.shouldUpgradeCallback !==
+            'undefined');
     }
     catch {
         return false;
     }
 }
-/**
- * Options for {@linkcode startServer}.
- * @typedef StartServerOpts
- * @property {import('http').Server} httpServer - HTTP server instance
- * @property {number} port - Port to run on
- * @property {number} keepAliveTimeout - Keep-alive timeout in milliseconds
- * @property {string} [hostname] - Optional hostname
- * @property {number} [requestTimeout] - The timeout value in milliseconds for
- * receiving the entire request from the client
- */
-/**
- * @typedef {import('@appium/types').AppiumServer} AppiumServer
- */
-/**
- * @typedef {import('@appium/types').MethodMap<import('@appium/types').ExternalDriver>} MethodMap
- */
-/**
- * Options for {@linkcode configureHttp}
- * @typedef ConfigureHttpOpts
- * @property {import('http').Server} httpServer - HTTP server instance
- * @property {(error?: any) => void} reject - Rejection function from `Promise` constructor
- * @property {number} keepAliveTimeout - Keep-alive timeout in milliseconds
- * @property {number} gracefulShutdownTimeout - For how long the server should delay its
- * shutdown before force-closing all open connections to it. Providing zero will force-close
- * the server without waiting for any connections.
- */
-/**
- * Options for {@linkcode server}
- * @typedef ServerOpts
- * @property {RouteConfiguringFunction} routeConfiguringFunction
- * @property {number} port
- * @property {import('@appium/types').ServerArgs} [cliArgs]
- * @property {string} [hostname]
- * @property {boolean} [allowCors]
- * @property {string} [basePath]
- * @property {MethodMap} [extraMethodMap]
- * @property {import('@appium/types').UpdateServerCallback[]} [serverUpdaters]
- * @property {number} [keepAliveTimeout]
- * @property {number} [requestTimeout]
- */
-/**
- * A function which configures routes
- * @callback RouteConfiguringFunction
- * @param {import('express').Express} app
- * @param {RouteConfiguringFunctionOpts} [opts]
- * @returns {void}
- */
-/**
- * Options for a {@linkcode RouteConfiguringFunction}
- * @typedef RouteConfiguringFunctionOpts
- * @property {string} [basePath]
- * @property {MethodMap} [extraMethodMap]
- */
-/**
- * Options for {@linkcode configureServer}
- * @typedef ConfigureServerOpts
- * @property {import('express').Express} app
- * @property {RouteConfiguringFunction} addRoutes
- * @property {boolean} [allowCors]
- * @property {string} [basePath]
- * @property {MethodMap} [extraMethodMap]
- * @property {import('@appium/types').StringRecord} [webSocketsMapping={}]
- * @property {boolean} [useLegacyUpgradeHandler=true] - Whether to use legacy Express middleware for WebSocket upgrades.
- *   Set to false when using shouldUpgradeCallback on the HTTP server (Node.js >= 22.21.0 or >= 24.9.0).
- */
 //# sourceMappingURL=server.js.map

package/build/lib/express/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../lib/express/server.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../lib/express/server.ts"],"names":[],"mappings":"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"}

package/build/lib/express/static.d.ts

@@ -1,6 +1,11 @@
-export function guineaPig(req: any, res: any): Promise<void>;
-export function guineaPigScrollable(req: any, res: any): Promise<void>;
-export function guineaPigAppBanner(req: any, res: any): Promise<void>;
-export function welcome(req: any, res: any): Promise<void>;
-export let STATIC_DIR: string;
+import type { Request, Response } from 'express';
+export declare const STATIC_DIR: string;
+/** Dynamic page mapped to /test/guinea-pig */
+export declare function guineaPig(req: Request, res: Response): Promise<void>;
+/** Dynamic page mapped to /test/guinea-pig-scrollable */
+export declare function guineaPigScrollable(req: Request, res: Response): Promise<void>;
+/** Dynamic page mapped to /test/guinea-pig-app-banner */
+export declare function guineaPigAppBanner(req: Request, res: Response): Promise<void>;
+/** Dynamic page mapped to /welcome */
+export declare function welcome(req: Request, res: Response): Promise<void>;
 //# sourceMappingURL=static.d.ts.map

package/build/lib/express/static.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../../lib/express/static.js"],"names":[],"mappings":"AA2CA,6DAEC;AAKD,uEAEC;AAKD,sEAEC;AAKD,2DAIC;AA9DD,8BAAqE"}
+{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../../../lib/express/static.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE/C,eAAO,MAAM,UAAU,QAEgC,CAAC;AAIxD,8CAA8C;AAC9C,wBAAsB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;AAED,yDAAyD;AACzD,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpF;AAED,yDAAyD;AACzD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnF;AAED,sCAAsC;AACtC,wBAAsB,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxE"}

package/build/lib/express/static.js

@@ -8,33 +8,48 @@ exports.guineaPig = guineaPig;
 exports.guineaPigScrollable = guineaPigScrollable;
 exports.guineaPigAppBanner = guineaPigAppBanner;
 exports.welcome = welcome;
-const path_1 = __importDefault(require("path"));
-const logger_1 = __importDefault(require("./logger"));
+const node_path_1 = __importDefault(require("node:path"));
+const logger_1 = require("./logger");
 const lodash_1 = __importDefault(require("lodash"));
 const support_1 = require("@appium/support");
 const bluebird_1 = __importDefault(require("bluebird"));
-let STATIC_DIR = path_1.default.resolve(__dirname, '..', '..', '..', 'static');
-exports.STATIC_DIR = STATIC_DIR;
-if (lodash_1.default.isNull(path_1.default.resolve(__dirname).match(/build[/\\]lib[/\\]express$/))) {
-    // in some contexts we are not in the build directory,
-    // so we don't want to go back the extra level
-    exports.STATIC_DIR = STATIC_DIR = path_1.default.resolve(__dirname, '..', '..', 'static');
+exports.STATIC_DIR = lodash_1.default.isNull(node_path_1.default.resolve(__dirname).match(/build[/\\]lib[/\\]express$/))
+    ? node_path_1.default.resolve(__dirname, '..', '..', 'static')
+    : node_path_1.default.resolve(__dirname, '..', '..', '..', 'static');
+/** Dynamic page mapped to /test/guinea-pig */
+async function guineaPig(req, res) {
+    await guineaPigTemplate(req, res, 'guinea-pig.html');
+}
+/** Dynamic page mapped to /test/guinea-pig-scrollable */
+async function guineaPigScrollable(req, res) {
+    await guineaPigTemplate(req, res, 'guinea-pig-scrollable.html');
+}
+/** Dynamic page mapped to /test/guinea-pig-app-banner */
+async function guineaPigAppBanner(req, res) {
+    await guineaPigTemplate(req, res, 'guinea-pig-app-banner.html');
+}
+/** Dynamic page mapped to /welcome */
+async function welcome(req, res) {
+    const params = { message: "Let's browse!" };
+    logger_1.log.debug(`Sending welcome response with params: ${JSON.stringify(params)}`);
+    const template = await getTemplate('welcome.html');
+    res.send(template(params));
 }
 async function guineaPigTemplate(req, res, page) {
-    const delay = parseInt(req.params.delay || req.query.delay || 0, 10);
-    const throwError = req.params.throwError || req.query.throwError || '';
-    let params = {
+    const delay = parseInt(String(req.params.delay ?? (req.query?.delay ?? 0)), 10);
+    const throwError = String(req.params.throwError ?? req.query?.throwError ?? '');
+    const params = {
         throwError,
         serverTime: new Date(),
         userAgent: req.headers['user-agent'],
         comment: 'None',
     };
-    if (req.method === 'POST') {
-        params.comment = req.body.comments || params.comment;
+    if (req.method === 'POST' && req.body && typeof req.body === 'object' && 'comments' in req.body) {
+        params.comment = String(req.body.comments ?? params.comment);
     }
-    logger_1.default.debug(`Sending guinea pig response with params: ${JSON.stringify(params)}`);
+    logger_1.log.debug(`Sending guinea pig response with params: ${JSON.stringify(params)}`);
     if (delay) {
-        logger_1.default.debug(`Waiting ${delay}ms before responding`);
+        logger_1.log.debug(`Waiting ${delay}ms before responding`);
         await bluebird_1.default.delay(delay);
     }
     res.set('content-type', 'text/html');
@@ -44,36 +59,11 @@ async function guineaPigTemplate(req, res, page) {
         domain: '.blargimarg.com',
         path: '/',
     });
-    res.send((await getTemplate(page))(params));
-}
-/*
- * Dynamic page mapped to /test/guinea-pig
- */
-async function guineaPig(req, res) {
-    return await guineaPigTemplate(req, res, 'guinea-pig.html');
-}
-/*
- * Dynamic page mapped to /test/guinea-pig-scrollable
- */
-async function guineaPigScrollable(req, res) {
-    return await guineaPigTemplate(req, res, 'guinea-pig-scrollable.html');
-}
-/*
- * Dynamic page mapped to /test/guinea-pig-app-banner
- */
-async function guineaPigAppBanner(req, res) {
-    return await guineaPigTemplate(req, res, 'guinea-pig-app-banner.html');
-}
-/*
- * Dynamic page mapped to /welcome
- */
-async function welcome(req, res) {
-    let params = { message: "Let's browse!" };
-    logger_1.default.debug(`Sending welcome response with params: ${JSON.stringify(params)}`);
-    res.send((await getTemplate('welcome.html'))(params));
+    const template = await getTemplate(page);
+    res.send(template(params));
 }
 async function getTemplate(templateName) {
-    let content = await support_1.fs.readFile(path_1.default.resolve(STATIC_DIR, 'test', templateName));
+    const content = await support_1.fs.readFile(node_path_1.default.resolve(exports.STATIC_DIR, 'test', templateName));
     return lodash_1.default.template(content.toString());
 }
 //# sourceMappingURL=static.js.map

package/build/lib/express/static.js.map

@@ -1 +1 @@
-{"version":3,"file":"static.js","sourceRoot":"","sources":["../../../lib/express/static.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"static.js","sourceRoot":"","sources":["../../../lib/express/static.ts"],"names":[],"mappings":"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"}

package/build/lib/express/websocket.d.ts

@@ -1,7 +1,23 @@
-export type AppiumServer = import("@appium/types").AppiumServer;
-export function addWebSocketHandler(this: import("@appium/types").AppiumServer, handlerPathname: string, handlerServer: import("ws").Server): Promise<void>;
-export function removeWebSocketHandler(this: import("@appium/types").AppiumServer, handlerPathname: string): Promise<boolean>;
-export function removeAllWebSocketHandlers(this: import("@appium/types").AppiumServer): Promise<boolean>;
-export function getWebSocketHandlers(this: import("@appium/types").AppiumServer, keysFilter?: string | null): Promise<Record<string, import("ws").Server>>;
-export const DEFAULT_WS_PATHNAME_PREFIX: "/ws";
+import type { AppiumServer, WSServer } from '@appium/types';
+export declare const DEFAULT_WS_PATHNAME_PREFIX = "/ws";
+/**
+ * Adds a WebSocket handler to this server's mapping.
+ * @see AppiumServerExtension.addWebSocketHandler
+ */
+export declare function addWebSocketHandler(this: AppiumServer, handlerPathname: string, handlerServer: WSServer): Promise<void>;
+/**
+ * Returns WebSocket handlers for this server, optionally filtered by pathname.
+ * @see AppiumServerExtension.getWebSocketHandlers
+ */
+export declare function getWebSocketHandlers(this: AppiumServer, keysFilter?: string | null): Promise<Record<string, WSServer>>;
+/**
+ * Removes a WebSocket handler by pathname.
+ * @see AppiumServerExtension.removeWebSocketHandler
+ */
+export declare function removeWebSocketHandler(this: AppiumServer, handlerPathname: string): Promise<boolean>;
+/**
+ * Removes all WebSocket handlers from this server.
+ * @see AppiumServerExtension.removeAllWebSocketHandlers
+ */
+export declare function removeAllWebSocketHandlers(this: AppiumServer): Promise<boolean>;
 //# sourceMappingURL=websocket.d.ts.map

package/build/lib/express/websocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../../lib/express/websocket.js"],"names":[],"mappings":"2BA6Ea,OAAO,eAAe,EAAE,YAAY;;;;;AAzEjD,yCAAmC,KAAK,CAAC"}
+{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../../lib/express/websocket.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE1D,eAAO,MAAM,0BAA0B,QAAQ,CAAC;AAEhD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,YAAY,EAClB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,QAAQ,GACtB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,YAAY,EAClB,UAAU,GAAE,MAAM,GAAG,IAAW,GAC/B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAUnC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,YAAY,EAClB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAkBlB;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAYrF"}

package/build/lib/express/websocket.js

@@ -5,23 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_WS_PATHNAME_PREFIX = void 0;
 exports.addWebSocketHandler = addWebSocketHandler;
+exports.getWebSocketHandlers = getWebSocketHandlers;
 exports.removeWebSocketHandler = removeWebSocketHandler;
 exports.removeAllWebSocketHandlers = removeAllWebSocketHandlers;
-exports.getWebSocketHandlers = getWebSocketHandlers;
 const lodash_1 = __importDefault(require("lodash"));
 const bluebird_1 = __importDefault(require("bluebird"));
-const DEFAULT_WS_PATHNAME_PREFIX = '/ws';
-exports.DEFAULT_WS_PATHNAME_PREFIX = DEFAULT_WS_PATHNAME_PREFIX;
+exports.DEFAULT_WS_PATHNAME_PREFIX = '/ws';
 /**
- * @this {AppiumServer}
- * @type {AppiumServer['addWebSocketHandler']}
+ * Adds a WebSocket handler to this server's mapping.
+ * @see AppiumServerExtension.addWebSocketHandler
  */
 async function addWebSocketHandler(handlerPathname, handlerServer) {
     this.webSocketsMapping[handlerPathname] = handlerServer;
 }
 /**
- * @this {AppiumServer}
- * @type {AppiumServer['getWebSocketHandlers']}
+ * Returns WebSocket handlers for this server, optionally filtered by pathname.
+ * @see AppiumServerExtension.getWebSocketHandlers
  */
 async function getWebSocketHandlers(keysFilter = null) {
     return lodash_1.default.toPairs(this.webSocketsMapping).reduce((acc, [pathname, wsServer]) => {
@@ -32,8 +31,8 @@ async function getWebSocketHandlers(keysFilter = null) {
     }, {});
 }
 /**
- * @this {AppiumServer}
- * @type {AppiumServer['removeWebSocketHandler']}
+ * Removes a WebSocket handler by pathname.
+ * @see AppiumServerExtension.removeWebSocketHandler
  */
 async function removeWebSocketHandler(handlerPathname) {
     const wsServer = this.webSocketsMapping?.[handlerPathname];
@@ -56,9 +55,8 @@ async function removeWebSocketHandler(handlerPathname) {
     return false;
 }
 /**
- *
- * @this {AppiumServer}
- * @type {AppiumServer['removeAllWebSocketHandlers']}
+ * Removes all WebSocket handlers from this server.
+ * @see AppiumServerExtension.removeAllWebSocketHandlers
  */
 async function removeAllWebSocketHandlers() {
     if (lodash_1.default.isEmpty(this.webSocketsMapping)) {
@@ -66,7 +64,4 @@ async function removeAllWebSocketHandlers() {
     }
     return lodash_1.default.some(await bluebird_1.default.all(lodash_1.default.keys(this.webSocketsMapping).map((pathname) => this.removeWebSocketHandler(pathname))));
 }
-/**
- * @typedef {import('@appium/types').AppiumServer} AppiumServer
- */
 //# sourceMappingURL=websocket.js.map

package/build/lib/express/websocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../lib/express/websocket.js"],"names":[],"mappings":";;;;;;AAqEE,kDAAmB;AACnB,wDAAsB;AACtB,gEAA0B;AAC1B,oDAAoB;AAvEtB,oDAAuB;AACvB,wDAAyB;AAEzB,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAqEvC,gEAA0B;AAnE5B;;;GAGG;AACH,KAAK,UAAU,mBAAmB,CAAC,eAAe,EAAE,aAAa;IAC/D,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,aAAa,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,oBAAoB,CAAC,UAAU,GAAG,IAAI;IACnD,OAAO,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC5E,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7D,GAAG,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,sBAAsB,CAAC,eAAe;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,eAAe,CAAC,CAAC;IAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAC5C,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;YAAS,CAAC;QACT,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,0BAA0B;IACvC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,gBAAC,CAAC,IAAI,CACX,MAAM,kBAAC,CAAC,GAAG,CACT,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CACxF,CACF,CAAC;AACJ,CAAC;AAUD;;GAEG"}
+{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../lib/express/websocket.ts"],"names":[],"mappings":";;;;;;AAUA,kDAMC;AAMD,oDAaC;AAMD,wDAqBC;AAMD,gEAYC;AAhFD,oDAAuB;AACvB,wDAAyB;AAGZ,QAAA,0BAA0B,GAAG,KAAK,CAAC;AAEhD;;;GAGG;AACI,KAAK,UAAU,mBAAmB,CAEvC,eAAuB,EACvB,aAAuB;IAEvB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,aAAa,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,oBAAoB,CAExC,aAA4B,IAAI;IAEhC,OAAO,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC5B,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7D,GAAG,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,sBAAsB,CAE1C,eAAuB;IAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,eAAe,CAAC,CAAC;IAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAC5C,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;YAAS,CAAC;QACT,OAAO,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,0BAA0B;IAC9C,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,gBAAC,CAAC,IAAI,CACX,MAAM,kBAAC,CAAC,GAAG,CACT,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC9C,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CACtC,CACF,CACF,CAAC;AACJ,CAAC"}