@wix/services-manager 0.2.0 → 0.2.3

package/build/helpers.d.ts

@@ -1 +1,3 @@
+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>;

package/build/helpers.js

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

package/build/remote-helpers.d.ts

@@ -14,7 +14,7 @@ export type RemoteServicesManager = ServicesManager<ThreadMode.REMOTE> & {
     awaitConnectionFromMain: () => Promise<boolean>;
 };
 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, localServicesManager: ServicesManager, awaiter?: Promise<any>): 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

@@ -1,13 +1,16 @@
 import { defineService, } from '@wix/services-definitions';
 import * as Comlink from 'comlink';
 import { initializeTransferHandlers } from './transfer-handlers/init-handlers.js';
-export function createServiceProxy(definition, remoteServiceManager, localServicesManager) {
+export function createServiceProxy(definition, remoteServiceManager, localServicesManager, awaiter) {
     return new Proxy({}, {
         get(_, prop) {
             if (prop === 'signals') {
                 return localServicesManager.getServiceSignals(definition);
             }
             return async (...args) => {
+                if (awaiter) {
+                    await awaiter;
+                }
                 let service = remoteServiceManager.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) => {
@@ -124,7 +129,11 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
                 }
             };
         };
+        // 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,7 @@ export function createRemoteServicesManager({ servicesManager, messageFrame, })
                 result = servicesManager.getService(definition, getService, signals || servicesManager.getServiceSignals(definition));
             }
             else {
-                result = createServiceProxy(definition, remoteServiceManager, servicesManager);
+                result = createServiceProxy(definition, remoteServiceManager, servicesManager, connectedPromise);
                 servicesManager.addService(definition, () => result);
             }
             if (result) {

package/build/services-manager.d.ts

@@ -1,7 +1,7 @@
 import { ServiceBinding, ServiceDefinition, ServiceFactory, ServiceFactoryConfig, ServicesManager, ThreadMode } from './types.js';
 import { createSignalsRegistry, SignalsRegistry } from './core-services/signals/registry.js';
 export { createSignalsRegistry, SignalsRegistry };
-export declare function createServicesManager<M extends ThreadMode = ThreadMode.MAIN>(servicesBindings: ServicesRegistrar, { signalsRegistry, }?: {
+export declare function createServicesManager<M extends ThreadMode = ThreadMode.MAIN>(servicesBindings?: ServicesRegistrar, { signalsRegistry, }?: {
     signalsRegistry?: SignalsRegistry;
     auth?: any;
 }): ServicesManager<M>;

package/build/services-manager.js

@@ -1,13 +1,14 @@
 import { SignalsServiceDefinition } from './core-services/signals/definition.js';
 import { SignalsServiceFactory } from './core-services/signals/service.js';
 import { createSignalsRegistry, SignalsRegistry, } from './core-services/signals/registry.js';
+import { wixContext } from '@wix/sdk-context';
 export { createSignalsRegistry, SignalsRegistry };
 export function createServicesManager(servicesBindings, { 
 // in case we decide to keep multiple services manager in the same thread, we can use one signals registry for all of them
 signalsRegistry = createSignalsRegistry(), } = {}) {
     const coreRegisteredServices = createServicesMap().addService(SignalsServiceDefinition, SignalsServiceFactory, { signalsRegistry });
     const bindingsByDefinition = new Map([
-        ...servicesBindings.registeredServices,
+        ...(servicesBindings ? servicesBindings.registeredServices : []),
         ...coreRegisteredServices.registeredServices,
     ].map((service) => [service.definition.toString(), service]));
     const initializedServices = new Map();
@@ -51,6 +52,22 @@ signalsRegistry = createSignalsRegistry(), } = {}) {
                 throw new Error(`Service ${definition.toString()} is already provided`);
             }
         },
+        enableContext(context) {
+            if (context === 'global') {
+                if (globalThis.__wix_context__) {
+                    globalThis.__wix_context__.getService = manager.getService;
+                }
+                else {
+                    globalThis.__wix_context__ = {
+                        getService: manager.getService,
+                    };
+                }
+            }
+            else {
+                wixContext.getService = manager.getService;
+            }
+            return this;
+        },
     };
     bindingsByDefinition.forEach(({ definition, impl, config }) => {
         initializedServices.set(definition, impl({

package/build/types.d.ts

@@ -8,4 +8,5 @@ export type ServicesManager<M extends ThreadMode = ThreadMode.MAIN> = {
     addService<T extends ServiceDefinition<any, any>, Impl extends ServiceFactory<T, any, ThreadMode.MAIN>>(definition: T, impl: Impl, config: ServiceFactoryConfig<Impl, ThreadMode.MAIN>): void;
     addService<T extends ServiceDefinition<any, any>, Impl extends ServiceFactory<T, any, ThreadMode.REMOTE>>(definition: T, impl: Impl): void;
     getSignalsRegistry(): SignalsRegistry;
+    enableContext(context: 'global' | 'module'): ServicesManager<M>;
 };

package/cjs/build/helpers.d.ts

@@ -1 +1,3 @@
+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>;

package/cjs/build/helpers.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.implementService = exports.defineService = void 0;
+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;

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

@@ -14,7 +14,7 @@ export type RemoteServicesManager = ServicesManager<ThreadMode.REMOTE> & {
     awaitConnectionFromMain: () => Promise<boolean>;
 };
 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, localServicesManager: ServicesManager, awaiter?: Promise<any>): 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

@@ -41,13 +41,16 @@ exports.createRemoteServicesManager = createRemoteServicesManager;
 const services_definitions_1 = require("@wix/services-definitions");
 const Comlink = __importStar(require("comlink"));
 const init_handlers_js_1 = require("./transfer-handlers/init-handlers.js");
-function createServiceProxy(definition, remoteServiceManager, localServicesManager) {
+function createServiceProxy(definition, remoteServiceManager, localServicesManager, awaiter) {
     return new Proxy({}, {
         get(_, prop) {
             if (prop === 'signals') {
                 return localServicesManager.getServiceSignals(definition);
             }
             return async (...args) => {
+                if (awaiter) {
+                    await awaiter;
+                }
                 let service = remoteServiceManager.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) => {
@@ -164,7 +169,11 @@ retryOptions: { timeout = 10000, interval = 11000 } = {}, remoteServices = [], a
                 }
             };
         };
+        // 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,7 @@ function createRemoteServicesManager({ servicesManager, messageFrame, }) {
                 result = servicesManager.getService(definition, getService, signals || servicesManager.getServiceSignals(definition));
             }
             else {
-                result = createServiceProxy(definition, remoteServiceManager, servicesManager);
+                result = createServiceProxy(definition, remoteServiceManager, servicesManager, connectedPromise);
                 servicesManager.addService(definition, () => result);
             }
             if (result) {

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

@@ -1,7 +1,7 @@
 import { ServiceBinding, ServiceDefinition, ServiceFactory, ServiceFactoryConfig, ServicesManager, ThreadMode } from './types.js';
 import { createSignalsRegistry, SignalsRegistry } from './core-services/signals/registry.js';
 export { createSignalsRegistry, SignalsRegistry };
-export declare function createServicesManager<M extends ThreadMode = ThreadMode.MAIN>(servicesBindings: ServicesRegistrar, { signalsRegistry, }?: {
+export declare function createServicesManager<M extends ThreadMode = ThreadMode.MAIN>(servicesBindings?: ServicesRegistrar, { signalsRegistry, }?: {
     signalsRegistry?: SignalsRegistry;
     auth?: any;
 }): ServicesManager<M>;

package/cjs/build/services-manager.js

@@ -8,12 +8,13 @@ const service_js_1 = require("./core-services/signals/service.js");
 const registry_js_1 = require("./core-services/signals/registry.js");
 Object.defineProperty(exports, "createSignalsRegistry", { enumerable: true, get: function () { return registry_js_1.createSignalsRegistry; } });
 Object.defineProperty(exports, "SignalsRegistry", { enumerable: true, get: function () { return registry_js_1.SignalsRegistry; } });
+const sdk_context_1 = require("@wix/sdk-context");
 function createServicesManager(servicesBindings, { 
 // in case we decide to keep multiple services manager in the same thread, we can use one signals registry for all of them
 signalsRegistry = (0, registry_js_1.createSignalsRegistry)(), } = {}) {
     const coreRegisteredServices = createServicesMap().addService(definition_js_1.SignalsServiceDefinition, service_js_1.SignalsServiceFactory, { signalsRegistry });
     const bindingsByDefinition = new Map([
-        ...servicesBindings.registeredServices,
+        ...(servicesBindings ? servicesBindings.registeredServices : []),
         ...coreRegisteredServices.registeredServices,
     ].map((service) => [service.definition.toString(), service]));
     const initializedServices = new Map();
@@ -57,6 +58,22 @@ signalsRegistry = (0, registry_js_1.createSignalsRegistry)(), } = {}) {
                 throw new Error(`Service ${definition.toString()} is already provided`);
             }
         },
+        enableContext(context) {
+            if (context === 'global') {
+                if (globalThis.__wix_context__) {
+                    globalThis.__wix_context__.getService = manager.getService;
+                }
+                else {
+                    globalThis.__wix_context__ = {
+                        getService: manager.getService,
+                    };
+                }
+            }
+            else {
+                sdk_context_1.wixContext.getService = manager.getService;
+            }
+            return this;
+        },
     };
     bindingsByDefinition.forEach(({ definition, impl, config }) => {
         initializedServices.set(definition, impl({

package/cjs/build/types.d.ts

@@ -8,4 +8,5 @@ export type ServicesManager<M extends ThreadMode = ThreadMode.MAIN> = {
     addService<T extends ServiceDefinition<any, any>, Impl extends ServiceFactory<T, any, ThreadMode.MAIN>>(definition: T, impl: Impl, config: ServiceFactoryConfig<Impl, ThreadMode.MAIN>): void;
     addService<T extends ServiceDefinition<any, any>, Impl extends ServiceFactory<T, any, ThreadMode.REMOTE>>(definition: T, impl: Impl): void;
     getSignalsRegistry(): SignalsRegistry;
+    enableContext(context: 'global' | 'module'): ServicesManager<M>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/services-manager",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "type": "module",
   "main": "./cjs/build/services-manager.js",
   "exports": {
@@ -90,5 +90,5 @@
       ]
     }
   },
-  "falconPackageHash": "e7021ce223e5746131e375005bff219f75349be729b08786f29ee1f2"
+  "falconPackageHash": "eed0598aa64a95e9a1df2cc92a6d52fb261b4b13956db5a9deaec5b9"
 }