@itwin/core-backend 3.1.0-dev.12 → 3.1.0-dev.19
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.
|
@@ -10,6 +10,8 @@ export interface LocalhostIpcHostOpts {
|
|
|
10
10
|
}
|
|
11
11
|
/** @internal */
|
|
12
12
|
export declare class LocalhostIpcHost {
|
|
13
|
+
private static _initialized;
|
|
14
|
+
private static _socket;
|
|
13
15
|
static connect(connection: ws): void;
|
|
14
16
|
static startup(opts?: {
|
|
15
17
|
localhostIpcHost?: LocalhostIpcHostOpts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalhostIpcHost.d.ts","sourceRoot":"","sources":["../../src/LocalhostIpcHost.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAGzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEvD,gBAAgB;AAChB,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"LocalhostIpcHost.d.ts","sourceRoot":"","sources":["../../src/LocalhostIpcHost.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAGzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEvD,gBAAgB;AAChB,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA6CD,gBAAgB;AAChB,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAAC,YAAY,CAAS;IACpC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAsB;WAE9B,OAAO,CAAC,UAAU,EAAE,EAAE;WAIhB,OAAO,CAAC,IAAI,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;QAAC,UAAU,CAAC,EAAE,uBAAuB,CAAA;KAAE;CASrH"}
|
|
@@ -15,22 +15,24 @@ class LocalTransport extends core_common_1.IpcWebSocketTransport {
|
|
|
15
15
|
constructor(opts) {
|
|
16
16
|
var _a;
|
|
17
17
|
super();
|
|
18
|
-
this._connections = new
|
|
18
|
+
this._connections = new Map();
|
|
19
19
|
if (!opts.noServer) {
|
|
20
20
|
this._server = new ws.Server({ port: (_a = opts.socketPort) !== null && _a !== void 0 ? _a : 3002 });
|
|
21
21
|
this._server.on("connection", (connection) => LocalhostIpcHost.connect(connection));
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
send(message) {
|
|
25
|
-
this._connections.forEach((connection) => {
|
|
25
|
+
this._connections.forEach((last, connection) => {
|
|
26
|
+
message.sequence = last + 1;
|
|
27
|
+
this._connections.set(connection, message.sequence);
|
|
26
28
|
const parts = this.serialize(message);
|
|
27
29
|
parts.forEach((part) => connection.send(part));
|
|
28
30
|
});
|
|
29
31
|
}
|
|
30
32
|
connect(connection) {
|
|
31
|
-
this._connections.
|
|
33
|
+
this._connections.set(connection, -1);
|
|
32
34
|
connection.on("message", async (data) => {
|
|
33
|
-
const message = await this.notifyIncoming(data);
|
|
35
|
+
const message = await this.notifyIncoming(data, connection);
|
|
34
36
|
if (core_common_1.IpcWebSocketMessage.skip(message)) {
|
|
35
37
|
return;
|
|
36
38
|
}
|
|
@@ -40,6 +42,7 @@ class LocalTransport extends core_common_1.IpcWebSocketTransport {
|
|
|
40
42
|
});
|
|
41
43
|
connection.on("close", () => {
|
|
42
44
|
this._connections.delete(connection);
|
|
45
|
+
this.notifyClose(connection);
|
|
43
46
|
});
|
|
44
47
|
}
|
|
45
48
|
}
|
|
@@ -50,10 +53,14 @@ class LocalhostIpcHost {
|
|
|
50
53
|
}
|
|
51
54
|
static async startup(opts) {
|
|
52
55
|
var _a;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
+
if (!this._initialized) {
|
|
57
|
+
core_common_1.IpcWebSocket.transport = new LocalTransport((_a = opts === null || opts === void 0 ? void 0 : opts.localhostIpcHost) !== null && _a !== void 0 ? _a : {});
|
|
58
|
+
this._socket = new core_common_1.IpcWebSocketBackend();
|
|
59
|
+
this._initialized = true;
|
|
60
|
+
}
|
|
61
|
+
await IpcHost_1.IpcHost.startup({ ipcHost: { socket: this._socket }, iModelHost: opts === null || opts === void 0 ? void 0 : opts.iModelHost });
|
|
56
62
|
}
|
|
57
63
|
}
|
|
58
64
|
exports.LocalhostIpcHost = LocalhostIpcHost;
|
|
65
|
+
LocalhostIpcHost._initialized = false;
|
|
59
66
|
//# sourceMappingURL=LocalhostIpcHost.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalhostIpcHost.js","sourceRoot":"","sources":["../../src/LocalhostIpcHost.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,yBAAyB;AACzB,oDAAmH;AACnH,uCAAoC;AASpC,MAAM,cAAe,SAAQ,mCAAqB;IAIhD,YAAmB,IAA0B;;QAC3C,KAAK,EAAE,CAAC;QAHF,iBAAY,
|
|
1
|
+
{"version":3,"file":"LocalhostIpcHost.js","sourceRoot":"","sources":["../../src/LocalhostIpcHost.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,yBAAyB;AACzB,oDAAmH;AACnH,uCAAoC;AASpC,MAAM,cAAe,SAAQ,mCAAqB;IAIhD,YAAmB,IAA0B;;QAC3C,KAAK,EAAE,CAAC;QAHF,iBAAY,GAAoB,IAAI,GAAG,EAAE,CAAC;QAKhD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,IAAI,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;SACrF;IACH,CAAC;IAEM,IAAI,CAAC,OAA4B;QACtC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE;YAC7C,OAAO,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACtC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,OAAO,CAAC,UAAc;QAC3B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC5D,IAAI,iCAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBACrC,OAAO;aACR;YAED,KAAK,MAAM,QAAQ,IAAI,0BAAY,CAAC,SAAS,EAAE;gBAC7C,QAAQ,CAAC,EAAW,EAAE,OAAO,CAAC,CAAC;aAChC;QACH,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAC1B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,gBAAgB;AAChB,MAAa,gBAAgB;IAIpB,MAAM,CAAC,OAAO,CAAC,UAAc;QACjC,0BAAY,CAAC,SAA4B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAwF;;QAClH,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,0BAAY,CAAC,SAAS,GAAG,IAAI,cAAc,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,gBAAgB,mCAAI,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,OAAO,GAAG,IAAI,iCAAmB,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC1B;QAED,MAAM,iBAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAE,CAAC,CAAC;IAC7F,CAAC;;AAhBH,4CAiBC;AAhBgB,6BAAY,GAAG,KAAK,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module IModelHost\r\n */\r\n\r\nimport * as ws from \"ws\";\r\nimport { IpcWebSocket, IpcWebSocketBackend, IpcWebSocketMessage, IpcWebSocketTransport } from \"@itwin/core-common\";\r\nimport { IpcHost } from \"./IpcHost\";\r\nimport { IModelHostConfiguration } from \"./IModelHost\";\r\n\r\n/** @internal */\r\nexport interface LocalhostIpcHostOpts {\r\n socketPort?: number;\r\n noServer?: boolean;\r\n}\r\n\r\nclass LocalTransport extends IpcWebSocketTransport {\r\n private _server: ws.Server | undefined;\r\n private _connections: Map<ws, number> = new Map();\r\n\r\n public constructor(opts: LocalhostIpcHostOpts) {\r\n super();\r\n\r\n if (!opts.noServer) {\r\n this._server = new ws.Server({ port: opts.socketPort ?? 3002 });\r\n this._server.on(\"connection\", (connection) => LocalhostIpcHost.connect(connection));\r\n }\r\n }\r\n\r\n public send(message: IpcWebSocketMessage): void {\r\n this._connections.forEach((last, connection) => {\r\n message.sequence = last + 1;\r\n this._connections.set(connection, message.sequence);\r\n const parts = this.serialize(message);\r\n parts.forEach((part) => connection.send(part));\r\n });\r\n }\r\n\r\n public connect(connection: ws) {\r\n this._connections.set(connection, -1);\r\n\r\n connection.on(\"message\", async (data) => {\r\n const message = await this.notifyIncoming(data, connection);\r\n if (IpcWebSocketMessage.skip(message)) {\r\n return;\r\n }\r\n\r\n for (const listener of IpcWebSocket.receivers) {\r\n listener({} as Event, message);\r\n }\r\n });\r\n\r\n connection.on(\"close\", () => {\r\n this._connections.delete(connection);\r\n this.notifyClose(connection);\r\n });\r\n }\r\n}\r\n\r\n/** @internal */\r\nexport class LocalhostIpcHost {\r\n private static _initialized = false;\r\n private static _socket: IpcWebSocketBackend;\r\n\r\n public static connect(connection: ws) {\r\n (IpcWebSocket.transport as LocalTransport).connect(connection);\r\n }\r\n\r\n public static async startup(opts?: { localhostIpcHost?: LocalhostIpcHostOpts, iModelHost?: IModelHostConfiguration }) {\r\n if (!this._initialized) {\r\n IpcWebSocket.transport = new LocalTransport(opts?.localhostIpcHost ?? {});\r\n this._socket = new IpcWebSocketBackend();\r\n this._initialized = true;\r\n }\r\n\r\n await IpcHost.startup({ ipcHost: { socket: this._socket }, iModelHost: opts?.iModelHost });\r\n }\r\n}\r\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@itwin/core-backend",
|
|
3
|
-
"version": "3.1.0-dev.
|
|
3
|
+
"version": "3.1.0-dev.19",
|
|
4
4
|
"description": "iTwin.js backend components",
|
|
5
5
|
"main": "lib/cjs/core-backend.js",
|
|
6
6
|
"typings": "lib/cjs/core-backend",
|
|
@@ -24,22 +24,22 @@
|
|
|
24
24
|
"url": "http://www.bentley.com"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
|
-
"@itwin/core-bentley": "^3.1.0-dev.
|
|
28
|
-
"@itwin/core-common": "^3.1.0-dev.
|
|
29
|
-
"@itwin/core-geometry": "^3.1.0-dev.
|
|
30
|
-
"@itwin/ecschema-metadata": "^3.1.0-dev.
|
|
27
|
+
"@itwin/core-bentley": "^3.1.0-dev.19",
|
|
28
|
+
"@itwin/core-common": "^3.1.0-dev.19",
|
|
29
|
+
"@itwin/core-geometry": "^3.1.0-dev.19",
|
|
30
|
+
"@itwin/ecschema-metadata": "^3.1.0-dev.19"
|
|
31
31
|
},
|
|
32
32
|
"//devDependencies": [
|
|
33
33
|
"NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install",
|
|
34
34
|
"NOTE: All tools used by scripts in this package must be listed as devDependencies"
|
|
35
35
|
],
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@itwin/build-tools": "3.1.0-dev.
|
|
38
|
-
"@itwin/core-bentley": "3.1.0-dev.
|
|
39
|
-
"@itwin/core-common": "3.1.0-dev.
|
|
40
|
-
"@itwin/core-geometry": "3.1.0-dev.
|
|
41
|
-
"@itwin/ecschema-metadata": "3.1.0-dev.
|
|
42
|
-
"@itwin/eslint-plugin": "3.1.0-dev.
|
|
37
|
+
"@itwin/build-tools": "3.1.0-dev.19",
|
|
38
|
+
"@itwin/core-bentley": "3.1.0-dev.19",
|
|
39
|
+
"@itwin/core-common": "3.1.0-dev.19",
|
|
40
|
+
"@itwin/core-geometry": "3.1.0-dev.19",
|
|
41
|
+
"@itwin/ecschema-metadata": "3.1.0-dev.19",
|
|
42
|
+
"@itwin/eslint-plugin": "3.1.0-dev.19",
|
|
43
43
|
"@types/chai": "^4.1.4",
|
|
44
44
|
"@types/chai-as-promised": "^7",
|
|
45
45
|
"@types/fs-extra": "^4.0.7",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"dependencies": {
|
|
66
66
|
"@azure/storage-blob": "^12.7.0",
|
|
67
67
|
"@bentley/imodeljs-native": "3.1.1",
|
|
68
|
-
"@itwin/core-telemetry": "3.1.0-dev.
|
|
68
|
+
"@itwin/core-telemetry": "3.1.0-dev.19",
|
|
69
69
|
"form-data": "^2.3.2",
|
|
70
70
|
"fs-extra": "^8.1.0",
|
|
71
71
|
"json5": "^2.2.0",
|