@actualwave/deferred-data-access 2.0.0 → 2.1.1

package/interface/index.js

@@ -1,7 +1,396 @@
-export * from './src/handshake';
-export * from './src/helpers';
-export * from './src/intialize';
-export * from './src/request';
-export * from './src/types';
-export * from './src/utils';
-//# sourceMappingURL=index.js.map
+'use strict';
+
+var utils = require('@actualwave/deferred-data-access/utils');
+var proxy = require('@actualwave/deferred-data-access/proxy');
+var resource = require('@actualwave/deferred-data-access/resource');
+var deferredDataAccess = require('@actualwave/deferred-data-access');
+
+let pool;
+const getPool = () => {
+    if (!pool) {
+        pool = resource.getRegistry().createPool();
+    }
+    return pool;
+};
+const extractResourceFrom = (value) => {
+    if (!resource.isResourceObject(value)) {
+        return value;
+    }
+    const { poolId, id } = value;
+    const resourcePool = resource.getRegistry().get(poolId);
+    if (!resourcePool) {
+        throw new Error(`Resource Pool "${poolId}" does not exist.`);
+    }
+    const target = resourcePool.getById(id);
+    if (target === undefined) {
+        throw new Error(`Resource "${id}" does not exist, pool "${poolId}".`);
+    }
+    return target;
+};
+const commandDispatch = {
+    [proxy.ProxyCommand.GET]: (target, name) => target[name],
+    [proxy.ProxyCommand.SET]: (target, name, value) => {
+        target[name] = extractResourceFrom(value);
+        return target[name];
+    },
+    [proxy.ProxyCommand.DELETE_PROPERTY]: (target, name) => delete target[name],
+    [proxy.ProxyCommand.APPLY]: (target, _name, value) => {
+        const [exeContext, args] = value;
+        return target.apply(extractResourceFrom(exeContext), args.map(extractResourceFrom));
+    },
+    [proxy.ProxyCommand.METHOD_CALL]: (target, name, value) => target[name](...value.map(extractResourceFrom)),
+};
+const applyRemoteRequest = ({ command, command: { type, value }, context, }) => {
+    const target = extractResourceFrom(context);
+    const name = command.name;
+    if (type !== proxy.ProxyCommand.APPLY && !target) {
+        throw new Error(
+        // Fix typo: "excute" → "execute"
+        `Cannot execute command ${type}/${String(name)} on non-existent target (${target}).`);
+    }
+    const dispatch = commandDispatch[type];
+    if (!dispatch) {
+        throw new Error(`Unknown command type "${type}" cannot be applied remotely.`);
+    }
+    const result = dispatch(target, name, value);
+    // For SET and DELETE, return the result directly without wrapping
+    if (type === proxy.ProxyCommand.SET || type === proxy.ProxyCommand.DELETE_PROPERTY) {
+        return result;
+    }
+    if (result !== null && result !== undefined && typeof result === 'function') {
+        const resource = getPool().set(result);
+        return resource.toObject();
+    }
+    return result;
+};
+
+exports.InterfaceType = void 0;
+(function (InterfaceType) {
+    InterfaceType["HOST"] = "host";
+    InterfaceType["GUEST"] = "guest";
+})(exports.InterfaceType || (exports.InterfaceType = {}));
+exports.MessageType = void 0;
+(function (MessageType) {
+    MessageType["REQUEST"] = "request";
+    MessageType["RESPONSE"] = "response";
+})(exports.MessageType || (exports.MessageType = {}));
+const generateId = utils.createUIDGenerator('wi');
+const generateMessageId = utils.createUIDGenerator('m');
+const lookupForResource = async (value) => {
+    if (value === null || value === undefined) {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        const list = [];
+        for (const item of value) {
+            list.push(await lookupForResource(item));
+        }
+        return list;
+    }
+    if (proxy.isWrappedWithProxy(value)) {
+        const target = await proxy.unwrapProxy(value);
+        return lookupForResource(target);
+    }
+    if (typeof value === 'function') {
+        const resource = getPool().set(value);
+        return resource.toObject();
+    }
+    return value;
+};
+/*
+Message signature
+
+{
+  id, // every sent message has id, request and its response have same id
+  type, // message type -- "request" or "response"
+  source, // sender worker interface id
+  target, // receiver worker interface id
+  command, // request proxy command
+  context, // request command context
+  value, // response value
+  error, // response error
+}
+*/
+const createRequestMessage = (source, target) => async (commandChain, context, id = generateMessageId()) => {
+    const command = commandChain.toObject();
+    const contextTarget = await context;
+    // apply function to owner object
+    if (command.type === proxy.ProxyCommand.APPLY) {
+        let exeContext;
+        if (commandChain.prev) {
+            exeContext = await commandChain.prev.context;
+        }
+        // prepare arguments for Function.apply()
+        command.value = [exeContext, await lookupForResource(command.value)];
+    }
+    else {
+        command.value = await lookupForResource(command.value);
+    }
+    return {
+        id,
+        type: exports.MessageType.REQUEST,
+        source,
+        target,
+        command,
+        context: contextTarget,
+    };
+};
+const createResponseMessage = (source) => 
+// with "undefined" value, "error" key will not be packed into JSON, less bytes sent
+({ id, source: target }, value, error) => ({
+    id,
+    type: exports.MessageType.RESPONSE,
+    source,
+    target,
+    value,
+    error,
+});
+const createIsHandshakeMessage = (id = '') => (data) => {
+    if (data == null || typeof data !== 'object')
+        return false;
+    const dataId = data.id;
+    if (typeof dataId !== 'string')
+        return false;
+    return id ? id === dataId : /^wi/.test(dataId);
+};
+const createIsMessage = (target) => (data) => {
+    if (data == null || typeof data !== 'object')
+        return false;
+    const { id, target: dataTarget } = data;
+    return typeof id === 'string' && target === dataTarget;
+};
+const resolveOrTimeout = ({ handler, timeout, timeoutError = `Async operation didn't complete in ${timeout}ms.`, onTimeout, }) => {
+    const promise = typeof handler === 'function' ? new Promise(handler) : handler;
+    if (!timeout) {
+        return promise;
+    }
+    let timeoutHandle;
+    const timeoutPromise = new Promise((_, rej) => {
+        timeoutHandle = setTimeout(() => {
+            rej(timeoutError);
+            // Call onTimeout AFTER rejecting so the race is already settled.
+            // This prevents the double-rejection issue in initialize's onTimeout handler.
+            onTimeout && onTimeout(timeoutError);
+        }, timeout);
+    });
+    // Clear the timeout if the main promise wins the race
+    return Promise.race([
+        promise.then((v) => {
+            clearTimeout(timeoutHandle);
+            return v;
+        }, (e) => {
+            clearTimeout(timeoutHandle);
+            throw e;
+        }),
+        timeoutPromise,
+    ]);
+};
+const getMessageEventData = (event) => event != null && typeof event === 'object' && 'data' in event ? event.data : event;
+
+// leader (HOST): waits for guest to initiate, then replies
+const handshakeHost = ({ id, root, isMessage, subscribe, unsubscribe, sendMessage, preprocessResponse = (data) => data, }) => (resolve) => {
+    const handshakeHandler = (event) => {
+        const data = getMessageEventData(preprocessResponse(event));
+        if (!isMessage(data)) {
+            return;
+        }
+        unsubscribe(handshakeHandler);
+        sendMessage({ id, root });
+        resolve(data);
+    };
+    subscribe(handshakeHandler);
+};
+// follower (GUEST): initiates handshake by sending its identity, waits for host reply
+const handshakeGuest = ({ id, root, isMessage, subscribe, unsubscribe, sendMessage, handshakeInterval, preprocessResponse = (data) => data, }) => (resolve) => {
+    // Use ReturnType to avoid the TS2322 Timer/number mismatch across environments
+    let intervalId;
+    const handshakeHandler = (event) => {
+        const data = getMessageEventData(preprocessResponse(event));
+        if (!isMessage(data)) {
+            return;
+        }
+        unsubscribe(handshakeHandler);
+        if (intervalId !== undefined) {
+            clearInterval(intervalId);
+        }
+        resolve(data);
+    };
+    subscribe(handshakeHandler);
+    const intervalFn = () => sendMessage({ id, root });
+    if (handshakeInterval) {
+        intervalId = setInterval(intervalFn, handshakeInterval);
+    }
+    else {
+        intervalFn();
+    }
+};
+const handshake = ({ type, remoteId, handshakeTimeout, ...params }) => {
+    const data = {
+        ...params,
+        isMessage: createIsHandshakeMessage(remoteId),
+    };
+    const handler = type === exports.InterfaceType.HOST
+        ? handshakeHost(data)
+        : handshakeGuest(data);
+    return resolveOrTimeout({
+        handler,
+        timeout: handshakeTimeout,
+        timeoutError: `Handshake sequence could not complete in ${handshakeTimeout}ms.`,
+    });
+};
+
+const EVENT_TYPE = 'message';
+const findEventEmitter = (worker) => {
+    if (worker) {
+        return worker;
+    }
+    if (typeof self === 'object') {
+        return self;
+    }
+    throw new Error('EventEmitter is not defined, please provide EventEmitter interface via "worker" or "eventEmitter" property.');
+};
+const findMessagePort = (worker) => {
+    if (worker) {
+        return worker;
+    }
+    if (typeof self === 'object') {
+        return self;
+    }
+    throw new Error('MessagePort is not defined, please provide MessagePort interface via "worker" or "messagePort" property.');
+};
+const createSubscriberFns = (instance, eventType = EVENT_TYPE) => {
+    if (instance.addEventListener) {
+        return {
+            subscribe: (listener) => instance.addEventListener(eventType, listener),
+            unsubscribe: (listener) => instance.removeEventListener(eventType, listener),
+        };
+    }
+    if (instance.addListener) {
+        return {
+            subscribe: (listener) => instance.addListener(eventType, listener),
+            unsubscribe: (listener) => instance.removeListener(eventType, listener),
+        };
+    }
+    if (instance.on) {
+        return {
+            subscribe: (listener) => instance.on(eventType, listener),
+            unsubscribe: (listener) => instance.off(eventType, listener),
+        };
+    }
+    throw new Error('Target does not implement EventEmitter insterface, ' +
+        'it must expose "addEventListener"/"removeEventListener", ' +
+        '"addListener"/"removeListener" or ' +
+        '"on"/"off" method pair.');
+};
+
+const initialize = async ({ id: initId, root: apiRoot, ...params }) => {
+    const id = initId || generateId();
+    const root = apiRoot
+        ? getPool().set(apiRoot).toObject()
+        : undefined;
+    const { subscribe, unsubscribe, sendMessage, preprocessResponse = (data) => data, } = params;
+    const { id: remoteId, root: remoteRoot } = await handshake({
+        id,
+        root,
+        ...params,
+    });
+    // Tracks in-flight requests: messageId → { resolve, reject }
+    const pendingRequests = new Map();
+    const isMessage = createIsMessage(id);
+    const createRequest = createRequestMessage(id, remoteId);
+    const createResponse = createResponseMessage(id);
+    const messageHandler = async (event) => {
+        const data = getMessageEventData(preprocessResponse(event));
+        if (!isMessage(data)) {
+            return;
+        }
+        switch (data.type) {
+            case exports.MessageType.REQUEST: {
+                const request = data;
+                try {
+                    const value = await applyRemoteRequest(request);
+                    sendMessage(createResponse(request, value));
+                }
+                catch (error) {
+                    sendMessage(createResponse(request, undefined, { message: error.message }));
+                }
+                break;
+            }
+            case exports.MessageType.RESPONSE: {
+                const { id, value, error } = data;
+                const pending = pendingRequests.get(id);
+                if (!pending) {
+                    return;
+                }
+                pendingRequests.delete(id);
+                // Settle exactly once — delete before calling to prevent double-settle
+                if (error) {
+                    pending.reject(error);
+                }
+                else {
+                    pending.resolve(value);
+                }
+                break;
+            }
+        }
+    };
+    subscribe(messageHandler);
+    const stop = () => unsubscribe(messageHandler);
+    if (!remoteRoot) {
+        return { stop, pool: getPool() };
+    }
+    const wrap = deferredDataAccess.handle(async (command, context, wrap) => {
+        const { responseTimeout } = params;
+        const msgId = generateMessageId();
+        const timeoutError = `Could not receive command ${command.type}/${String(command.name)} response in ${responseTimeout}ms.`;
+        const resultPromise = resolveOrTimeout({
+            handler: async (resolve, reject) => {
+                try {
+                    const request = await createRequest(command, context, msgId);
+                    // Register before sending to eliminate the race between send and response arrival
+                    pendingRequests.set(msgId, { resolve, reject });
+                    sendMessage(request);
+                }
+                catch (error) {
+                    reject(error);
+                }
+            },
+            timeout: responseTimeout || 0,
+            timeoutError,
+            onTimeout: () => {
+                // resolveOrTimeout already rejected the race promise.
+                // We only need to clean up the pending entry here.
+                pendingRequests.delete(msgId);
+            },
+        });
+        const result = await resultPromise;
+        if (resource.isResourceObject(result)) {
+            return wrap(resultPromise, command);
+        }
+        return resultPromise;
+    }, false);
+    return {
+        stop,
+        wrap,
+        pendingRequests,
+        pool: getPool(),
+        root: remoteRoot ? wrap(remoteRoot) : null,
+    };
+};
+
+exports.applyRemoteRequest = applyRemoteRequest;
+exports.createIsHandshakeMessage = createIsHandshakeMessage;
+exports.createIsMessage = createIsMessage;
+exports.createRequestMessage = createRequestMessage;
+exports.createResponseMessage = createResponseMessage;
+exports.createSubscriberFns = createSubscriberFns;
+exports.findEventEmitter = findEventEmitter;
+exports.findMessagePort = findMessagePort;
+exports.generateId = generateId;
+exports.generateMessageId = generateMessageId;
+exports.getMessageEventData = getMessageEventData;
+exports.getPool = getPool;
+exports.handshake = handshake;
+exports.initialize = initialize;
+exports.resolveOrTimeout = resolveOrTimeout;
+//# sourceMappingURL=index.js.map

