@wdio/shared-store-service 8.16.17 → 8.16.19

package/build/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const CUSTOM_CAP = "wdio:sharedStoreServicePort";
+//# sourceMappingURL=constants.d.ts.map

package/build/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,gCAAgC,CAAA"}

package/build/constants.js

@@ -0,0 +1 @@
+export const CUSTOM_CAP = 'wdio:sharedStoreServicePort';

package/build/launcher.d.ts

@@ -1,7 +1,7 @@
-import type { SharedStoreServiceCapabilities } from './types.js';
-export default class SharedStoreLauncher {
+import type { Capabilities, Services } from '@wdio/types';
+export default class SharedStoreLauncher implements Services.HookFunctions {
     private _app?;
-    onPrepare(_: never, capabilities: SharedStoreServiceCapabilities[]): Promise<void>;
+    onPrepare(_: never, capabilities: Capabilities.RemoteCapabilities): Promise<void>;
     onComplete(): Promise<void>;
 }
 //# sourceMappingURL=launcher.d.ts.map

package/build/launcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,YAAY,CAAA;AAMhE,MAAM,CAAC,OAAO,OAAO,mBAAmB;IACpC,OAAO,CAAC,IAAI,CAAC,CAAe;IAEtB,SAAS,CAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,8BAA8B,EAAE;IAenE,UAAU;CAQnB"}
+{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAUzD,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,QAAQ,CAAC,aAAa;IACtE,OAAO,CAAC,IAAI,CAAC,CAAe;IAEtB,SAAS,CAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,CAAC,kBAAkB;IA6BlE,UAAU;CAQnB"}

package/build/launcher.js

@@ -1,5 +1,6 @@
 import logger from '@wdio/logger';
 import { setPort } from './client.js';
+import { CUSTOM_CAP } from './constants.js';
 const log = logger('@wdio/shared-store-service');
 let server;
 export default class SharedStoreLauncher {
@@ -12,9 +13,19 @@ export default class SharedStoreLauncher {
         const { port, app } = await server.startServer();
         this._app = app;
         setPort(port);
-        capabilities.forEach((capability) => {
-            capability['wdio:sharedStoreServicePort'] = port;
+        const capsList = Array.isArray(capabilities)
+            ? capabilities
+            : Object.values(capabilities).map((multiremoteOption) => multiremoteOption.capabilities);
+        const caps = capsList.flatMap((c) => {
+            const multiremote = c;
+            if (!multiremote.browserName && multiremote[Object.keys(multiremote)[0]].capabilities) {
+                return Object.values(multiremote).map((options) => options.capabilities?.alwaysMatch ||
+                    options.capabilities);
+            }
+            const w3cCaps = c;
+            return w3cCaps.alwaysMatch || c;
         });
+        caps.forEach((c) => { c[CUSTOM_CAP] = port; });
         log.info(`Started shared server on port ${port}`);
     }
     async onComplete() {

package/build/service.d.ts

@@ -1,8 +1,7 @@
-import type { Services } from '@wdio/types';
-import type { SharedStoreServiceCapabilities } from './types.js';
+import type { Services, Capabilities } from '@wdio/types';
 export default class SharedStoreService implements Services.ServiceInstance {
     private _browser?;
-    constructor(_: never, caps: SharedStoreServiceCapabilities);
-    before(caps: never, specs: never, browser: WebdriverIO.Browser): void;
+    constructor(_: never, caps: Capabilities.RemoteCapability);
+    before(caps: never, specs: never, _browser: WebdriverIO.Browser | WebdriverIO.MultiRemoteBrowser): void;
 }
 //# sourceMappingURL=service.d.ts.map

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiC,QAAQ,EAAa,MAAM,aAAa,CAAA;AAGrF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,YAAY,CAAA;AAGhE,MAAM,CAAC,OAAO,OAAO,kBAAmB,YAAW,QAAQ,CAAC,eAAe;IACvE,OAAO,CAAC,QAAQ,CAAC,CAAqB;gBAE1B,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,8BAA8B;IAI1D,MAAM,CACF,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,CAAC,OAAO;CAmCnC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiC,QAAQ,EAAa,YAAY,EAAE,MAAM,aAAa,CAAA;AAOnG,MAAM,CAAC,OAAO,OAAO,kBAAmB,YAAW,QAAQ,CAAC,eAAe;IACvE,OAAO,CAAC,QAAQ,CAAC,CAAsD;gBAE3D,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,gBAAgB;IAczD,MAAM,CACF,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB;CA0CrE"}

package/build/service.js

@@ -1,28 +1,41 @@
 import { getValue, setValue, setPort, setResourcePool, getValueFromPool, addValueToPool } from './client.js';
+import { CUSTOM_CAP } from './constants.js';
 export default class SharedStoreService {
     _browser;
     constructor(_, caps) {
-        setPort(caps['wdio:sharedStoreServicePort']);
+        const port = (caps[CUSTOM_CAP] ||
+            caps.alwaysMatch?.[CUSTOM_CAP] ||
+            (Object.values(caps)[0]?.capabilities)[CUSTOM_CAP]);
+        if (!port) {
+            throw new Error('SharedStoreService: port not found in capabilities');
+        }
+        setPort(port);
     }
-    before(caps, specs, browser) {
-        this._browser = browser;
+    before(caps, specs, _browser) {
+        this._browser = _browser;
         const sharedStore = Object.create({}, {
             get: {
-                value: (key) => this._browser?.call(() => getValue(key))
+                value: (key) => getValue(key)
             },
             set: {
-                value: (key, value) => this._browser?.call(() => setValue(key, value))
+                value: (key, value) => setValue(key, value)
             },
             setResourcePool: {
-                value: (key, value) => this._browser?.call(() => setResourcePool(key, value))
+                value: (key, value) => setResourcePool(key, value)
             },
             getValueFromPool: {
-                value: (key, options) => this._browser?.call(() => getValueFromPool(key, options))
+                value: (key, options) => getValueFromPool(key, options)
             },
             addValueToPool: {
-                value: (key, value) => this._browser?.call(() => addValueToPool(key, value))
+                value: (key, value) => addValueToPool(key, value)
             }
         });
         this._browser.sharedStore = sharedStore;
+        const browser = this._browser;
+        if (!this._browser.capabilities && browser.instances) {
+            browser.instances.forEach((browserName) => {
+                browser.getInstance(browserName).sharedStore = sharedStore;
+            });
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/shared-store-service",
-  "version": "8.16.17",
+  "version": "8.16.19",
   "description": "A WebdriverIO service to exchange data across processes",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-shared-store-service",
@@ -44,13 +44,13 @@
     "@wdio/types": "8.16.12",
     "got": "^ 12.6.1",
     "polka": "^0.5.2",
-    "webdriverio": "8.16.17"
+    "webdriverio": "8.16.19"
   },
   "devDependencies": {
-    "@wdio/globals": "8.16.17"
+    "@wdio/globals": "8.16.19"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5bb4539c96e11a7ece83630b30c0a54903b55c0e"
+  "gitHead": "d05091c0a00cbe739f68ad8fd1fdcf577855002a"
 }