@metapages/metapage 1.10.4 → 1.10.6
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/README.md +7 -7
- package/dist/index.js +125 -122
- package/dist/index.js.map +1 -1
- package/dist/metapage/Metapage.d.ts.map +1 -1
- package/dist/metapage/MetapageIFrameRpcClient.d.ts +3 -3
- package/dist/metapage/MetapageIFrameRpcClient.d.ts.map +1 -1
- package/dist/metapage/Shared.d.ts +3 -3
- package/dist/metapage/Shared.d.ts.map +1 -1
- package/dist/metapage/conversions-metaframe.d.ts +4 -4
- package/dist/metapage/conversions-metaframe.d.ts.map +1 -1
- package/dist/metapage/conversions-metapage.d.ts +3 -3
- package/dist/metapage/conversions-metapage.d.ts.map +1 -1
- package/dist/metapage/util.d.ts +3 -3
- package/dist/metapage/util.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/metapage/Metapage.ts +22 -11
- package/src/metapage/MetapageIFrameRpcClient.ts +6 -6
- package/src/metapage/Shared.ts +3 -5
- package/src/metapage/conversions-metaframe.ts +8 -5
- package/src/metapage/conversions-metapage.ts +7 -5
- package/src/metapage/util.ts +14 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Metapage.d.ts","sourceRoot":"","sources":["../../src/metapage/Metapage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Metapage.d.ts","sourceRoot":"","sources":["../../src/metapage/Metapage.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { JsonRpcMethodsFromParent } from "./jsonrpc";
|
|
|
5
5
|
import { JsonRpcRequest } from "./jsonrpc2";
|
|
6
6
|
import { MetapageShared } from "./Shared";
|
|
7
7
|
import { MetaframeInputMap } from "./v0_4";
|
|
8
|
-
import {
|
|
8
|
+
import { MetaframeDefinition } from "./v2";
|
|
9
9
|
import { VersionsMetaframe } from "./versions";
|
|
10
10
|
export declare class MetapageIFrameRpcClient extends EventEmitter<JsonRpcMethodsFromParent | MetapageEvents> {
|
|
11
11
|
iframe: Promise<HTMLIFrameElement>;
|
|
@@ -24,13 +24,13 @@ export declare class MetapageIFrameRpcClient extends EventEmitter<JsonRpcMethods
|
|
|
24
24
|
_parentId: MetapageId;
|
|
25
25
|
_debug: boolean;
|
|
26
26
|
_sendInputsAfterRegistration: boolean;
|
|
27
|
-
_definition:
|
|
27
|
+
_definition: MetaframeDefinition | undefined;
|
|
28
28
|
_metapage: MetapageShared;
|
|
29
29
|
constructor(metapage: MetapageShared, url: string, iframeId: MetaframeId, parentId: MetapageId, consoleBackgroundColor: string, debug?: boolean);
|
|
30
30
|
addListenerReturnDisposer(event: JsonRpcMethodsFromParent | MetapageEvents, listener: ListenerFn<any[]>): Disposer;
|
|
31
31
|
setMetapage(metapage: MetapageShared): MetapageIFrameRpcClient;
|
|
32
32
|
getDefinitionUrl(): string;
|
|
33
|
-
getDefinition(): Promise<
|
|
33
|
+
getDefinition(): Promise<MetaframeDefinition | undefined>;
|
|
34
34
|
setInput(name: MetaframePipeId, inputBlob: any): void;
|
|
35
35
|
_cachedEventInputsUpdate: {
|
|
36
36
|
iframeId: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetapageIFrameRpcClient.d.ts","sourceRoot":"","sources":["../../src/metapage/MetapageIFrameRpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMzD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE5E,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAEL,wBAAwB,EAGzB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAO5C,OAAO,EAAsB,cAAc,EAAE,MAAM,UAAU,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAA0B,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"MetapageIFrameRpcClient.d.ts","sourceRoot":"","sources":["../../src/metapage/MetapageIFrameRpcClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { EventEmitter } from "eventemitter3";
|
|
2
2
|
import { MetapageEvents } from "./events.js";
|
|
3
3
|
import { JsonRpcMethodsFromParent } from "./jsonrpc.js";
|
|
4
|
-
import { MetapageDefinition
|
|
4
|
+
import { MetapageDefinition } from "./v2/index.js";
|
|
5
5
|
export declare enum MetapageHashParams {
|
|
6
6
|
mp_debug = "mp_debug"
|
|
7
7
|
}
|
|
8
8
|
export declare const isIframe: () => boolean;
|
|
9
|
-
export declare const INITIAL_NULL_METAPAGE_DEFINITION:
|
|
9
|
+
export declare const INITIAL_NULL_METAPAGE_DEFINITION: MetapageDefinition;
|
|
10
10
|
export declare class MetapageShared extends EventEmitter<MetapageEvents | JsonRpcMethodsFromParent> {
|
|
11
|
-
_definition:
|
|
11
|
+
_definition: MetapageDefinition;
|
|
12
12
|
constructor();
|
|
13
13
|
error(err: any): void;
|
|
14
14
|
getDefinition(): MetapageDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shared.d.ts","sourceRoot":"","sources":["../../src/metapage/Shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"Shared.d.ts","sourceRoot":"","sources":["../../src/metapage/Shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,oBAAY,kBAAkB;IAC5B,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,QAAQ,QAAO,OAO3B,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAE9C,CAAC;AAEF,qBAAa,cAAe,SAAQ,YAAY,CAC9C,cAAc,GAAG,wBAAwB,CAC1C;IAEC,WAAW,EAAE,kBAAkB,CAAoC;;IAO5D,KAAK,CAAC,GAAG,EAAE,GAAG;IAGd,aAAa,IAAI,kBAAkB;CAG3C"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { type MetaframeDefinitionV03 } from "./v0_3/all.js";
|
|
2
2
|
import { MetaframeDefinitionV4, MetaframeDefinitionV5, MetaframeDefinitionV6 } from "./v0_4/index.js";
|
|
3
3
|
import { MetaframeDefinitionV1 } from "./v1/index.js";
|
|
4
|
+
import { HashParamsObject, HashParamsRaw, MetaframeDefinition, MetaframeDefinitionV2 } from "./v2/metaframe.js";
|
|
4
5
|
import { type VersionsMetaframe } from "./versions.js";
|
|
5
|
-
import { HashParamsObject, HashParamsRaw, MetaframeDefinitionV2 } from "./v2/metaframe.js";
|
|
6
6
|
export declare const normalizeHashParams: (hashParams: HashParamsRaw | undefined) => HashParamsObject | undefined;
|
|
7
|
-
type AnyMetaframeDefinition = MetaframeDefinitionV03 | MetaframeDefinitionV4 | MetaframeDefinitionV5 | MetaframeDefinitionV6 | MetaframeDefinitionV1 | MetaframeDefinitionV2;
|
|
7
|
+
type AnyMetaframeDefinition = MetaframeDefinitionV03 | MetaframeDefinitionV4 | MetaframeDefinitionV5 | MetaframeDefinitionV6 | MetaframeDefinitionV1 | MetaframeDefinitionV2 | MetaframeDefinition;
|
|
8
8
|
export declare const convertMetaframeDefinitionToVersion: (def: any | AnyMetaframeDefinition, targetVersion: VersionsMetaframe) => Promise<any>;
|
|
9
|
-
export declare const convertMetaframeDefinitionToCurrentVersion: (def: any | AnyMetaframeDefinition) => Promise<
|
|
9
|
+
export declare const convertMetaframeDefinitionToCurrentVersion: (def: any | AnyMetaframeDefinition) => Promise<MetaframeDefinition>;
|
|
10
10
|
export declare const convertMetaframeJsonToCurrentVersion: (m: AnyMetaframeDefinition | undefined, opts?: {
|
|
11
11
|
errorIfUnknownVersion?: boolean;
|
|
12
|
-
}) => Promise<
|
|
12
|
+
}) => Promise<MetaframeDefinition | undefined>;
|
|
13
13
|
export declare const getMatchingMetaframeVersion: (version: string | undefined) => VersionsMetaframe;
|
|
14
14
|
export {};
|
|
15
15
|
//# sourceMappingURL=conversions-metaframe.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversions-metaframe.d.ts","sourceRoot":"","sources":["../../src/metapage/conversions-metaframe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conversions-metaframe.d.ts","sourceRoot":"","sources":["../../src/metapage/conversions-metaframe.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAA2B,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAUhF,eAAO,MAAM,mBAAmB,eAClB,aAAa,GAAG,SAAS,KACpC,gBAAgB,GAAG,SAUrB,CAAC;AAEF,KAAK,sBAAsB,GACvB,sBAAsB,GACtB,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,GACrB,mBAAmB,CAAC;AAExB,eAAO,MAAM,mCAAmC,QACzC,GAAG,GAAG,sBAAsB,iBAClB,iBAAiB,KAC/B,QAAQ,GAAG,CA2Cb,CAAC;AAEF,eAAO,MAAM,0CAA0C,QAChD,GAAG,GAAG,sBAAsB,KAChC,QAAQ,mBAAmB,CAE7B,CAAC;AAoIF,eAAO,MAAM,oCAAoC,MAC5C,sBAAsB,GAAG,SAAS,SAE9B;IAAE,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAAE,KACzC,QAAQ,mBAAmB,GAAG,SAAS,CAUzC,CAAC;AA8IF,eAAO,MAAM,2BAA2B,YAC7B,MAAM,GAAG,SAAS,KAC1B,iBAwBF,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { MetapageDefinitionV02 } from "./v0_2/all.js";
|
|
2
2
|
import { MetapageDefinitionV03 } from "./v0_3/all.js";
|
|
3
3
|
import { MetapageDefinitionV1 } from "./v1/index.js";
|
|
4
|
+
import { MetapageDefinition, MetapageDefinitionV2 } from "./v2/metapage.js";
|
|
4
5
|
import { VersionsMetapage } from "./versions.js";
|
|
5
|
-
|
|
6
|
-
export declare const
|
|
7
|
-
export declare const convertMetapageDefinitionToCurrentVersion: (def: any | MetapageDefinitionV02 | MetapageDefinitionV03 | MetapageDefinitionV1 | MetapageDefinitionV2) => Promise<MetapageDefinitionV2>;
|
|
6
|
+
export declare const convertMetapageDefinitionToVersion: (def: any | MetapageDefinitionV02 | MetapageDefinitionV03 | MetapageDefinitionV1 | MetapageDefinitionV2 | MetapageDefinition, targetVersion: VersionsMetapage) => Promise<any>;
|
|
7
|
+
export declare const convertMetapageDefinitionToCurrentVersion: (def: any | MetapageDefinitionV02 | MetapageDefinitionV03 | MetapageDefinitionV1 | MetapageDefinitionV2 | MetapageDefinition) => Promise<MetapageDefinition>;
|
|
8
8
|
export declare const getMatchingMetapageVersion: (version: string | undefined) => VersionsMetapage;
|
|
9
9
|
//# sourceMappingURL=conversions-metapage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversions-metapage.d.ts","sourceRoot":"","sources":["../../src/metapage/conversions-metapage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"conversions-metapage.d.ts","sourceRoot":"","sources":["../../src/metapage/conversions-metapage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,EAA0B,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIzE,eAAO,MAAM,kCAAkC,QAEzC,GAAG,GACH,qBAAqB,GACrB,qBAAqB,GACrB,oBAAoB,GACpB,oBAAoB,GACpB,kBAAkB,iBACP,gBAAgB,KAC9B,QAAQ,GAAG,CA2Cb,CAAC;AAEF,eAAO,MAAM,yCAAyC,QAEhD,GAAG,GACH,qBAAqB,GACrB,qBAAqB,GACrB,oBAAoB,GACpB,oBAAoB,GACpB,kBAAkB,KACrB,QAAQ,kBAAkB,CAE5B,CAAC;AA2LF,eAAO,MAAM,0BAA0B,YAC5B,MAAM,GAAG,SAAS,KAC1B,gBAuBF,CAAC"}
|
package/dist/metapage/util.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { MetaframeDefinitionV4 } from "./v0_4";
|
|
1
2
|
import { MetaframeDefinitionV1 } from "./v1";
|
|
3
|
+
import { MetaframeDefinition, MetaframeDefinitionV2, MetapageDefinition } from "./v2";
|
|
2
4
|
import { VersionsMetaframe, VersionsMetapage } from "./versions";
|
|
3
|
-
import { MetaframeDefinitionV4 } from "./v0_4";
|
|
4
|
-
import { MetaframeDefinitionV2, MetapageDefinition } from "./v2";
|
|
5
5
|
export declare const getMetapageDefinitionFromUrl: (url: string, version?: VersionsMetapage) => Promise<MetapageDefinition>;
|
|
6
|
-
export declare const getMetaframeDefinitionFromUrl: (url: string, version?: VersionsMetaframe) => Promise<MetaframeDefinitionV2 | MetaframeDefinitionV1 | MetaframeDefinitionV4 | undefined>;
|
|
6
|
+
export declare const getMetaframeDefinitionFromUrl: (url: string, version?: VersionsMetaframe) => Promise<MetaframeDefinitionV2 | MetaframeDefinitionV1 | MetaframeDefinitionV4 | MetaframeDefinition | undefined>;
|
|
7
7
|
export declare const isEmptyMetaframeDefinition: (definition?: MetaframeDefinitionV1 | MetaframeDefinitionV2 | MetaframeDefinitionV4) => boolean;
|
|
8
8
|
//# sourceMappingURL=util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/metapage/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/metapage/util.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,MAAM,CAAC;AACd,OAAO,EAGL,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAIpB,eAAO,MAAM,4BAA4B,QAClC,MAAM,YACD,gBAAgB,KACzB,QAAQ,kBAAkB,CAgB5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,QACnC,MAAM,YACD,iBAAiB,KAC1B,QACC,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,GACrB,mBAAmB,GACnB,SAAS,CAyDZ,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBAEjC,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,KACxB,OAiBF,CAAC"}
|
package/package.json
CHANGED
package/src/metapage/Metapage.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ListenerFn } from "eventemitter3";
|
|
2
2
|
import { create } from "mutative";
|
|
3
3
|
import picomatch from "picomatch/posix";
|
|
4
|
+
|
|
4
5
|
import {
|
|
5
|
-
setHashParamValueBase64EncodedInUrl,
|
|
6
6
|
getHashParamValueBase64DecodedFromUrl,
|
|
7
|
+
setHashParamValueBase64EncodedInUrl,
|
|
7
8
|
} from "@metapages/hash-query";
|
|
8
9
|
|
|
9
10
|
import { VERSION_METAPAGE } from "./Constants";
|
|
@@ -40,11 +41,7 @@ import {
|
|
|
40
41
|
PipeUpdateBlob,
|
|
41
42
|
} from "./v0_4";
|
|
42
43
|
import { MetapageOptionsV1 } from "./v1";
|
|
43
|
-
import {
|
|
44
|
-
MetapageDefinition,
|
|
45
|
-
MetapageDefinitionV2,
|
|
46
|
-
MetapageMetadataV2,
|
|
47
|
-
} from "./v2";
|
|
44
|
+
import { MetapageDefinition, MetapageMetadataV2 } from "./v2";
|
|
48
45
|
import { VersionsMetapage } from "./versions";
|
|
49
46
|
|
|
50
47
|
interface MetapageStatePartial {
|
|
@@ -395,6 +392,11 @@ export class Metapage extends MetapageShared {
|
|
|
395
392
|
return;
|
|
396
393
|
}
|
|
397
394
|
|
|
395
|
+
// Early return for data URLs - they don't support URL manipulation
|
|
396
|
+
if (metaframe.url.startsWith("data:")) {
|
|
397
|
+
return;
|
|
398
|
+
}
|
|
399
|
+
|
|
398
400
|
// Initialize storage for this metaframe if needed
|
|
399
401
|
if (!this._injectedSecrets[metaframeName]) {
|
|
400
402
|
this._injectedSecrets[metaframeName] = {};
|
|
@@ -478,7 +480,7 @@ export class Metapage extends MetapageShared {
|
|
|
478
480
|
* Helper method to get the definition without any injected secrets.
|
|
479
481
|
* Returns the definition with secret hash/query params replaced by their original values.
|
|
480
482
|
*/
|
|
481
|
-
private _getDefinitionWithoutSecrets():
|
|
483
|
+
private _getDefinitionWithoutSecrets(): MetapageDefinition {
|
|
482
484
|
if (
|
|
483
485
|
Object.keys(this._injectedSecrets).length === 0 &&
|
|
484
486
|
Object.keys(this._injectedQuerySecrets).length === 0
|
|
@@ -505,6 +507,11 @@ export class Metapage extends MetapageShared {
|
|
|
505
507
|
return;
|
|
506
508
|
}
|
|
507
509
|
|
|
510
|
+
// Data URLs don't support URL manipulation
|
|
511
|
+
if (metaframe.url.startsWith("data:")) {
|
|
512
|
+
return;
|
|
513
|
+
}
|
|
514
|
+
|
|
508
515
|
let cleanUrl = metaframe.url;
|
|
509
516
|
|
|
510
517
|
// Handle hash param secrets
|
|
@@ -572,11 +579,11 @@ export class Metapage extends MetapageShared {
|
|
|
572
579
|
def: any,
|
|
573
580
|
state?: MetapageState,
|
|
574
581
|
): Promise<{
|
|
575
|
-
newDefinition:
|
|
582
|
+
newDefinition: MetapageDefinition;
|
|
576
583
|
added: { [key: string]: MetapageIFrameRpcClient };
|
|
577
584
|
removed: { [key: string]: MetapageIFrameRpcClient };
|
|
578
585
|
}> {
|
|
579
|
-
const newDefinition:
|
|
586
|
+
const newDefinition: MetapageDefinition =
|
|
580
587
|
await convertMetapageDefinitionToCurrentVersion(def);
|
|
581
588
|
|
|
582
589
|
if (this.isDisposed()) {
|
|
@@ -654,7 +661,7 @@ export class Metapage extends MetapageShared {
|
|
|
654
661
|
const metaframe = this._metaframes[metaframeName];
|
|
655
662
|
const newDefinitionUrl =
|
|
656
663
|
this._definition?.metaframes?.[metaframeName]?.url;
|
|
657
|
-
if (!newDefinitionUrl) return;
|
|
664
|
+
if (!newDefinitionUrl || newDefinitionUrl.startsWith("data:")) return;
|
|
658
665
|
|
|
659
666
|
let url = new URL(newDefinitionUrl);
|
|
660
667
|
|
|
@@ -1567,6 +1574,10 @@ export class Metapage extends MetapageShared {
|
|
|
1567
1574
|
// In the current use case this app: https://github.com/metapages/metapage-app
|
|
1568
1575
|
// will listen for the event and update the definition accordingly
|
|
1569
1576
|
if (metaframe) {
|
|
1577
|
+
// Data URLs don't support URL manipulation
|
|
1578
|
+
if (metaframe.url.startsWith("data:")) {
|
|
1579
|
+
break;
|
|
1580
|
+
}
|
|
1570
1581
|
// Update in place the local references to the new metaframe URL with the
|
|
1571
1582
|
// new hash params:
|
|
1572
1583
|
// - if you call metapage.getDefinition() it will include the new URL
|
|
@@ -1672,7 +1683,7 @@ export class Metapage extends MetapageShared {
|
|
|
1672
1683
|
|
|
1673
1684
|
const cleanUrl = new URL(cleanUrlStr);
|
|
1674
1685
|
|
|
1675
|
-
this._definition = create<
|
|
1686
|
+
this._definition = create<MetapageDefinition>(
|
|
1676
1687
|
this._definition,
|
|
1677
1688
|
(draft) => {
|
|
1678
1689
|
draft.metaframes[metaframeName].url = cleanUrl.href;
|
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
import { MetapageHashParams, MetapageShared } from "./Shared";
|
|
24
24
|
import { getMetaframeDefinitionFromUrl } from "./util";
|
|
25
25
|
import { MetaframeInputMap, MetapageInstanceInputs } from "./v0_4";
|
|
26
|
-
import {
|
|
26
|
+
import { MetaframeDefinition } from "./v2";
|
|
27
27
|
import { VersionsMetaframe, VersionsMetapage } from "./versions";
|
|
28
28
|
|
|
29
29
|
/**
|
|
@@ -55,7 +55,7 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
55
55
|
_parentId: MetapageId;
|
|
56
56
|
_debug: boolean;
|
|
57
57
|
_sendInputsAfterRegistration: boolean = false;
|
|
58
|
-
_definition:
|
|
58
|
+
_definition: MetaframeDefinition | undefined;
|
|
59
59
|
|
|
60
60
|
_metapage: MetapageShared;
|
|
61
61
|
|
|
@@ -90,7 +90,7 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
90
90
|
this._metapage = metapage;
|
|
91
91
|
this._debug = debug;
|
|
92
92
|
// Add the custom URL params
|
|
93
|
-
if (debug) {
|
|
93
|
+
if (debug && !url.startsWith("data:")) {
|
|
94
94
|
var urlBlob = new URL(this.url);
|
|
95
95
|
urlBlob.searchParams.set(MetapageHashParams.mp_debug, "true");
|
|
96
96
|
this.url = urlBlob.href;
|
|
@@ -127,7 +127,7 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
127
127
|
}
|
|
128
128
|
} else {
|
|
129
129
|
// else use the url encoded definition
|
|
130
|
-
let urlEncodedDefinition:
|
|
130
|
+
let urlEncodedDefinition: MetaframeDefinition | undefined =
|
|
131
131
|
getHashParamValueJsonFromUrl(this.url, "definition");
|
|
132
132
|
|
|
133
133
|
urlEncodedDefinition =
|
|
@@ -144,7 +144,7 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
144
144
|
selfThis._iframe.allow = urlEncodedDefinition.allow;
|
|
145
145
|
} else {
|
|
146
146
|
// Otherwise use whatever is in the metaframe.json
|
|
147
|
-
let metaframeDef:
|
|
147
|
+
let metaframeDef: MetaframeDefinition | undefined =
|
|
148
148
|
await selfThis.getDefinition();
|
|
149
149
|
if (this._debug) {
|
|
150
150
|
this.log(`mf metaframeDef=${JSON.stringify(metaframeDef)}`);
|
|
@@ -233,7 +233,7 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
233
233
|
* but advanced features e.g. allow permissions won't work and
|
|
234
234
|
* anything relying on metadata.
|
|
235
235
|
*/
|
|
236
|
-
public async getDefinition(): Promise<
|
|
236
|
+
public async getDefinition(): Promise<MetaframeDefinition | undefined> {
|
|
237
237
|
if (this._definition) {
|
|
238
238
|
return this._definition;
|
|
239
239
|
}
|
package/src/metapage/Shared.ts
CHANGED
|
@@ -2,8 +2,7 @@ import { EventEmitter } from "eventemitter3";
|
|
|
2
2
|
|
|
3
3
|
import { MetapageEvents } from "./events.js";
|
|
4
4
|
import { JsonRpcMethodsFromParent } from "./jsonrpc.js";
|
|
5
|
-
import { MetapageDefinition
|
|
6
|
-
import { MetapageVersionCurrent } from "./versions.js";
|
|
5
|
+
import { MetapageDefinition } from "./v2/index.js";
|
|
7
6
|
|
|
8
7
|
export enum MetapageHashParams {
|
|
9
8
|
mp_debug = "mp_debug",
|
|
@@ -18,8 +17,7 @@ export const isIframe = (): boolean => {
|
|
|
18
17
|
}
|
|
19
18
|
};
|
|
20
19
|
|
|
21
|
-
export const INITIAL_NULL_METAPAGE_DEFINITION:
|
|
22
|
-
version: MetapageVersionCurrent,
|
|
20
|
+
export const INITIAL_NULL_METAPAGE_DEFINITION: MetapageDefinition = {
|
|
23
21
|
metaframes: {},
|
|
24
22
|
};
|
|
25
23
|
|
|
@@ -27,7 +25,7 @@ export class MetapageShared extends EventEmitter<
|
|
|
27
25
|
MetapageEvents | JsonRpcMethodsFromParent
|
|
28
26
|
> {
|
|
29
27
|
// Easier to ensure this value is never null|undefined
|
|
30
|
-
_definition:
|
|
28
|
+
_definition: MetapageDefinition = INITIAL_NULL_METAPAGE_DEFINITION;
|
|
31
29
|
|
|
32
30
|
constructor() {
|
|
33
31
|
super();
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { compareVersions } from "compare-versions";
|
|
2
|
-
import { create } from "mutative";
|
|
3
2
|
import fetchRetryWrapper from "fetch-retry";
|
|
3
|
+
import { create } from "mutative";
|
|
4
|
+
|
|
4
5
|
import { type MetaframeDefinitionV03 } from "./v0_3/all.js";
|
|
5
6
|
import {
|
|
6
7
|
MetaframeDefinitionV4,
|
|
@@ -8,13 +9,14 @@ import {
|
|
|
8
9
|
MetaframeDefinitionV6,
|
|
9
10
|
} from "./v0_4/index.js";
|
|
10
11
|
import { MetaframeDefinitionV1 } from "./v1/index.js";
|
|
11
|
-
import { MetaframeVersionCurrent, type VersionsMetaframe } from "./versions.js";
|
|
12
12
|
import {
|
|
13
13
|
HashParamsObject,
|
|
14
14
|
HashParamsRaw,
|
|
15
|
+
MetaframeDefinition,
|
|
15
16
|
MetaframeDefinitionV2,
|
|
16
17
|
} from "./v2/metaframe.js";
|
|
17
18
|
import { detectMetaframeVersion } from "./version-detection.js";
|
|
19
|
+
import { MetaframeVersionCurrent, type VersionsMetaframe } from "./versions.js";
|
|
18
20
|
|
|
19
21
|
const fetchRetry = fetchRetryWrapper(fetch);
|
|
20
22
|
|
|
@@ -44,7 +46,8 @@ type AnyMetaframeDefinition =
|
|
|
44
46
|
| MetaframeDefinitionV5
|
|
45
47
|
| MetaframeDefinitionV6
|
|
46
48
|
| MetaframeDefinitionV1
|
|
47
|
-
| MetaframeDefinitionV2
|
|
49
|
+
| MetaframeDefinitionV2
|
|
50
|
+
| MetaframeDefinition;
|
|
48
51
|
|
|
49
52
|
export const convertMetaframeDefinitionToVersion = async (
|
|
50
53
|
def: any | AnyMetaframeDefinition,
|
|
@@ -96,7 +99,7 @@ export const convertMetaframeDefinitionToVersion = async (
|
|
|
96
99
|
|
|
97
100
|
export const convertMetaframeDefinitionToCurrentVersion = async (
|
|
98
101
|
def: any | AnyMetaframeDefinition,
|
|
99
|
-
): Promise<
|
|
102
|
+
): Promise<MetaframeDefinition> => {
|
|
100
103
|
return convertMetaframeDefinitionToVersion(def, MetaframeVersionCurrent);
|
|
101
104
|
};
|
|
102
105
|
|
|
@@ -234,7 +237,7 @@ export const convertMetaframeJsonToCurrentVersion = async (
|
|
|
234
237
|
m: AnyMetaframeDefinition | undefined,
|
|
235
238
|
// deprecated
|
|
236
239
|
opts?: { errorIfUnknownVersion?: boolean },
|
|
237
|
-
): Promise<
|
|
240
|
+
): Promise<MetaframeDefinition | undefined> => {
|
|
238
241
|
if (!m) {
|
|
239
242
|
return;
|
|
240
243
|
}
|
|
@@ -5,9 +5,9 @@ import { create } from "mutative";
|
|
|
5
5
|
import { MetapageDefinitionV02 } from "./v0_2/all.js";
|
|
6
6
|
import { MetapageDefinitionV03 } from "./v0_3/all.js";
|
|
7
7
|
import { MetapageDefinitionV1 } from "./v1/index.js";
|
|
8
|
-
import {
|
|
9
|
-
import { MetapageDefinitionV2 } from "./v2/metapage.js";
|
|
8
|
+
import { MetapageDefinition, MetapageDefinitionV2 } from "./v2/metapage.js";
|
|
10
9
|
import { detectMetapageVersion } from "./version-detection.js";
|
|
10
|
+
import { MetapageVersionCurrent, VersionsMetapage } from "./versions.js";
|
|
11
11
|
|
|
12
12
|
const fetchRetry = fetchRetryWrapper(fetch);
|
|
13
13
|
|
|
@@ -17,7 +17,8 @@ export const convertMetapageDefinitionToVersion = async (
|
|
|
17
17
|
| MetapageDefinitionV02
|
|
18
18
|
| MetapageDefinitionV03
|
|
19
19
|
| MetapageDefinitionV1
|
|
20
|
-
| MetapageDefinitionV2
|
|
20
|
+
| MetapageDefinitionV2
|
|
21
|
+
| MetapageDefinition,
|
|
21
22
|
targetVersion: VersionsMetapage,
|
|
22
23
|
): Promise<any> => {
|
|
23
24
|
if (!def) {
|
|
@@ -70,8 +71,9 @@ export const convertMetapageDefinitionToCurrentVersion = async (
|
|
|
70
71
|
| MetapageDefinitionV02
|
|
71
72
|
| MetapageDefinitionV03
|
|
72
73
|
| MetapageDefinitionV1
|
|
73
|
-
| MetapageDefinitionV2
|
|
74
|
-
|
|
74
|
+
| MetapageDefinitionV2
|
|
75
|
+
| MetapageDefinition,
|
|
76
|
+
): Promise<MetapageDefinition> => {
|
|
75
77
|
return convertMetapageDefinitionToVersion(def, MetapageVersionCurrent);
|
|
76
78
|
};
|
|
77
79
|
|
package/src/metapage/util.ts
CHANGED
|
@@ -1,19 +1,25 @@
|
|
|
1
1
|
import fetchRetryWrapper from "fetch-retry";
|
|
2
|
+
|
|
3
|
+
import { getHashParamValueJsonFromUrl } from "@metapages/hash-query";
|
|
4
|
+
|
|
5
|
+
import {
|
|
6
|
+
convertMetaframeDefinitionToVersion,
|
|
7
|
+
convertMetaframeJsonToCurrentVersion,
|
|
8
|
+
} from "./conversions-metaframe";
|
|
2
9
|
import { convertMetapageDefinitionToVersion } from "./conversions-metapage";
|
|
10
|
+
import { MetaframeDefinitionV4 } from "./v0_4";
|
|
3
11
|
import { MetaframeDefinitionV1 } from "./v1";
|
|
12
|
+
import {
|
|
13
|
+
MetaframeDefinition,
|
|
14
|
+
MetaframeDefinitionV2,
|
|
15
|
+
MetapageDefinition,
|
|
16
|
+
} from "./v2";
|
|
4
17
|
import {
|
|
5
18
|
MetaframeVersionCurrent,
|
|
6
19
|
MetapageVersionCurrent,
|
|
7
20
|
VersionsMetaframe,
|
|
8
21
|
VersionsMetapage,
|
|
9
22
|
} from "./versions";
|
|
10
|
-
import { MetaframeDefinitionV4 } from "./v0_4";
|
|
11
|
-
import {
|
|
12
|
-
convertMetaframeDefinitionToVersion,
|
|
13
|
-
convertMetaframeJsonToCurrentVersion,
|
|
14
|
-
} from "./conversions-metaframe";
|
|
15
|
-
import { MetaframeDefinitionV2, MetapageDefinition } from "./v2";
|
|
16
|
-
import { getHashParamValueJsonFromUrl } from "@metapages/hash-query";
|
|
17
23
|
|
|
18
24
|
const fetchRetry = fetchRetryWrapper(fetch);
|
|
19
25
|
|
|
@@ -45,6 +51,7 @@ export const getMetaframeDefinitionFromUrl = async (
|
|
|
45
51
|
| MetaframeDefinitionV2
|
|
46
52
|
| MetaframeDefinitionV1
|
|
47
53
|
| MetaframeDefinitionV4
|
|
54
|
+
| MetaframeDefinition
|
|
48
55
|
| undefined
|
|
49
56
|
> => {
|
|
50
57
|
// we know some URLs will never provide a definition, so we can skip them
|