piral-cli 0.15.0-beta.4512 → 0.15.0-beta.4560
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/lib/common/importmap.js.map +1 -1
- package/lib/common/inspect.d.ts +5 -5
- package/lib/common/inspect.js.map +1 -1
- package/lib/common/package.d.ts +11 -11
- package/lib/common/package.js +36 -18
- package/lib/common/package.js.map +1 -1
- package/lib/injectors/pilet-injector.d.ts +8 -6
- package/lib/injectors/pilet-injector.js +46 -25
- package/lib/injectors/pilet-injector.js.map +1 -1
- package/lib/types/internal.d.ts +23 -3
- package/package.json +2 -2
- package/src/common/importmap.ts +1 -6
- package/src/common/inspect.ts +5 -5
- package/src/common/package.test.ts +3 -1
- package/src/common/package.ts +56 -38
- package/src/injectors/pilet-injector.test.ts +3 -9
- package/src/injectors/pilet-injector.ts +59 -38
- package/src/types/internal.ts +32 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAoD;AACpD,+BAAkC;AAClC,uCAAgD;AAChD,iCAAqC;AACrC,6BAAkF;AAClF,+BAA0C;
|
|
1
|
+
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
|
package/lib/common/inspect.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { PackageData, PackageFiles } from '../types';
|
|
3
|
-
export declare function getPossiblePiletMainPaths(data:
|
|
4
|
-
export declare function getPiletMainPath(data:
|
|
5
|
-
export interface
|
|
2
|
+
import { PiletPackageData, PackageData, PackageFiles } from '../types';
|
|
3
|
+
export declare function getPossiblePiletMainPaths(data: PiletPackageData): string[];
|
|
4
|
+
export declare function getPiletMainPath(data: PiletPackageData, files: PackageFiles): string;
|
|
5
|
+
export interface InspectedPiletPackageData extends PiletPackageData {
|
|
6
6
|
root: string;
|
|
7
7
|
}
|
|
8
8
|
export declare function inspectPackage(stream: NodeJS.ReadableStream): Promise<PackageData>;
|
|
9
|
-
export declare function inspectPilet(stream: NodeJS.ReadableStream): Promise<
|
|
9
|
+
export declare function inspectPilet(stream: NodeJS.ReadableStream): Promise<InspectedPiletPackageData>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/common/inspect.ts"],"names":[],"mappings":";;;AAAA,+BAAyC;AACzC,uCAAwC;AACxC,0CAAkC;AAGlC,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B,SAAS,cAAc,CAAC,KAAmB;IACzC,MAAM,QAAQ,GAAG,GAAG,WAAW,cAAc,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,cAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,yBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/common/inspect.ts"],"names":[],"mappings":";;;AAAA,+BAAyC;AACzC,uCAAwC;AACxC,0CAAkC;AAGlC,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B,SAAS,cAAc,CAAC,KAAmB;IACzC,MAAM,QAAQ,GAAG,GAAG,WAAW,cAAc,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,cAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAsB;IAC9D,MAAM,EAAE,IAAI,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,EAAE,GAAG,IAAI,WAAW,EAAE,QAAQ,IAAI,WAAW,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;AAC1G,CAAC;AAHD,8DAGC;AAED,SAAgB,gBAAgB,CAAC,IAAsB,EAAE,KAAmB;IAC1E,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,WAAW,GAAG,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpG,CAAC;AAHD,4CAGC;AAMD,SAAgB,cAAc,CAAC,MAA6B;IAC1D,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,MAA6B;IACxD,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;QAC5B,uCACK,IAAI,KACP,IAAI;YACJ,IAAI,IACJ;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,oCAYC"}
|
package/lib/common/package.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { ForceOverwrite } from './enums';
|
|
2
|
-
import { SourceLanguage, Framework, FileInfo, PiletsInfo, TemplateFileLocation,
|
|
3
|
-
export
|
|
4
|
-
export declare function readPiralPackage(root: string, name: string): Promise<PackageData>;
|
|
5
|
-
export interface PiralPackageData {
|
|
2
|
+
import { SourceLanguage, Framework, FileInfo, PiletsInfo, TemplateFileLocation, PiralPackageData, SharedDependency } from '../types';
|
|
3
|
+
export interface PiralInstanceData {
|
|
6
4
|
packageName: Framework;
|
|
7
5
|
language: SourceLanguage;
|
|
8
6
|
reactVersion: number;
|
|
9
7
|
reactRouterVersion: number;
|
|
10
8
|
}
|
|
11
|
-
export declare function
|
|
12
|
-
export declare function
|
|
9
|
+
export declare function getPiralPath(root: string, name: string): string;
|
|
10
|
+
export declare function readPiralPackage(root: string, name: string): Promise<PiralPackageData>;
|
|
11
|
+
export declare function patchPiralPackage(root: string, app: string, data: PiralInstanceData, version: string, bundler?: string): Promise<void>;
|
|
12
|
+
export declare function getPiralPackage(app: string, data: PiralInstanceData, version: string, bundler?: string): Promise<{
|
|
13
13
|
app: string;
|
|
14
14
|
scripts: {
|
|
15
15
|
start: string;
|
|
@@ -32,8 +32,8 @@ export declare function getFileStats(root: string, name: string, fileMap?: Array
|
|
|
32
32
|
changed: boolean;
|
|
33
33
|
}[]>;
|
|
34
34
|
export declare function copyScaffoldingFiles(source: string, target: string, files: Array<string | TemplateFileLocation>, piralInfo?: any, variables?: Record<string, string>): Promise<void>;
|
|
35
|
-
export declare function copyPiralFiles(root: string, name: string, piralInfo:
|
|
36
|
-
export declare function getPiletsInfo(piralInfo: Partial<
|
|
35
|
+
export declare function copyPiralFiles(root: string, name: string, piralInfo: PiralPackageData, forceOverwrite: ForceOverwrite, variables: Record<string, string>, originalFiles?: Array<FileInfo>): Promise<void>;
|
|
36
|
+
export declare function getPiletsInfo(piralInfo: Partial<PiralPackageData>): PiletsInfo;
|
|
37
37
|
export declare function retrievePiralRoot(baseDir: string, entry: string): Promise<string>;
|
|
38
38
|
export declare function findDependencyVersion(pckg: Record<string, any>, rootPath: string, packageName: string): Promise<string>;
|
|
39
39
|
export declare function findPackageVersion(rootPath: string, packageName: string): Promise<string>;
|
|
@@ -61,18 +61,18 @@ export declare function retrievePiletsInfo(entryFile: string): Promise<{
|
|
|
61
61
|
postUpgrade: string;
|
|
62
62
|
}>;
|
|
63
63
|
export declare function isValidDependency(name: string): boolean;
|
|
64
|
-
export declare function patchPiletPackage(root: string, name: string, version: string, piralInfo:
|
|
64
|
+
export declare function patchPiletPackage(root: string, name: string, version: string, piralInfo: PiralPackageData, fromEmulator: boolean, newInfo?: {
|
|
65
65
|
language: SourceLanguage;
|
|
66
66
|
bundler: string;
|
|
67
67
|
}): Promise<void>;
|
|
68
|
-
export declare function getPiletPackage(root: string, name: string, version: string, piralInfo:
|
|
68
|
+
export declare function getPiletPackage(root: string, name: string, version: string, piralInfo: PiralPackageData, fromEmulator: boolean, newInfo?: {
|
|
69
69
|
language: SourceLanguage;
|
|
70
70
|
bundler: string;
|
|
71
71
|
}): Promise<any>;
|
|
72
72
|
/**
|
|
73
73
|
* Returns true if its an emulator package, otherwise it has to be a "raw" app shell.
|
|
74
74
|
*/
|
|
75
|
-
export declare function checkAppShellPackage(appPackage:
|
|
75
|
+
export declare function checkAppShellPackage(appPackage: PiralPackageData): boolean;
|
|
76
76
|
export declare function combinePiletExternals(appShells: Array<string>, peerDependencies: Record<string, string>, peerModules: Array<string>, importmap: Array<SharedDependency>): string[];
|
|
77
77
|
export declare function retrievePiletData(target: string, app?: string): Promise<{
|
|
78
78
|
dependencies: any;
|
package/lib/common/package.js
CHANGED
|
@@ -128,27 +128,41 @@ function getPiralPath(root, name) {
|
|
|
128
128
|
return (0, path_1.dirname)(path);
|
|
129
129
|
}
|
|
130
130
|
exports.getPiralPath = getPiralPath;
|
|
131
|
-
function findPackage(
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
131
|
+
function findPackage(proposedApps, piletPackage, piletDefinition, baseDir) {
|
|
132
|
+
var _a;
|
|
133
|
+
if (piletDefinition) {
|
|
134
|
+
const availableApps = Object.keys(piletDefinition.piralInstances || {});
|
|
135
|
+
if (!proposedApps) {
|
|
136
|
+
proposedApps = availableApps.filter(m => piletDefinition.piralInstances[m].selected);
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
proposedApps = proposedApps.filter(m => availableApps.includes(m));
|
|
138
140
|
}
|
|
139
141
|
}
|
|
140
142
|
else {
|
|
141
|
-
const
|
|
142
|
-
if (
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
appPackage.app = relPath && (0, path_1.resolve)(root, relPath);
|
|
148
|
-
appPackage.root = root;
|
|
149
|
-
return appPackage;
|
|
143
|
+
const availableApps = [(_a = piletPackage.piral) === null || _a === void 0 ? void 0 : _a.name].filter(Boolean);
|
|
144
|
+
if (!proposedApps) {
|
|
145
|
+
proposedApps = availableApps;
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
proposedApps = proposedApps.filter(m => availableApps.includes(m));
|
|
150
149
|
}
|
|
151
150
|
}
|
|
151
|
+
if (proposedApps.length === 0) {
|
|
152
|
+
return undefined;
|
|
153
|
+
}
|
|
154
|
+
//TODO Right now let's just pick the first
|
|
155
|
+
const [proposedApp] = proposedApps;
|
|
156
|
+
const path = (0, npm_2.findPackageRoot)(proposedApp, baseDir);
|
|
157
|
+
if (path) {
|
|
158
|
+
(0, log_1.log)('generalDebug_0003', `Following the app package in "${path}" ...`);
|
|
159
|
+
const appPackage = require(path);
|
|
160
|
+
const root = (0, path_1.dirname)(path);
|
|
161
|
+
const relPath = appPackage && appPackage.app;
|
|
162
|
+
appPackage.app = relPath && (0, path_1.resolve)(root, relPath);
|
|
163
|
+
appPackage.root = root;
|
|
164
|
+
return appPackage;
|
|
165
|
+
}
|
|
152
166
|
return undefined;
|
|
153
167
|
}
|
|
154
168
|
function readPiralPackage(root, name) {
|
|
@@ -523,13 +537,17 @@ function combinePiletExternals(appShells, peerDependencies, peerModules, importm
|
|
|
523
537
|
exports.combinePiletExternals = combinePiletExternals;
|
|
524
538
|
function retrievePiletData(target, app) {
|
|
525
539
|
return __awaiter(this, void 0, void 0, function* () {
|
|
526
|
-
const
|
|
540
|
+
const piletJson = yield (0, io_2.findFile)(target, 'pilet.json');
|
|
541
|
+
const proposedRoot = piletJson ? (0, path_1.dirname)(piletJson) : target;
|
|
542
|
+
const packageJson = yield (0, io_2.findFile)(proposedRoot, 'package.json');
|
|
543
|
+
console.log(piletJson, proposedRoot, packageJson);
|
|
527
544
|
if (!packageJson) {
|
|
528
545
|
(0, log_1.fail)('packageJsonMissing_0075');
|
|
529
546
|
}
|
|
530
547
|
const root = (0, path_1.dirname)(packageJson);
|
|
531
548
|
const piletPackage = require(packageJson);
|
|
532
|
-
const
|
|
549
|
+
const piletDefinition = piletJson && require(piletJson);
|
|
550
|
+
const appPackage = findPackage(app && [app], piletPackage, piletDefinition, target);
|
|
533
551
|
const appFile = appPackage === null || appPackage === void 0 ? void 0 : appPackage.app;
|
|
534
552
|
const appRoot = appPackage === null || appPackage === void 0 ? void 0 : appPackage.root;
|
|
535
553
|
if (!appFile || !appRoot) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { Bundler } from '../types';
|
|
|
6
6
|
interface Pilet {
|
|
7
7
|
bundler: Bundler;
|
|
8
8
|
root: string;
|
|
9
|
-
|
|
9
|
+
getMeta(basePath: string): PiletMetadata;
|
|
10
10
|
}
|
|
11
11
|
export interface PiletInjectorConfig extends KrasInjectorConfig {
|
|
12
12
|
pilets: Array<Pilet>;
|
|
@@ -23,21 +23,23 @@ interface PiletMetadata {
|
|
|
23
23
|
}
|
|
24
24
|
export default class PiletInjector implements KrasInjector {
|
|
25
25
|
config: PiletInjectorConfig;
|
|
26
|
-
private
|
|
26
|
+
private serverConfig;
|
|
27
27
|
private indexPath;
|
|
28
|
-
constructor(
|
|
28
|
+
constructor(config: PiletInjectorConfig, serverConfig: KrasConfiguration, core: EventEmitter);
|
|
29
29
|
get active(): boolean;
|
|
30
30
|
set active(value: boolean);
|
|
31
31
|
get name(): string;
|
|
32
32
|
getOptions(): {};
|
|
33
33
|
setOptions(): void;
|
|
34
|
-
|
|
34
|
+
getPiletApi(baseUrl: string): string;
|
|
35
|
+
getPiletMeta(baseUrl: string, pilet: Pilet): string;
|
|
36
|
+
getIndexMeta(baseUrl: string): Promise<string>;
|
|
35
37
|
loadRemoteFeed(feed?: string | Array<string>): Promise<Array<Array<PiletMetadata>>>;
|
|
36
38
|
mergePilets(localPilets: Array<PiletMetadata>, remoteFeeds: Array<Array<PiletMetadata>>): PiletMetadata[];
|
|
37
39
|
sendContent(content: Buffer | string, type: string, url: string): KrasResponse;
|
|
38
40
|
sendFile(target: string, url: string): KrasResponse;
|
|
39
|
-
sendResponse(path: string, url: string): Promise<KrasResult>;
|
|
40
|
-
sendIndexFile(target: string, url: string): KrasResponse;
|
|
41
|
+
sendResponse(path: string, url: string, baseUrl: string): Promise<KrasResult>;
|
|
42
|
+
sendIndexFile(target: string, url: string, baseUrl: string): KrasResponse;
|
|
41
43
|
handle(req: KrasRequest): KrasResponse;
|
|
42
44
|
}
|
|
43
45
|
export {};
|
|
@@ -16,8 +16,7 @@ const log_1 = require("../common/log");
|
|
|
16
16
|
const spec_1 = require("../common/spec");
|
|
17
17
|
const config_1 = require("../common/config");
|
|
18
18
|
const external_1 = require("../external");
|
|
19
|
-
|
|
20
|
-
function fillPiletMeta(pilet, basePath, metaFile) {
|
|
19
|
+
function fillPiletMeta(pilet, metaFile, subPath) {
|
|
21
20
|
const { root, bundler } = pilet;
|
|
22
21
|
const metaPath = (0, path_1.join)(root, metaFile);
|
|
23
22
|
const packagePath = (0, path_1.join)(root, 'package.json');
|
|
@@ -25,10 +24,11 @@ function fillPiletMeta(pilet, basePath, metaFile) {
|
|
|
25
24
|
const metaOverride = (0, fs_1.existsSync)(metaPath) ? external_1.jju.parse((0, fs_1.readFileSync)(metaPath, 'utf8')) : undefined;
|
|
26
25
|
const file = bundler.bundle.name.replace(/^[\/\\]/, '');
|
|
27
26
|
const target = (0, path_1.join)(bundler.bundle.dir, file);
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
pilet.getMeta = (parentPath) => {
|
|
28
|
+
const basePath = `${parentPath}${subPath}`;
|
|
29
|
+
const url = new url_1.URL(file, basePath);
|
|
30
|
+
return Object.assign(Object.assign(Object.assign({ custom: def.custom, config: def.piletConfig }, metaOverride), { name: def.name, version: def.version, link: `${url.href}?updated=${Date.now()}` }), (0, spec_1.getPiletSpecMeta)(target, basePath));
|
|
31
|
+
};
|
|
32
32
|
}
|
|
33
33
|
function loadFeed(feed) {
|
|
34
34
|
var _a;
|
|
@@ -51,29 +51,30 @@ function loadFeed(feed) {
|
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
class PiletInjector {
|
|
54
|
-
constructor(
|
|
55
|
-
this.config =
|
|
54
|
+
constructor(config, serverConfig, core) {
|
|
55
|
+
this.config = config;
|
|
56
|
+
this.serverConfig = serverConfig;
|
|
56
57
|
if (this.config.active) {
|
|
57
|
-
|
|
58
|
-
this.piletApi = /^https?:/.test(options.api)
|
|
59
|
-
? options.api
|
|
60
|
-
: `${config.ssl ? 'https' : 'http'}://${host}:${config.port}${options.api}`;
|
|
61
|
-
const { pilets, api, publicUrl } = options;
|
|
58
|
+
const { pilets, api, publicUrl } = config;
|
|
62
59
|
this.indexPath = `${publicUrl}index.html`;
|
|
63
60
|
const cbs = {};
|
|
64
61
|
core.on('user-connected', (e) => {
|
|
65
62
|
if (e.target === '*' && e.url === api.substring(1)) {
|
|
66
|
-
cbs[e.id] =
|
|
63
|
+
cbs[e.id] = {
|
|
64
|
+
baseUrl: e.req.headers.origin,
|
|
65
|
+
notify: (msg) => e.ws.send(msg),
|
|
66
|
+
};
|
|
67
67
|
}
|
|
68
68
|
});
|
|
69
69
|
core.on('user-disconnected', (e) => {
|
|
70
70
|
delete cbs[e.id];
|
|
71
71
|
});
|
|
72
72
|
pilets.forEach((p, i) => p.bundler.on(() => {
|
|
73
|
-
|
|
74
|
-
const meta = fillPiletMeta(p, basePath, options.meta);
|
|
73
|
+
fillPiletMeta(p, config.meta, `/${i}/`);
|
|
75
74
|
for (const id of Object.keys(cbs)) {
|
|
76
|
-
cbs[id]
|
|
75
|
+
const { baseUrl, notify } = cbs[id];
|
|
76
|
+
const meta = this.getPiletMeta(baseUrl, p);
|
|
77
|
+
notify(meta);
|
|
77
78
|
}
|
|
78
79
|
}));
|
|
79
80
|
}
|
|
@@ -91,10 +92,29 @@ class PiletInjector {
|
|
|
91
92
|
return {};
|
|
92
93
|
}
|
|
93
94
|
setOptions() { }
|
|
94
|
-
|
|
95
|
+
getPiletApi(baseUrl) {
|
|
96
|
+
const { api } = this.config;
|
|
97
|
+
if (/^https?:/.test(api)) {
|
|
98
|
+
return api;
|
|
99
|
+
}
|
|
100
|
+
else if (baseUrl) {
|
|
101
|
+
return `${baseUrl}${api}`;
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
const { ssl, port } = this.serverConfig;
|
|
105
|
+
const { host } = config_1.config;
|
|
106
|
+
return `${ssl ? 'https' : 'http'}://${host}:${port}${api}`;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
getPiletMeta(baseUrl, pilet) {
|
|
110
|
+
const basePath = this.getPiletApi(baseUrl);
|
|
111
|
+
return JSON.stringify(pilet.getMeta(basePath));
|
|
112
|
+
}
|
|
113
|
+
getIndexMeta(baseUrl) {
|
|
95
114
|
return __awaiter(this, void 0, void 0, function* () {
|
|
96
115
|
const { pilets, feed } = this.config;
|
|
97
|
-
const
|
|
116
|
+
const basePath = this.getPiletApi(baseUrl);
|
|
117
|
+
const localPilets = pilets.map((pilet) => { var _a; return (_a = pilet.getMeta) === null || _a === void 0 ? void 0 : _a.call(pilet, basePath); }).filter(Boolean);
|
|
98
118
|
const mergedPilets = this.mergePilets(localPilets, yield this.loadRemoteFeed(feed));
|
|
99
119
|
return JSON.stringify(mergedPilets);
|
|
100
120
|
});
|
|
@@ -136,7 +156,7 @@ class PiletInjector {
|
|
|
136
156
|
const type = (_a = external_1.mime.getType(target)) !== null && _a !== void 0 ? _a : 'application/octet-stream';
|
|
137
157
|
return this.sendContent(content, type, url);
|
|
138
158
|
}
|
|
139
|
-
sendResponse(path, url) {
|
|
159
|
+
sendResponse(path, url, baseUrl) {
|
|
140
160
|
return __awaiter(this, void 0, void 0, function* () {
|
|
141
161
|
const { pilets } = this.config;
|
|
142
162
|
const [index, ...rest] = path.split('/');
|
|
@@ -144,7 +164,7 @@ class PiletInjector {
|
|
|
144
164
|
const bundler = pilet === null || pilet === void 0 ? void 0 : pilet.bundler;
|
|
145
165
|
if (!path) {
|
|
146
166
|
yield (bundler === null || bundler === void 0 ? void 0 : bundler.ready());
|
|
147
|
-
const content = yield this.
|
|
167
|
+
const content = yield this.getIndexMeta(baseUrl);
|
|
148
168
|
return this.sendContent(content, 'application/json', url);
|
|
149
169
|
}
|
|
150
170
|
else {
|
|
@@ -157,10 +177,10 @@ class PiletInjector {
|
|
|
157
177
|
}
|
|
158
178
|
});
|
|
159
179
|
}
|
|
160
|
-
sendIndexFile(target, url) {
|
|
180
|
+
sendIndexFile(target, url, baseUrl) {
|
|
161
181
|
const indexHtml = (0, fs_1.readFileSync)(target, 'utf8');
|
|
162
182
|
// mechanism to inject server side debug piletApi config into piral emulator
|
|
163
|
-
const windowInjectionScript = `window['dbg:pilet-api'] = '${this.
|
|
183
|
+
const windowInjectionScript = `window['dbg:pilet-api'] = '${this.getPiletApi(baseUrl)}';`;
|
|
164
184
|
const findStr = `<script`;
|
|
165
185
|
const replaceStr = `<script>/* Pilet Debugging Emulator Config Injection */${windowInjectionScript}</script><script`;
|
|
166
186
|
const content = indexHtml.replace(`${findStr}`, `${replaceStr}`);
|
|
@@ -168,13 +188,14 @@ class PiletInjector {
|
|
|
168
188
|
}
|
|
169
189
|
handle(req) {
|
|
170
190
|
const { app, api, publicUrl } = this.config;
|
|
191
|
+
const baseUrl = req.headers.host ? `${req.encrypted ? 'https' : 'http'}://${req.headers.host}` : undefined;
|
|
171
192
|
if (!req.target) {
|
|
172
193
|
if (req.url.startsWith(publicUrl)) {
|
|
173
194
|
const path = req.url.substring(publicUrl.length).split('?')[0];
|
|
174
195
|
const target = (0, path_1.join)(app, path);
|
|
175
196
|
if ((0, fs_1.existsSync)(target) && (0, fs_1.statSync)(target).isFile()) {
|
|
176
197
|
if (req.url === this.indexPath) {
|
|
177
|
-
return this.sendIndexFile(target, req.url);
|
|
198
|
+
return this.sendIndexFile(target, req.url, baseUrl);
|
|
178
199
|
}
|
|
179
200
|
else {
|
|
180
201
|
return this.sendFile(target, req.url);
|
|
@@ -188,7 +209,7 @@ class PiletInjector {
|
|
|
188
209
|
}
|
|
189
210
|
else if (req.target === api) {
|
|
190
211
|
const path = req.url.substring(1).split('?')[0];
|
|
191
|
-
return this.sendResponse(path, req.url);
|
|
212
|
+
return this.sendResponse(path, req.url, baseUrl);
|
|
192
213
|
}
|
|
193
214
|
}
|
|
194
215
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet-injector.js","sourceRoot":"","sources":["../../src/injectors/pilet-injector.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAA0B;AAC1B,+BAA4B;AAE5B,2BAAwD;AAExD,uCAAoC;AACpC,yCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"pilet-injector.js","sourceRoot":"","sources":["../../src/injectors/pilet-injector.ts"],"names":[],"mappings":"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"}
|
package/lib/types/internal.d.ts
CHANGED
|
@@ -1,24 +1,44 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { LogLevels, PiletsInfo } from './common';
|
|
3
|
+
export interface Importmap {
|
|
4
|
+
imports: Record<string, string>;
|
|
5
|
+
inherit: Array<string>;
|
|
6
|
+
}
|
|
3
7
|
export interface PackageData {
|
|
4
8
|
name: string;
|
|
5
9
|
version: string;
|
|
6
10
|
description: string;
|
|
11
|
+
importmap?: Importmap;
|
|
7
12
|
main: string;
|
|
8
13
|
author: string | {
|
|
9
14
|
name?: string;
|
|
10
15
|
url?: string;
|
|
11
16
|
email?: string;
|
|
12
17
|
};
|
|
18
|
+
dependencies: Record<string, string>;
|
|
19
|
+
peerDependencies: Record<string, string>;
|
|
20
|
+
devDependencies: Record<string, string>;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Shape of the pilet.json
|
|
24
|
+
*/
|
|
25
|
+
export interface PiletDefinition {
|
|
26
|
+
piralInstances?: Record<string, {
|
|
27
|
+
selected?: boolean;
|
|
28
|
+
}>;
|
|
29
|
+
}
|
|
30
|
+
export interface PiletPackageData extends PackageData {
|
|
31
|
+
piral?: {
|
|
32
|
+
name: string;
|
|
33
|
+
};
|
|
13
34
|
custom?: any;
|
|
35
|
+
}
|
|
36
|
+
export interface PiralPackageData extends PackageData {
|
|
14
37
|
pilets?: PiletsInfo;
|
|
15
38
|
piralCLI?: {
|
|
16
39
|
generated: boolean;
|
|
17
40
|
version: string;
|
|
18
41
|
};
|
|
19
|
-
dependencies: Record<string, string>;
|
|
20
|
-
peerDependencies: Record<string, string>;
|
|
21
|
-
devDependencies: Record<string, string>;
|
|
22
42
|
}
|
|
23
43
|
export interface PackageFiles {
|
|
24
44
|
[file: string]: Buffer;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.15.0-beta.
|
|
3
|
+
"version": "0.15.0-beta.4560",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"typescript": "^4.7.3",
|
|
79
79
|
"yargs": "^15.4.1"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "b4fa0e9b24f7b8e340dc3a32d0e37d21b3d26c3d"
|
|
82
82
|
}
|
package/src/common/importmap.ts
CHANGED
|
@@ -4,12 +4,7 @@ import { satisfies, validate } from './version';
|
|
|
4
4
|
import { computeHash } from './hash';
|
|
5
5
|
import { getHash, readJson, findFile, checkExists, checkIsDirectory } from './io';
|
|
6
6
|
import { tryResolvePackage } from './npm';
|
|
7
|
-
import { SharedDependency } from '../types';
|
|
8
|
-
|
|
9
|
-
interface Importmap {
|
|
10
|
-
imports: Record<string, string>;
|
|
11
|
-
inherit: Array<string>;
|
|
12
|
-
}
|
|
7
|
+
import { SharedDependency, Importmap } from '../types';
|
|
13
8
|
|
|
14
9
|
const shorthandsUrls = ['', '.', '...'];
|
|
15
10
|
|
package/src/common/inspect.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { dirname, basename } from 'path';
|
|
2
2
|
import { unpackGzTar } from './archive';
|
|
3
3
|
import { jju } from '../external';
|
|
4
|
-
import { PackageData, PackageFiles } from '../types';
|
|
4
|
+
import { PiletPackageData, PackageData, PackageFiles } from '../types';
|
|
5
5
|
|
|
6
6
|
const packageRoot = 'package/';
|
|
7
7
|
|
|
@@ -12,17 +12,17 @@ function getPackageJson(files: PackageFiles): PackageData {
|
|
|
12
12
|
return jju.parse(content);
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
export function getPossiblePiletMainPaths(data:
|
|
15
|
+
export function getPossiblePiletMainPaths(data: PiletPackageData) {
|
|
16
16
|
const { main = 'index.js' } = data;
|
|
17
17
|
return [main, `dist/${main}`, `${main}/index.js`, `dist/${main}/index.js`, 'index.js', 'dist/index.js'];
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
export function getPiletMainPath(data:
|
|
20
|
+
export function getPiletMainPath(data: PiletPackageData, files: PackageFiles) {
|
|
21
21
|
const paths = getPossiblePiletMainPaths(data);
|
|
22
22
|
return paths.map((filePath) => `${packageRoot}${filePath}`).find((filePath) => !!files[filePath]);
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
export interface
|
|
25
|
+
export interface InspectedPiletPackageData extends PiletPackageData {
|
|
26
26
|
root: string;
|
|
27
27
|
}
|
|
28
28
|
|
|
@@ -30,7 +30,7 @@ export function inspectPackage(stream: NodeJS.ReadableStream): Promise<PackageDa
|
|
|
30
30
|
return unpackGzTar(stream).then((files) => getPackageJson(files));
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
export function inspectPilet(stream: NodeJS.ReadableStream): Promise<
|
|
33
|
+
export function inspectPilet(stream: NodeJS.ReadableStream): Promise<InspectedPiletPackageData> {
|
|
34
34
|
return unpackGzTar(stream).then((files) => {
|
|
35
35
|
const data = getPackageJson(files);
|
|
36
36
|
const path = getPiletMainPath(data, files);
|
|
@@ -2,6 +2,8 @@ import { findPackageVersion, getPiralPackage, getPiletsInfo, retrievePiletData }
|
|
|
2
2
|
import { cliVersion } from './info';
|
|
3
3
|
|
|
4
4
|
describe('CLI package module', () => {
|
|
5
|
+
jest.setTimeout(15000);
|
|
6
|
+
|
|
5
7
|
it('findPackageVersion finds the current package version', async () => {
|
|
6
8
|
const version = await findPackageVersion(process.cwd(), 'sample-piral');
|
|
7
9
|
expect(version).toBe(cliVersion);
|
|
@@ -99,7 +101,7 @@ describe('CLI package module', () => {
|
|
|
99
101
|
await retrievePiletData('foo', '').catch((err) =>
|
|
100
102
|
expect(err).toStrictEqual(Error('[0011] Could not find a valid Piral instance.')),
|
|
101
103
|
);
|
|
102
|
-
await retrievePiletData('foo', 'sample-piral').catch((err) =>
|
|
104
|
+
await retrievePiletData('/foo', 'sample-piral').catch((err) =>
|
|
103
105
|
expect(err).toStrictEqual(
|
|
104
106
|
Error('[0075] Cannot find the "package.json". You need a valid package.json for your pilet.'),
|
|
105
107
|
),
|
package/src/common/package.ts
CHANGED
|
@@ -18,10 +18,19 @@ import {
|
|
|
18
18
|
FileInfo,
|
|
19
19
|
PiletsInfo,
|
|
20
20
|
TemplateFileLocation,
|
|
21
|
-
|
|
21
|
+
PiletPackageData,
|
|
22
|
+
PiralPackageData,
|
|
22
23
|
SharedDependency,
|
|
24
|
+
PiletDefinition,
|
|
23
25
|
} from '../types';
|
|
24
26
|
|
|
27
|
+
export interface PiralInstanceData {
|
|
28
|
+
packageName: Framework;
|
|
29
|
+
language: SourceLanguage;
|
|
30
|
+
reactVersion: number;
|
|
31
|
+
reactRouterVersion: number;
|
|
32
|
+
}
|
|
33
|
+
|
|
25
34
|
async function appendBundler(devDependencies: Record<string, string>, bundler: string, proposedVersion: string) {
|
|
26
35
|
if (bundler && bundler !== 'none') {
|
|
27
36
|
if (isValidDependency(bundler)) {
|
|
@@ -140,49 +149,56 @@ export function getPiralPath(root: string, name: string) {
|
|
|
140
149
|
return dirname(path);
|
|
141
150
|
}
|
|
142
151
|
|
|
143
|
-
function findPackage(
|
|
144
|
-
if (
|
|
145
|
-
|
|
146
|
-
const result = findPackage(item, baseDir);
|
|
152
|
+
function findPackage(proposedApps: Array<string>, piletPackage: PiletPackageData, piletDefinition: undefined | PiletDefinition, baseDir: string) {
|
|
153
|
+
if (piletDefinition) {
|
|
154
|
+
const availableApps = Object.keys(piletDefinition.piralInstances || {});
|
|
147
155
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
156
|
+
if (!proposedApps) {
|
|
157
|
+
proposedApps = availableApps.filter(m => piletDefinition.piralInstances[m].selected);
|
|
158
|
+
} else {
|
|
159
|
+
proposedApps = proposedApps.filter(m => availableApps.includes(m));
|
|
151
160
|
}
|
|
152
161
|
} else {
|
|
153
|
-
const
|
|
154
|
-
|
|
155
|
-
if (
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
const relPath = appPackage && appPackage.app;
|
|
160
|
-
appPackage.app = relPath && resolve(root, relPath);
|
|
161
|
-
appPackage.root = root;
|
|
162
|
-
return appPackage;
|
|
162
|
+
const availableApps = [piletPackage.piral?.name].filter(Boolean);
|
|
163
|
+
|
|
164
|
+
if (!proposedApps) {
|
|
165
|
+
proposedApps = availableApps;
|
|
166
|
+
} else {
|
|
167
|
+
proposedApps = proposedApps.filter(m => availableApps.includes(m));
|
|
163
168
|
}
|
|
164
169
|
}
|
|
165
170
|
|
|
171
|
+
if (proposedApps.length === 0) {
|
|
172
|
+
return undefined;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
//TODO Right now let's just pick the first
|
|
176
|
+
const [proposedApp] = proposedApps;
|
|
177
|
+
const path = findPackageRoot(proposedApp, baseDir);
|
|
178
|
+
|
|
179
|
+
if (path) {
|
|
180
|
+
log('generalDebug_0003', `Following the app package in "${path}" ...`);
|
|
181
|
+
const appPackage = require(path);
|
|
182
|
+
const root = dirname(path);
|
|
183
|
+
const relPath = appPackage && appPackage.app;
|
|
184
|
+
appPackage.app = relPath && resolve(root, relPath);
|
|
185
|
+
appPackage.root = root;
|
|
186
|
+
return appPackage;
|
|
187
|
+
}
|
|
188
|
+
|
|
166
189
|
return undefined;
|
|
167
190
|
}
|
|
168
191
|
|
|
169
|
-
export function readPiralPackage(root: string, name: string): Promise<
|
|
192
|
+
export function readPiralPackage(root: string, name: string): Promise<PiralPackageData> {
|
|
170
193
|
log('generalDebug_0003', `Reading the piral package in "${root}" ...`);
|
|
171
194
|
const path = getPiralPath(root, name);
|
|
172
195
|
return readJson(path, 'package.json');
|
|
173
196
|
}
|
|
174
197
|
|
|
175
|
-
export interface PiralPackageData {
|
|
176
|
-
packageName: Framework;
|
|
177
|
-
language: SourceLanguage;
|
|
178
|
-
reactVersion: number;
|
|
179
|
-
reactRouterVersion: number;
|
|
180
|
-
}
|
|
181
|
-
|
|
182
198
|
export async function patchPiralPackage(
|
|
183
199
|
root: string,
|
|
184
200
|
app: string,
|
|
185
|
-
data:
|
|
201
|
+
data: PiralInstanceData,
|
|
186
202
|
version: string,
|
|
187
203
|
bundler?: string,
|
|
188
204
|
) {
|
|
@@ -196,7 +212,7 @@ export async function patchPiralPackage(
|
|
|
196
212
|
log('generalDebug_0003', `Succesfully patched the pilet.json.`);
|
|
197
213
|
}
|
|
198
214
|
|
|
199
|
-
export async function getPiralPackage(app: string, data:
|
|
215
|
+
export async function getPiralPackage(app: string, data: PiralInstanceData, version: string, bundler?: string) {
|
|
200
216
|
const framework = data.packageName;
|
|
201
217
|
const devDependencies = {
|
|
202
218
|
...getDevDependencies(
|
|
@@ -359,7 +375,7 @@ function tryFindPackageVersion(packageName: string): string {
|
|
|
359
375
|
export async function copyPiralFiles(
|
|
360
376
|
root: string,
|
|
361
377
|
name: string,
|
|
362
|
-
piralInfo:
|
|
378
|
+
piralInfo: PiralPackageData,
|
|
363
379
|
forceOverwrite: ForceOverwrite,
|
|
364
380
|
variables: Record<string, string>,
|
|
365
381
|
originalFiles?: Array<FileInfo>,
|
|
@@ -379,7 +395,7 @@ export async function copyPiralFiles(
|
|
|
379
395
|
await copyFiles(files, forceOverwrite, originalFiles, variables);
|
|
380
396
|
}
|
|
381
397
|
|
|
382
|
-
export function getPiletsInfo(piralInfo: Partial<
|
|
398
|
+
export function getPiletsInfo(piralInfo: Partial<PiralPackageData>): PiletsInfo {
|
|
383
399
|
const {
|
|
384
400
|
files = [],
|
|
385
401
|
scripts = {},
|
|
@@ -538,7 +554,7 @@ export async function patchPiletPackage(
|
|
|
538
554
|
root: string,
|
|
539
555
|
name: string,
|
|
540
556
|
version: string,
|
|
541
|
-
piralInfo:
|
|
557
|
+
piralInfo: PiralPackageData,
|
|
542
558
|
fromEmulator: boolean,
|
|
543
559
|
newInfo?: { language: SourceLanguage; bundler: string },
|
|
544
560
|
) {
|
|
@@ -560,7 +576,7 @@ export async function getPiletPackage(
|
|
|
560
576
|
root: string,
|
|
561
577
|
name: string,
|
|
562
578
|
version: string,
|
|
563
|
-
piralInfo:
|
|
579
|
+
piralInfo: PiralPackageData,
|
|
564
580
|
fromEmulator: boolean,
|
|
565
581
|
newInfo?: { language: SourceLanguage; bundler: string },
|
|
566
582
|
) {
|
|
@@ -624,7 +640,7 @@ export async function getPiletPackage(
|
|
|
624
640
|
/**
|
|
625
641
|
* Returns true if its an emulator package, otherwise it has to be a "raw" app shell.
|
|
626
642
|
*/
|
|
627
|
-
export function checkAppShellPackage(appPackage:
|
|
643
|
+
export function checkAppShellPackage(appPackage: PiralPackageData) {
|
|
628
644
|
const { piralCLI = { generated: false, version: cliVersion } } = appPackage;
|
|
629
645
|
|
|
630
646
|
if (piralCLI.generated) {
|
|
@@ -665,7 +681,11 @@ export function combinePiletExternals(
|
|
|
665
681
|
}
|
|
666
682
|
|
|
667
683
|
export async function retrievePiletData(target: string, app?: string) {
|
|
668
|
-
const
|
|
684
|
+
const piletJson = await findFile(target, 'pilet.json');
|
|
685
|
+
const proposedRoot = piletJson ? dirname(piletJson) : target;
|
|
686
|
+
const packageJson = await findFile(proposedRoot, 'package.json');
|
|
687
|
+
|
|
688
|
+
console.log(piletJson, proposedRoot, packageJson);
|
|
669
689
|
|
|
670
690
|
if (!packageJson) {
|
|
671
691
|
fail('packageJsonMissing_0075');
|
|
@@ -673,10 +693,8 @@ export async function retrievePiletData(target: string, app?: string) {
|
|
|
673
693
|
|
|
674
694
|
const root = dirname(packageJson);
|
|
675
695
|
const piletPackage = require(packageJson);
|
|
676
|
-
const
|
|
677
|
-
|
|
678
|
-
target,
|
|
679
|
-
);
|
|
696
|
+
const piletDefinition = piletJson && require(piletJson);
|
|
697
|
+
const appPackage = findPackage(app && [app], piletPackage, piletDefinition, target);
|
|
680
698
|
const appFile: string = appPackage?.app;
|
|
681
699
|
const appRoot: string = appPackage?.root;
|
|
682
700
|
|
|
@@ -5,11 +5,9 @@ import PiletInjector from './pilet-injector';
|
|
|
5
5
|
const optionsMock = {
|
|
6
6
|
pilets: [],
|
|
7
7
|
publicUrl: '/',
|
|
8
|
-
meta: 'debug-meta.json',
|
|
9
8
|
api: '',
|
|
10
9
|
app: '',
|
|
11
10
|
active: true,
|
|
12
|
-
publicUrl: '/',
|
|
13
11
|
meta: '',
|
|
14
12
|
headers: {},
|
|
15
13
|
};
|
|
@@ -18,7 +16,7 @@ const configMock: any = {
|
|
|
18
16
|
port: 1234,
|
|
19
17
|
};
|
|
20
18
|
|
|
21
|
-
describe('Piral-CLI
|
|
19
|
+
describe('Piral-CLI pilet injector', () => {
|
|
22
20
|
it('PiletInjector is active when configured', () => {
|
|
23
21
|
const core = new EventEmitter();
|
|
24
22
|
const injector = new PiletInjector(optionsMock, configMock, core);
|
|
@@ -35,7 +33,7 @@ describe('Piral-CLI piral injector', () => {
|
|
|
35
33
|
injector.name;
|
|
36
34
|
injector.getOptions();
|
|
37
35
|
//injector.getMetaOf(0);
|
|
38
|
-
injector.
|
|
36
|
+
injector.getIndexMeta('http://localhost:9000');
|
|
39
37
|
|
|
40
38
|
// Assert
|
|
41
39
|
expect(injector.active).toBeFalsy();
|
|
@@ -78,7 +76,7 @@ describe('Piral-CLI piral injector', () => {
|
|
|
78
76
|
const injector = new PiletInjector(optionsMock, configMock, core);
|
|
79
77
|
|
|
80
78
|
// Act
|
|
81
|
-
const res = await injector.sendResponse('some/nice/invalid/path', 'localhost:1234');
|
|
79
|
+
const res = await injector.sendResponse('some/nice/invalid/path', 'localhost:1234', 'http://localhost:9000');
|
|
82
80
|
|
|
83
81
|
// Assert
|
|
84
82
|
expect(res).toBeUndefined();
|
|
@@ -88,8 +86,6 @@ describe('Piral-CLI piral injector', () => {
|
|
|
88
86
|
// Arrange
|
|
89
87
|
const optionsMock = {
|
|
90
88
|
pilets: [],
|
|
91
|
-
meta: 'debug-meta.json',
|
|
92
|
-
publicUrl: '/',
|
|
93
89
|
api: 'http://someFakeApi:1234',
|
|
94
90
|
app: '',
|
|
95
91
|
publicUrl: '/',
|
|
@@ -120,8 +116,6 @@ describe('Piral-CLI piral injector', () => {
|
|
|
120
116
|
// Arrange
|
|
121
117
|
const optionsMock = {
|
|
122
118
|
pilets: [],
|
|
123
|
-
meta: 'debug-meta.json',
|
|
124
|
-
publicUrl: '/',
|
|
125
119
|
api: 'http://someFakeApi:1234',
|
|
126
120
|
app: '',
|
|
127
121
|
publicUrl: '/',
|
|
@@ -5,16 +5,14 @@ import { readFileSync, existsSync, statSync } from 'fs';
|
|
|
5
5
|
import { KrasInjector, KrasResponse, KrasRequest, KrasInjectorConfig, KrasConfiguration, KrasResult } from 'kras';
|
|
6
6
|
import { log } from '../common/log';
|
|
7
7
|
import { getPiletSpecMeta } from '../common/spec';
|
|
8
|
-
import { config } from '../common/config';
|
|
8
|
+
import { config as commonConfig } from '../common/config';
|
|
9
9
|
import { axios, mime, jju } from '../external';
|
|
10
10
|
import { Bundler } from '../types';
|
|
11
11
|
|
|
12
|
-
const { host } = config;
|
|
13
|
-
|
|
14
12
|
interface Pilet {
|
|
15
13
|
bundler: Bundler;
|
|
16
14
|
root: string;
|
|
17
|
-
|
|
15
|
+
getMeta(basePath: string): PiletMetadata;
|
|
18
16
|
}
|
|
19
17
|
|
|
20
18
|
export interface PiletInjectorConfig extends KrasInjectorConfig {
|
|
@@ -32,7 +30,7 @@ interface PiletMetadata {
|
|
|
32
30
|
[key: string]: unknown;
|
|
33
31
|
}
|
|
34
32
|
|
|
35
|
-
function fillPiletMeta(pilet: Pilet,
|
|
33
|
+
function fillPiletMeta(pilet: Pilet, metaFile: string, subPath: string) {
|
|
36
34
|
const { root, bundler } = pilet;
|
|
37
35
|
const metaPath = join(root, metaFile);
|
|
38
36
|
const packagePath = join(root, 'package.json');
|
|
@@ -40,19 +38,21 @@ function fillPiletMeta(pilet: Pilet, basePath: string, metaFile: string) {
|
|
|
40
38
|
const metaOverride = existsSync(metaPath) ? jju.parse(readFileSync(metaPath, 'utf8')) : undefined;
|
|
41
39
|
const file = bundler.bundle.name.replace(/^[\/\\]/, '');
|
|
42
40
|
const target = join(bundler.bundle.dir, file);
|
|
43
|
-
const url = new URL(file, basePath);
|
|
44
|
-
const meta = {
|
|
45
|
-
custom: def.custom,
|
|
46
|
-
config: def.piletConfig,
|
|
47
|
-
...metaOverride,
|
|
48
|
-
name: def.name,
|
|
49
|
-
version: def.version,
|
|
50
|
-
link: `${url.href}?updated=${Date.now()}`,
|
|
51
|
-
...getPiletSpecMeta(target, basePath),
|
|
52
|
-
};
|
|
53
41
|
|
|
54
|
-
pilet.
|
|
55
|
-
|
|
42
|
+
pilet.getMeta = (parentPath) => {
|
|
43
|
+
const basePath = `${parentPath}${subPath}`;
|
|
44
|
+
const url = new URL(file, basePath);
|
|
45
|
+
|
|
46
|
+
return {
|
|
47
|
+
custom: def.custom,
|
|
48
|
+
config: def.piletConfig,
|
|
49
|
+
...metaOverride,
|
|
50
|
+
name: def.name,
|
|
51
|
+
version: def.version,
|
|
52
|
+
link: `${url.href}?updated=${Date.now()}`,
|
|
53
|
+
...getPiletSpecMeta(target, basePath),
|
|
54
|
+
};
|
|
55
|
+
};
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
async function loadFeed(feed: string) {
|
|
@@ -75,25 +75,24 @@ async function loadFeed(feed: string) {
|
|
|
75
75
|
|
|
76
76
|
export default class PiletInjector implements KrasInjector {
|
|
77
77
|
public config: PiletInjectorConfig;
|
|
78
|
-
private
|
|
78
|
+
private serverConfig: KrasConfiguration;
|
|
79
79
|
private indexPath: string;
|
|
80
80
|
|
|
81
|
-
constructor(
|
|
82
|
-
this.config =
|
|
81
|
+
constructor(config: PiletInjectorConfig, serverConfig: KrasConfiguration, core: EventEmitter) {
|
|
82
|
+
this.config = config;
|
|
83
|
+
this.serverConfig = serverConfig;
|
|
83
84
|
|
|
84
85
|
if (this.config.active) {
|
|
85
|
-
|
|
86
|
-
this.piletApi = /^https?:/.test(options.api)
|
|
87
|
-
? options.api
|
|
88
|
-
: `${config.ssl ? 'https' : 'http'}://${host}:${config.port}${options.api}`;
|
|
89
|
-
|
|
90
|
-
const { pilets, api, publicUrl } = options;
|
|
86
|
+
const { pilets, api, publicUrl } = config;
|
|
91
87
|
this.indexPath = `${publicUrl}index.html`;
|
|
92
88
|
const cbs = {};
|
|
93
89
|
|
|
94
90
|
core.on('user-connected', (e) => {
|
|
95
91
|
if (e.target === '*' && e.url === api.substring(1)) {
|
|
96
|
-
cbs[e.id] =
|
|
92
|
+
cbs[e.id] = {
|
|
93
|
+
baseUrl: e.req.headers.origin,
|
|
94
|
+
notify: (msg: string) => e.ws.send(msg),
|
|
95
|
+
};
|
|
97
96
|
}
|
|
98
97
|
});
|
|
99
98
|
|
|
@@ -103,11 +102,12 @@ export default class PiletInjector implements KrasInjector {
|
|
|
103
102
|
|
|
104
103
|
pilets.forEach((p, i) =>
|
|
105
104
|
p.bundler.on(() => {
|
|
106
|
-
|
|
107
|
-
const meta = fillPiletMeta(p, basePath, options.meta);
|
|
105
|
+
fillPiletMeta(p, config.meta, `/${i}/`);
|
|
108
106
|
|
|
109
107
|
for (const id of Object.keys(cbs)) {
|
|
110
|
-
cbs[id]
|
|
108
|
+
const { baseUrl, notify } = cbs[id];
|
|
109
|
+
const meta = this.getPiletMeta(baseUrl, p);
|
|
110
|
+
notify(meta);
|
|
111
111
|
}
|
|
112
112
|
}),
|
|
113
113
|
);
|
|
@@ -132,9 +132,29 @@ export default class PiletInjector implements KrasInjector {
|
|
|
132
132
|
|
|
133
133
|
setOptions() {}
|
|
134
134
|
|
|
135
|
-
|
|
135
|
+
getPiletApi(baseUrl: string) {
|
|
136
|
+
const { api } = this.config;
|
|
137
|
+
|
|
138
|
+
if (/^https?:/.test(api)) {
|
|
139
|
+
return api;
|
|
140
|
+
} else if (baseUrl) {
|
|
141
|
+
return `${baseUrl}${api}`;
|
|
142
|
+
} else {
|
|
143
|
+
const { ssl, port } = this.serverConfig;
|
|
144
|
+
const { host } = commonConfig;
|
|
145
|
+
return `${ssl ? 'https' : 'http'}://${host}:${port}${api}`;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
getPiletMeta(baseUrl: string, pilet: Pilet) {
|
|
150
|
+
const basePath = this.getPiletApi(baseUrl);
|
|
151
|
+
return JSON.stringify(pilet.getMeta(basePath));
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
async getIndexMeta(baseUrl: string) {
|
|
136
155
|
const { pilets, feed } = this.config;
|
|
137
|
-
const
|
|
156
|
+
const basePath = this.getPiletApi(baseUrl);
|
|
157
|
+
const localPilets = pilets.map((pilet) => pilet.getMeta?.(basePath)).filter(Boolean);
|
|
138
158
|
const mergedPilets = this.mergePilets(localPilets, await this.loadRemoteFeed(feed));
|
|
139
159
|
return JSON.stringify(mergedPilets);
|
|
140
160
|
}
|
|
@@ -187,7 +207,7 @@ export default class PiletInjector implements KrasInjector {
|
|
|
187
207
|
return this.sendContent(content, type, url);
|
|
188
208
|
}
|
|
189
209
|
|
|
190
|
-
async sendResponse(path: string, url: string): Promise<KrasResult> {
|
|
210
|
+
async sendResponse(path: string, url: string, baseUrl: string): Promise<KrasResult> {
|
|
191
211
|
const { pilets } = this.config;
|
|
192
212
|
const [index, ...rest] = path.split('/');
|
|
193
213
|
const pilet = pilets[+index];
|
|
@@ -195,7 +215,7 @@ export default class PiletInjector implements KrasInjector {
|
|
|
195
215
|
|
|
196
216
|
if (!path) {
|
|
197
217
|
await bundler?.ready();
|
|
198
|
-
const content = await this.
|
|
218
|
+
const content = await this.getIndexMeta(baseUrl);
|
|
199
219
|
return this.sendContent(content, 'application/json', url);
|
|
200
220
|
} else {
|
|
201
221
|
return bundler?.ready().then(() => {
|
|
@@ -208,11 +228,11 @@ export default class PiletInjector implements KrasInjector {
|
|
|
208
228
|
}
|
|
209
229
|
}
|
|
210
230
|
|
|
211
|
-
sendIndexFile(target: string, url: string): KrasResponse {
|
|
231
|
+
sendIndexFile(target: string, url: string, baseUrl: string): KrasResponse {
|
|
212
232
|
const indexHtml = readFileSync(target, 'utf8');
|
|
213
233
|
|
|
214
234
|
// mechanism to inject server side debug piletApi config into piral emulator
|
|
215
|
-
const windowInjectionScript = `window['dbg:pilet-api'] = '${this.
|
|
235
|
+
const windowInjectionScript = `window['dbg:pilet-api'] = '${this.getPiletApi(baseUrl)}';`;
|
|
216
236
|
const findStr = `<script`;
|
|
217
237
|
const replaceStr = `<script>/* Pilet Debugging Emulator Config Injection */${windowInjectionScript}</script><script`;
|
|
218
238
|
const content = indexHtml.replace(`${findStr}`, `${replaceStr}`);
|
|
@@ -222,6 +242,7 @@ export default class PiletInjector implements KrasInjector {
|
|
|
222
242
|
|
|
223
243
|
handle(req: KrasRequest): KrasResponse {
|
|
224
244
|
const { app, api, publicUrl } = this.config;
|
|
245
|
+
const baseUrl = req.headers.host ? `${req.encrypted ? 'https' : 'http'}://${req.headers.host}` : undefined;
|
|
225
246
|
|
|
226
247
|
if (!req.target) {
|
|
227
248
|
if (req.url.startsWith(publicUrl)) {
|
|
@@ -230,7 +251,7 @@ export default class PiletInjector implements KrasInjector {
|
|
|
230
251
|
|
|
231
252
|
if (existsSync(target) && statSync(target).isFile()) {
|
|
232
253
|
if (req.url === this.indexPath) {
|
|
233
|
-
return this.sendIndexFile(target, req.url);
|
|
254
|
+
return this.sendIndexFile(target, req.url, baseUrl);
|
|
234
255
|
} else {
|
|
235
256
|
return this.sendFile(target, req.url);
|
|
236
257
|
}
|
|
@@ -245,7 +266,7 @@ export default class PiletInjector implements KrasInjector {
|
|
|
245
266
|
return undefined;
|
|
246
267
|
} else if (req.target === api) {
|
|
247
268
|
const path = req.url.substring(1).split('?')[0];
|
|
248
|
-
return this.sendResponse(path, req.url);
|
|
269
|
+
return this.sendResponse(path, req.url, baseUrl);
|
|
249
270
|
}
|
|
250
271
|
}
|
|
251
272
|
}
|
package/src/types/internal.ts
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import type { LogLevels, PiletsInfo } from './common';
|
|
2
2
|
|
|
3
|
+
export interface Importmap {
|
|
4
|
+
imports: Record<string, string>;
|
|
5
|
+
inherit: Array<string>;
|
|
6
|
+
}
|
|
7
|
+
|
|
3
8
|
export interface PackageData {
|
|
4
9
|
name: string;
|
|
5
10
|
version: string;
|
|
6
11
|
description: string;
|
|
12
|
+
importmap?: Importmap;
|
|
7
13
|
main: string;
|
|
8
14
|
author:
|
|
9
15
|
| string
|
|
@@ -12,14 +18,37 @@ export interface PackageData {
|
|
|
12
18
|
url?: string;
|
|
13
19
|
email?: string;
|
|
14
20
|
};
|
|
15
|
-
custom?: any;
|
|
16
|
-
pilets?: PiletsInfo;
|
|
17
|
-
piralCLI?: { generated: boolean; version: string };
|
|
18
21
|
dependencies: Record<string, string>;
|
|
19
22
|
peerDependencies: Record<string, string>;
|
|
20
23
|
devDependencies: Record<string, string>;
|
|
21
24
|
}
|
|
22
25
|
|
|
26
|
+
/**
|
|
27
|
+
* Shape of the pilet.json
|
|
28
|
+
*/
|
|
29
|
+
export interface PiletDefinition {
|
|
30
|
+
piralInstances?: Record<
|
|
31
|
+
string,
|
|
32
|
+
{
|
|
33
|
+
selected?: boolean;
|
|
34
|
+
}
|
|
35
|
+
>;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
// Shape of the package.json of a pilet
|
|
39
|
+
export interface PiletPackageData extends PackageData {
|
|
40
|
+
piral?: {
|
|
41
|
+
name: string;
|
|
42
|
+
};
|
|
43
|
+
custom?: any;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
// Shape of the package.json of a Piral instance or emulator
|
|
47
|
+
export interface PiralPackageData extends PackageData {
|
|
48
|
+
pilets?: PiletsInfo;
|
|
49
|
+
piralCLI?: { generated: boolean; version: string };
|
|
50
|
+
}
|
|
51
|
+
|
|
23
52
|
export interface PackageFiles {
|
|
24
53
|
[file: string]: Buffer;
|
|
25
54
|
}
|