@wix/services-manager 0.2.1 → 0.2.4

package/build/helpers.d.ts

@@ -1 +1,4 @@
+import { GetService, ThreadMode } from '@wix/services-definitions';
 export { defineService, implementService } from '@wix/services-definitions';
+export declare const resolveServiceGetterFromContext: <M extends ThreadMode = ThreadMode.REMOTE>() => GetService<M>;
+export declare const resolveSignalsReadyFromContext: () => Promise<void>;

package/build/helpers.js

@@ -1 +1,9 @@
+import { wixContext } from '@wix/sdk-context';
 export { defineService, implementService } from '@wix/services-definitions';
+export const resolveServiceGetterFromContext = () => wixContext?.getService || globalThis?.__wix_context__?.getService;
+export const resolveSignalsReadyFromContext = () => {
+    const awaitRemoteSignals = wixContext?.awaitRemoteSignals ||
+        globalThis?.__wix_context__?.awaitRemoteSignals ||
+        (() => Promise.resolve());
+    return awaitRemoteSignals();
+};

package/build/remote-helpers.d.ts

@@ -12,9 +12,10 @@ export type RemoteServicesManager = ServicesManager<ThreadMode.REMOTE> & {
         signals: any;
     }[];
     awaitConnectionFromMain: () => Promise<boolean>;
+    enableContext: (context: 'global' | 'module') => RemoteServicesManager;
 };
 export type ProxyServiceManager = Comlink.Remote<RemoteServicesManager>;
-export declare function createServiceProxy<T extends ServiceDefinition<any, any>>(definition: T, remoteServiceManager: ProxyServiceManager, localServicesManager: ServicesManager): PromisifiedServiceAPI<T>;
+export declare function createServiceProxy<T extends ServiceDefinition<any, any>>(definition: T, remoteServiceManager: ProxyServiceManager | Promise<ProxyServiceManager>, localServicesManager: ServicesManager): PromisifiedServiceAPI<T>;
 export declare enum SERVICE_MANAGER_MESSAGES {
     INIT_PORT = "WIX_MESSAGE.SERVICE_MANAGER.INIT_PORT",
     SIGNAL = "WIX_MESSAGE.SERVICE_MANAGER.SIGNAL",

package/build/remote-helpers.js

@@ -8,7 +8,10 @@ export function createServiceProxy(definition, remoteServiceManager, localServic
                 return localServicesManager.getServiceSignals(definition);
             }
             return async (...args) => {
-                let service = remoteServiceManager.getServiceProxy(definition);
+                const remoteManager = remoteServiceManager instanceof Promise
+                    ? await remoteServiceManager
+                    : remoteServiceManager;
+                let service = remoteManager.getServiceProxy(definition);
                 if (!service[prop]) {
                     service = await service;
                 }
@@ -52,24 +55,26 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
         console.warn('setting a low interval might cause a race condition on the response message');
     }
     const signalsRegistry = manager.getSignalsRegistry();
+    const onReadyFromRemote = (callback) => {
+        if (type === 'iframe') {
+            window.addEventListener('message', (event) => {
+                if (event.data?.type === SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION &&
+                    event.source === target) {
+                    callback();
+                }
+            });
+        }
+        else {
+            target.onmessage = (event) => {
+                if (event.data?.type === SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION) {
+                    callback();
+                }
+            };
+        }
+    };
     if (awaitInitialConnection && typeof window !== 'undefined') {
         await new Promise((resolve) => {
-            if (type === 'iframe') {
-                window.addEventListener('message', (event) => {
-                    if (event.data?.type ===
-                        SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION &&
-                        event.source === target) {
-                        resolve();
-                    }
-                });
-            }
-            else {
-                target.onmessage = (event) => {
-                    if (event.data?.type === SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION) {
-                        resolve();
-                    }
-                };
-            }
+            onReadyFromRemote(resolve);
         });
     }
     return new Promise((resolve, reject) => {
@@ -109,6 +114,7 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
                     const remoteServicesManager = createRemoteServicesManager({
                         servicesManager: manager,
                     });
+                    Comlink.expose(remoteServicesManager, localPort);
                     // sync from main to remote manager when set is from main
                     signalsRegistry.addReplicator((id, value, revision) => {
                         wrappedManager.syncSignal(id, value, revision);
@@ -119,12 +125,15 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
                         .forEach(({ serviceId, signals }) => {
                         signalsRegistry.setServiceSignals(serviceId, signals);
                     });
-                    Comlink.expose(remoteServicesManager, localPort);
                     resolve(wrappedManager);
                 }
             };
         };
+        // first connection
         triggerConnection();
+        // re-establish connection if remote frame is reloaded
+        onReadyFromRemote(() => triggerConnection());
+        // retries if defined in options
         const intervalId = setInterval(triggerConnection, interval);
         const timeoutId = setTimeout(() => {
             clearInterval(intervalId);
@@ -152,7 +161,12 @@ export function createRemoteServicesManager({ servicesManager, messageFrame, })
                 result = servicesManager.getService(definition, getService, signals || servicesManager.getServiceSignals(definition));
             }
             else {
-                result = createServiceProxy(definition, remoteServiceManager, servicesManager);
+                result = createServiceProxy(definition, 
+                // remoteServiceManager!,
+                (async () => {
+                    await connectedPromise;
+                    return remoteServiceManager;
+                })(), servicesManager);
                 servicesManager.addService(definition, () => result);
             }
             if (result) {
@@ -197,6 +211,10 @@ export function createRemoteServicesManager({ servicesManager, messageFrame, })
                 signals: remoteManager.getService(definition).signals,
             }));
         },
