corequery 0.10.0 → 0.11.0
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/package.json +1 -1
- package/server/dist/server/api/handlers/foundational-data/v1/builder.js +2 -2
- package/server/dist/server/api/handlers/foundational-data/v1/builder.js.map +1 -1
- package/server/dist/server/api/handlers/foundational-data/v1/index.js +5 -5
- package/server/dist/server/api/handlers/foundational-data/v1/index.js.map +1 -1
- package/server/dist/server/api/handlers/version-check/v1/index.js +3 -4
- package/server/dist/server/api/handlers/version-check/v1/index.js.map +1 -1
- package/server/dist/server/api/handlers/versions/v1/index.js +7 -14
- package/server/dist/server/api/handlers/versions/v1/index.js.map +1 -1
- package/server/dist/server/corequery.d.ts +5 -2
- package/server/dist/server/corequery.js +31 -4
- package/server/dist/server/corequery.js.map +1 -1
- package/server/dist/server/get-corequery-package-version.d.ts +1 -1
- package/server/dist/server/get-corequery-package-version.js +7 -6
- package/server/dist/server/get-corequery-package-version.js.map +1 -1
- package/server/dist/server/web-server/asset-preparer.d.ts +5 -2
- package/server/dist/server/web-server/asset-preparer.js +91 -8
- package/server/dist/server/web-server/asset-preparer.js.map +1 -1
- package/server/dist/server/web-server/index-html-preparer.d.ts +4 -3
- package/server/dist/server/web-server/index-html-preparer.js +13 -6
- package/server/dist/server/web-server/index-html-preparer.js.map +1 -1
- package/server/dist/server/web-server/service-worker-preparer.d.ts +2 -1
- package/server/dist/server/web-server/service-worker-preparer.js +7 -2
- package/server/dist/server/web-server/service-worker-preparer.js.map +1 -1
- package/server/dist/server/web-server/web-server.d.ts +2 -0
- package/server/dist/server/web-server/web-server.js +19 -5
- package/server/dist/server/web-server/web-server.js.map +1 -1
- package/web/dist/assets/{About-DZzvxTsC.js → About-RNYMHtTm.js} +1 -1
- package/web/dist/assets/Debug-D1TumJP7.js +1 -0
- package/web/dist/assets/Home-DL157Zc0.js +1 -0
- package/web/dist/assets/{NotFound-BLjxBrp8.js → NotFound-DQr-VzOD.js} +1 -1
- package/web/dist/assets/{Page-C-5JtnHw.js → Page-CkjfP8rn.js} +1 -1
- package/web/dist/assets/index-BL1_vftv.css +1 -0
- package/web/dist/assets/{index-DIo4XJLj.js → index-KxZO3Q-Z.js} +3 -3
- package/web/dist/assets/{use-simple-headers-siUQCJxx.js → use-simple-headers-DVaC1F_Z.js} +1 -1
- package/web/dist/index.html +4 -3
- package/web/dist/sw.js +1 -1
- package/web/dist/assets/Debug-DLDWv0xn.js +0 -1
- package/web/dist/assets/Home-CT0wZ4Lg.js +0 -1
- package/web/dist/assets/index-CwS5Ckic.css +0 -1
package/package.json
CHANGED
|
@@ -13,13 +13,13 @@ export class FoundationalDataV1Builder {
|
|
|
13
13
|
// environment work, since in dev this._app.version won't be set).
|
|
14
14
|
const hash = crypto
|
|
15
15
|
.createHash("sha256")
|
|
16
|
-
.update(this._app.
|
|
16
|
+
.update(this._app.serverVersion + JSON.stringify(resultWithoutMetadata))
|
|
17
17
|
.digest("hex");
|
|
18
18
|
return {
|
|
19
19
|
...resultWithoutMetadata,
|
|
20
20
|
metadata: {
|
|
21
21
|
hash: hash,
|
|
22
|
-
serverVersion: this._app.
|
|
22
|
+
serverVersion: this._app.serverVersion,
|
|
23
23
|
},
|
|
24
24
|
};
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../../api/handlers/foundational-data/v1/builder.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAQ5B,MAAM,OAAO,yBAAyB;IACP;IAA7B,YAA6B,IAAe;QAAf,SAAI,GAAJ,IAAI,CAAW;IAAG,CAAC;IAEhD,KAAK;QACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE3D,2EAA2E;QAC3E,yEAAyE;QACzE,uEAAuE;QACvE,wEAAwE;QACxE,kEAAkE;QAClE,MAAM,IAAI,GAAG,MAAM;aAChB,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../../api/handlers/foundational-data/v1/builder.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAQ5B,MAAM,OAAO,yBAAyB;IACP;IAA7B,YAA6B,IAAe;QAAf,SAAI,GAAJ,IAAI,CAAW;IAAG,CAAC;IAEhD,KAAK;QACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE3D,2EAA2E;QAC3E,yEAAyE;QACzE,uEAAuE;QACvE,wEAAwE;QACxE,kEAAkE;QAClE,MAAM,IAAI,GAAG,MAAM;aAChB,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;aACvE,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjB,OAAO;YACL,GAAG,qBAAqB;YACxB,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa;aACvC;SACF,CAAC;IACJ,CAAC;IAEO,qBAAqB;QAC3B,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7C,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7C,WAAW,EAAE;gBACX,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,eAAe;aAC7D;YACD,MAAM,EAAE;gBACN,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe;aACxD;SACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { FoundationalDataV1Builder } from "../../../../../server/api/handlers/foundational-data/v1/builder.js";
|
|
2
|
-
|
|
3
|
-
export async function handle(ctx, args) {
|
|
2
|
+
export function handle(ctx, args) {
|
|
4
3
|
// await new Promise((resolve) => setTimeout(resolve, 500));
|
|
5
4
|
const foda = new FoundationalDataV1Builder(ctx.app).build();
|
|
6
|
-
if (args.hash === foda.metadata.hash)
|
|
7
|
-
return { result: "up-to-date" };
|
|
8
|
-
|
|
5
|
+
if (args.hash === foda.metadata.hash) {
|
|
6
|
+
return Promise.resolve({ result: "up-to-date" });
|
|
7
|
+
}
|
|
8
|
+
return Promise.resolve({ result: "outdated", foundationalData: foda });
|
|
9
9
|
}
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/foundational-data/v1/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAElG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/foundational-data/v1/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAElG,MAAM,UAAU,MAAM,CACpB,GAAe,EACf,IAAyC;IAEzC,4DAA4D;IAE5D,MAAM,IAAI,GAAG,IAAI,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IAE5D,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
return {
|
|
1
|
+
export function handle(_ctx, _args) {
|
|
2
|
+
return Promise.resolve({
|
|
4
3
|
// In theory, one day we might want a way to ensure old versions of the app
|
|
5
4
|
// are updated automatically upon loading, e.g. to deprecate an old version
|
|
6
5
|
// of an API. If we return `isForceUpdateOfServiceWorkerRequired: true`, the
|
|
@@ -16,6 +15,6 @@ export async function handle(_ctx, _args) {
|
|
|
16
15
|
// though, as it's based on a random hash right now, not a nicely ordered
|
|
17
16
|
// versioning system).
|
|
18
17
|
isForceUpdateOfServiceWorkerRequired: false,
|
|
19
|
-
};
|
|
18
|
+
});
|
|
20
19
|
}
|
|
21
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/version-check/v1/index.ts"],"names":[],"mappings":"AAIA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/version-check/v1/index.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,MAAM,CACpB,IAAgB,EAChB,KAAsC;IAEtC,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,2EAA2E;QAC3E,2EAA2E;QAC3E,4EAA4E;QAC5E,2EAA2E;QAC3E,QAAQ;QACR,EAAE;QACF,wEAAwE;QACxE,0EAA0E;QAC1E,wEAAwE;QACxE,0EAA0E;QAC1E,qEAAqE;QACrE,sEAAsE;QACtE,yEAAyE;QACzE,sBAAsB;QACtB,oCAAoC,EAAE,KAAK;KAC5C,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,20 +1,13 @@
|
|
|
1
1
|
import { FoundationalDataV1Builder } from "../../../../../server/api/handlers/foundational-data/v1/builder.js";
|
|
2
|
-
|
|
3
|
-
export async function handle(ctx, _args) {
|
|
2
|
+
export function handle(ctx, _args) {
|
|
4
3
|
const foda = new FoundationalDataV1Builder(ctx.app).build();
|
|
5
|
-
return {
|
|
6
|
-
serverVersion: ctx.app.
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
// package, let alone every commit in a consumer package (which is what
|
|
10
|
-
// serverVersion is based on). My current thinking is that it can be based
|
|
11
|
-
// on a hash of the sw.js file (which includes hashes of all the files it
|
|
12
|
-
// pre-caches).
|
|
13
|
-
frontendVersion: ctx.app.version,
|
|
14
|
-
corequeryPackageVersion: ctx.app.corequeryPackageVersion,
|
|
4
|
+
return Promise.resolve({
|
|
5
|
+
serverVersion: ctx.app.serverVersion,
|
|
6
|
+
frontendVersion: ctx.app.getFrontendVersion(),
|
|
7
|
+
corequeryPackageVersion: ctx.app.getCorequeryPackageVersion(),
|
|
15
8
|
foundationalDataHash: foda.metadata.hash,
|
|
16
9
|
// Deprecated, but kept for backwards compatibility.
|
|
17
|
-
version: ctx.app.
|
|
18
|
-
};
|
|
10
|
+
version: ctx.app.serverVersion,
|
|
11
|
+
});
|
|
19
12
|
}
|
|
20
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/versions/v1/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAElG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../api/handlers/versions/v1/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAElG,MAAM,UAAU,MAAM,CACpB,GAAe,EACf,KAAiC;IAEjC,MAAM,IAAI,GAAG,IAAI,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IAE5D,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,aAAa;QACpC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAC7C,uBAAuB,EAAE,GAAG,CAAC,GAAG,CAAC,0BAA0B,EAAE;QAC7D,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;QAExC,oDAAoD;QACpD,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,aAAa;KAC/B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -6,12 +6,15 @@ export type CorequeryConfigBuilder = (corequery: Corequery) => CorequeryConfig;
|
|
|
6
6
|
export declare class Corequery {
|
|
7
7
|
private readonly _config;
|
|
8
8
|
private readonly _webServer;
|
|
9
|
-
readonly
|
|
10
|
-
|
|
9
|
+
readonly serverVersion: string;
|
|
10
|
+
private _corequeryPackageVersion;
|
|
11
|
+
private _frontendVersion;
|
|
11
12
|
readonly stops: StopCollection;
|
|
12
13
|
readonly lines: LineCollection;
|
|
13
14
|
readonly landingPageConfig: LandingPageConfig;
|
|
14
15
|
readonly footerConfig: FooterConfig;
|
|
15
16
|
constructor(configBuilder: CorequeryConfigBuilder);
|
|
17
|
+
getCorequeryPackageVersion(): string;
|
|
18
|
+
getFrontendVersion(): string;
|
|
16
19
|
start(): Promise<void>;
|
|
17
20
|
}
|
|
@@ -7,8 +7,9 @@ import { getCorequeryPackageVersion } from "../server/get-corequery-package-vers
|
|
|
7
7
|
export class Corequery {
|
|
8
8
|
_config;
|
|
9
9
|
_webServer;
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
serverVersion;
|
|
11
|
+
_corequeryPackageVersion;
|
|
12
|
+
_frontendVersion;
|
|
12
13
|
stops;
|
|
13
14
|
lines;
|
|
14
15
|
// I'm happy just exposing the config for now. Can be migrated to full classes
|
|
@@ -18,16 +19,42 @@ export class Corequery {
|
|
|
18
19
|
constructor(configBuilder) {
|
|
19
20
|
this._config = configBuilder(this);
|
|
20
21
|
this._webServer = new WebServer(this, this._config.port, this._config.assets, env.COREQUERY_HOT_RELOAD ? "vite-middleware" : "dist-folder", serverFolderPath);
|
|
21
|
-
this.
|
|
22
|
-
|
|
22
|
+
this.serverVersion = this._config.version;
|
|
23
|
+
// Currently fetched async during start().
|
|
24
|
+
this._corequeryPackageVersion = null;
|
|
25
|
+
// Only known after assets are prepared, during start().
|
|
26
|
+
this._frontendVersion = null;
|
|
23
27
|
const { stopTagSuccession, lineTagSuccession } = this._config.tags;
|
|
24
28
|
this.stops = StopCollection.build(this._config.stops, stopTagSuccession);
|
|
25
29
|
this.lines = LineCollection.build(this._config.lines, lineTagSuccession);
|
|
26
30
|
this.landingPageConfig = this._config.landingPage;
|
|
27
31
|
this.footerConfig = this._config.footer;
|
|
28
32
|
}
|
|
33
|
+
getCorequeryPackageVersion() {
|
|
34
|
+
if (this._corequeryPackageVersion == null) {
|
|
35
|
+
throw new Error("Call start() first.");
|
|
36
|
+
}
|
|
37
|
+
return this._corequeryPackageVersion;
|
|
38
|
+
}
|
|
39
|
+
getFrontendVersion() {
|
|
40
|
+
if (this._frontendVersion == null) {
|
|
41
|
+
throw new Error("Call start() first.");
|
|
42
|
+
}
|
|
43
|
+
return this._frontendVersion;
|
|
44
|
+
}
|
|
29
45
|
async start() {
|
|
46
|
+
this._corequeryPackageVersion = await getCorequeryPackageVersion();
|
|
30
47
|
await this._webServer.prepareAssets();
|
|
48
|
+
this._frontendVersion = this._webServer.getFrontendVersion();
|
|
49
|
+
// TODO: Use proper logger.
|
|
50
|
+
// eslint-disable-next-line no-console
|
|
51
|
+
console.log(`Starting ${this._config.assets.appName}...`);
|
|
52
|
+
// eslint-disable-next-line no-console
|
|
53
|
+
console.log(`- Server version: ${this.serverVersion}`);
|
|
54
|
+
// eslint-disable-next-line no-console
|
|
55
|
+
console.log(`- Frontend version: ${this.getFrontendVersion()}`);
|
|
56
|
+
// eslint-disable-next-line no-console
|
|
57
|
+
console.log(`- CoreQuery version: ${this.getCorequeryPackageVersion()}`);
|
|
31
58
|
await this._webServer.start();
|
|
32
59
|
}
|
|
33
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"corequery.js","sourceRoot":"","sources":["../../corequery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAIvF,MAAM,OAAO,SAAS;IACH,OAAO,CAAkB;IACzB,UAAU,CAAY;IAE9B,
|
|
1
|
+
{"version":3,"file":"corequery.js","sourceRoot":"","sources":["../../corequery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function getCorequeryPackageVersion(): string
|
|
1
|
+
export declare function getCorequeryPackageVersion(): Promise<string>;
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { serverFolderPath } from "../server/dirname.js";
|
|
2
|
-
import
|
|
2
|
+
import fsp from "fs/promises";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import z from "zod";
|
|
5
5
|
const packageJsonSchema = z.object({
|
|
6
6
|
version: z.string(),
|
|
7
7
|
});
|
|
8
|
-
export function getCorequeryPackageVersion() {
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
|
|
8
|
+
export async function getCorequeryPackageVersion() {
|
|
9
|
+
const relativePath = "../../../package.json";
|
|
10
|
+
const packageJsonPath = path.resolve(serverFolderPath, relativePath);
|
|
11
|
+
const packageJsonStr = await fsp.readFile(packageJsonPath, "utf-8");
|
|
12
|
+
const packageJson = packageJsonSchema.parse(JSON.parse(packageJsonStr));
|
|
13
|
+
return packageJson.version;
|
|
13
14
|
}
|
|
14
15
|
//# sourceMappingURL=get-corequery-package-version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-corequery-package-version.js","sourceRoot":"","sources":["../../get-corequery-package-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"get-corequery-package-version.js","sourceRoot":"","sources":["../../get-corequery-package-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,0BAA0B;IAC9C,MAAM,YAAY,GAAG,uBAAuB,CAAC;IAC7C,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAErE,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;IAExE,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC"}
|
|
@@ -2,14 +2,17 @@ import type { AssetConfig } from "../../server/config/types/asset-config.js";
|
|
|
2
2
|
export declare class AssetPreparer {
|
|
3
3
|
private readonly _distFolderPath;
|
|
4
4
|
private readonly _config;
|
|
5
|
-
private readonly _frontendVersion;
|
|
6
5
|
private readonly _corequeryPackageVersion;
|
|
6
|
+
private readonly _serverVersion;
|
|
7
7
|
static readonly ALL_MODIFIED_FILES: string[];
|
|
8
8
|
private readonly _indexHtml;
|
|
9
9
|
private readonly _manifest;
|
|
10
10
|
private readonly _icons;
|
|
11
11
|
private readonly _serviceWorker;
|
|
12
|
-
|
|
12
|
+
private _frontendVersion;
|
|
13
|
+
constructor(_distFolderPath: string, _config: AssetConfig, _corequeryPackageVersion: string, _serverVersion: string);
|
|
13
14
|
run(): Promise<void>;
|
|
14
15
|
validateDistFolder(): Promise<void>;
|
|
16
|
+
getFrontendVersion(): string;
|
|
17
|
+
private _replaceHashForIndexHtmlInServiceWorker;
|
|
15
18
|
}
|
|
@@ -5,8 +5,8 @@ import { ServiceWorkerPreparer } from "../../server/web-server/service-worker-pr
|
|
|
5
5
|
export class AssetPreparer {
|
|
6
6
|
_distFolderPath;
|
|
7
7
|
_config;
|
|
8
|
-
_frontendVersion;
|
|
9
8
|
_corequeryPackageVersion;
|
|
9
|
+
_serverVersion;
|
|
10
10
|
static ALL_MODIFIED_FILES = [
|
|
11
11
|
IndexHtmlPreparer.FILE_PATH,
|
|
12
12
|
ManifestPreparer.FILE_PATH,
|
|
@@ -16,29 +16,101 @@ export class AssetPreparer {
|
|
|
16
16
|
_manifest;
|
|
17
17
|
_icons;
|
|
18
18
|
_serviceWorker;
|
|
19
|
-
|
|
19
|
+
_frontendVersion;
|
|
20
|
+
constructor(_distFolderPath, _config, _corequeryPackageVersion, _serverVersion) {
|
|
20
21
|
this._distFolderPath = _distFolderPath;
|
|
21
22
|
this._config = _config;
|
|
22
|
-
this._frontendVersion = _frontendVersion;
|
|
23
23
|
this._corequeryPackageVersion = _corequeryPackageVersion;
|
|
24
|
+
this._serverVersion = _serverVersion;
|
|
24
25
|
this._indexHtml = new IndexHtmlPreparer(this._distFolderPath, {
|
|
25
26
|
...this._config,
|
|
26
|
-
frontendVersion: this._frontendVersion,
|
|
27
27
|
corequeryPackageVersion: this._corequeryPackageVersion,
|
|
28
|
+
serverVersion: this._serverVersion,
|
|
28
29
|
});
|
|
29
30
|
this._manifest = new ManifestPreparer(this._distFolderPath, this._config);
|
|
30
31
|
this._icons = new IconsPreparer(this._distFolderPath, this._config);
|
|
31
32
|
this._serviceWorker = new ServiceWorkerPreparer(this._distFolderPath, {
|
|
32
33
|
filesReplaced: AssetPreparer.ALL_MODIFIED_FILES,
|
|
33
34
|
});
|
|
35
|
+
this._frontendVersion = null;
|
|
34
36
|
}
|
|
35
37
|
async run() {
|
|
36
|
-
|
|
38
|
+
// Order of operations matters a lot here!
|
|
39
|
+
// Step 1: Replace all the assets which are gonna be pre-cached by the
|
|
40
|
+
// service worker (with the exception of a few fields in the `index.html`
|
|
41
|
+
// file), so that a change to any of these would result in the PWA noticing
|
|
42
|
+
// an update is available.
|
|
43
|
+
await this._indexHtml.runPartial();
|
|
37
44
|
await this._manifest.run();
|
|
38
45
|
await this._icons.run();
|
|
39
|
-
//
|
|
40
|
-
//
|
|
41
|
-
|
|
46
|
+
// Step 2: Now that the assets are replaced, we need to update the hashes
|
|
47
|
+
// Vite generated in the `sw.js` file for these assets. Note that
|
|
48
|
+
// `index.html` also has a hash in `sw.js`, but we haven't yet replaced some
|
|
49
|
+
// of the meta tags.
|
|
50
|
+
//
|
|
51
|
+
// This is intentional, and here's why:
|
|
52
|
+
//
|
|
53
|
+
// - Real frontend changes (i.e. changes to `index.html` content such as
|
|
54
|
+
// additional DOM content) occur at build time, not as part of this
|
|
55
|
+
// replacement process, so they've already happened and will be factored
|
|
56
|
+
// into the new hash.
|
|
57
|
+
//
|
|
58
|
+
// - Likewise, `appName` and `description` have been substituted already,
|
|
59
|
+
// during the `runPartial()` method.
|
|
60
|
+
//
|
|
61
|
+
// - `corequeryPackageVersion` and `serverVersion` changes do not
|
|
62
|
+
// necessarily indicate a frontend change, and shouldn't themselves
|
|
63
|
+
// trigger a PWA update. Therefore, they SHOULDN'T be factored into the
|
|
64
|
+
// new hash.
|
|
65
|
+
//
|
|
66
|
+
// - We DO want any change to `frontendVersion` to cause the hash for
|
|
67
|
+
// `index.html` to change, because there is always meant to be a 1-to-1
|
|
68
|
+
// correlation between PWA updates, and `frontendVersion` changes.
|
|
69
|
+
// HOWEVER, we don't know the value for `frontendVersion` yet. It's
|
|
70
|
+
// calculated by hashing the content of `sw.js` after all inner hashes are
|
|
71
|
+
// replaced in this next step.
|
|
72
|
+
const frontendVersion = await this._serviceWorker.run();
|
|
73
|
+
// Step 3: Now that we know the `frontendVersion`, we'll replace the hash
|
|
74
|
+
// for `index.html` in the service worker file with this `frontendVersion`
|
|
75
|
+
// value.
|
|
76
|
+
//
|
|
77
|
+
// Because we calculate `frontendVersion` based on the content of `sw.js`
|
|
78
|
+
// prior to this point, it means any changes to the following are accounted
|
|
79
|
+
// for in the `frontendVersion` value:
|
|
80
|
+
//
|
|
81
|
+
// - the `index.html` file (excluding the three tags yet to be replaced)
|
|
82
|
+
// - the `manifest.webmanifest` file
|
|
83
|
+
// - any of the icons
|
|
84
|
+
// - any of the JS/CSS files
|
|
85
|
+
//
|
|
86
|
+
// The ONLY things it doesn't account for are:
|
|
87
|
+
//
|
|
88
|
+
// - `corequeryPackageVersion`
|
|
89
|
+
// - `serverVersion`
|
|
90
|
+
//
|
|
91
|
+
// And again, that's intentional. We don't want changes to these values to
|
|
92
|
+
// be considered a frontend update.
|
|
93
|
+
//
|
|
94
|
+
// The `index.html` file ALSO has a meta tag for `frontendVersion` that
|
|
95
|
+
// we haven't populated yet, but since it's literally the value used for the
|
|
96
|
+
// hash, it means any change to that value causes the hash for `index.html`
|
|
97
|
+
// to change anyway!
|
|
98
|
+
//
|
|
99
|
+
// Theoretically we could substitute in the value for `frontendVersion` and
|
|
100
|
+
// recalculate the hash for `index.html` "properly", but then we'd still
|
|
101
|
+
// need to substitute `corequeryPackageVersion` and `serverVersion` into the
|
|
102
|
+
// `index.html` file afterwards to prevent them impacting the hash.
|
|
103
|
+
//
|
|
104
|
+
// Using the value of `frontendVersion` instead avoids three-stages of
|
|
105
|
+
// substitution. Remember, since the previous content of `index.html` is
|
|
106
|
+
// ALREADY FACTORED INTO the `frontendVersion` hash value, we're not losing
|
|
107
|
+
// anything by replacing the hash like this.
|
|
108
|
+
await this._replaceHashForIndexHtmlInServiceWorker(frontendVersion);
|
|
109
|
+
// Step 4: Now that all hashes are finalised we can do the second stage of
|
|
110
|
+
// substitution into the `index.html` file, for `frontendVersion`,
|
|
111
|
+
// `corequeryPackageVersion`, and `serverVersion`.
|
|
112
|
+
await this._indexHtml.run(frontendVersion);
|
|
113
|
+
this._frontendVersion = frontendVersion;
|
|
42
114
|
}
|
|
43
115
|
async validateDistFolder() {
|
|
44
116
|
await this._indexHtml.validate();
|
|
@@ -46,5 +118,16 @@ export class AssetPreparer {
|
|
|
46
118
|
await this._icons.validate();
|
|
47
119
|
await this._serviceWorker.validate();
|
|
48
120
|
}
|
|
121
|
+
getFrontendVersion() {
|
|
122
|
+
if (this._frontendVersion == null)
|
|
123
|
+
throw new Error("Call run() first.");
|
|
124
|
+
return this._frontendVersion;
|
|
125
|
+
}
|
|
126
|
+
async _replaceHashForIndexHtmlInServiceWorker(newHash) {
|
|
127
|
+
await new ServiceWorkerPreparer(this._distFolderPath, {
|
|
128
|
+
filesReplaced: [IndexHtmlPreparer.FILE_PATH],
|
|
129
|
+
getFileHash: () => Promise.resolve(newHash),
|
|
130
|
+
}).run();
|
|
131
|
+
}
|
|
49
132
|
}
|
|
50
133
|
//# sourceMappingURL=asset-preparer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-preparer.js","sourceRoot":"","sources":["../../../web-server/asset-preparer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAGvF,MAAM,OAAO,aAAa;
|
|
1
|
+
{"version":3,"file":"asset-preparer.js","sourceRoot":"","sources":["../../../web-server/asset-preparer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,16 +2,17 @@ type Config = {
|
|
|
2
2
|
readonly appName: string;
|
|
3
3
|
readonly shortAppName: string;
|
|
4
4
|
readonly description: string;
|
|
5
|
-
readonly frontendVersion: string;
|
|
6
5
|
readonly corequeryPackageVersion: string;
|
|
6
|
+
readonly serverVersion: string;
|
|
7
7
|
};
|
|
8
8
|
export declare class IndexHtmlPreparer {
|
|
9
9
|
private readonly _distFolderPath;
|
|
10
10
|
private readonly _config;
|
|
11
11
|
static readonly FILE_PATH = "index.html";
|
|
12
12
|
constructor(_distFolderPath: string, _config: Config);
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
runPartial(): Promise<void>;
|
|
14
|
+
run(frontendVersion: string): Promise<void>;
|
|
15
|
+
getReplacedContent(partial: boolean, frontendVersion: string): Promise<string>;
|
|
15
16
|
validate(): Promise<void>;
|
|
16
17
|
private _readTags;
|
|
17
18
|
private _fullFilePath;
|
|
@@ -9,16 +9,22 @@ export class IndexHtmlPreparer {
|
|
|
9
9
|
this._distFolderPath = _distFolderPath;
|
|
10
10
|
this._config = _config;
|
|
11
11
|
}
|
|
12
|
-
async
|
|
13
|
-
await fsp.writeFile(this._fullFilePath(), await this.getReplacedContent());
|
|
12
|
+
async runPartial() {
|
|
13
|
+
await fsp.writeFile(this._fullFilePath(), await this.getReplacedContent(true, ""));
|
|
14
14
|
}
|
|
15
|
-
async
|
|
15
|
+
async run(frontendVersion) {
|
|
16
|
+
await fsp.writeFile(this._fullFilePath(), await this.getReplacedContent(false, frontendVersion));
|
|
17
|
+
}
|
|
18
|
+
async getReplacedContent(partial, frontendVersion) {
|
|
16
19
|
const tags = await this._readTags();
|
|
17
20
|
tags.title.textContent = this._config.appName;
|
|
18
21
|
tags.description.setAttribute("content", this._config.description);
|
|
19
22
|
tags.appName.setAttribute("content", this._config.appName);
|
|
20
|
-
|
|
21
|
-
|
|
23
|
+
if (!partial) {
|
|
24
|
+
tags.frontendVersion.setAttribute("content", frontendVersion);
|
|
25
|
+
tags.packageVersionOnLastUpdate.setAttribute("content", this._config.corequeryPackageVersion);
|
|
26
|
+
tags.serverVersionOnLastUpdate.setAttribute("content", this._config.serverVersion);
|
|
27
|
+
}
|
|
22
28
|
return tags.indexHtml.toString();
|
|
23
29
|
}
|
|
24
30
|
async validate() {
|
|
@@ -41,7 +47,8 @@ export class IndexHtmlPreparer {
|
|
|
41
47
|
description: requireTag('meta[name="description"]'),
|
|
42
48
|
appName: requireTag('meta[name="corequery-app-name"]'),
|
|
43
49
|
frontendVersion: requireTag('meta[name="corequery-frontend-version"]'),
|
|
44
|
-
|
|
50
|
+
packageVersionOnLastUpdate: requireTag('meta[name="corequery-package-version-on-last-update"]'),
|
|
51
|
+
serverVersionOnLastUpdate: requireTag('meta[name="corequery-server-version-on-last-update"]'),
|
|
45
52
|
};
|
|
46
53
|
}
|
|
47
54
|
_fullFilePath() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-html-preparer.js","sourceRoot":"","sources":["../../../web-server/index-html-preparer.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAUzC,MAAM,OAAO,iBAAiB;IAIT;IACA;IAJnB,MAAM,CAAU,SAAS,GAAG,YAAY,CAAC;IAEzC,YACmB,eAAuB,EACvB,OAAe;QADf,oBAAe,GAAf,eAAe,CAAQ;QACvB,YAAO,GAAP,OAAO,CAAQ;IAC/B,CAAC;IAEJ,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"index-html-preparer.js","sourceRoot":"","sources":["../../../web-server/index-html-preparer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,11 @@ export declare class ServiceWorkerPreparer {
|
|
|
7
7
|
private readonly _config;
|
|
8
8
|
static readonly FILE_PATH = "sw.js";
|
|
9
9
|
constructor(_distFolderPath: string, _config: Config);
|
|
10
|
-
run(): Promise<
|
|
10
|
+
run(): Promise<string>;
|
|
11
11
|
getReplacedContent(): Promise<string>;
|
|
12
12
|
validate(): Promise<void>;
|
|
13
13
|
private _getFileHash;
|
|
14
|
+
private _hashValue;
|
|
14
15
|
private _getSubstringsToReplace;
|
|
15
16
|
private _fullFilePath;
|
|
16
17
|
}
|
|
@@ -10,7 +10,9 @@ export class ServiceWorkerPreparer {
|
|
|
10
10
|
this._config = _config;
|
|
11
11
|
}
|
|
12
12
|
async run() {
|
|
13
|
-
|
|
13
|
+
const content = await this.getReplacedContent();
|
|
14
|
+
await fsp.writeFile(this._fullFilePath(), content);
|
|
15
|
+
return this._hashValue(content);
|
|
14
16
|
}
|
|
15
17
|
async getReplacedContent() {
|
|
16
18
|
const { serviceWorkerStr, substringsPerFile } = await this._getSubstringsToReplace();
|
|
@@ -35,9 +37,12 @@ export class ServiceWorkerPreparer {
|
|
|
35
37
|
else {
|
|
36
38
|
const fullFilePath = path.join(this._distFolderPath, filePath);
|
|
37
39
|
const fileContent = await fsp.readFile(fullFilePath);
|
|
38
|
-
return
|
|
40
|
+
return this._hashValue(fileContent);
|
|
39
41
|
}
|
|
40
42
|
}
|
|
43
|
+
_hashValue(value) {
|
|
44
|
+
return crypto.createHash("md5").update(value).digest("hex");
|
|
45
|
+
}
|
|
41
46
|
async _getSubstringsToReplace() {
|
|
42
47
|
const serviceWorkerStr = await fsp.readFile(this._fullFilePath(), "utf-8");
|
|
43
48
|
const allMatches = Array.from(serviceWorkerStr.matchAll(/{url:"([^"]+)",revision:"[^"]+"}/g)).map((match) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-worker-preparer.js","sourceRoot":"","sources":["../../../web-server/service-worker-preparer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAO5B,MAAM,OAAO,qBAAqB;IAIb;IACA;IAJnB,MAAM,CAAU,SAAS,GAAG,OAAO,CAAC;IAEpC,YACmB,eAAuB,EACvB,OAAe;QADf,oBAAe,GAAf,eAAe,CAAQ;QACvB,YAAO,GAAP,OAAO,CAAQ;IAC/B,CAAC;IAEJ,KAAK,CAAC,GAAG;QACP,MAAM,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"service-worker-preparer.js","sourceRoot":"","sources":["../../../web-server/service-worker-preparer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,11 @@ export declare class WebServer {
|
|
|
7
7
|
private readonly _assetConfig;
|
|
8
8
|
private readonly _clientMode;
|
|
9
9
|
private readonly _serverFolderPath;
|
|
10
|
+
private _frontendVersion;
|
|
10
11
|
constructor(_app: Corequery, _port: number, _assetConfig: AssetConfig, _clientMode: ClientMode, _serverFolderPath: string);
|
|
11
12
|
prepareAssets(): Promise<void>;
|
|
12
13
|
start(): Promise<void>;
|
|
14
|
+
getFrontendVersion(): string;
|
|
13
15
|
private _serveFrontendFromDistFolder;
|
|
14
16
|
private _serveFrontendUsingViteMiddleware;
|
|
15
17
|
private _getWebFolderPath;
|
|
@@ -9,22 +9,30 @@ export class WebServer {
|
|
|
9
9
|
_assetConfig;
|
|
10
10
|
_clientMode;
|
|
11
11
|
_serverFolderPath;
|
|
12
|
+
_frontendVersion;
|
|
12
13
|
constructor(_app, _port, _assetConfig, _clientMode, _serverFolderPath) {
|
|
13
14
|
this._app = _app;
|
|
14
15
|
this._port = _port;
|
|
15
16
|
this._assetConfig = _assetConfig;
|
|
16
17
|
this._clientMode = _clientMode;
|
|
17
18
|
this._serverFolderPath = _serverFolderPath;
|
|
19
|
+
// Not known until after prepareAssets() has run.
|
|
20
|
+
this._frontendVersion = null;
|
|
18
21
|
}
|
|
19
22
|
async prepareAssets() {
|
|
20
23
|
if (this._clientMode === "dist-folder") {
|
|
21
24
|
const distFolderPath = this._getWebFolderPath("dist");
|
|
22
|
-
|
|
25
|
+
const assetPreparer = new AssetPreparer(distFolderPath, this._assetConfig, this._app.getCorequeryPackageVersion(), this._app.serverVersion);
|
|
26
|
+
await assetPreparer.run();
|
|
27
|
+
this._frontendVersion = assetPreparer.getFrontendVersion();
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
// It's hard to think of a way to reasonably replace the assets in
|
|
31
|
+
// middleware mode, as you'd be replacing the source assets. It's only a
|
|
32
|
+
// "nice to have" anyway, using the CoreQuery assets during demo-app
|
|
33
|
+
// development is perfectly acceptable.
|
|
34
|
+
this._frontendVersion = "dev";
|
|
23
35
|
}
|
|
24
|
-
// It's hard to think of a way to reasonably replace the assets in
|
|
25
|
-
// middleware mode, as you'd be replacing the source assets. It's only a
|
|
26
|
-
// "nice to have" anyway, using the CoreQuery assets during demo-app
|
|
27
|
-
// development is perfectly acceptable.
|
|
28
36
|
}
|
|
29
37
|
async start() {
|
|
30
38
|
const server = express();
|
|
@@ -41,6 +49,12 @@ export class WebServer {
|
|
|
41
49
|
console.log(`Server ready (http://localhost:${this._port})!`);
|
|
42
50
|
});
|
|
43
51
|
}
|
|
52
|
+
getFrontendVersion() {
|
|
53
|
+
if (this._frontendVersion == null) {
|
|
54
|
+
throw new Error("Call prepareAssets() first.");
|
|
55
|
+
}
|
|
56
|
+
return this._frontendVersion;
|
|
57
|
+
}
|
|
44
58
|
async _serveFrontendFromDistFolder(server) {
|
|
45
59
|
server.use(express.static(this._getWebFolderPath("dist")));
|
|
46
60
|
// The /reset page, which intentionally exists separately to the rest of the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server.js","sourceRoot":"","sources":["../../../web-server/web-server.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAIpE,MAAM,OAAO,SAAS;
|
|
1
|
+
{"version":3,"file":"web-server.js","sourceRoot":"","sources":["../../../web-server/web-server.ts"],"names":[],"mappings":"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"}
|