@dxos/rpc-tunnel 0.1.57 → 0.1.58-main.0009f6a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/index.mjs +5 -6
- package/dist/lib/browser/index.mjs.map +2 -2
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +5 -6
- package/dist/lib/node/index.cjs.map +2 -2
- package/dist/lib/node/meta.json +1 -1
- package/dist/types/src/port-muxer.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/port-muxer.ts +1 -4
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// packages/core/mesh/rpc-tunnel/src/ports/iframe.ts
|
|
2
2
|
import { UAParser } from "ua-parser-js";
|
|
3
3
|
import { log } from "@dxos/log";
|
|
4
|
-
var __dxlog_file = "/
|
|
4
|
+
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/rpc-tunnel/src/ports/iframe.ts";
|
|
5
5
|
var browser;
|
|
6
6
|
var os;
|
|
7
7
|
if (typeof navigator !== "undefined") {
|
|
@@ -116,7 +116,7 @@ var createIFrame = (source, id, { hidden = true, allow } = {}) => {
|
|
|
116
116
|
|
|
117
117
|
// packages/core/mesh/rpc-tunnel/src/ports/worker.ts
|
|
118
118
|
import { log as log2 } from "@dxos/log";
|
|
119
|
-
var __dxlog_file2 = "/
|
|
119
|
+
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/rpc-tunnel/src/ports/worker.ts";
|
|
120
120
|
var createWorkerPort = ({ port, channel, subscribe }) => ({
|
|
121
121
|
send: async (message) => {
|
|
122
122
|
const payload = message.buffer.slice(message.byteOffset, message.byteOffset + message.byteLength);
|
|
@@ -150,9 +150,8 @@ var createWorkerPort = ({ port, channel, subscribe }) => ({
|
|
|
150
150
|
|
|
151
151
|
// packages/core/mesh/rpc-tunnel/src/port-muxer.ts
|
|
152
152
|
import { log as log3 } from "@dxos/log";
|
|
153
|
-
var __dxlog_file3 = "/
|
|
153
|
+
var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/rpc-tunnel/src/port-muxer.ts";
|
|
154
154
|
var PortMuxer = class {
|
|
155
|
-
// prettier-ignore
|
|
156
155
|
constructor(_messagePort) {
|
|
157
156
|
this._messagePort = _messagePort;
|
|
158
157
|
this._activeChannels = /* @__PURE__ */ new Map();
|
|
@@ -191,7 +190,7 @@ var PortMuxer = class {
|
|
|
191
190
|
payload: message.payload
|
|
192
191
|
}, {
|
|
193
192
|
F: __dxlog_file3,
|
|
194
|
-
L:
|
|
193
|
+
L: 56,
|
|
195
194
|
S: this,
|
|
196
195
|
C: (f, a) => f(...a)
|
|
197
196
|
});
|
|
@@ -205,7 +204,7 @@ var PortMuxer = class {
|
|
|
205
204
|
payload: message.payload
|
|
206
205
|
}, {
|
|
207
206
|
F: __dxlog_file3,
|
|
208
|
-
L:
|
|
207
|
+
L: 67,
|
|
209
208
|
S: this,
|
|
210
209
|
C: (f, a) => f(...a)
|
|
211
210
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/ports/iframe.ts", "../../../src/ports/worker.ts", "../../../src/port-muxer.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport { UAParser } from 'ua-parser-js';\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nlet browser: string | undefined;\nlet os: string | undefined;\n\nif (typeof navigator !== 'undefined') {\n // TODO(wittjosiah): Stop user agent parsing.\n const parser = new UAParser(navigator.userAgent);\n browser = parser.getBrowser().name;\n os = parser.getOS().name;\n}\n\nconst sendToIFrame = (iframe: HTMLIFrameElement, origin: string, message: MessageData) => {\n if (!iframe.contentWindow) {\n log('IFrame content window missing', { origin });\n return;\n }\n\n if (browser === 'Chrome' && os === 'iOS') {\n iframe.contentWindow.postMessage(message, origin);\n } else {\n iframe.contentWindow.postMessage(message, origin, [message.payload]);\n }\n};\n\nconst sendToParentWindow = (origin: string, message: MessageData) => {\n if (browser === 'Chrome' && os === 'iOS') {\n window.parent.postMessage(message, origin);\n } else {\n window.parent.postMessage(message, origin, [message.payload]);\n }\n};\n\nexport type IFramePortOptions = {\n channel: string;\n iframe?: HTMLIFrameElement;\n origin?: string;\n onOrigin?: (origin: string) => void;\n};\n\n/**\n * Create a RPC port with an iframe over window messaging.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.iframe Instance of the iframe if sending to child.\n * @param options.origin Origin of the destination window.\n * @param options.onOrigin Callback triggered when origin of destination window is verified.\n * @returns RPC port for messaging.\n */\nexport const createIFramePort = ({ channel, iframe, origin, onOrigin }: IFramePortOptions): RpcPort => {\n return {\n send: async (data) => {\n if (!origin) {\n log('no origin set', { channel });\n return;\n }\n\n log('sending', { channel, data: data.length });\n const payload = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);\n const message = { channel, payload };\n if (iframe) {\n sendToIFrame(iframe, origin, message);\n } else {\n sendToParentWindow(origin, message);\n }\n },\n\n subscribe: (callback) => {\n const handler = (event: MessageEvent<unknown>) => {\n if (!iframe && event.source !== window.parent) {\n // Not from parent window.\n return;\n } else if (iframe && event.source !== iframe.contentWindow) {\n // Not from child window.\n return;\n }\n\n const isMessageData =\n event.data && typeof event.data === 'object' && 'channel' in event.data && 'payload' in event.data;\n const message = isMessageData ? (event.data as MessageData) : undefined;\n if (message?.channel !== channel) {\n return;\n }\n\n if (!origin) {\n origin = event.origin;\n onOrigin?.(origin);\n }\n\n log('received', message);\n callback(new Uint8Array(message.payload));\n };\n\n window.addEventListener('message', handler);\n return () => window.removeEventListener('message', handler);\n },\n };\n};\n\nexport type CreateIFrameOptions = {\n hidden?: boolean;\n allow?: string;\n};\n\n/**\n * Create a hidden iframe and insert it into the DOM.\n * If an element with the same id already exists it will be returned instead.\n * @param source Source of the iframe.\n * @param id DOM id of the iframe.\n * @returns The created iframe.\n */\nexport const createIFrame = (source: string, id: string, { hidden = true, allow }: CreateIFrameOptions = {}) => {\n const create = () => {\n const iframe = document.createElement('iframe') as HTMLIFrameElement;\n iframe.id = id;\n iframe.src = source;\n hidden && iframe.setAttribute('style', 'display: none;');\n allow && iframe.setAttribute('allow', allow);\n document.body.appendChild(iframe);\n return iframe;\n };\n\n return (document.getElementById(id) as HTMLIFrameElement) ?? create();\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nexport type WorkerPortOptions = {\n port: MessagePort;\n channel?: string;\n subscribe?: RpcPort['subscribe'];\n};\n\n/**\n * Create a RPC port for a worker.\n * @param options.port Message port to send message on.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.subscribe\n * @returns RPC port for messaging.\n */\n// TODO(wittjosiah): Rename for more general purpose MessagePort.\nexport const createWorkerPort = ({ port, channel, subscribe }: WorkerPortOptions): RpcPort => ({\n send: async (message) => {\n // Based on https://stackoverflow.com/a/54646864/2804332.\n const payload = message.buffer.slice(message.byteOffset, message.byteOffset + message.byteLength);\n port.postMessage(\n {\n channel,\n payload,\n },\n [payload],\n );\n },\n\n subscribe:\n subscribe ??\n ((callback) => {\n const handler = (event: MessageEvent<MessageData>) => {\n const message = event.data;\n if (channel && message.channel !== channel) {\n return;\n }\n\n log.debug('Recieved message', message);\n callback(new Uint8Array(message.payload));\n };\n\n port.onmessage = handler;\n return () => {\n port.onmessage = null;\n };\n }),\n});\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from './message';\nimport { createIFramePort, createWorkerPort, IFramePortOptions, WorkerPortOptions } from './ports';\n\n/**\n * Facilitates the multiplexing of multiple RpcPorts over a single MessagePort.\n */\nexport class PortMuxer {\n private readonly _activeChannels = new Map<string, (msg: Uint8Array) => void>();\n\n private readonly _rpcPorts = new Map<string, RpcPort>();\n\n
|
|
5
|
-
"mappings": "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
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport { UAParser } from 'ua-parser-js';\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nlet browser: string | undefined;\nlet os: string | undefined;\n\nif (typeof navigator !== 'undefined') {\n // TODO(wittjosiah): Stop user agent parsing.\n const parser = new UAParser(navigator.userAgent);\n browser = parser.getBrowser().name;\n os = parser.getOS().name;\n}\n\nconst sendToIFrame = (iframe: HTMLIFrameElement, origin: string, message: MessageData) => {\n if (!iframe.contentWindow) {\n log('IFrame content window missing', { origin });\n return;\n }\n\n if (browser === 'Chrome' && os === 'iOS') {\n iframe.contentWindow.postMessage(message, origin);\n } else {\n iframe.contentWindow.postMessage(message, origin, [message.payload]);\n }\n};\n\nconst sendToParentWindow = (origin: string, message: MessageData) => {\n if (browser === 'Chrome' && os === 'iOS') {\n window.parent.postMessage(message, origin);\n } else {\n window.parent.postMessage(message, origin, [message.payload]);\n }\n};\n\nexport type IFramePortOptions = {\n channel: string;\n iframe?: HTMLIFrameElement;\n origin?: string;\n onOrigin?: (origin: string) => void;\n};\n\n/**\n * Create a RPC port with an iframe over window messaging.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.iframe Instance of the iframe if sending to child.\n * @param options.origin Origin of the destination window.\n * @param options.onOrigin Callback triggered when origin of destination window is verified.\n * @returns RPC port for messaging.\n */\nexport const createIFramePort = ({ channel, iframe, origin, onOrigin }: IFramePortOptions): RpcPort => {\n return {\n send: async (data) => {\n if (!origin) {\n log('no origin set', { channel });\n return;\n }\n\n log('sending', { channel, data: data.length });\n const payload = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);\n const message = { channel, payload };\n if (iframe) {\n sendToIFrame(iframe, origin, message);\n } else {\n sendToParentWindow(origin, message);\n }\n },\n\n subscribe: (callback) => {\n const handler = (event: MessageEvent<unknown>) => {\n if (!iframe && event.source !== window.parent) {\n // Not from parent window.\n return;\n } else if (iframe && event.source !== iframe.contentWindow) {\n // Not from child window.\n return;\n }\n\n const isMessageData =\n event.data && typeof event.data === 'object' && 'channel' in event.data && 'payload' in event.data;\n const message = isMessageData ? (event.data as MessageData) : undefined;\n if (message?.channel !== channel) {\n return;\n }\n\n if (!origin) {\n origin = event.origin;\n onOrigin?.(origin);\n }\n\n log('received', message);\n callback(new Uint8Array(message.payload));\n };\n\n window.addEventListener('message', handler);\n return () => window.removeEventListener('message', handler);\n },\n };\n};\n\nexport type CreateIFrameOptions = {\n hidden?: boolean;\n allow?: string;\n};\n\n/**\n * Create a hidden iframe and insert it into the DOM.\n * If an element with the same id already exists it will be returned instead.\n * @param source Source of the iframe.\n * @param id DOM id of the iframe.\n * @returns The created iframe.\n */\nexport const createIFrame = (source: string, id: string, { hidden = true, allow }: CreateIFrameOptions = {}) => {\n const create = () => {\n const iframe = document.createElement('iframe') as HTMLIFrameElement;\n iframe.id = id;\n iframe.src = source;\n hidden && iframe.setAttribute('style', 'display: none;');\n allow && iframe.setAttribute('allow', allow);\n document.body.appendChild(iframe);\n return iframe;\n };\n\n return (document.getElementById(id) as HTMLIFrameElement) ?? create();\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nexport type WorkerPortOptions = {\n port: MessagePort;\n channel?: string;\n subscribe?: RpcPort['subscribe'];\n};\n\n/**\n * Create a RPC port for a worker.\n * @param options.port Message port to send message on.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.subscribe\n * @returns RPC port for messaging.\n */\n// TODO(wittjosiah): Rename for more general purpose MessagePort.\nexport const createWorkerPort = ({ port, channel, subscribe }: WorkerPortOptions): RpcPort => ({\n send: async (message) => {\n // Based on https://stackoverflow.com/a/54646864/2804332.\n const payload = message.buffer.slice(message.byteOffset, message.byteOffset + message.byteLength);\n port.postMessage(\n {\n channel,\n payload,\n },\n [payload],\n );\n },\n\n subscribe:\n subscribe ??\n ((callback) => {\n const handler = (event: MessageEvent<MessageData>) => {\n const message = event.data;\n if (channel && message.channel !== channel) {\n return;\n }\n\n log.debug('Recieved message', message);\n callback(new Uint8Array(message.payload));\n };\n\n port.onmessage = handler;\n return () => {\n port.onmessage = null;\n };\n }),\n});\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from './message';\nimport { createIFramePort, createWorkerPort, IFramePortOptions, WorkerPortOptions } from './ports';\n\n/**\n * Facilitates the multiplexing of multiple RpcPorts over a single MessagePort.\n */\nexport class PortMuxer {\n private readonly _activeChannels = new Map<string, (msg: Uint8Array) => void>();\n\n private readonly _rpcPorts = new Map<string, RpcPort>();\n\n constructor(private readonly _messagePort?: MessagePort) {\n if (this._messagePort) {\n this._messagePort.onmessage = (event) => this.onWorkerMessage(event);\n }\n\n if (typeof window !== 'undefined') {\n window.addEventListener('message', (event) => this.onWindowMessage(event));\n }\n }\n\n createWorkerPort(options: Omit<WorkerPortOptions, 'port' | 'subscribe' | 'channel'> & { channel: string }) {\n if (!this._messagePort) {\n throw new Error('Message port is required to create worker ports');\n }\n\n const port = createWorkerPort({\n ...options,\n port: this._messagePort,\n subscribe: (callback) => {\n this._activeChannels.set(options.channel, callback);\n return () => this._activeChannels.delete(options.channel);\n },\n });\n this._rpcPorts.set(options.channel, port);\n\n return port;\n }\n\n createIFramePort(options: IFramePortOptions) {\n const port = createIFramePort(options);\n this._rpcPorts.set(options.channel, port);\n\n return port;\n }\n\n private onWorkerMessage(event: MessageEvent<MessageData>) {\n const message = event.data;\n log.debug('Recieved message from worker port', {\n channel: message.channel,\n payload: message.payload,\n });\n\n const callback = this._activeChannels.get(message.channel);\n callback?.(new Uint8Array(message.payload));\n }\n\n private onWindowMessage(event: MessageEvent<MessageData>) {\n const message = event.data;\n log.debug('Recieved message from window', {\n channel: message.channel,\n payload: message.payload,\n });\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["UAParser", "log", "browser", "os", "navigator", "parser", "userAgent", "getBrowser", "name", "getOS", "sendToIFrame", "iframe", "origin", "message", "contentWindow", "postMessage", "payload", "sendToParentWindow", "window", "parent", "createIFramePort", "channel", "onOrigin", "send", "data", "length", "buffer", "slice", "byteOffset", "byteLength", "subscribe", "callback", "handler", "event", "source", "isMessageData", "undefined", "Uint8Array", "addEventListener", "removeEventListener", "createIFrame", "id", "hidden", "allow", "create", "document", "createElement", "src", "setAttribute", "body", "appendChild", "getElementById", "log", "createWorkerPort", "port", "channel", "subscribe", "send", "message", "payload", "buffer", "slice", "byteOffset", "byteLength", "postMessage", "callback", "handler", "event", "data", "debug", "Uint8Array", "onmessage", "log", "PortMuxer", "constructor", "_messagePort", "_activeChannels", "Map", "_rpcPorts", "onmessage", "event", "onWorkerMessage", "window", "addEventListener", "onWindowMessage", "createWorkerPort", "options", "Error", "port", "subscribe", "callback", "set", "channel", "delete", "createIFramePort", "message", "data", "log", "debug", "payload", "get", "Uint8Array"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/core/mesh/rpc-tunnel/src/message.ts":{"bytes":
|
|
1
|
+
{"inputs":{"packages/core/mesh/rpc-tunnel/src/message.ts":{"bytes":523,"imports":[],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/ports/iframe.ts":{"bytes":13980,"imports":[{"path":"ua-parser-js","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/ports/worker.ts":{"bytes":4789,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/ports/index.ts":{"bytes":555,"imports":[{"path":"packages/core/mesh/rpc-tunnel/src/ports/iframe.ts","kind":"import-statement","original":"./iframe"},{"path":"packages/core/mesh/rpc-tunnel/src/ports/worker.ts","kind":"import-statement","original":"./worker"}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/port-muxer.ts":{"bytes":7565,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc-tunnel/src/ports/index.ts","kind":"import-statement","original":"./ports"}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/index.ts":{"bytes":643,"imports":[{"path":"packages/core/mesh/rpc-tunnel/src/message.ts","kind":"import-statement","original":"./message"},{"path":"packages/core/mesh/rpc-tunnel/src/ports/index.ts","kind":"import-statement","original":"./ports"},{"path":"packages/core/mesh/rpc-tunnel/src/port-muxer.ts","kind":"import-statement","original":"./port-muxer"}],"format":"esm"}},"outputs":{"packages/core/mesh/rpc-tunnel/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":12734},"packages/core/mesh/rpc-tunnel/dist/lib/browser/index.mjs":{"imports":[{"path":"ua-parser-js","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"exports":["PortMuxer","createIFrame","createIFramePort","createWorkerPort"],"entryPoint":"packages/core/mesh/rpc-tunnel/src/index.ts","inputs":{"packages/core/mesh/rpc-tunnel/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/rpc-tunnel/src/ports/iframe.ts":{"bytesInOutput":3199},"packages/core/mesh/rpc-tunnel/src/ports/index.ts":{"bytesInOutput":0},"packages/core/mesh/rpc-tunnel/src/ports/worker.ts":{"bytesInOutput":905},"packages/core/mesh/rpc-tunnel/src/port-muxer.ts":{"bytesInOutput":1853}},"bytes":6231}}}
|
package/dist/lib/node/index.cjs
CHANGED
|
@@ -30,7 +30,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
30
30
|
// packages/core/mesh/rpc-tunnel/src/ports/iframe.ts
|
|
31
31
|
var import_ua_parser_js = require("ua-parser-js");
|
|
32
32
|
var import_log = require("@dxos/log");
|
|
33
|
-
var __dxlog_file = "/
|
|
33
|
+
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/rpc-tunnel/src/ports/iframe.ts";
|
|
34
34
|
var browser;
|
|
35
35
|
var os;
|
|
36
36
|
if (typeof navigator !== "undefined") {
|
|
@@ -145,7 +145,7 @@ var createIFrame = (source, id, { hidden = true, allow } = {}) => {
|
|
|
145
145
|
|
|
146
146
|
// packages/core/mesh/rpc-tunnel/src/ports/worker.ts
|
|
147
147
|
var import_log2 = require("@dxos/log");
|
|
148
|
-
var __dxlog_file2 = "/
|
|
148
|
+
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/rpc-tunnel/src/ports/worker.ts";
|
|
149
149
|
var createWorkerPort = ({ port, channel, subscribe }) => ({
|
|
150
150
|
send: async (message) => {
|
|
151
151
|
const payload = message.buffer.slice(message.byteOffset, message.byteOffset + message.byteLength);
|
|
@@ -179,9 +179,8 @@ var createWorkerPort = ({ port, channel, subscribe }) => ({
|
|
|
179
179
|
|
|
180
180
|
// packages/core/mesh/rpc-tunnel/src/port-muxer.ts
|
|
181
181
|
var import_log3 = require("@dxos/log");
|
|
182
|
-
var __dxlog_file3 = "/
|
|
182
|
+
var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/rpc-tunnel/src/port-muxer.ts";
|
|
183
183
|
var PortMuxer = class {
|
|
184
|
-
// prettier-ignore
|
|
185
184
|
constructor(_messagePort) {
|
|
186
185
|
this._messagePort = _messagePort;
|
|
187
186
|
this._activeChannels = /* @__PURE__ */ new Map();
|
|
@@ -220,7 +219,7 @@ var PortMuxer = class {
|
|
|
220
219
|
payload: message.payload
|
|
221
220
|
}, {
|
|
222
221
|
F: __dxlog_file3,
|
|
223
|
-
L:
|
|
222
|
+
L: 56,
|
|
224
223
|
S: this,
|
|
225
224
|
C: (f, a) => f(...a)
|
|
226
225
|
});
|
|
@@ -234,7 +233,7 @@ var PortMuxer = class {
|
|
|
234
233
|
payload: message.payload
|
|
235
234
|
}, {
|
|
236
235
|
F: __dxlog_file3,
|
|
237
|
-
L:
|
|
236
|
+
L: 67,
|
|
238
237
|
S: this,
|
|
239
238
|
C: (f, a) => f(...a)
|
|
240
239
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/index.ts", "../../../src/ports/iframe.ts", "../../../src/ports/worker.ts", "../../../src/port-muxer.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nexport * from './message';\nexport * from './ports';\nexport * from './port-muxer';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { UAParser } from 'ua-parser-js';\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nlet browser: string | undefined;\nlet os: string | undefined;\n\nif (typeof navigator !== 'undefined') {\n // TODO(wittjosiah): Stop user agent parsing.\n const parser = new UAParser(navigator.userAgent);\n browser = parser.getBrowser().name;\n os = parser.getOS().name;\n}\n\nconst sendToIFrame = (iframe: HTMLIFrameElement, origin: string, message: MessageData) => {\n if (!iframe.contentWindow) {\n log('IFrame content window missing', { origin });\n return;\n }\n\n if (browser === 'Chrome' && os === 'iOS') {\n iframe.contentWindow.postMessage(message, origin);\n } else {\n iframe.contentWindow.postMessage(message, origin, [message.payload]);\n }\n};\n\nconst sendToParentWindow = (origin: string, message: MessageData) => {\n if (browser === 'Chrome' && os === 'iOS') {\n window.parent.postMessage(message, origin);\n } else {\n window.parent.postMessage(message, origin, [message.payload]);\n }\n};\n\nexport type IFramePortOptions = {\n channel: string;\n iframe?: HTMLIFrameElement;\n origin?: string;\n onOrigin?: (origin: string) => void;\n};\n\n/**\n * Create a RPC port with an iframe over window messaging.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.iframe Instance of the iframe if sending to child.\n * @param options.origin Origin of the destination window.\n * @param options.onOrigin Callback triggered when origin of destination window is verified.\n * @returns RPC port for messaging.\n */\nexport const createIFramePort = ({ channel, iframe, origin, onOrigin }: IFramePortOptions): RpcPort => {\n return {\n send: async (data) => {\n if (!origin) {\n log('no origin set', { channel });\n return;\n }\n\n log('sending', { channel, data: data.length });\n const payload = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);\n const message = { channel, payload };\n if (iframe) {\n sendToIFrame(iframe, origin, message);\n } else {\n sendToParentWindow(origin, message);\n }\n },\n\n subscribe: (callback) => {\n const handler = (event: MessageEvent<unknown>) => {\n if (!iframe && event.source !== window.parent) {\n // Not from parent window.\n return;\n } else if (iframe && event.source !== iframe.contentWindow) {\n // Not from child window.\n return;\n }\n\n const isMessageData =\n event.data && typeof event.data === 'object' && 'channel' in event.data && 'payload' in event.data;\n const message = isMessageData ? (event.data as MessageData) : undefined;\n if (message?.channel !== channel) {\n return;\n }\n\n if (!origin) {\n origin = event.origin;\n onOrigin?.(origin);\n }\n\n log('received', message);\n callback(new Uint8Array(message.payload));\n };\n\n window.addEventListener('message', handler);\n return () => window.removeEventListener('message', handler);\n },\n };\n};\n\nexport type CreateIFrameOptions = {\n hidden?: boolean;\n allow?: string;\n};\n\n/**\n * Create a hidden iframe and insert it into the DOM.\n * If an element with the same id already exists it will be returned instead.\n * @param source Source of the iframe.\n * @param id DOM id of the iframe.\n * @returns The created iframe.\n */\nexport const createIFrame = (source: string, id: string, { hidden = true, allow }: CreateIFrameOptions = {}) => {\n const create = () => {\n const iframe = document.createElement('iframe') as HTMLIFrameElement;\n iframe.id = id;\n iframe.src = source;\n hidden && iframe.setAttribute('style', 'display: none;');\n allow && iframe.setAttribute('allow', allow);\n document.body.appendChild(iframe);\n return iframe;\n };\n\n return (document.getElementById(id) as HTMLIFrameElement) ?? create();\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nexport type WorkerPortOptions = {\n port: MessagePort;\n channel?: string;\n subscribe?: RpcPort['subscribe'];\n};\n\n/**\n * Create a RPC port for a worker.\n * @param options.port Message port to send message on.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.subscribe\n * @returns RPC port for messaging.\n */\n// TODO(wittjosiah): Rename for more general purpose MessagePort.\nexport const createWorkerPort = ({ port, channel, subscribe }: WorkerPortOptions): RpcPort => ({\n send: async (message) => {\n // Based on https://stackoverflow.com/a/54646864/2804332.\n const payload = message.buffer.slice(message.byteOffset, message.byteOffset + message.byteLength);\n port.postMessage(\n {\n channel,\n payload,\n },\n [payload],\n );\n },\n\n subscribe:\n subscribe ??\n ((callback) => {\n const handler = (event: MessageEvent<MessageData>) => {\n const message = event.data;\n if (channel && message.channel !== channel) {\n return;\n }\n\n log.debug('Recieved message', message);\n callback(new Uint8Array(message.payload));\n };\n\n port.onmessage = handler;\n return () => {\n port.onmessage = null;\n };\n }),\n});\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from './message';\nimport { createIFramePort, createWorkerPort, IFramePortOptions, WorkerPortOptions } from './ports';\n\n/**\n * Facilitates the multiplexing of multiple RpcPorts over a single MessagePort.\n */\nexport class PortMuxer {\n private readonly _activeChannels = new Map<string, (msg: Uint8Array) => void>();\n\n private readonly _rpcPorts = new Map<string, RpcPort>();\n\n
|
|
5
|
-
"mappings": "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
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nexport * from './message';\nexport * from './ports';\nexport * from './port-muxer';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { UAParser } from 'ua-parser-js';\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nlet browser: string | undefined;\nlet os: string | undefined;\n\nif (typeof navigator !== 'undefined') {\n // TODO(wittjosiah): Stop user agent parsing.\n const parser = new UAParser(navigator.userAgent);\n browser = parser.getBrowser().name;\n os = parser.getOS().name;\n}\n\nconst sendToIFrame = (iframe: HTMLIFrameElement, origin: string, message: MessageData) => {\n if (!iframe.contentWindow) {\n log('IFrame content window missing', { origin });\n return;\n }\n\n if (browser === 'Chrome' && os === 'iOS') {\n iframe.contentWindow.postMessage(message, origin);\n } else {\n iframe.contentWindow.postMessage(message, origin, [message.payload]);\n }\n};\n\nconst sendToParentWindow = (origin: string, message: MessageData) => {\n if (browser === 'Chrome' && os === 'iOS') {\n window.parent.postMessage(message, origin);\n } else {\n window.parent.postMessage(message, origin, [message.payload]);\n }\n};\n\nexport type IFramePortOptions = {\n channel: string;\n iframe?: HTMLIFrameElement;\n origin?: string;\n onOrigin?: (origin: string) => void;\n};\n\n/**\n * Create a RPC port with an iframe over window messaging.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.iframe Instance of the iframe if sending to child.\n * @param options.origin Origin of the destination window.\n * @param options.onOrigin Callback triggered when origin of destination window is verified.\n * @returns RPC port for messaging.\n */\nexport const createIFramePort = ({ channel, iframe, origin, onOrigin }: IFramePortOptions): RpcPort => {\n return {\n send: async (data) => {\n if (!origin) {\n log('no origin set', { channel });\n return;\n }\n\n log('sending', { channel, data: data.length });\n const payload = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);\n const message = { channel, payload };\n if (iframe) {\n sendToIFrame(iframe, origin, message);\n } else {\n sendToParentWindow(origin, message);\n }\n },\n\n subscribe: (callback) => {\n const handler = (event: MessageEvent<unknown>) => {\n if (!iframe && event.source !== window.parent) {\n // Not from parent window.\n return;\n } else if (iframe && event.source !== iframe.contentWindow) {\n // Not from child window.\n return;\n }\n\n const isMessageData =\n event.data && typeof event.data === 'object' && 'channel' in event.data && 'payload' in event.data;\n const message = isMessageData ? (event.data as MessageData) : undefined;\n if (message?.channel !== channel) {\n return;\n }\n\n if (!origin) {\n origin = event.origin;\n onOrigin?.(origin);\n }\n\n log('received', message);\n callback(new Uint8Array(message.payload));\n };\n\n window.addEventListener('message', handler);\n return () => window.removeEventListener('message', handler);\n },\n };\n};\n\nexport type CreateIFrameOptions = {\n hidden?: boolean;\n allow?: string;\n};\n\n/**\n * Create a hidden iframe and insert it into the DOM.\n * If an element with the same id already exists it will be returned instead.\n * @param source Source of the iframe.\n * @param id DOM id of the iframe.\n * @returns The created iframe.\n */\nexport const createIFrame = (source: string, id: string, { hidden = true, allow }: CreateIFrameOptions = {}) => {\n const create = () => {\n const iframe = document.createElement('iframe') as HTMLIFrameElement;\n iframe.id = id;\n iframe.src = source;\n hidden && iframe.setAttribute('style', 'display: none;');\n allow && iframe.setAttribute('allow', allow);\n document.body.appendChild(iframe);\n return iframe;\n };\n\n return (document.getElementById(id) as HTMLIFrameElement) ?? create();\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from '../message';\n\nexport type WorkerPortOptions = {\n port: MessagePort;\n channel?: string;\n subscribe?: RpcPort['subscribe'];\n};\n\n/**\n * Create a RPC port for a worker.\n * @param options.port Message port to send message on.\n * @param options.channel Identifier for sent/recieved messages.\n * @param options.subscribe\n * @returns RPC port for messaging.\n */\n// TODO(wittjosiah): Rename for more general purpose MessagePort.\nexport const createWorkerPort = ({ port, channel, subscribe }: WorkerPortOptions): RpcPort => ({\n send: async (message) => {\n // Based on https://stackoverflow.com/a/54646864/2804332.\n const payload = message.buffer.slice(message.byteOffset, message.byteOffset + message.byteLength);\n port.postMessage(\n {\n channel,\n payload,\n },\n [payload],\n );\n },\n\n subscribe:\n subscribe ??\n ((callback) => {\n const handler = (event: MessageEvent<MessageData>) => {\n const message = event.data;\n if (channel && message.channel !== channel) {\n return;\n }\n\n log.debug('Recieved message', message);\n callback(new Uint8Array(message.payload));\n };\n\n port.onmessage = handler;\n return () => {\n port.onmessage = null;\n };\n }),\n});\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { RpcPort } from '@dxos/rpc';\n\nimport { MessageData } from './message';\nimport { createIFramePort, createWorkerPort, IFramePortOptions, WorkerPortOptions } from './ports';\n\n/**\n * Facilitates the multiplexing of multiple RpcPorts over a single MessagePort.\n */\nexport class PortMuxer {\n private readonly _activeChannels = new Map<string, (msg: Uint8Array) => void>();\n\n private readonly _rpcPorts = new Map<string, RpcPort>();\n\n constructor(private readonly _messagePort?: MessagePort) {\n if (this._messagePort) {\n this._messagePort.onmessage = (event) => this.onWorkerMessage(event);\n }\n\n if (typeof window !== 'undefined') {\n window.addEventListener('message', (event) => this.onWindowMessage(event));\n }\n }\n\n createWorkerPort(options: Omit<WorkerPortOptions, 'port' | 'subscribe' | 'channel'> & { channel: string }) {\n if (!this._messagePort) {\n throw new Error('Message port is required to create worker ports');\n }\n\n const port = createWorkerPort({\n ...options,\n port: this._messagePort,\n subscribe: (callback) => {\n this._activeChannels.set(options.channel, callback);\n return () => this._activeChannels.delete(options.channel);\n },\n });\n this._rpcPorts.set(options.channel, port);\n\n return port;\n }\n\n createIFramePort(options: IFramePortOptions) {\n const port = createIFramePort(options);\n this._rpcPorts.set(options.channel, port);\n\n return port;\n }\n\n private onWorkerMessage(event: MessageEvent<MessageData>) {\n const message = event.data;\n log.debug('Recieved message from worker port', {\n channel: message.channel,\n payload: message.payload,\n });\n\n const callback = this._activeChannels.get(message.channel);\n callback?.(new Uint8Array(message.payload));\n }\n\n private onWindowMessage(event: MessageEvent<MessageData>) {\n const message = event.data;\n log.debug('Recieved message from window', {\n channel: message.channel,\n payload: message.payload,\n });\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["browser", "os", "navigator", "parser", "UAParser", "userAgent", "getBrowser", "name", "getOS", "sendToIFrame", "iframe", "origin", "message", "contentWindow", "log", "postMessage", "payload", "sendToParentWindow", "window", "parent", "createIFramePort", "channel", "onOrigin", "send", "data", "length", "buffer", "slice", "byteOffset", "byteLength", "subscribe", "callback", "handler", "event", "source", "isMessageData", "undefined", "Uint8Array", "addEventListener", "removeEventListener", "createIFrame", "id", "hidden", "allow", "create", "document", "createElement", "src", "setAttribute", "body", "appendChild", "getElementById", "import_log", "createWorkerPort", "port", "channel", "subscribe", "send", "message", "payload", "buffer", "slice", "byteOffset", "byteLength", "postMessage", "callback", "handler", "event", "data", "log", "debug", "Uint8Array", "onmessage", "import_log", "PortMuxer", "constructor", "_messagePort", "_activeChannels", "Map", "_rpcPorts", "onmessage", "event", "onWorkerMessage", "window", "addEventListener", "onWindowMessage", "createWorkerPort", "options", "Error", "port", "subscribe", "callback", "set", "channel", "delete", "createIFramePort", "message", "data", "log", "debug", "payload", "get", "Uint8Array"]
|
|
7
7
|
}
|
package/dist/lib/node/meta.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/core/mesh/rpc-tunnel/src/message.ts":{"bytes":
|
|
1
|
+
{"inputs":{"packages/core/mesh/rpc-tunnel/src/message.ts":{"bytes":523,"imports":[],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/ports/iframe.ts":{"bytes":13980,"imports":[{"path":"ua-parser-js","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/ports/worker.ts":{"bytes":4789,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/ports/index.ts":{"bytes":555,"imports":[{"path":"packages/core/mesh/rpc-tunnel/src/ports/iframe.ts","kind":"import-statement","original":"./iframe"},{"path":"packages/core/mesh/rpc-tunnel/src/ports/worker.ts","kind":"import-statement","original":"./worker"}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/port-muxer.ts":{"bytes":7565,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc-tunnel/src/ports/index.ts","kind":"import-statement","original":"./ports"}],"format":"esm"},"packages/core/mesh/rpc-tunnel/src/index.ts":{"bytes":643,"imports":[{"path":"packages/core/mesh/rpc-tunnel/src/message.ts","kind":"import-statement","original":"./message"},{"path":"packages/core/mesh/rpc-tunnel/src/ports/index.ts","kind":"import-statement","original":"./ports"},{"path":"packages/core/mesh/rpc-tunnel/src/port-muxer.ts","kind":"import-statement","original":"./port-muxer"}],"format":"esm"}},"outputs":{"packages/core/mesh/rpc-tunnel/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":12907},"packages/core/mesh/rpc-tunnel/dist/lib/node/index.cjs":{"imports":[{"path":"ua-parser-js","kind":"require-call","external":true},{"path":"@dxos/log","kind":"require-call","external":true},{"path":"@dxos/log","kind":"require-call","external":true},{"path":"@dxos/log","kind":"require-call","external":true}],"exports":[],"entryPoint":"packages/core/mesh/rpc-tunnel/src/index.ts","inputs":{"packages/core/mesh/rpc-tunnel/src/index.ts":{"bytesInOutput":247},"packages/core/mesh/rpc-tunnel/src/ports/iframe.ts":{"bytesInOutput":3299},"packages/core/mesh/rpc-tunnel/src/ports/index.ts":{"bytesInOutput":0},"packages/core/mesh/rpc-tunnel/src/ports/worker.ts":{"bytesInOutput":915},"packages/core/mesh/rpc-tunnel/src/port-muxer.ts":{"bytesInOutput":1874}},"bytes":7535}}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-muxer.d.ts","sourceRoot":"","sources":["../../../src/port-muxer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAsC,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEnG;;GAEG;AACH,qBAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"port-muxer.d.ts","sourceRoot":"","sources":["../../../src/port-muxer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAsC,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEnG;;GAEG;AACH,qBAAa,SAAS;IAKR,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAJ1C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgD;IAEhF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAE3B,YAAY,CAAC,yBAAa;IAUvD,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;IAkBzG,gBAAgB,CAAC,OAAO,EAAE,iBAAiB;IAO3C,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,eAAe;CAOxB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/rpc-tunnel",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.58-main.0009f6a",
|
|
4
4
|
"description": "RPC ports over various transports.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
],
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"ua-parser-js": "^1.0.35",
|
|
20
|
-
"@dxos/log": "0.1.
|
|
21
|
-
"@dxos/rpc": "0.1.
|
|
20
|
+
"@dxos/log": "0.1.58-main.0009f6a",
|
|
21
|
+
"@dxos/rpc": "0.1.58-main.0009f6a"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@types/ua-parser-js": "^0.7.36"
|
package/src/port-muxer.ts
CHANGED
|
@@ -16,10 +16,7 @@ export class PortMuxer {
|
|
|
16
16
|
|
|
17
17
|
private readonly _rpcPorts = new Map<string, RpcPort>();
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
constructor(
|
|
21
|
-
private readonly _messagePort?: MessagePort
|
|
22
|
-
) {
|
|
19
|
+
constructor(private readonly _messagePort?: MessagePort) {
|
|
23
20
|
if (this._messagePort) {
|
|
24
21
|
this._messagePort.onmessage = (event) => this.onWorkerMessage(event);
|
|
25
22
|
}
|