package/interface/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/deferred-data-access/interface/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sources":["../../../../../../packages/deferred-data-access/interface/src/request.ts","../../../../../../packages/deferred-data-access/interface/src/utils.ts","../../../../../../packages/deferred-data-access/interface/src/handshake.ts","../../../../../../packages/deferred-data-access/interface/src/helpers.ts","../../../../../../packages/deferred-data-access/interface/src/intialize.ts"],"sourcesContent":[null,null,null,null,null],"names":["getRegistry","isResourceObject","ProxyCommand","InterfaceType","MessageType","createUIDGenerator","isWrappedWithProxy","unwrapProxy","handle"],"mappings":"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"}

package/interface/package.json

@@ -1,4 +1,7 @@
 {
   "name": "@actualwave/deferred-data-access/interface",
-  "version": "2.0.0"
+  "version": "2.0.0",
+  "main": "index.js",
+  "module": "index.es.js",
+  "types": "index.d.ts"
 }

package/interface/src/handshake.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handshake.d.ts","sourceRoot":"","sources":["../../../../packages/deferred-data-access/interface/src/handshake.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,iBAAiB,EAElB,MAAM,SAAS,CAAC;AA8EjB,eAAO,MAAM,SAAS,GAAI,iDAKvB,aAAa,KAAG,OAAO,CAAC,iBAAiB,CAgB3C,CAAC"}