+        enableContext(context) {
+            servicesManager.enableContext.bind(this)(context);
+            return this;
+        },
     };
     if (messageFrame) {
         messageFrame.onmessage = (event) => {

package/build/services-manager.d.ts

@@ -7,6 +7,6 @@ export declare function createServicesManager<M extends ThreadMode = ThreadMode.
 }): ServicesManager<M>;
 export type ServicesRegistrar = {
     registeredServices: ServiceBinding<any, any>[];
-    addService<T extends ServiceDefinition<any, any>, Impl extends ServiceFactory<T, any, M>, M extends ThreadMode = any>(definition: T, impl: Impl, config?: ServiceFactoryConfig<Impl, M>): ServicesRegistrar;
+    addService<T extends ServiceDefinition<any, any> = any, Impl extends ServiceFactory<T, any, M> = any, M extends ThreadMode = any>(definition: T, impl: Impl, config?: ServiceFactoryConfig<Impl, M>): ServicesRegistrar;
 };
 export declare function createServicesMap(registeredServices?: ServiceBinding<any, any>[]): ServicesRegistrar;

package/build/services-manager.js

@@ -53,19 +53,19 @@ signalsRegistry = createSignalsRegistry(), } = {}) {
             }
         },
         enableContext(context) {
+            let resolvedContext = wixContext;
             if (context === 'global') {
-                if (globalThis.__wix_context__) {
-                    globalThis.__wix_context__.getService = manager.getService;
+                if (!globalThis.__wix_context__) {
+                    globalThis.__wix_context__ = {};
                 }
-                else {
-                    globalThis.__wix_context__ = {
-                        getService: manager.getService,
-                    };
-                }
-            }
-            else {
-                wixContext.getService = manager.getService;
+                resolvedContext = globalThis.__wix_context__;
             }
+            resolvedContext.getService = this.getService;
+            resolvedContext.awaitRemoteSignals = async () => 
+            // remote services manager
+            this.awaitConnectionFromMain
+                ? this.awaitConnectionFromMain()
+                : true;
             return this;
         },
     };

package/cjs/build/helpers.d.ts

@@ -1 +1,4 @@
+import { GetService, ThreadMode } from '@wix/services-definitions';
 export { defineService, implementService } from '@wix/services-definitions';
+export declare const resolveServiceGetterFromContext: <M extends ThreadMode = ThreadMode.REMOTE>() => GetService<M>;
+export declare const resolveSignalsReadyFromContext: () => Promise<void>;

