@backstage/plugin-signals 0.0.35 → 0.0.36-next.1

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/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @backstage/plugin-signals
2
2
 
3
+ ## 0.0.36-next.1
4
+
5
+ ### Patch Changes
6
+
7
+ - b8e865b: The signals client now shares one WebSocket connection across simultaneous subscriptions and does not connect or retry when no identity token is available.
8
+ - Updated dependencies
9
+ - @backstage/core-components@0.18.15-next.2
10
+
11
+ ## 0.0.36-next.0
12
+
13
+ ### Patch Changes
14
+
15
+ - Updated dependencies
16
+ - @backstage/core-components@0.18.15-next.0
17
+ - @backstage/core-plugin-api@1.12.11-next.0
18
+ - @backstage/frontend-plugin-api@0.18.2-next.0
19
+ - @backstage/plugin-signals-react@0.0.27-next.0
20
+
3
21
  ## 0.0.35
4
22
 
5
23
  ### Patch Changes
@@ -1 +1 @@
1
- {"version":3,"file":"alpha.esm.js","sources":["../src/alpha.tsx"],"sourcesContent":["/*\n * Copyright 2025 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n ApiBlueprint,\n createFrontendPlugin,\n discoveryApiRef,\n identityApiRef,\n} from '@backstage/frontend-plugin-api';\nimport { RiBroadcastLine } from '@remixicon/react';\nimport { signalApiRef } from '@backstage/plugin-signals-react';\nimport { SignalClient } from './api/SignalClient';\n\nconst api = ApiBlueprint.make({\n params: defineParams =>\n defineParams({\n api: signalApiRef,\n deps: {\n identity: identityApiRef,\n discoveryApi: discoveryApiRef,\n },\n factory: ({ identity, discoveryApi }) => {\n return SignalClient.create({\n identity,\n discoveryApi,\n });\n },\n }),\n});\n\n/** @alpha */\nexport default createFrontendPlugin({\n pluginId: 'signals',\n title: 'Signals',\n icon: <RiBroadcastLine />,\n info: { packageJson: () => import('../package.json') },\n extensions: [api],\n});\n"],"names":[],"mappings":";;;;;;AA0BA,MAAM,GAAA,GAAM,aAAa,IAAA,CAAK;AAAA,EAC5B,MAAA,EAAQ,kBACN,YAAA,CAAa;AAAA,IACX,GAAA,EAAK,YAAA;AAAA,IACL,IAAA,EAAM;AAAA,MACJ,QAAA,EAAU,cAAA;AAAA,MACV,YAAA,EAAc;AAAA,KAChB;AAAA,IACA,OAAA,EAAS,CAAC,EAAE,QAAA,EAAU,cAAa,KAAM;AACvC,MAAA,OAAO,aAAa,MAAA,CAAO;AAAA,QACzB,QAAA;AAAA,QACA;AAAA,OACD,CAAA;AAAA,IACH;AAAA,GACD;AACL,CAAC,CAAA;AAGD,YAAe,oBAAA,CAAqB;AAAA,EAClC,QAAA,EAAU,SAAA;AAAA,EACV,KAAA,EAAO,SAAA;AAAA,EACP,IAAA,sBAAO,eAAA,EAAA,EAAgB,CAAA;AAAA,EACvB,MAAM,EAAE,WAAA,EAAa,MAAM,OAAO,uBAAiB,CAAA,EAAE;AAAA,EACrD,UAAA,EAAY,CAAC,GAAG;AAClB,CAAC,CAAA;;;;"}
1
+ {"version":3,"file":"alpha.esm.js","sources":["../src/alpha.tsx"],"sourcesContent":["/*\n * Copyright 2025 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n ApiBlueprint,\n createFrontendPlugin,\n discoveryApiRef,\n identityApiRef,\n} from '@backstage/frontend-plugin-api';\nimport { RiBroadcastLine } from '@remixicon/react';\nimport { signalApiRef } from '@backstage/plugin-signals-react';\nimport { SignalClient } from './api/SignalClient';\n\nconst api = ApiBlueprint.make({\n params: defineParams =>\n defineParams({\n api: signalApiRef,\n deps: {\n identity: identityApiRef,\n discoveryApi: discoveryApiRef,\n },\n factory: ({ identity, discoveryApi }) => {\n return SignalClient.create({\n identity,\n discoveryApi,\n });\n },\n }),\n});\n\n/** @alpha */\nexport default createFrontendPlugin({\n pluginId: 'signals',\n title: 'Signals',\n icon: <RiBroadcastLine />,\n info: { packageJson: () => import('../package.json') },\n extensions: [api],\n});\n"],"names":[],"mappings":";;;;;;AA0BA,MAAM,GAAA,GAAM,aAAa,IAAA,CAAK;AAAA,EAC5B,MAAA,EAAQ,kBACN,YAAA,CAAa;AAAA,IACX,GAAA,EAAK,YAAA;AAAA,IACL,IAAA,EAAM;AAAA,MACJ,QAAA,EAAU,cAAA;AAAA,MACV,YAAA,EAAc;AAAA,KAChB;AAAA,IACA,OAAA,EAAS,CAAC,EAAE,QAAA,EAAU,cAAa,KAAM;AACvC,MAAA,OAAO,aAAa,MAAA,CAAO;AAAA,QACzB,QAAA;AAAA,QACA;AAAA,OACD,CAAA;AAAA,IACH;AAAA,GACD;AACL,CAAC,CAAA;AAGD,YAAe,oBAAA,CAAqB;AAAA,EAClC,QAAA,EAAU,SAAA;AAAA,EACV,KAAA,EAAO,SAAA;AAAA,EACP,IAAA,sBAAO,eAAA,EAAA,EAAgB,CAAA;AAAA,EACvB,MAAM,EAAE,WAAA,EAAa,MAAM,OAAO,uBAAiB,CAAA,EAAE;AAAA,EACrD,UAAA,EAAY,CAAC,GAAG;AAClB,CAAC,CAAA;;"}
@@ -4,8 +4,10 @@ class SignalClient {
4
4
  static DEFAULT_CONNECT_TIMEOUT_MS = 1e3;
5
5
  static DEFAULT_RECONNECT_TIMEOUT_MS = 5e3;
6
6
  ws = null;
7
+ connecting;
8
+ connectionGeneration = 0;
7
9
  subscriptions = /* @__PURE__ */ new Map();
8
- messageQueue = [];
10
+ subscribedChannels = /* @__PURE__ */ new Set();
9
11
  reconnectTo;
10
12
  static create(options) {
11
13
  const {
@@ -33,16 +35,13 @@ class SignalClient {
33
35
  }
34
36
  subscribe(channel, onMessage) {
35
37
  const subscriptionId = globalThis.crypto.randomUUID();
36
- const exists = [...this.subscriptions.values()].find(
37
- (sub) => sub.channel === channel
38
- );
39
38
  this.subscriptions.set(subscriptionId, {
40
39
  channel,
41
40
  callback: onMessage
42
41
  });
43
- this.connect().then(() => {
44
- if (!exists) {
45
- this.send({ action: "subscribe", channel });
42
+ this.connect().then((connected) => {
43
+ if (connected) {
44
+ this.syncSubscriptions();
46
45
  }
47
46
  }).catch(() => {
48
47
  this.reconnect();
@@ -53,69 +52,123 @@ class SignalClient {
53
52
  return;
54
53
  }
55
54
  this.subscriptions.delete(subscriptionId);
56
- const multipleExists = [...this.subscriptions.values()].find(
57
- (s) => s.channel === channel
58
- );
59
- if (!multipleExists) {
60
- this.send({ action: "unsubscribe", channel: sub.channel });
61
- }
55
+ this.syncSubscriptions();
62
56
  if (this.subscriptions.size === 0) {
63
- this.ws?.close(WS_CLOSE_NORMAL);
57
+ if (this.reconnectTo) {
58
+ clearTimeout(this.reconnectTo);
59
+ this.reconnectTo = void 0;
60
+ }
61
+ this.connectionGeneration += 1;
62
+ this.connecting = void 0;
63
+ const ws = this.ws;
64
64
  this.ws = null;
65
+ ws?.close(WS_CLOSE_NORMAL);
66
+ this.subscribedChannels.clear();
65
67
  }
66
68
  };
67
69
  return { unsubscribe };
68
70
  }
69
- send(data) {
70
- const jsonMessage = JSON.stringify(data);
71
- if (jsonMessage.length === 0) {
71
+ syncSubscriptions() {
72
+ if (this.connecting || this.ws?.readyState !== WebSocket.OPEN) {
72
73
  return;
73
74
  }
74
- if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
75
- if (data) {
76
- this.messageQueue.unshift(jsonMessage);
75
+ const desiredChannels = new Set(
76
+ [...this.subscriptions.values()].map((sub) => sub.channel)
77
+ );
78
+ for (const channel of this.subscribedChannels) {
79
+ if (!desiredChannels.has(channel)) {
80
+ this.ws.send(JSON.stringify({ action: "unsubscribe", channel }));
81
+ this.subscribedChannels.delete(channel);
77
82
  }
78
- return;
79
83
  }
80
- for (const msg of this.messageQueue) {
81
- this.ws.send(msg);
84
+ for (const channel of desiredChannels) {
85
+ if (!this.subscribedChannels.has(channel)) {
86
+ this.ws.send(JSON.stringify({ action: "subscribe", channel }));
87
+ this.subscribedChannels.add(channel);
88
+ }
89
+ }
90
+ }
91
+ connect() {
92
+ if (this.connecting) {
93
+ return this.connecting;
82
94
  }
83
- this.messageQueue = [];
84
- if (data) {
85
- this.ws.send(jsonMessage);
95
+ if (this.ws?.readyState === WebSocket.OPEN) {
96
+ return Promise.resolve(true);
86
97
  }
98
+ if (this.reconnectTo) {
99
+ clearTimeout(this.reconnectTo);
100
+ this.reconnectTo = void 0;
101
+ }
102
+ const generation = ++this.connectionGeneration;
103
+ this.connecting = this.openConnection(generation).catch((error) => {
104
+ if (generation !== this.connectionGeneration) {
105
+ return false;
106
+ }
107
+ throw error;
108
+ }).finally(() => {
109
+ if (generation === this.connectionGeneration) {
110
+ this.connecting = void 0;
111
+ }
112
+ });
113
+ return this.connecting;
87
114
  }
88
- async connect() {
89
- if (this.ws && this.ws.readyState !== WebSocket.CLOSED) {
90
- return;
115
+ async openConnection(generation) {
116
+ const { token } = await this.identity.getCredentials();
117
+ if (!token || generation !== this.connectionGeneration) {
118
+ return false;
91
119
  }
92
120
  const apiUrl = await this.discoveryApi.getBaseUrl("signals");
93
- const { token } = await this.identity.getCredentials();
121
+ if (generation !== this.connectionGeneration) {
122
+ return false;
123
+ }
94
124
  const url = new URL(apiUrl);
95
125
  url.protocol = url.protocol === "http:" ? "ws:" : "wss:";
96
- this.ws = new WebSocket(url.toString(), token);
126
+ const ws = new WebSocket(url.toString(), token);
127
+ this.ws = ws;
128
+ this.subscribedChannels.clear();
129
+ ws.onopen = () => {
130
+ if (this.ws !== ws || this.subscriptions.size === 0) {
131
+ ws.close(WS_CLOSE_NORMAL);
132
+ }
133
+ };
97
134
  let connectSleep = 0;
98
- while (this.ws && this.ws.readyState !== WebSocket.OPEN && connectSleep < this.connectTimeout) {
135
+ while (this.ws === ws && ws.readyState === WebSocket.CONNECTING && connectSleep < this.connectTimeout) {
99
136
  await new Promise((r) => setTimeout(r, 100));
100
137
  connectSleep += 100;
101
138
  }
102
- if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
139
+ if (this.ws !== ws || ws.readyState !== WebSocket.OPEN) {
140
+ ws.close(WS_CLOSE_NORMAL);
141
+ if (this.ws === ws) {
142
+ this.ws = null;
143
+ }
144
+ if (generation !== this.connectionGeneration) {
145
+ return false;
146
+ }
103
147
  throw new Error("Connect timeout");
104
148
  }
105
- this.ws.onmessage = (data) => {
149
+ ws.onmessage = (data) => {
106
150
  this.handleMessage(data);
107
151
  };
108
- this.ws.onerror = () => {
109
- if (this.ws) {
110
- this.ws.close();
152
+ ws.onerror = () => {
153
+ if (this.ws !== ws) {
154
+ return;
111
155
  }
156
+ ws.close();
112
157
  this.ws = null;
158
+ this.subscribedChannels.clear();
159
+ this.reconnect();
113
160
  };
114
- this.ws.onclose = (ev) => {
161
+ ws.onclose = (ev) => {
162
+ if (this.ws !== ws) {
163
+ return;
164
+ }
165
+ this.ws = null;
166
+ this.subscribedChannels.clear();
115
167
  if (ev.code !== WS_CLOSE_NORMAL && ev.code !== WS_CLOSE_GOING_AWAY) {
116
168
  this.reconnect();
117
169
  }
118
170
  };
171
+ return true;
119
172
  }
120
173
  handleMessage(data) {
121
174
  try {
@@ -132,18 +185,17 @@ class SignalClient {
132
185
  }
133
186
  }
134
187
  reconnect() {
135
- if (this.reconnectTo) {
136
- clearTimeout(this.reconnectTo);
188
+ if (this.reconnectTo || this.subscriptions.size === 0) {
189
+ return;
137
190
  }
138
191
  this.reconnectTo = setTimeout(() => {
139
- this.reconnectTo = null;
140
- if (this.ws) {
141
- this.ws.close();
192
+ this.reconnectTo = void 0;
193
+ if (this.subscriptions.size === 0) {
194
+ return;
142
195
  }
143
- this.ws = null;
144
- this.connect().then(() => {
145
- for (const sub of this.subscriptions.values()) {
146
- this.send({ action: "subscribe", channel: sub.channel });
196
+ this.connect().then((connected) => {
197
+ if (connected) {
198
+ this.syncSubscriptions();
147
199
  }
148
200
  }).catch(() => {
149
201
  this.reconnect();
@@ -1 +1 @@
1
- {"version":3,"file":"SignalClient.esm.js","sources":["../../src/api/SignalClient.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { SignalApi, SignalSubscriber } from '@backstage/plugin-signals-react';\nimport { JsonObject } from '@backstage/types';\nimport { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';\n\ntype Subscription = {\n channel: string;\n callback: (message: any) => void;\n};\n\nconst WS_CLOSE_NORMAL = 1000;\nconst WS_CLOSE_GOING_AWAY = 1001;\n\n/** @public */\nexport class SignalClient implements SignalApi {\n static readonly DEFAULT_CONNECT_TIMEOUT_MS: number = 1000;\n static readonly DEFAULT_RECONNECT_TIMEOUT_MS: number = 5000;\n private ws: WebSocket | null = null;\n private subscriptions: Map<string, Subscription> = new Map();\n private messageQueue: string[] = [];\n private reconnectTo: any;\n\n static create(options: {\n identity: IdentityApi;\n discoveryApi: DiscoveryApi;\n connectTimeout?: number;\n reconnectTimeout?: number;\n }) {\n const {\n identity,\n discoveryApi,\n connectTimeout = SignalClient.DEFAULT_CONNECT_TIMEOUT_MS,\n reconnectTimeout = SignalClient.DEFAULT_RECONNECT_TIMEOUT_MS,\n } = options;\n return new SignalClient(\n identity,\n discoveryApi,\n connectTimeout,\n reconnectTimeout,\n );\n }\n\n private identity: IdentityApi;\n private discoveryApi: DiscoveryApi;\n private connectTimeout: number;\n private reconnectTimeout: number;\n\n private constructor(\n identity: IdentityApi,\n discoveryApi: DiscoveryApi,\n connectTimeout: number,\n reconnectTimeout: number,\n ) {\n this.identity = identity;\n this.discoveryApi = discoveryApi;\n this.connectTimeout = connectTimeout;\n this.reconnectTimeout = reconnectTimeout;\n }\n\n subscribe<TMessage extends JsonObject = JsonObject>(\n channel: string,\n onMessage: (message: TMessage) => void,\n ): SignalSubscriber {\n const subscriptionId = globalThis.crypto.randomUUID();\n const exists = [...this.subscriptions.values()].find(\n sub => sub.channel === channel,\n );\n this.subscriptions.set(subscriptionId, {\n channel,\n callback: onMessage,\n });\n\n this.connect()\n .then(() => {\n // Do not subscribe twice to same channel even there is multiple callbacks\n if (!exists) {\n this.send({ action: 'subscribe', channel });\n }\n })\n .catch(() => {\n this.reconnect();\n });\n\n const unsubscribe = () => {\n const sub = this.subscriptions.get(subscriptionId);\n if (!sub) {\n return;\n }\n this.subscriptions.delete(subscriptionId);\n const multipleExists = [...this.subscriptions.values()].find(\n s => s.channel === channel,\n );\n // If there are subscriptions still listening to this channel, do not\n // unsubscribe from the server\n if (!multipleExists) {\n this.send({ action: 'unsubscribe', channel: sub.channel });\n }\n\n // If there are no subscriptions, close the connection\n if (this.subscriptions.size === 0) {\n this.ws?.close(WS_CLOSE_NORMAL);\n this.ws = null;\n }\n };\n\n return { unsubscribe };\n }\n\n private send(data?: JsonObject): void {\n const jsonMessage = JSON.stringify(data);\n if (jsonMessage.length === 0) {\n return;\n }\n\n if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {\n if (data) {\n this.messageQueue.unshift(jsonMessage);\n }\n return;\n }\n\n // First send queue\n for (const msg of this.messageQueue) {\n this.ws!.send(msg);\n }\n this.messageQueue = [];\n if (data) {\n this.ws!.send(jsonMessage);\n }\n }\n\n private async connect() {\n if (this.ws && this.ws.readyState !== WebSocket.CLOSED) {\n return;\n }\n\n const apiUrl = await this.discoveryApi.getBaseUrl('signals');\n const { token } = await this.identity.getCredentials();\n\n const url = new URL(apiUrl);\n url.protocol = url.protocol === 'http:' ? 'ws:' : 'wss:';\n this.ws = new WebSocket(url.toString(), token);\n\n // Wait until connection is open\n let connectSleep = 0;\n while (\n this.ws &&\n this.ws.readyState !== WebSocket.OPEN &&\n connectSleep < this.connectTimeout\n ) {\n await new Promise(r => setTimeout(r, 100));\n connectSleep += 100;\n }\n\n if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {\n throw new Error('Connect timeout');\n }\n\n this.ws.onmessage = (data: MessageEvent) => {\n this.handleMessage(data);\n };\n\n this.ws.onerror = () => {\n if (this.ws) {\n this.ws.close();\n }\n this.ws = null;\n };\n\n this.ws.onclose = (ev: CloseEvent) => {\n if (ev.code !== WS_CLOSE_NORMAL && ev.code !== WS_CLOSE_GOING_AWAY) {\n this.reconnect();\n }\n };\n }\n\n private handleMessage(data: MessageEvent) {\n try {\n const json = JSON.parse(data.data);\n if (!json.channel) {\n return;\n }\n\n for (const sub of this.subscriptions.values()) {\n if (sub.channel === json.channel) {\n sub.callback(json.message);\n }\n }\n } catch (e) {\n // NOOP\n }\n }\n\n private reconnect() {\n if (this.reconnectTo) {\n clearTimeout(this.reconnectTo);\n }\n\n this.reconnectTo = setTimeout(() => {\n this.reconnectTo = null;\n if (this.ws) {\n this.ws.close();\n }\n this.ws = null;\n this.connect()\n .then(() => {\n // Resubscribe to existing channels in case we lost connection\n for (const sub of this.subscriptions.values()) {\n this.send({ action: 'subscribe', channel: sub.channel });\n }\n })\n .catch(() => {\n this.reconnect();\n });\n }, this.reconnectTimeout);\n }\n}\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SignalClient.esm.js","sources":["../../src/api/SignalClient.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { SignalApi, SignalSubscriber } from '@backstage/plugin-signals-react';\nimport { JsonObject } from '@backstage/types';\nimport { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';\n\ntype Subscription = {\n channel: string;\n callback: (message: any) => void;\n};\n\nconst WS_CLOSE_NORMAL = 1000;\nconst WS_CLOSE_GOING_AWAY = 1001;\n\n/** @public */\nexport class SignalClient implements SignalApi {\n static readonly DEFAULT_CONNECT_TIMEOUT_MS: number = 1000;\n static readonly DEFAULT_RECONNECT_TIMEOUT_MS: number = 5000;\n private ws: WebSocket | null = null;\n private connecting?: Promise<boolean>;\n private connectionGeneration = 0;\n private subscriptions: Map<string, Subscription> = new Map();\n private subscribedChannels = new Set<string>();\n private reconnectTo: ReturnType<typeof setTimeout> | undefined;\n\n static create(options: {\n identity: IdentityApi;\n discoveryApi: DiscoveryApi;\n connectTimeout?: number;\n reconnectTimeout?: number;\n }) {\n const {\n identity,\n discoveryApi,\n connectTimeout = SignalClient.DEFAULT_CONNECT_TIMEOUT_MS,\n reconnectTimeout = SignalClient.DEFAULT_RECONNECT_TIMEOUT_MS,\n } = options;\n return new SignalClient(\n identity,\n discoveryApi,\n connectTimeout,\n reconnectTimeout,\n );\n }\n\n private identity: IdentityApi;\n private discoveryApi: DiscoveryApi;\n private connectTimeout: number;\n private reconnectTimeout: number;\n\n private constructor(\n identity: IdentityApi,\n discoveryApi: DiscoveryApi,\n connectTimeout: number,\n reconnectTimeout: number,\n ) {\n this.identity = identity;\n this.discoveryApi = discoveryApi;\n this.connectTimeout = connectTimeout;\n this.reconnectTimeout = reconnectTimeout;\n }\n\n subscribe<TMessage extends JsonObject = JsonObject>(\n channel: string,\n onMessage: (message: TMessage) => void,\n ): SignalSubscriber {\n const subscriptionId = globalThis.crypto.randomUUID();\n this.subscriptions.set(subscriptionId, {\n channel,\n callback: onMessage,\n });\n\n this.connect()\n .then(connected => {\n if (connected) {\n this.syncSubscriptions();\n }\n })\n .catch(() => {\n this.reconnect();\n });\n\n const unsubscribe = () => {\n const sub = this.subscriptions.get(subscriptionId);\n if (!sub) {\n return;\n }\n this.subscriptions.delete(subscriptionId);\n this.syncSubscriptions();\n\n // If there are no subscriptions, close the connection\n if (this.subscriptions.size === 0) {\n if (this.reconnectTo) {\n clearTimeout(this.reconnectTo);\n this.reconnectTo = undefined;\n }\n this.connectionGeneration += 1;\n this.connecting = undefined;\n const ws = this.ws;\n this.ws = null;\n ws?.close(WS_CLOSE_NORMAL);\n this.subscribedChannels.clear();\n }\n };\n\n return { unsubscribe };\n }\n\n private syncSubscriptions(): void {\n if (this.connecting || this.ws?.readyState !== WebSocket.OPEN) {\n return;\n }\n\n const desiredChannels = new Set(\n [...this.subscriptions.values()].map(sub => sub.channel),\n );\n for (const channel of this.subscribedChannels) {\n if (!desiredChannels.has(channel)) {\n this.ws.send(JSON.stringify({ action: 'unsubscribe', channel }));\n this.subscribedChannels.delete(channel);\n }\n }\n for (const channel of desiredChannels) {\n if (!this.subscribedChannels.has(channel)) {\n this.ws.send(JSON.stringify({ action: 'subscribe', channel }));\n this.subscribedChannels.add(channel);\n }\n }\n }\n\n private connect(): Promise<boolean> {\n if (this.connecting) {\n return this.connecting;\n }\n if (this.ws?.readyState === WebSocket.OPEN) {\n return Promise.resolve(true);\n }\n\n if (this.reconnectTo) {\n clearTimeout(this.reconnectTo);\n this.reconnectTo = undefined;\n }\n const generation = ++this.connectionGeneration;\n this.connecting = this.openConnection(generation)\n .catch(error => {\n if (generation !== this.connectionGeneration) {\n return false;\n }\n throw error;\n })\n .finally(() => {\n if (generation === this.connectionGeneration) {\n this.connecting = undefined;\n }\n });\n return this.connecting;\n }\n\n private async openConnection(generation: number): Promise<boolean> {\n const { token } = await this.identity.getCredentials();\n if (!token || generation !== this.connectionGeneration) {\n return false;\n }\n\n const apiUrl = await this.discoveryApi.getBaseUrl('signals');\n if (generation !== this.connectionGeneration) {\n return false;\n }\n\n const url = new URL(apiUrl);\n url.protocol = url.protocol === 'http:' ? 'ws:' : 'wss:';\n const ws = new WebSocket(url.toString(), token);\n this.ws = ws;\n this.subscribedChannels.clear();\n ws.onopen = () => {\n if (this.ws !== ws || this.subscriptions.size === 0) {\n ws.close(WS_CLOSE_NORMAL);\n }\n };\n\n // Wait until connection is open\n let connectSleep = 0;\n while (\n this.ws === ws &&\n ws.readyState === WebSocket.CONNECTING &&\n connectSleep < this.connectTimeout\n ) {\n await new Promise(r => setTimeout(r, 100));\n connectSleep += 100;\n }\n\n if (this.ws !== ws || ws.readyState !== WebSocket.OPEN) {\n ws.close(WS_CLOSE_NORMAL);\n if (this.ws === ws) {\n this.ws = null;\n }\n if (generation !== this.connectionGeneration) {\n return false;\n }\n throw new Error('Connect timeout');\n }\n\n ws.onmessage = (data: MessageEvent) => {\n this.handleMessage(data);\n };\n\n ws.onerror = () => {\n if (this.ws !== ws) {\n return;\n }\n ws.close();\n this.ws = null;\n this.subscribedChannels.clear();\n this.reconnect();\n };\n\n ws.onclose = (ev: CloseEvent) => {\n if (this.ws !== ws) {\n return;\n }\n this.ws = null;\n this.subscribedChannels.clear();\n if (ev.code !== WS_CLOSE_NORMAL && ev.code !== WS_CLOSE_GOING_AWAY) {\n this.reconnect();\n }\n };\n\n return true;\n }\n\n private handleMessage(data: MessageEvent) {\n try {\n const json = JSON.parse(data.data);\n if (!json.channel) {\n return;\n }\n\n for (const sub of this.subscriptions.values()) {\n if (sub.channel === json.channel) {\n sub.callback(json.message);\n }\n }\n } catch (e) {\n // NOOP\n }\n }\n\n private reconnect() {\n if (this.reconnectTo || this.subscriptions.size === 0) {\n return;\n }\n\n this.reconnectTo = setTimeout(() => {\n this.reconnectTo = undefined;\n if (this.subscriptions.size === 0) {\n return;\n }\n this.connect()\n .then(connected => {\n if (connected) {\n this.syncSubscriptions();\n }\n })\n .catch(() => {\n this.reconnect();\n });\n }, this.reconnectTimeout);\n }\n}\n"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -13,8 +13,10 @@ declare class SignalClient implements SignalApi {
13
13
  static readonly DEFAULT_CONNECT_TIMEOUT_MS: number;
14
14
  static readonly DEFAULT_RECONNECT_TIMEOUT_MS: number;
15
15
  private ws;
16
+ private connecting?;
17
+ private connectionGeneration;
16
18
  private subscriptions;
17
- private messageQueue;
19
+ private subscribedChannels;
18
20
  private reconnectTo;
19
21
  static create(options: {
20
22
  identity: IdentityApi;
@@ -28,8 +30,9 @@ declare class SignalClient implements SignalApi {
28
30
  private reconnectTimeout;
29
31
  private constructor();
30
32
  subscribe<TMessage extends JsonObject = JsonObject>(channel: string, onMessage: (message: TMessage) => void): SignalSubscriber;
31
- private send;
33
+ private syncSubscriptions;
32
34
  private connect;
35
+ private openConnection;
33
36
  private handleMessage;
34
37
  private reconnect;
35
38
  }
@@ -1,5 +1,5 @@
1
1
  var name = "@backstage/plugin-signals";
2
- var version = "0.0.35";
2
+ var version = "0.0.36-next.1";
3
3
  var backstage = {
4
4
  role: "frontend-plugin",
5
5
  pluginId: "signals",
@@ -1 +1 @@
1
- {"version":3,"file":"package.json.esm.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"package.json.esm.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.esm.js","sources":["../src/plugin.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n createApiFactory,\n createComponentExtension,\n createPlugin,\n discoveryApiRef,\n identityApiRef,\n} from '@backstage/core-plugin-api';\nimport { signalApiRef } from '@backstage/plugin-signals-react';\nimport { SignalClient } from './api/SignalClient';\n\n/** @public */\nexport const signalsPlugin = createPlugin({\n id: 'signals',\n apis: [\n createApiFactory({\n api: signalApiRef,\n deps: {\n identity: identityApiRef,\n discoveryApi: discoveryApiRef,\n },\n factory: ({ identity, discoveryApi }) => {\n return SignalClient.create({\n identity,\n discoveryApi,\n });\n },\n }),\n ],\n});\n\n/** @public */\nexport const SignalsDisplay = signalsPlugin.provide(\n createComponentExtension({\n name: 'SignalsDisplay',\n component: {\n // No-op for now, this is just a placeholder to avoid the need for an explicit plugin installation\n sync: () => null,\n },\n }),\n);\n"],"names":[],"mappings":";;;;AA0BO,MAAM,gBAAgB,YAAA,CAAa;AAAA,EACxC,EAAA,EAAI,SAAA;AAAA,EACJ,IAAA,EAAM;AAAA,IACJ,gBAAA,CAAiB;AAAA,MACf,GAAA,EAAK,YAAA;AAAA,MACL,IAAA,EAAM;AAAA,QACJ,QAAA,EAAU,cAAA;AAAA,QACV,YAAA,EAAc;AAAA,OAChB;AAAA,MACA,OAAA,EAAS,CAAC,EAAE,QAAA,EAAU,cAAa,KAAM;AACvC,QAAA,OAAO,aAAa,MAAA,CAAO;AAAA,UACzB,QAAA;AAAA,UACA;AAAA,SACD,CAAA;AAAA,MACH;AAAA,KACD;AAAA;AAEL,CAAC;AAGM,MAAM,iBAAiB,aAAA,CAAc,OAAA;AAAA,EAC1C,wBAAA,CAAyB;AAAA,IACvB,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,EAAW;AAAA;AAAA,MAET,MAAM,MAAM;AAAA;AACd,GACD;AACH;;;;"}
1
+ {"version":3,"file":"plugin.esm.js","sources":["../src/plugin.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n createApiFactory,\n createComponentExtension,\n createPlugin,\n discoveryApiRef,\n identityApiRef,\n} from '@backstage/core-plugin-api';\nimport { signalApiRef } from '@backstage/plugin-signals-react';\nimport { SignalClient } from './api/SignalClient';\n\n/** @public */\nexport const signalsPlugin = createPlugin({\n id: 'signals',\n apis: [\n createApiFactory({\n api: signalApiRef,\n deps: {\n identity: identityApiRef,\n discoveryApi: discoveryApiRef,\n },\n factory: ({ identity, discoveryApi }) => {\n return SignalClient.create({\n identity,\n discoveryApi,\n });\n },\n }),\n ],\n});\n\n/** @public */\nexport const SignalsDisplay = signalsPlugin.provide(\n createComponentExtension({\n name: 'SignalsDisplay',\n component: {\n // No-op for now, this is just a placeholder to avoid the need for an explicit plugin installation\n sync: () => null,\n },\n }),\n);\n"],"names":[],"mappings":";;;;AA0BO,MAAM,gBAAgB,YAAA,CAAa;AAAA,EACxC,EAAA,EAAI,SAAA;AAAA,EACJ,IAAA,EAAM;AAAA,IACJ,gBAAA,CAAiB;AAAA,MACf,GAAA,EAAK,YAAA;AAAA,MACL,IAAA,EAAM;AAAA,QACJ,QAAA,EAAU,cAAA;AAAA,QACV,YAAA,EAAc;AAAA,OAChB;AAAA,MACA,OAAA,EAAS,CAAC,EAAE,QAAA,EAAU,cAAa,KAAM;AACvC,QAAA,OAAO,aAAa,MAAA,CAAO;AAAA,UACzB,QAAA;AAAA,UACA;AAAA,SACD,CAAA;AAAA,MACH;AAAA,KACD;AAAA;AAEL,CAAC;AAGM,MAAM,iBAAiB,aAAA,CAAc,OAAA;AAAA,EAC1C,wBAAA,CAAyB;AAAA,IACvB,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,EAAW;AAAA;AAAA,MAET,MAAM,MAAM;AAAA;AACd,GACD;AACH;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@backstage/plugin-signals",
3
- "version": "0.0.35",
3
+ "version": "0.0.36-next.1",
4
4
  "backstage": {
5
5
  "role": "frontend-plugin",
6
6
  "pluginId": "signals",
@@ -63,19 +63,19 @@
63
63
  "test": "backstage-cli package test"
64
64
  },
65
65
  "dependencies": {
66
- "@backstage/core-components": "^0.18.14",
67
- "@backstage/core-plugin-api": "^1.12.10",
68
- "@backstage/frontend-plugin-api": "^0.18.1",
69
- "@backstage/plugin-signals-react": "^0.0.26",
70
- "@backstage/theme": "^0.7.3",
71
- "@backstage/types": "^1.2.2",
66
+ "@backstage/core-components": "0.18.15-next.2",
67
+ "@backstage/core-plugin-api": "1.12.11-next.0",
68
+ "@backstage/frontend-plugin-api": "0.18.2-next.0",
69
+ "@backstage/plugin-signals-react": "0.0.27-next.0",
70
+ "@backstage/theme": "0.7.3",
71
+ "@backstage/types": "1.2.2",
72
72
  "@material-ui/core": "^4.12.4",
73
73
  "@remixicon/react": ">=4.6.0 <4.9.0"
74
74
  },
75
75
  "devDependencies": {
76
- "@backstage/cli": "^0.36.6",
77
- "@backstage/dev-utils": "^1.1.27",
78
- "@backstage/test-utils": "^1.7.22",
76
+ "@backstage/cli": "0.36.7-next.0",
77
+ "@backstage/dev-utils": "1.1.28-next.0",
78
+ "@backstage/test-utils": "1.7.23-next.0",
79
79
  "@testing-library/dom": "^10.0.0",
80
80
  "@testing-library/jest-dom": "^6.0.0",
81
81
  "@testing-library/react": "^16.0.0",