package/interface/src/handshake.js

@@ -1,5 +1,5 @@
 import { createIsHandshakeMessage, getMessageEventData, InterfaceType, resolveOrTimeout, } from './utils';
-// leader
+// leader (HOST): waits for guest to initiate, then replies
 const handshakeHost = ({ id, root, isMessage, subscribe, unsubscribe, sendMessage, preprocessResponse = (data) => data, }) => (resolve) => {
     const handshakeHandler = (event) => {
         const data = getMessageEventData(preprocessResponse(event));
@@ -12,8 +12,9 @@ const handshakeHost = ({ id, root, isMessage, subscribe, unsubscribe, sendMessag
     };
     subscribe(handshakeHandler);
 };
-// follower
+// follower (GUEST): initiates handshake by sending its identity, waits for host reply
 const handshakeGuest = ({ id, root, isMessage, subscribe, unsubscribe, sendMessage, handshakeInterval, preprocessResponse = (data) => data, }) => (resolve) => {
+    // Use ReturnType to avoid the TS2322 Timer/number mismatch across environments
     let intervalId;
     const handshakeHandler = (event) => {
         const data = getMessageEventData(preprocessResponse(event));
@@ -21,13 +22,14 @@ const handshakeGuest = ({ id, root, isMessage, subscribe, unsubscribe, sendMessa
             return;
         }
         unsubscribe(handshakeHandler);
-        clearInterval(intervalId);
+        if (intervalId !== undefined) {
+            clearInterval(intervalId);
+        }
         resolve(data);
     };
     subscribe(handshakeHandler);
     const intervalFn = () => sendMessage({ id, root });
     if (handshakeInterval) {
-        // FIXME TS2322: Type 'Timer' is not assignable to type 'number'.
         intervalId = setInterval(intervalFn, handshakeInterval);
     }
     else {

package/interface/src/handshake.js.map

@@ -1 +1 @@
-{"version":3,"file":"handshake.js","sourceRoot":"","sources":["../../../../packages/deferred-data-access/interface/src/handshake.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACnB,aAAa,EACb,gBAAgB,GACjB,MAAM,SAAS,CAAC;AAEjB,SAAS;AACT,MAAM,aAAa,GACjB,CAAC,EACC,EAAE,EACF,IAAI,EACJ,SAAS,EACT,SAAS,EACT,WAAW,EACX,WAAW,EACX,kBAAkB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,GACtB,EAAE,EAAE,CAC5B,CAAC,OAA0C,EAAE,EAAE;IAC7C,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QAE5D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAC9B,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEJ,WAAW;AACX,MAAM,cAAc,GAClB,CAAC,EACC,EAAE,EACF,IAAI,EACJ,SAAS,EACT,SAAS,EACT,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,kBAAkB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,GACxB,EAAE,EAAE,CAC1B,CAAC,OAA0C,EAAE,EAAE;IAC7C,IAAI,UAAkB,CAAC;IAEvB,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QAE5D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAC9B,aAAa,CAAC,UAAU,CAAC,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAE5B,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnD,IAAI,iBAAiB,EAAE,CAAC;QACtB,iEAAiE;QACjE,UAAU,GAAG,WAAW,CACtB,UAAU,EACV,iBAAiB,CACG,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,UAAU,EAAE,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,GAAG,MAAM,EACK,EAA8B,EAAE;IAC9C,MAAM,IAAI,GAAG;QACX,GAAG,MAAM;QACT,SAAS,EAAE,wBAAwB,CAAC,QAAQ,CAAC;KAC9C,CAAC;IAEF,MAAM,OAAO,GACX,IAAI,KAAK,aAAa,CAAC,IAAI;QACzB,CAAC,CAAC,aAAa,CAAC,IAA6B,CAAC;QAC9C,CAAC,CAAC,cAAc,CAAC,IAA2B,CAAC,CAAC;IAElD,OAAO,gBAAgB,CAAoB;QACzC,OAAO;QACP,OAAO,EAAE,gBAAgB;QACzB,YAAY,EAAE,4CAA4C,gBAAgB,KAAK;KAChF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"handshake.js","sourceRoot":"","sources":["../../../../packages/deferred-data-access/interface/src/handshake.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACnB,aAAa,EACb,gBAAgB,GACjB,MAAM,SAAS,CAAC;AAEjB,2DAA2D;AAC3D,MAAM,aAAa,GACjB,CAAC,EACC,EAAE,EACF,IAAI,EACJ,SAAS,EACT,SAAS,EACT,WAAW,EACX,WAAW,EACX,kBAAkB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,GACtB,EAAE,EAAE,CAC5B,CAAC,OAA0C,EAAE,EAAE;IAC7C,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QAE5D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAC9B,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEJ,sFAAsF;AACtF,MAAM,cAAc,GAClB,CAAC,EACC,EAAE,EACF,IAAI,EACJ,SAAS,EACT,SAAS,EACT,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,kBAAkB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,GACxB,EAAE,EAAE,CAC1B,CAAC,OAA0C,EAAE,EAAE;IAC7C,+EAA+E;IAC/E,IAAI,UAAsD,CAAC;IAE3D,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QAE5D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAE9B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,aAAa,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAE5B,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnD,IAAI,iBAAiB,EAAE,CAAC;QACtB,UAAU,GAAG,WAAW,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,UAAU,EAAE,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,GAAG,MAAM,EACK,EAA8B,EAAE;IAC9C,MAAM,IAAI,GAAG;QACX,GAAG,MAAM;QACT,SAAS,EAAE,wBAAwB,CAAC,QAAQ,CAAC;KAC9C,CAAC;IAEF,MAAM,OAAO,GACX,IAAI,KAAK,aAAa,CAAC,IAAI;QACzB,CAAC,CAAC,aAAa,CAAC,IAA6B,CAAC;QAC9C,CAAC,CAAC,cAAc,CAAC,IAA2B,CAAC,CAAC;IAElD,OAAO,gBAAgB,CAAoB;QACzC,OAAO;QACP,OAAO,EAAE,gBAAgB;QACzB,YAAY,EAAE,4CAA4C,gBAAgB,KAAK;KAChF,CAAC,CAAC;AACL,CAAC,CAAC"}

package/interface/src/helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../packages/deferred-data-access/interface/src/helpers.ts"],"names":[],"mappings":"AAEA,KAAK,YAAY,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;AAE5C,eAAO,MAAM,gBAAgB,GAAI,QAAQ,OAAO,KAAG,OAYlD,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,QAAQ,OAAO,KAAG,OAYjD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,UAAU,GAAG,EACb,kBAAsB,KACrB;IACD,SAAS,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,IAAI,CAAC;IACtC,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,IAAI,CAAC;CAkCzC,CAAC"}

package/interface/src/intialize.d.ts

@@ -7,8 +7,11 @@ export declare const initialize: ({ id: initId, root: apiRoot, ...params }: Init
     root?: undefined;
 } | {
     stop: () => void;
-    pool: import("@actualwave/deferred-data-access/resource").ResourcePool;
     wrap: (context?: unknown, command?: import("@actualwave/deferred-data-access/command").Command) => unknown;
-    pendingRequests: Map<any, any>;
+    pendingRequests: Map<string, {
+        resolve: (v: unknown) => void;
+        reject: (e: unknown) => void;
+    }>;
+    pool: import("@actualwave/deferred-data-access/resource").ResourcePool;
     root: unknown;
 }>;

package/interface/src/intialize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"intialize.d.ts","sourceRoot":"","sources":["../../../../packages/deferred-data-access/interface/src/intialize.ts"],"names":[],"mappings":"AAYA,OAAO,EAKL,UAAU,EACX,MAAM,SAAS,CAAC;AAYjB,eAAO,MAAM,UAAU,GAAU,0CAI9B,UAAU;;;;;;;;;;iBAsBE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI;gBAAU,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI;;;;EA0GhE,CAAC"}

package/interface/src/intialize.js

@@ -1,27 +1,12 @@
 import { handle } from '@actualwave/deferred-data-access';
 import { isResourceObject, } from '@actualwave/deferred-data-access/resource';
 import { handshake } from './handshake';
-import { pool, applyRemoteRequest } from './request';
+import { getPool, applyRemoteRequest } from './request';
 import { createIsMessage, createRequestMessage, createResponseMessage, generateId, generateMessageId, getMessageEventData, MessageType, resolveOrTimeout, } from './utils';
-/*
-{
-  id,
-  type,
-  root,
-  remoteId, // we might expect a connection with matching ID
-  subscribe,
-  unsubscribe,
-  sendMessage,
-  handshakeTimeout,
-  responseTimeout,
-  handshakeInterval,
-  preprocessResponse,
-}
-*/
 export const initialize = async ({ id: initId, root: apiRoot, ...params }) => {
     const id = initId || generateId();
     const root = apiRoot
-        ? pool.set(apiRoot).toObject()
+        ? getPool().set(apiRoot).toObject()
         : undefined;
     const { subscribe, unsubscribe, sendMessage, preprocessResponse = (data) => data, } = params;
     const { id: remoteId, root: remoteRoot } = await handshake({
@@ -29,7 +14,8 @@ export const initialize = async ({ id: initId, root: apiRoot, ...params }) => {
         root,
         ...params,
     });
-    const pendingRequests = new Map(); // {[key: string]: { resolve: (value) => void, reject: (error) => void }}
+    // Tracks in-flight requests: messageId → { resolve, reject }
+    const pendingRequests = new Map();
     const isMessage = createIsMessage(id);
     const createRequest = createRequestMessage(id, remoteId);
     const createResponse = createResponseMessage(id);
@@ -39,54 +25,51 @@ export const initialize = async ({ id: initId, root: apiRoot, ...params }) => {
             return;
         }
         switch (data.type) {
-            case MessageType.REQUEST:
-                {
-                    const request = data;
-                    try {
-                        const value = await applyRemoteRequest(request);
-                        sendMessage(createResponse(request, value));
-                    }
-                    catch (error) {
-                        sendMessage(createResponse(request, undefined, { message: error.message }));
-                    }
+            case MessageType.REQUEST: {
+                const request = data;
+                try {
+                    const value = await applyRemoteRequest(request);
+                    sendMessage(createResponse(request, value));
+                }
+                catch (error) {
+                    sendMessage(createResponse(request, undefined, { message: error.message }));
                 }
                 break;
-            case MessageType.RESPONSE:
-                {
-                    const { id, value, error } = data;
-                    const { resolve, reject } = pendingRequests.get(id) || {};
-                    // if error present call reject, if not -- call resolve
-                    if (reject && error) {
-                        reject(error);
-                    }
-                    else if (resolve) {
-                        resolve(value);
-                    }
+            }
+            case MessageType.RESPONSE: {
+                const { id, value, error } = data;
+                const pending = pendingRequests.get(id);
+                if (!pending) {
+                    return;
+                }
+                pendingRequests.delete(id);
+                // Settle exactly once — delete before calling to prevent double-settle
+                if (error) {
+                    pending.reject(error);
+                }
+                else {
+                    pending.resolve(value);
                 }
                 break;
+            }
         }
     };
     subscribe(messageHandler);
     const stop = () => unsubscribe(messageHandler);
     if (!remoteRoot) {
-        return { stop, pool };
+        return { stop, pool: getPool() };
     }
-    const wrap = handle(async (command, context, 
-    // wrap() is a partially applied handle(), so it makes possible to apply same command handlers to other objects
-    wrap) => {
+    const wrap = handle(async (command, context, wrap) => {
         const { responseTimeout } = params;
-        /*
-        If target is not a resource, there are no need to send command to remote, it can be resolved immediately.
-        Need to know if there will be such cases.
-      */
-        const id = generateMessageId();
+        const msgId = generateMessageId();
         const timeoutError = `Could not receive command ${command.type}/${String(command.name)} response in ${responseTimeout}ms.`;
         const resultPromise = resolveOrTimeout({
             handler: async (resolve, reject) => {
                 try {
-                    const request = await createRequest(command, context, id);
+                    const request = await createRequest(command, context, msgId);
+                    // Register before sending to eliminate the race between send and response arrival
+                    pendingRequests.set(msgId, { resolve, reject });
                     sendMessage(request);
-                    pendingRequests.set(id, { resolve, reject });
                 }
                 catch (error) {
                     reject(error);
@@ -95,12 +78,9 @@ export const initialize = async ({ id: initId, root: apiRoot, ...params }) => {
             timeout: responseTimeout || 0,
             timeoutError,
             onTimeout: () => {
-                const rq = pendingRequests.get(id);
-                if (!rq) {
-                    return;
-                }
-                rq.reject(new Error(timeoutError));
-                pendingRequests.delete(id);
+                // resolveOrTimeout already rejected the race promise.
+                // We only need to clean up the pending entry here.
+                pendingRequests.delete(msgId);
             },
         });
         const result = await resultPromise;
@@ -111,9 +91,9 @@ export const initialize = async ({ id: initId, root: apiRoot, ...params }) => {
     }, false);
     return {
         stop,
-        pool,
         wrap,
         pendingRequests,
+        pool: getPool(),
         root: remoteRoot ? wrap(remoteRoot) : null,
     };
 };