package/cjs/build/helpers.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.implementService = exports.defineService = void 0;
+exports.resolveSignalsReadyFromContext = exports.resolveServiceGetterFromContext = exports.implementService = exports.defineService = void 0;
+const sdk_context_1 = require("@wix/sdk-context");
 var services_definitions_1 = require("@wix/services-definitions");
 Object.defineProperty(exports, "defineService", { enumerable: true, get: function () { return services_definitions_1.defineService; } });
 Object.defineProperty(exports, "implementService", { enumerable: true, get: function () { return services_definitions_1.implementService; } });
+const resolveServiceGetterFromContext = () => sdk_context_1.wixContext?.getService || globalThis?.__wix_context__?.getService;
+exports.resolveServiceGetterFromContext = resolveServiceGetterFromContext;
+const resolveSignalsReadyFromContext = () => {
+    const awaitRemoteSignals = sdk_context_1.wixContext?.awaitRemoteSignals ||
+        globalThis?.__wix_context__?.awaitRemoteSignals ||
+        (() => Promise.resolve());
+    return awaitRemoteSignals();
+};
+exports.resolveSignalsReadyFromContext = resolveSignalsReadyFromContext;

package/cjs/build/remote-helpers.d.ts

@@ -12,9 +12,10 @@ export type RemoteServicesManager = ServicesManager<ThreadMode.REMOTE> & {
         signals: any;
     }[];
     awaitConnectionFromMain: () => Promise<boolean>;
+    enableContext: (context: 'global' | 'module') => RemoteServicesManager;
 };
 export type ProxyServiceManager = Comlink.Remote<RemoteServicesManager>;
