@serve.zone/platformclient 4.1.1 → 32.0.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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/platformclient',
6
- version: '4.1.1',
6
+ version: '32.0.1',
7
7
  description: 'a module that makes it really easy to use the serve.zone platform inside your app'
8
8
  };
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSw0QkFBNEI7SUFDbEMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLG1GQUFtRjtDQUNqRyxDQUFBIn0=
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSw0QkFBNEI7SUFDbEMsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLG1GQUFtRjtDQUNqRyxDQUFBIn0=
@@ -4,7 +4,10 @@ import { SzPushNotificationConnector } from './email/classes.pushnotificationcon
4
4
  import { SzLetterConnector } from './email/classes.letterconnector.js';
5
5
  import { SzWebPushConnector } from './webpush/classes.webpushconnector.js';
6
6
  import { SzCoreMailConnector, type ISzCoreMailConnectorOptions } from './coremail/classes.coremailconnector.js';
7
+ import { SzPlatformProtocolIncompatibleError } from './protocol.js';
7
8
  import * as plugins from './plugins.js';
9
+ /** What a caller can act on: a usable session, none, or a peer of another contract. */
10
+ export type TSzPlatformSessionStatus = 'connected' | 'disconnected' | 'protocol-incompatible';
8
11
  export interface ISzPlatformClientOptions {
9
12
  authorizationString?: string;
10
13
  authorization?: string;
@@ -24,12 +27,32 @@ export declare class SzPlatformClient {
24
27
  platformBindings: plugins.servezoneInterfaces.platform.IPlatformBinding[];
25
28
  typedrouter: plugins.typedrequest.TypedRouter;
26
29
  typedsocket?: plugins.typedsocket.TypedSocket;
30
+ /**
31
+ * The refusal this client met, kept for the caller that never saw it.
32
+ *
33
+ * A refused offer stands until an operator upgrades one of the two sides, and a refusal met
34
+ * while a reconnect restores the session reaches no caller at all, so it is read from here.
35
+ */
36
+ lastProtocolRefusal?: SzPlatformProtocolIncompatibleError;
27
37
  private identity?;
28
38
  private authenticationGeneration;
29
39
  private authenticationAbort?;
30
40
  private authenticationOperations;
31
41
  private renewalTimer?;
32
42
  private statusSubscription?;
43
+ /**
44
+ * The name resolver behind {@link getConfiguredEnvVar}: process environment, then Docker secrets.
45
+ *
46
+ * This client owns no list of required variables and must never enforce anyone else's. Which
47
+ * names matter is a per-call decision here - the mail connector even composes them from an
48
+ * address token at send time - and every read site below treats a missing value as its own
49
+ * business. So the instance is pointed at this package's own directory, which holds no
50
+ * `qenv.yml`, instead of qenv's default of `process.cwd()`: that is the embedding application's
51
+ * directory, and since qenv 8.0.0 a name its `qenv.yml` lists under `required:` without a value
52
+ * makes the constructor throw `QenvMissingRequiredEnvVarsError`. A host declaring a requirement
53
+ * it has not met yet is the host's decision to act on, never a reason for this library to refuse
54
+ * construction, so `failOnMissing` is false as well.
55
+ */
33
56
  private qenvInstance;
34
57
  private stopped;
35
58
  private initPromise?;
@@ -50,6 +73,21 @@ export declare class SzPlatformClient {
50
73
  private getConnectionAddress;
51
74
  private getConfiguredAuthorizationString;
52
75
  requireTypedSocket(): plugins.typedsocket.TypedSocket;
76
+ /**
77
+ * The platform session as a caller can act on it.
78
+ *
79
+ * `protocol-incompatible` outranks the transport state: it stands until an operator upgrades
80
+ * one of the two sides, and `lastProtocolRefusal` names both of them.
81
+ */
82
+ getSessionStatus(): TSzPlatformSessionStatus;
83
+ /**
84
+ * Release the socket lifecycle a restoration was refused in; every other failure passes on.
85
+ *
86
+ * TypedSocket ends its own client on a denied restoration and never reconnects from one, so the
87
+ * reference held here is dead — keeping it would report an unavailable session instead of the
88
+ * incompatible peer.
89
+ */
90
+ private releaseRefusedSocket;
53
91
  private invalidateAuthentication;
54
92
  private trackAuthentication;
55
93
  private authenticate;
@@ -4,6 +4,7 @@ import { SzPushNotificationConnector } from './email/classes.pushnotificationcon
4
4
  import { SzLetterConnector } from './email/classes.letterconnector.js';
5
5
  import { SzWebPushConnector } from './webpush/classes.webpushconnector.js';
6
6
  import { SzCoreMailConnector, } from './coremail/classes.coremailconnector.js';
7
+ import { platformSessionProtocolOffer, requireCompatibleProtocol, rethrowProtocolRefusal, SzPlatformProtocolIncompatibleError, } from './protocol.js';
7
8
  import * as plugins from './plugins.js';
8
9
  export class SzPlatformClient {
9
10
  constructor(authorizationStringArg) {
@@ -12,7 +13,20 @@ export class SzPlatformClient {
12
13
  this.typedrouter = new plugins.typedrequest.TypedRouter();
13
14
  this.authenticationGeneration = 0;
14
15
  this.authenticationOperations = new Set();
15
- this.qenvInstance = new plugins.qenv.Qenv();
16
+ /**
17
+ * The name resolver behind {@link getConfiguredEnvVar}: process environment, then Docker secrets.
18
+ *
19
+ * This client owns no list of required variables and must never enforce anyone else's. Which
20
+ * names matter is a per-call decision here - the mail connector even composes them from an
21
+ * address token at send time - and every read site below treats a missing value as its own
22
+ * business. So the instance is pointed at this package's own directory, which holds no
23
+ * `qenv.yml`, instead of qenv's default of `process.cwd()`: that is the embedding application's
24
+ * directory, and since qenv 8.0.0 a name its `qenv.yml` lists under `required:` without a value
25
+ * makes the constructor throw `QenvMissingRequiredEnvVarsError`. A host declaring a requirement
26
+ * it has not met yet is the host's decision to act on, never a reason for this library to refuse
27
+ * construction, so `failOnMissing` is false as well.
28
+ */
29
+ this.qenvInstance = new plugins.qenv.Qenv(import.meta.dirname, undefined, false);
16
30
  this.stopped = false;
17
31
  this.platformSocketAbortController = new AbortController();
18
32
  this.emailConnector = new SzEmailConnector(this);
@@ -60,7 +74,8 @@ export class SzPlatformClient {
60
74
  restoreConnection: (context) => {
61
75
  this.invalidateAuthentication();
62
76
  const generation = this.authenticationGeneration;
63
- return this.trackAuthentication(this.authenticate(context.createTypedRequest, context.abortSignal, generation));
77
+ return this.trackAuthentication(this.authenticate(context.createTypedRequest, context.abortSignal, generation)
78
+ .catch((error) => this.releaseRefusedSocket(error, generation)));
64
79
  },
65
80
  });
66
81
  if (this.stopped) {
@@ -135,10 +150,43 @@ export class SzPlatformClient {
135
150
  }
136
151
  requireTypedSocket() {
137
152
  this.assertRunning();
138
- if (!this.typedsocket || this.typedsocket.getStatus() !== 'connected' || !this.identity
139
- || this.identity.expiresAt <= Date.now())
153
+ const socket = this.typedsocket;
154
+ const status = this.getSessionStatus();
155
+ // A refused protocol is the one unavailability a caller can act on, so it keeps its name.
156
+ if (status === 'protocol-incompatible' && this.lastProtocolRefusal)
157
+ throw this.lastProtocolRefusal;
158
+ if (!socket || status !== 'connected') {
140
159
  throw new Error('Cloudly platform session is unavailable.');
141
- return this.typedsocket;
160
+ }
161
+ return socket;
162
+ }
163
+ /**
164
+ * The platform session as a caller can act on it.
165
+ *
166
+ * `protocol-incompatible` outranks the transport state: it stands until an operator upgrades
167
+ * one of the two sides, and `lastProtocolRefusal` names both of them.
168
+ */
169
+ getSessionStatus() {
170
+ if (this.lastProtocolRefusal)
171
+ return 'protocol-incompatible';
172
+ if (this.typedsocket?.getStatus() === 'connected' && this.identity
173
+ && this.identity.expiresAt > Date.now())
174
+ return 'connected';
175
+ return 'disconnected';
176
+ }
177
+ /**
178
+ * Release the socket lifecycle a restoration was refused in; every other failure passes on.
179
+ *
180
+ * TypedSocket ends its own client on a denied restoration and never reconnects from one, so the
181
+ * reference held here is dead — keeping it would report an unavailable session instead of the
182
+ * incompatible peer.
183
+ */
184
+ releaseRefusedSocket(errorArg, generationArg) {
185
+ if (errorArg instanceof SzPlatformProtocolIncompatibleError
186
+ && generationArg === this.authenticationGeneration) {
187
+ this.typedsocket = undefined;
188
+ }
189
+ throw errorArg;
142
190
  }
143
191
  invalidateAuthentication() {
144
192
  this.authenticationGeneration++;
@@ -173,20 +221,29 @@ export class SzPlatformClient {
173
221
  || !Number.isSafeInteger(identity.expiresAt) || identity.expiresAt <= Date.now() + 1000) {
174
222
  throw new Error('Invalid platform identity.');
175
223
  }
176
- const requestData = plugins.servezoneInterfaces.data.snapshotRegisterCloudlyClientSessionRequestV1({
177
- schemaVersion: 1, identity: { jwt: identity.jwt },
224
+ const requestData = plugins.servezoneInterfaces.data.snapshotRegisterCloudlyClientSessionRequest({
225
+ identity: { jwt: identity.jwt }, protocol: platformSessionProtocolOffer,
178
226
  });
179
- const registration = createRequest('registerCloudlyClientSessionV1');
227
+ const registration = createRequest('registerCloudlyClientSession');
180
228
  registration.skipHooks = true;
181
- const registered = await registration.fire(requestData, { maxRetries: 0, abortSignal: signal });
182
- plugins.servezoneInterfaces.data.snapshotRegisterCloudlyClientSessionResponseV1(registered);
229
+ const registered = await registration
230
+ .fire(requestData, { maxRetries: 0, abortSignal: signal })
231
+ .catch(rethrowProtocolRefusal);
232
+ requireCompatibleProtocol(plugins.servezoneInterfaces.data
233
+ .snapshotRegisterCloudlyClientSessionResponse(registered).protocol);
183
234
  requireCurrent();
184
235
  this.identity = { type: identity.type, role: identity.role, userId: identity.userId,
185
236
  name: identity.userId, expiresAt: identity.expiresAt, jwt: requestData.identity.jwt };
186
237
  }
187
- catch {
238
+ catch (error) {
188
239
  if (this.stopped || signal.aborted || generation !== this.authenticationGeneration)
189
240
  throw this.createAbortError();
241
+ // A refused offer rejected no credential of this caller's, so it is named rather than
242
+ // collapsed, and kept where a restoration that has no caller can still be read.
243
+ if (error instanceof SzPlatformProtocolIncompatibleError) {
244
+ this.lastProtocolRefusal = error;
245
+ throw error;
246
+ }
190
247
  throw new Error('Cloudly platform authentication failed.');
191
248
  }
192
249
  }
@@ -333,4 +390,4 @@ export class SzPlatformClient {
333
390
  return processEnv?.[envNameArg];
334
391
  }
335
392
  }
336
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.platformclient.js","sourceRoot":"","sources":["../ts/classes.platformclient.ts"],"names":[],"mappings":"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"}
393
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.platformclient.js","sourceRoot":"","sources":["../ts/classes.platformclient.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  export * from './classes.platformclient.js';
2
+ export { platformSessionProtocolOffer, SzPlatformProtocolIncompatibleError, } from './protocol.js';
2
3
  export * from './coremail/classes.coremailconnector.js';
3
4
  export * from './email/classes.emailconnector.js';
4
5
  export * from './webpush/classes.webpushconnector.js';
package/dist_ts/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  export * from './classes.platformclient.js';
2
+ export { platformSessionProtocolOffer, SzPlatformProtocolIncompatibleError, } from './protocol.js';
2
3
  export * from './coremail/classes.coremailconnector.js';
3
4
  export * from './email/classes.emailconnector.js';
4
5
  export * from './webpush/classes.webpushconnector.js';
5
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMseUNBQXlDLENBQUM7QUFDeEQsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLHVDQUF1QyxDQUFDIn0=
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLE9BQU8sRUFDTCw0QkFBNEIsRUFDNUIsbUNBQW1DLEdBQ3BDLE1BQU0sZUFBZSxDQUFDO0FBQ3ZCLGNBQWMseUNBQXlDLENBQUM7QUFDeEQsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLHVDQUF1QyxDQUFDIn0=
@@ -0,0 +1,29 @@
1
+ import * as plugins from './plugins.js';
2
+ /** This build's offer for the one session kind the platform client opens. */
3
+ export declare const platformSessionProtocolOffer: plugins.servezoneInterfaces.protocol.IProtocolOffer;
4
+ /**
5
+ * Two peers that cannot serve one session, named rather than collapsed into an authentication
6
+ * failure.
7
+ *
8
+ * A refusal stands until an operator upgrades one of the two sides, so it is never retried: the
9
+ * caller is rejected with it, and a refusal met while a reconnect restores the session — where no
10
+ * caller waits — ends that socket lifecycle and is retained on the client instead.
11
+ */
12
+ export declare class SzPlatformProtocolIncompatibleError extends Error {
13
+ readonly refusal: plugins.servezoneInterfaces.protocol.IProtocolRefusal;
14
+ constructor(refusalArg: plugins.servezoneInterfaces.protocol.IProtocolRefusal, optionsArg?: ErrorOptions);
15
+ }
16
+ /**
17
+ * Rethrow a refused offer as this client's named error; every other failure passes untouched.
18
+ *
19
+ * The transport error stays attached as the cause, so the correlation a caller needs to find the
20
+ * hop in a log is not lost behind the refusal.
21
+ */
22
+ export declare const rethrowProtocolRefusal: (errorArg: unknown) => never;
23
+ /**
24
+ * The controller's own offer, judged from this client's side.
25
+ *
26
+ * Acceptance is the controller's decision about this client; whether this client can serve the
27
+ * session it was just given is this check, and a client that cannot must not use it.
28
+ */
29
+ export declare const requireCompatibleProtocol: (peerOfferArg: plugins.servezoneInterfaces.protocol.IProtocolOffer) => void;
@@ -0,0 +1,67 @@
1
+ import * as plugins from './plugins.js';
2
+ const protocol = plugins.servezoneInterfaces.protocol;
3
+ /**
4
+ * The oldest Cloudly release this client opens its platform session with.
5
+ *
6
+ * It is raised only by the commit that starts depending on a later `@serve.zone/interfaces`
7
+ * minor, and that raise is named in the changelog: a client that demands more than it needs
8
+ * refuses controllers it could have served. What this client speaks is never stated here — it is
9
+ * the installed release, which `createProtocolOffer` reads from the package itself.
10
+ */
11
+ const platformSessionMinimumPeerVersion = '32.0.0';
12
+ /** This build's offer for the one session kind the platform client opens. */
13
+ export const platformSessionProtocolOffer = protocol.createProtocolOffer(platformSessionMinimumPeerVersion);
14
+ /**
15
+ * Two peers that cannot serve one session, named rather than collapsed into an authentication
16
+ * failure.
17
+ *
18
+ * A refusal stands until an operator upgrades one of the two sides, so it is never retried: the
19
+ * caller is rejected with it, and a refusal met while a reconnect restores the session — where no
20
+ * caller waits — ends that socket lifecycle and is retained on the client instead.
21
+ */
22
+ export class SzPlatformProtocolIncompatibleError extends Error {
23
+ constructor(refusalArg, optionsArg) {
24
+ super(protocol.describeProtocolRefusal(refusalArg), optionsArg);
25
+ this.name = 'SzPlatformProtocolIncompatibleError';
26
+ this.refusal = refusalArg;
27
+ }
28
+ }
29
+ /**
30
+ * The payload a failed TypedRequest hop carried.
31
+ *
32
+ * Read structurally rather than through `instanceof TypedResponseError`: the request that fails is
33
+ * created by TypedSocket, which resolves its own `@api.global/typedrequest`, so a class identity
34
+ * check could miss a refusal in a consumer tree that holds a second copy.
35
+ */
36
+ const readErrorData = (errorArg) => {
37
+ if (typeof errorArg !== 'object' || errorArg === null || !('errorData' in errorArg)) {
38
+ return undefined;
39
+ }
40
+ return errorArg.errorData;
41
+ };
42
+ /**
43
+ * Rethrow a refused offer as this client's named error; every other failure passes untouched.
44
+ *
45
+ * The transport error stays attached as the cause, so the correlation a caller needs to find the
46
+ * hop in a log is not lost behind the refusal.
47
+ */
48
+ export const rethrowProtocolRefusal = (errorArg) => {
49
+ const refusal = protocol.readProtocolRefusal(readErrorData(errorArg));
50
+ if (refusal === null) {
51
+ throw errorArg;
52
+ }
53
+ throw new SzPlatformProtocolIncompatibleError(refusal, { cause: errorArg });
54
+ };
55
+ /**
56
+ * The controller's own offer, judged from this client's side.
57
+ *
58
+ * Acceptance is the controller's decision about this client; whether this client can serve the
59
+ * session it was just given is this check, and a client that cannot must not use it.
60
+ */
61
+ export const requireCompatibleProtocol = (peerOfferArg) => {
62
+ const negotiation = protocol.negotiateProtocol(platformSessionProtocolOffer, peerOfferArg);
63
+ if (!negotiation.compatible) {
64
+ throw new SzPlatformProtocolIncompatibleError(negotiation.refusal);
65
+ }
66
+ };
67
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9wcm90b2NvbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDO0FBRXREOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLGlDQUFpQyxHQUFHLFFBQVEsQ0FBQztBQUVuRCw2RUFBNkU7QUFDN0UsTUFBTSxDQUFDLE1BQU0sNEJBQTRCLEdBQ3ZDLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO0FBRWxFOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLE9BQU8sbUNBQW9DLFNBQVEsS0FBSztJQUc1RCxZQUNFLFVBQWlFLEVBQ2pFLFVBQXlCO1FBRXpCLEtBQUssQ0FBQyxRQUFRLENBQUMsdUJBQXVCLENBQUMsVUFBVSxDQUFDLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDaEUsSUFBSSxDQUFDLElBQUksR0FBRyxxQ0FBcUMsQ0FBQztRQUNsRCxJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUM1QixDQUFDO0NBQ0Y7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLGFBQWEsR0FBRyxDQUFDLFFBQWlCLEVBQVcsRUFBRTtJQUNuRCxJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVEsSUFBSSxRQUFRLEtBQUssSUFBSSxJQUFJLENBQUMsQ0FBQyxXQUFXLElBQUksUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUNwRixPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBQ0QsT0FBTyxRQUFRLENBQUMsU0FBUyxDQUFDO0FBQzVCLENBQUMsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxRQUFpQixFQUFTLEVBQUU7SUFDakUsTUFBTSxPQUFPLEdBQUcsUUFBUSxDQUFDLG1CQUFtQixDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ3RFLElBQUksT0FBTyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ3JCLE1BQU0sUUFBUSxDQUFDO0lBQ2pCLENBQUM7SUFDRCxNQUFNLElBQUksbUNBQW1DLENBQUMsT0FBTyxFQUFFLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7QUFDOUUsQ0FBQyxDQUFDO0FBRUY7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxDQUN2QyxZQUFpRSxFQUMzRCxFQUFFO0lBQ1IsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLGlCQUFpQixDQUFDLDRCQUE0QixFQUFFLFlBQVksQ0FBQyxDQUFDO0lBQzNGLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDNUIsTUFBTSxJQUFJLG1DQUFtQyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNyRSxDQUFDO0FBQ0gsQ0FBQyxDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@serve.zone/platformclient",
3
- "version": "4.1.1",
3
+ "version": "32.0.1",
4
4
  "private": false,
5
5
  "description": "a module that makes it really easy to use the serve.zone platform inside your app",
6
6
  "main": "dist_ts/index.js",
@@ -9,23 +9,23 @@
9
9
  "author": "Task Venture Capital GmbH",
10
10
  "license": "MIT",
11
11
  "devDependencies": {
12
- "@git.zone/tsbuild": "^4.4.3",
12
+ "@git.zone/tsbuild": "^4.5.0",
13
13
  "@git.zone/tsbundle": "^2.13.0",
14
14
  "@git.zone/tsrun": "^2.0.6",
15
- "@git.zone/tstest": "6.1.0",
15
+ "@git.zone/tstest": "6.1.1",
16
16
  "@push.rocks/smartmongo": "9.0.0",
17
17
  "@push.rocks/smartserve": "6.2.1",
18
- "@serve.zone/coremail": "1.2.0",
19
- "@types/node": "26.5.0"
18
+ "@serve.zone/coremail": "32.0.0",
19
+ "@types/node": "26.5.1"
20
20
  },
21
21
  "dependencies": {
22
22
  "@api.global/typedrequest": "^8.0.4",
23
23
  "@api.global/typedrequest-interfaces": "^7.1.0",
24
- "@api.global/typedsocket": "^8.1.0",
25
- "@push.rocks/qenv": "^7.0.0",
24
+ "@api.global/typedsocket": "^8.4.0",
25
+ "@push.rocks/qenv": "^8.0.0",
26
26
  "@push.rocks/smartlog": "^3.2.2",
27
27
  "@push.rocks/smartntml": "^2.0.9",
28
- "@serve.zone/interfaces": "^30.13.0"
28
+ "@serve.zone/interfaces": "^32.1.0"
29
29
  },
30
30
  "repository": {
31
31
  "type": "git",
package/readme.md CHANGED
@@ -45,11 +45,11 @@ await platformClient.emailConnector.sendEmail({
45
45
  | `letterConnector` | `sendLetter()` | `letter` |
46
46
  | `coreMailConnector` | `prepareOutboundSubmission()`, `uploadOutboundPart()`, `finalizeOutboundSubmission()`, `getOutboundSubmission()`, `listInboundDeliveries()`, `fetchInboundDelivery()`, `acknowledgeInboundDelivery()` | CoreMail workload binding |
47
47
 
48
- The request and response payloads come from `@serve.zone/interfaces`, so TypeScript stays aligned with the serve.zone platform contracts.
48
+ The request and response payloads come from `@serve.zone/interfaces`, so TypeScript stays aligned with the serve.zone platform contracts. The installed `@serve.zone/interfaces` release *is* the contract version this client speaks; no payload states a schema version of its own.
49
49
 
50
50
  ## Configuration
51
51
 
52
- The shared platform connection requires a Cloudly machine token and an explicit HTTPS Cloudly origin. On each connection it exchanges the token for an API machine identity and registers that JWT on the physical socket before initialization succeeds. Reconnect repeats both steps, and a live connection renews its identity before expiry. Rejected credentials, invalid registration replies, or failed renewal close the connection. Value-free platform bindings describe capabilities; they never select the Cloudly authority or provide credentials.
52
+ The shared platform connection requires a Cloudly machine token and an explicit HTTPS Cloudly origin. On each connection it exchanges the token for an API machine identity and calls `registerCloudlyClientSession` with that JWT and its protocol offer before initialization succeeds. Reconnect repeats both steps, and a live connection renews its identity before expiry. Rejected credentials, invalid registration replies, or failed renewal close the connection. Value-free platform bindings describe capabilities; they never select the Cloudly authority or provide credentials.
53
53
 
54
54
  | Value | Sources |
55
55
  | --- | --- |
@@ -57,6 +57,8 @@ The shared platform connection requires a Cloudly machine token and an explicit
57
57
  | Cloudly URL | `cloudlyUrl`, `url`, `platformUrl`, or `SERVEZONE_PLATFORM_URL`; an explicit HTTPS origin is required. |
58
58
  | Platform bindings | Constructor `binding` or `bindings`, `SERVEZONE_PLATFORM_BINDING`, or `SERVEZONE_PLATFORM_BINDINGS`. |
59
59
 
60
+ Every environment name in this document is read on demand: the process environment first, then the Docker secrets. The client keeps no list of required variables and never reads or enforces the embedding application's `qenv.yml`; a requirement declared there is the application's to act on, and never a reason for `new SzPlatformClient()` to refuse.
61
+
60
62
  Workloads should receive their service-scoped `platform:session` token through `SERVEZONE_PLATFORM_AUTHORIZATION`. A deployment token does not grant a platform session. The SDK never sends the token to a binding or mail endpoint. Token exchange and registration bypass request payload hooks and disable automatic RPC retries.
61
63
 
62
64
  Binding environment variables must contain JSON encoded, value-free `IPlatformBinding` objects from `@serve.zone/interfaces`.
@@ -91,6 +93,28 @@ const client = new SzPlatformClient({
91
93
  await client.init();
92
94
  ```
93
95
 
96
+ ## Protocol handshake
97
+
98
+ Every platform session states which contract it speaks. `registerCloudlyClientSession` carries `protocol.createProtocolOffer('32.0.0')` — the installed `@serve.zone/interfaces` version as `interfacesVersion`, and `32.0.0` as the oldest Cloudly release this client accepts — and Cloudly answers with its own offer, which this client negotiates against its own before it uses the session.
99
+
100
+ A peer that cannot serve the session is named, never collapsed into a credential failure: the caller is rejected with `SzPlatformProtocolIncompatibleError`, which carries the `IProtocolRefusal` (`code: 'protocol-incompatible'`, its reason, and both sides' offers). A refusal stands until an operator upgrades one of the two sides, so it is never retried: a refusal met while a reconnect restores the session — where no caller waits — ends that socket lifecycle and is kept on the client.
101
+
102
+ | Member | Meaning |
103
+ | --- | --- |
104
+ | `getSessionStatus()` | `'connected'`, `'disconnected'`, or `'protocol-incompatible'` — the refusal outranks the transport state |
105
+ | `lastProtocolRefusal` | The retained `SzPlatformProtocolIncompatibleError`, with `refusal.refusing` and `refusal.refused` |
106
+ | `platformSessionProtocolOffer` | This build's offer, exported for callers that report platform compatibility |
107
+
108
+ ```typescript
109
+ await client.init().catch((error) => {
110
+ if (client.getSessionStatus() === 'protocol-incompatible') {
111
+ // Both offers are in client.lastProtocolRefusal.refusal; upgrade one side.
112
+ throw client.lastProtocolRefusal;
113
+ }
114
+ throw error;
115
+ });
116
+ ```
117
+
94
118
  ## Socket 8 migration
95
119
 
96
120
  Version 4 requires Socket 8 peers: upgrade Cloudly and the dedicated dcrouter mail/Web Push endpoints together with their clients. Older Socket 4/5 servers are incompatible. Set `SERVEZONE_PLATFORM_URL` to Cloudly's HTTPS origin and retain `MAIL_TYPED_URL` for the dedicated mail endpoint. Replace legacy platform tokens with Cloudly service credentials; initialization no longer accepts a successful transport handshake as authentication. CoreMail, SMTP credential discovery, mail delivery status, attachments, Reply-To, and debug connector behavior remain available.
@@ -122,7 +146,7 @@ The current SMS verification method is spelled `sendSmsVerifcation()` in code. U
122
146
 
123
147
  ## Lifecycle
124
148
 
125
- `SzPlatformClient` keeps separate TypedSocket connections for Cloudly, CoreMail, typed service mail, and managed Web Push. Call `stop()` to cancel initialization, renewal, and restoration and join their cleanup. `requireTypedSocket()` returns the authenticated Cloudly connection while its identity is valid; `typedsocket` is optional. The mail router is private to its own connection, so Cloudly and Web Push peers cannot invoke inbound mail handlers.
149
+ `SzPlatformClient` keeps separate TypedSocket connections for Cloudly, CoreMail, typed service mail, and managed Web Push. Call `stop()` to cancel initialization, renewal, and restoration and join their cleanup. `requireTypedSocket()` returns the authenticated Cloudly connection while `getSessionStatus()` is `connected`; `typedsocket` is optional. The mail router is private to its own connection, so Cloudly and Web Push peers cannot invoke inbound mail handlers.
126
150
 
127
151
  ```typescript
128
152
  const client = new SzPlatformClient({
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/platformclient',
6
- version: '4.1.1',
6
+ version: '32.0.1',
7
7
  description: 'a module that makes it really easy to use the serve.zone platform inside your app'
8
8
  }
@@ -7,8 +7,17 @@ import {
7
7
  SzCoreMailConnector,
8
8
  type ISzCoreMailConnectorOptions,
9
9
  } from './coremail/classes.coremailconnector.js';
10
+ import {
11
+ platformSessionProtocolOffer,
12
+ requireCompatibleProtocol,
13
+ rethrowProtocolRefusal,
14
+ SzPlatformProtocolIncompatibleError,
15
+ } from './protocol.js';
10
16
  import * as plugins from './plugins.js';
11
17
 
18
+ /** What a caller can act on: a usable session, none, or a peer of another contract. */
19
+ export type TSzPlatformSessionStatus = 'connected' | 'disconnected' | 'protocol-incompatible';
20
+
12
21
  export interface ISzPlatformClientOptions {
13
22
  authorizationString?: string;
14
23
  authorization?: string;
@@ -29,13 +38,33 @@ export class SzPlatformClient {
29
38
  public platformBindings: plugins.servezoneInterfaces.platform.IPlatformBinding[] = [];
30
39
  public typedrouter: plugins.typedrequest.TypedRouter = new plugins.typedrequest.TypedRouter();
31
40
  public typedsocket?: plugins.typedsocket.TypedSocket;
41
+ /**
42
+ * The refusal this client met, kept for the caller that never saw it.
43
+ *
44
+ * A refused offer stands until an operator upgrades one of the two sides, and a refusal met
45
+ * while a reconnect restores the session reaches no caller at all, so it is read from here.
46
+ */
47
+ public lastProtocolRefusal?: SzPlatformProtocolIncompatibleError;
32
48
  private identity?: plugins.servezoneInterfaces.data.IIdentity;
33
49
  private authenticationGeneration = 0;
34
50
  private authenticationAbort?: AbortController;
35
51
  private authenticationOperations = new Set<Promise<unknown>>();
36
52
  private renewalTimer?: ReturnType<typeof setTimeout>;
37
53
  private statusSubscription?: { unsubscribe(): void };
38
- private qenvInstance = new plugins.qenv.Qenv();
54
+ /**
55
+ * The name resolver behind {@link getConfiguredEnvVar}: process environment, then Docker secrets.
56
+ *
57
+ * This client owns no list of required variables and must never enforce anyone else's. Which
58
+ * names matter is a per-call decision here - the mail connector even composes them from an
59
+ * address token at send time - and every read site below treats a missing value as its own
60
+ * business. So the instance is pointed at this package's own directory, which holds no
61
+ * `qenv.yml`, instead of qenv's default of `process.cwd()`: that is the embedding application's
62
+ * directory, and since qenv 8.0.0 a name its `qenv.yml` lists under `required:` without a value
63
+ * makes the constructor throw `QenvMissingRequiredEnvVarsError`. A host declaring a requirement
64
+ * it has not met yet is the host's decision to act on, never a reason for this library to refuse
65
+ * construction, so `failOnMissing` is false as well.
66
+ */
67
+ private qenvInstance = new plugins.qenv.Qenv(import.meta.dirname, undefined, false);
39
68
  private stopped = false;
40
69
  private initPromise?: Promise<void>;
41
70
  private stopPromise?: Promise<void>;
@@ -98,7 +127,10 @@ export class SzPlatformClient {
98
127
  restoreConnection: (context) => {
99
128
  this.invalidateAuthentication();
100
129
  const generation = this.authenticationGeneration;
101
- return this.trackAuthentication(this.authenticate(context.createTypedRequest, context.abortSignal, generation));
130
+ return this.trackAuthentication(
131
+ this.authenticate(context.createTypedRequest, context.abortSignal, generation)
132
+ .catch((error) => this.releaseRefusedSocket(error, generation)),
133
+ );
102
134
  },
103
135
  },
104
136
  );
@@ -188,9 +220,42 @@ export class SzPlatformClient {
188
220
 
189
221
  public requireTypedSocket(): plugins.typedsocket.TypedSocket {
190
222
  this.assertRunning();
191
- if (!this.typedsocket || this.typedsocket.getStatus() !== 'connected' || !this.identity
192
- || this.identity.expiresAt <= Date.now()) throw new Error('Cloudly platform session is unavailable.');
193
- return this.typedsocket;
223
+ const socket = this.typedsocket;
224
+ const status = this.getSessionStatus();
225
+ // A refused protocol is the one unavailability a caller can act on, so it keeps its name.
226
+ if (status === 'protocol-incompatible' && this.lastProtocolRefusal) throw this.lastProtocolRefusal;
227
+ if (!socket || status !== 'connected') {
228
+ throw new Error('Cloudly platform session is unavailable.');
229
+ }
230
+ return socket;
231
+ }
232
+
233
+ /**
234
+ * The platform session as a caller can act on it.
235
+ *
236
+ * `protocol-incompatible` outranks the transport state: it stands until an operator upgrades
237
+ * one of the two sides, and `lastProtocolRefusal` names both of them.
238
+ */
239
+ public getSessionStatus(): TSzPlatformSessionStatus {
240
+ if (this.lastProtocolRefusal) return 'protocol-incompatible';
241
+ if (this.typedsocket?.getStatus() === 'connected' && this.identity
242
+ && this.identity.expiresAt > Date.now()) return 'connected';
243
+ return 'disconnected';
244
+ }
245
+
246
+ /**
247
+ * Release the socket lifecycle a restoration was refused in; every other failure passes on.
248
+ *
249
+ * TypedSocket ends its own client on a denied restoration and never reconnects from one, so the
250
+ * reference held here is dead — keeping it would report an unavailable session instead of the
251
+ * incompatible peer.
252
+ */
253
+ private releaseRefusedSocket(errorArg: unknown, generationArg: number): never {
254
+ if (errorArg instanceof SzPlatformProtocolIncompatibleError
255
+ && generationArg === this.authenticationGeneration) {
256
+ this.typedsocket = undefined;
257
+ }
258
+ throw errorArg;
194
259
  }
195
260
 
196
261
  private invalidateAuthentication(): void {
@@ -227,19 +292,28 @@ export class SzPlatformClient {
227
292
  || !Number.isSafeInteger(identity.expiresAt) || identity.expiresAt <= Date.now() + 1000) {
228
293
  throw new Error('Invalid platform identity.');
229
294
  }
230
- const requestData = plugins.servezoneInterfaces.data.snapshotRegisterCloudlyClientSessionRequestV1({
231
- schemaVersion: 1, identity: { jwt: identity.jwt },
295
+ const requestData = plugins.servezoneInterfaces.data.snapshotRegisterCloudlyClientSessionRequest({
296
+ identity: { jwt: identity.jwt }, protocol: platformSessionProtocolOffer,
232
297
  });
233
- const registration = createRequest<plugins.servezoneInterfaces.requests.runtimesession.IReq_Any_Cloudly_RegisterCloudlyClientSessionV1>(
234
- 'registerCloudlyClientSessionV1');
298
+ const registration = createRequest<plugins.servezoneInterfaces.requests.runtimesession.IReq_Any_Cloudly_RegisterCloudlyClientSession>(
299
+ 'registerCloudlyClientSession');
235
300
  registration.skipHooks = true;
236
- const registered = await registration.fire(requestData, { maxRetries: 0, abortSignal: signal });
237
- plugins.servezoneInterfaces.data.snapshotRegisterCloudlyClientSessionResponseV1(registered);
301
+ const registered = await registration
302
+ .fire(requestData, { maxRetries: 0, abortSignal: signal })
303
+ .catch(rethrowProtocolRefusal);
304
+ requireCompatibleProtocol(plugins.servezoneInterfaces.data
305
+ .snapshotRegisterCloudlyClientSessionResponse(registered).protocol);
238
306
  requireCurrent();
239
307
  this.identity = { type: identity.type, role: identity.role, userId: identity.userId,
240
308
  name: identity.userId, expiresAt: identity.expiresAt, jwt: requestData.identity.jwt };
241
- } catch {
309
+ } catch (error) {
242
310
  if (this.stopped || signal.aborted || generation !== this.authenticationGeneration) throw this.createAbortError();
311
+ // A refused offer rejected no credential of this caller's, so it is named rather than
312
+ // collapsed, and kept where a restoration that has no caller can still be read.
313
+ if (error instanceof SzPlatformProtocolIncompatibleError) {
314
+ this.lastProtocolRefusal = error;
315
+ throw error;
316
+ }
243
317
  throw new Error('Cloudly platform authentication failed.');
244
318
  }
245
319
  }
package/ts/index.ts CHANGED
@@ -1,4 +1,8 @@
1
1
  export * from './classes.platformclient.js';
2
+ export {
3
+ platformSessionProtocolOffer,
4
+ SzPlatformProtocolIncompatibleError,
5
+ } from './protocol.js';
2
6
  export * from './coremail/classes.coremailconnector.js';
3
7
  export * from './email/classes.emailconnector.js';
4
8
  export * from './webpush/classes.webpushconnector.js';
package/ts/protocol.ts ADDED
@@ -0,0 +1,81 @@
1
+ import * as plugins from './plugins.js';
2
+
3
+ const protocol = plugins.servezoneInterfaces.protocol;
4
+
5
+ /**
6
+ * The oldest Cloudly release this client opens its platform session with.
7
+ *
8
+ * It is raised only by the commit that starts depending on a later `@serve.zone/interfaces`
9
+ * minor, and that raise is named in the changelog: a client that demands more than it needs
10
+ * refuses controllers it could have served. What this client speaks is never stated here — it is
11
+ * the installed release, which `createProtocolOffer` reads from the package itself.
12
+ */
13
+ const platformSessionMinimumPeerVersion = '32.0.0';
14
+
15
+ /** This build's offer for the one session kind the platform client opens. */
16
+ export const platformSessionProtocolOffer: plugins.servezoneInterfaces.protocol.IProtocolOffer =
17
+ protocol.createProtocolOffer(platformSessionMinimumPeerVersion);
18
+
19
+ /**
20
+ * Two peers that cannot serve one session, named rather than collapsed into an authentication
21
+ * failure.
22
+ *
23
+ * A refusal stands until an operator upgrades one of the two sides, so it is never retried: the
24
+ * caller is rejected with it, and a refusal met while a reconnect restores the session — where no
25
+ * caller waits — ends that socket lifecycle and is retained on the client instead.
26
+ */
27
+ export class SzPlatformProtocolIncompatibleError extends Error {
28
+ public readonly refusal: plugins.servezoneInterfaces.protocol.IProtocolRefusal;
29
+
30
+ constructor(
31
+ refusalArg: plugins.servezoneInterfaces.protocol.IProtocolRefusal,
32
+ optionsArg?: ErrorOptions,
33
+ ) {
34
+ super(protocol.describeProtocolRefusal(refusalArg), optionsArg);
35
+ this.name = 'SzPlatformProtocolIncompatibleError';
36
+ this.refusal = refusalArg;
37
+ }
38
+ }
39
+
40
+ /**
41
+ * The payload a failed TypedRequest hop carried.
42
+ *
43
+ * Read structurally rather than through `instanceof TypedResponseError`: the request that fails is
44
+ * created by TypedSocket, which resolves its own `@api.global/typedrequest`, so a class identity
45
+ * check could miss a refusal in a consumer tree that holds a second copy.
46
+ */
47
+ const readErrorData = (errorArg: unknown): unknown => {
48
+ if (typeof errorArg !== 'object' || errorArg === null || !('errorData' in errorArg)) {
49
+ return undefined;
50
+ }
51
+ return errorArg.errorData;
52
+ };
53
+
54
+ /**
55
+ * Rethrow a refused offer as this client's named error; every other failure passes untouched.
56
+ *
57
+ * The transport error stays attached as the cause, so the correlation a caller needs to find the
58
+ * hop in a log is not lost behind the refusal.
59
+ */
60
+ export const rethrowProtocolRefusal = (errorArg: unknown): never => {
61
+ const refusal = protocol.readProtocolRefusal(readErrorData(errorArg));
62
+ if (refusal === null) {
63
+ throw errorArg;
64
+ }
65
+ throw new SzPlatformProtocolIncompatibleError(refusal, { cause: errorArg });
66
+ };
67
+
68
+ /**
69
+ * The controller's own offer, judged from this client's side.
70
+ *
71
+ * Acceptance is the controller's decision about this client; whether this client can serve the
72
+ * session it was just given is this check, and a client that cannot must not use it.
73
+ */
74
+ export const requireCompatibleProtocol = (
75
+ peerOfferArg: plugins.servezoneInterfaces.protocol.IProtocolOffer,
76
+ ): void => {
77
+ const negotiation = protocol.negotiateProtocol(platformSessionProtocolOffer, peerOfferArg);
78
+ if (!negotiation.compatible) {
79
+ throw new SzPlatformProtocolIncompatibleError(negotiation.refusal);
80
+ }
81
+ };