-export declare function createServiceProxy<T extends ServiceDefinition<any, any>>(definition: T, remoteServiceManager: ProxyServiceManager, localServicesManager: ServicesManager): PromisifiedServiceAPI<T>;
+export declare function createServiceProxy<T extends ServiceDefinition<any, any>>(definition: T, remoteServiceManager: ProxyServiceManager | Promise<ProxyServiceManager>, localServicesManager: ServicesManager): PromisifiedServiceAPI<T>;
 export declare enum SERVICE_MANAGER_MESSAGES {
     INIT_PORT = "WIX_MESSAGE.SERVICE_MANAGER.INIT_PORT",
     SIGNAL = "WIX_MESSAGE.SERVICE_MANAGER.SIGNAL",

package/cjs/build/remote-helpers.js

@@ -48,7 +48,10 @@ function createServiceProxy(definition, remoteServiceManager, localServicesManag
                 return localServicesManager.getServiceSignals(definition);
             }
             return async (...args) => {
-                let service = remoteServiceManager.getServiceProxy(definition);
+                const remoteManager = remoteServiceManager instanceof Promise
+                    ? await remoteServiceManager
+                    : remoteServiceManager;
+                let service = remoteManager.getServiceProxy(definition);
                 if (!service[prop]) {
                     service = await service;
                 }
@@ -92,24 +95,26 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
         console.warn('setting a low interval might cause a race condition on the response message');
     }
     const signalsRegistry = manager.getSignalsRegistry();
+    const onReadyFromRemote = (callback) => {
+        if (type === 'iframe') {
+            window.addEventListener('message', (event) => {
+                if (event.data?.type === SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION &&
+                    event.source === target) {
+                    callback();
+                }
+            });
+        }
+        else {
+            target.onmessage = (event) => {
+                if (event.data?.type === SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION) {
+                    callback();
+                }
+            };
+        }
+    };
     if (awaitInitialConnection && typeof window !== 'undefined') {
         await new Promise((resolve) => {
-            if (type === 'iframe') {
-                window.addEventListener('message', (event) => {
-                    if (event.data?.type ===
-                        SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION &&
-                        event.source === target) {
-                        resolve();
-                    }
-                });
-            }
-            else {
-                target.onmessage = (event) => {
-                    if (event.data?.type === SERVICE_MANAGER_MESSAGES.READY_FOR_CONNECTION) {
-                        resolve();
-                    }
-                };
-            }
+            onReadyFromRemote(resolve);
         });
     }
     return new Promise((resolve, reject) => {
@@ -149,6 +154,7 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
                     const remoteServicesManager = createRemoteServicesManager({
                         servicesManager: manager,
                     });
+                    Comlink.expose(remoteServicesManager, localPort);
                     // sync from main to remote manager when set is from main
                     signalsRegistry.addReplicator((id, value, revision) => {
                         wrappedManager.syncSignal(id, value, revision);
@@ -159,12 +165,15 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
                         .forEach(({ serviceId, signals }) => {
                         signalsRegistry.setServiceSignals(serviceId, signals);
                     });
-                    Comlink.expose(remoteServicesManager, localPort);
                     resolve(wrappedManager);
                 }
             };
         };
+        // first connection
         triggerConnection();
+        // re-establish connection if remote frame is reloaded
+        onReadyFromRemote(() => triggerConnection());
+        // retries if defined in options
         const intervalId = setInterval(triggerConnection, interval);
         const timeoutId = setTimeout(() => {
             clearInterval(intervalId);
@@ -192,7 +201,12 @@ function createRemoteServicesManager({ servicesManager, messageFrame, }) {
                 result = servicesManager.getService(definition, getService, signals || servicesManager.getServiceSignals(definition));
             }
             else {
-                result = createServiceProxy(definition, remoteServiceManager, servicesManager);
+                result = createServiceProxy(definition, 
+                // remoteServiceManager!,
+                (async () => {
+                    await connectedPromise;
+                    return remoteServiceManager;
+                })(), servicesManager);
                 servicesManager.addService(definition, () => result);
             }
             if (result) {
@@ -237,6 +251,10 @@ function createRemoteServicesManager({ servicesManager, messageFrame, }) {
                 signals: remoteManager.getService(definition).signals,
             }));
         },
+        enableContext(context) {
+            servicesManager.enableContext.bind(this)(context);
+            return this;
+        },
     };
     if (messageFrame) {
         messageFrame.onmessage = (event) => {

package/cjs/build/services-manager.d.ts

@@ -7,6 +7,6 @@ export declare function createServicesManager<M extends ThreadMode = ThreadMode.
 }): ServicesManager<M>;
 export type ServicesRegistrar = {
     registeredServices: ServiceBinding<any, any>[];
-    addService<T extends ServiceDefinition<any, any>, Impl extends ServiceFactory<T, any, M>, M extends ThreadMode = any>(definition: T, impl: Impl, config?: ServiceFactoryConfig<Impl, M>): ServicesRegistrar;
+    addService<T extends ServiceDefinition<any, any> = any, Impl extends ServiceFactory<T, any, M> = any, M extends ThreadMode = any>(definition: T, impl: Impl, config?: ServiceFactoryConfig<Impl, M>): ServicesRegistrar;
 };
 export declare function createServicesMap(registeredServices?: ServiceBinding<any, any>[]): ServicesRegistrar;

package/cjs/build/services-manager.js

@@ -59,19 +59,19 @@ signalsRegistry = (0, registry_js_1.createSignalsRegistry)(), } = {}) {
             }
         },
         enableContext(context) {
+            let resolvedContext = sdk_context_1.wixContext;
             if (context === 'global') {
-                if (globalThis.__wix_context__) {
-                    globalThis.__wix_context__.getService = manager.getService;
+                if (!globalThis.__wix_context__) {
+                    globalThis.__wix_context__ = {};
                 }
-                else {
-                    globalThis.__wix_context__ = {
-                        getService: manager.getService,
-                    };
-                }
-            }
-            else {
-                sdk_context_1.wixContext.getService = manager.getService;
+                resolvedContext = globalThis.__wix_context__;
             }
+            resolvedContext.getService = this.getService;
+            resolvedContext.awaitRemoteSignals = async () => 
+            // remote services manager
+            this.awaitConnectionFromMain
+                ? this.awaitConnectionFromMain()
+                : true;
             return this;
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/services-manager",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "type": "module",
   "main": "./cjs/build/services-manager.js",
   "exports": {
@@ -90,5 +90,5 @@
       ]
     }
   },
-  "falconPackageHash": "db299042061f1059d9b8c0e0c5fe7d87b50de29a2430a530afebd384"
+  "falconPackageHash": "db3a2d98d49707022d917c5b3cf20b5969b0a32671ac878a22b5a096"
 }