@metapages/metapage 1.8.15 → 1.8.17
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/dist/index.js +177 -183
- package/dist/index.js.map +1 -1
- package/dist/metapage/Metaframe.d.ts +1 -1
- package/dist/metapage/Metaframe.d.ts.map +1 -1
- package/dist/metapage/Metapage.d.ts +10 -10
- package/dist/metapage/Metapage.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/metapage/Metaframe.ts +24 -19
- package/src/metapage/Metapage.ts +36 -17
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventEmitter, ListenerFn } from 'eventemitter3';
|
|
2
|
-
import { MetaframeInputMap } from './v0_4';
|
|
3
2
|
import { MetaframePipeId, MetapageId } from './core';
|
|
4
3
|
import { JsonRpcMethodsFromChild, SetupIframeServerResponseData } from './jsonrpc';
|
|
4
|
+
import { MetaframeInputMap } from './v0_4';
|
|
5
5
|
import { VersionsMetapage } from './versions';
|
|
6
6
|
export declare enum MetaframeLoadingState {
|
|
7
7
|
WaitingForPageLoad = "WaitingForPageLoad",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Metaframe.d.ts","sourceRoot":"","sources":["../../src/metapage/Metaframe.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,UAAU,EACX,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Metaframe.d.ts","sourceRoot":"","sources":["../../src/metapage/Metaframe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { ListenerFn } from
|
|
2
|
-
import { MetaframeId, MetaframePipeId, MetapageId } from
|
|
3
|
-
import { MetapageEvents } from
|
|
4
|
-
import { MinimumClientMessage } from
|
|
5
|
-
import { MetapageIFrameRpcClient } from
|
|
6
|
-
import { MetapageShared } from
|
|
7
|
-
import { MetaframeInputMap, MetaframeInstance, MetapageInstanceInputs, PipeInput, PipeUpdateBlob } from
|
|
8
|
-
import { MetapageOptionsV1 } from
|
|
9
|
-
import { MetapageDefinitionV2, MetapageMetadataV2 } from
|
|
10
|
-
import { VersionsMetapage } from
|
|
1
|
+
import { ListenerFn } from 'eventemitter3';
|
|
2
|
+
import { MetaframeId, MetaframePipeId, MetapageId } from './core';
|
|
3
|
+
import { MetapageEvents } from './events';
|
|
4
|
+
import { MinimumClientMessage } from './jsonrpc';
|
|
5
|
+
import { MetapageIFrameRpcClient } from './MetapageIFrameRpcClient';
|
|
6
|
+
import { MetapageShared } from './Shared';
|
|
7
|
+
import { MetaframeInputMap, MetaframeInstance, MetapageInstanceInputs, PipeInput, PipeUpdateBlob } from './v0_4';
|
|
8
|
+
import { MetapageOptionsV1 } from './v1';
|
|
9
|
+
import { MetapageDefinitionV2, MetapageMetadataV2 } from './v2';
|
|
10
|
+
import { VersionsMetapage } from './versions';
|
|
11
11
|
interface MetapageStatePartial {
|
|
12
12
|
inputs: MetapageInstanceInputs;
|
|
13
13
|
outputs: MetapageInstanceInputs;
|
|
@@ -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;AAS3C,OAAO,
|
|
1
|
+
{"version":3,"file":"Metapage.d.ts","sourceRoot":"","sources":["../../src/metapage/Metapage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAS3C,OAAO,EACL,WAAW,EACX,eAAe,EACf,UAAU,EACX,MAAM,QAAQ,CAAC;AAKhB,OAAO,EAEL,cAAc,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EAEL,oBAAoB,EAErB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAOpE,OAAO,EAEL,cAAc,EACf,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,SAAS,EACT,cAAc,EACf,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,UAAU,oBAAoB;IAC5B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,OAAO,EAAE,sBAAsB,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,oBAAoB,CAAC;CAClC;AAYD,eAAO,MAAM,yBAAyB,YAC3B,MAAM,KACd,gBAEF,CAAC;AAEF,eAAO,MAAM,SAAS,eAAgB,MAAM,WAAW,MAAM,KAAG,OA+B/D,CAAC;AAEF,KAAK,+BAA+B,GAAG;IACrC,SAAS,EAAE,WAAW,CAAC;IACvB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,CAAC,GAAG,EAAE,WAAW,GAAG,+BAA+B,EAAE,CAAC;KACvD,CAAC;CACH,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,CAAC,GAAG,EAAE,WAAW,GAAG,uBAAuB,CAAC;CAC7C,CAAC;AAIF,qBAAa,QAAS,SAAQ,cAAc;IAE1C,gBAAuB,OAAO,4BAAoB;IAGlD,gBAAuB,UAAU,6BAA6B;IAC9D,gBAAuB,KAAK,wBAAwB;IACpD,gBAAuB,MAAM,yBAAyB;IACtD,gBAAuB,OAAO,0BAA0B;IACxD,gBAAuB,OAAO,0BAA0B;IACxD,gBAAuB,KAAK,wBAAwB;IAEpD,OAAc,iBAAiB,4DAAqB;IACpD,OAAc,eAAe,4DAAmB;WAE5B,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;IAgB3E,GAAG,EAAE,UAAU,CAAC;IAChB,MAAM,EAAE,aAAa,CAAc;IACnC,WAAW,EAAE,gBAAgB,CAAgC;IAE7D,KAAK,EAAE,OAAO,CAA2B;IACzC,uBAAuB,EAAE,MAAM,CAAC;IAGhC,+BAA+B,EAAE,MAAM,CAAK;IAG5C,qBAAqB,EAAE,oBAAoB,CAGzC;IACF,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC;KAC5B,CAAM;gBA4BK,IAAI,CAAC,EAAE,iBAAiB;IA2D7B,UAAU;IAIjB,yBAAyB,CACvB,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,GAC1B,MAAM,IAAI;IAQN,qBAAqB,IAAI,QAAQ;IAYjC,QAAQ,IAAI,aAAa;IAIzB,QAAQ,CAAC,QAAQ,EAAE,aAAa;IAmBhC,kBAAkB,IAAI,oBAAoB;IAI1C,aAAa,IAAI,oBAAoB;IAI/B,aAAa,CACxB,GAAG,EAAE,GAAG,EACR,KAAK,CAAC,EAAE,aAAa,GACpB,OAAO,CAAC,QAAQ,CAAC;IAsFpB,WAAW,CAAC,QAAQ,EAAE,kBAAkB;IAQxC,oBAAoB;IAWpB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS;IAW7C,eAAe,CAAC,WAAW,EAAE,WAAW;IAwCxC,SAAS,IAAI,IAAI;IAUV,UAAU;;;IAIV,YAAY,IAAI,WAAW,EAAE;IAI7B,eAAe,IAAI,WAAW,EAAE;IAIhC,aAAa,IAAI;QACtB,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAC;KACxC;IAIM,YAAY,CAAC,EAAE,EAAE,WAAW,GAAG,uBAAuB;IAK7D,YAAY,CACV,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,iBAAiB,GAC5B,uBAAuB;IAwDnB,OAAO;IAuBP,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM;IAOpD,KAAK,CAAC,GAAG,EAAE,GAAG;IAKd,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAKnC,mBAAmB,CACjB,MAAM,EAAE,WAAW,EAEnB,YAAY,EAAE,eAAe,GAC5B,+BAA+B,EAAE;IAwDpC,qBAAqB,CAAC,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC;IAwCjD,QAAQ,CACb,QAAQ,EAAE,WAAW,GAAG,sBAAsB,EAC9C,WAAW,CAAC,EAAE,eAAe,GAAG,iBAAiB,EACjD,KAAK,CAAC,EAAE,cAAc;IA2BxB,yCAAyC,CACvC,QAAQ,EAAE,WAAW,GAAG,sBAAsB,EAC9C,WAAW,CAAC,EAAE,eAAe,GAAG,iBAAiB,EACjD,KAAK,CAAC,EAAE,cAAc;IAqCjB,SAAS,CACd,QAAQ,EAAE,WAAW,GAAG,sBAAsB,EAC9C,WAAW,CAAC,EAAE,eAAe,GAAG,iBAAiB,EACjD,KAAK,CAAC,EAAE,cAAc;IAKxB,wCAAwC,CACtC,cAAc,EAAE,sBAAsB;IAKxC,qCAAqC,CACnC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,eAAe,EAC5B,KAAK,CAAC,EAAE,cAAc;IAUxB,mCAAmC,CACjC,WAAW,EAAE,WAAW,EACxB,kBAAkB,EAAE,iBAAiB;IAKvC,uCAAuC,CACrC,cAAc,EAAE,sBAAsB;IAKxC,oCAAoC,CAClC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,eAAe,EAC5B,KAAK,CAAC,EAAE,cAAc;IAUxB,kCAAkC,CAChC,WAAW,EAAE,WAAW,EACxB,kBAAkB,EAAE,iBAAiB;IAKvC,gCAAgC,CAC9B,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,eAAe,EAChC,KAAK,CAAC,EAAE,cAAc,GACrB,IAAI;IAwCP,8BAA8B,CAC5B,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,WAAW,EACxB,kBAAkB,EAAE,iBAAiB,GACpC,IAAI;IAiCP,uBAAuB,CACrB,QAAQ,EAAE,OAAO,EACjB,mBAAmB,EAAE,sBAAsB,GAC1C,IAAI;IAyCP,SAAS,CAAC,CAAC,EAAE,YAAY;IAmMzB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM;CAe7D"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@metapages/metapage",
|
|
3
3
|
"public": true,
|
|
4
|
-
"version": "1.8.
|
|
4
|
+
"version": "1.8.17",
|
|
5
5
|
"description": "Connect web pages together",
|
|
6
6
|
"repository": "https://github.com/metapages/metapage",
|
|
7
7
|
"homepage": "https://metapage.io/",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
],
|
|
24
24
|
"source": "src/index.ts",
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@metapages/hash-query": "^0.9.
|
|
26
|
+
"@metapages/hash-query": "^0.9.8",
|
|
27
27
|
"base64-arraybuffer": "^1.0.2",
|
|
28
28
|
"compare-versions": "^6.1.1",
|
|
29
29
|
"eventemitter3": "^4.0.0",
|
|
@@ -2,25 +2,39 @@ import {
|
|
|
2
2
|
EventEmitter,
|
|
3
3
|
ListenerFn,
|
|
4
4
|
} from 'eventemitter3';
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
7
|
getHashParamFromWindow,
|
|
8
|
-
|
|
8
|
+
getHashParamValueBase64DecodedFromWindow,
|
|
9
9
|
getHashParamValueBooleanFromWindow,
|
|
10
|
-
|
|
10
|
+
getHashParamValueFloatFromWindow,
|
|
11
|
+
getHashParamValueIntFromWindow,
|
|
11
12
|
getHashParamValueJsonFromWindow,
|
|
13
|
+
setHashParamInWindow,
|
|
12
14
|
setHashParamValueBase64EncodedInWindow,
|
|
13
|
-
|
|
15
|
+
setHashParamValueBooleanInWindow,
|
|
14
16
|
setHashParamValueFloatInWindow,
|
|
15
|
-
getHashParamValueFloatFromWindow,
|
|
16
17
|
setHashParamValueIntInWindow,
|
|
17
|
-
|
|
18
|
+
setHashParamValueJsonInWindow,
|
|
18
19
|
} from '@metapages/hash-query';
|
|
20
|
+
|
|
19
21
|
import { VERSION_METAFRAME } from './Constants';
|
|
22
|
+
import {
|
|
23
|
+
MetaframeId,
|
|
24
|
+
MetaframePipeId,
|
|
25
|
+
MetapageId,
|
|
26
|
+
} from './core';
|
|
20
27
|
import {
|
|
21
28
|
deserializeInputs,
|
|
22
29
|
serializeInputs,
|
|
23
30
|
} from './data';
|
|
31
|
+
import { MetapageEventUrlHashUpdate } from './events';
|
|
32
|
+
import {
|
|
33
|
+
JsonRpcMethodsFromChild,
|
|
34
|
+
JsonRpcMethodsFromParent,
|
|
35
|
+
MinimumClientMessage,
|
|
36
|
+
SetupIframeServerResponseData,
|
|
37
|
+
} from './jsonrpc';
|
|
24
38
|
import {
|
|
25
39
|
isDebugFromUrlsParams,
|
|
26
40
|
log as MetapageToolsLog,
|
|
@@ -29,16 +43,7 @@ import {
|
|
|
29
43
|
stringToRgb,
|
|
30
44
|
} from './MetapageTools';
|
|
31
45
|
import { isIframe } from './Shared';
|
|
32
|
-
import {
|
|
33
|
-
MetaframeInputMap,
|
|
34
|
-
} from './v0_4';
|
|
35
|
-
import {
|
|
36
|
-
MetaframeId,
|
|
37
|
-
MetaframePipeId,
|
|
38
|
-
MetapageId,
|
|
39
|
-
} from './core';
|
|
40
|
-
import { MetapageEventUrlHashUpdate } from './events';
|
|
41
|
-
import { JsonRpcMethodsFromChild, JsonRpcMethodsFromParent, MinimumClientMessage, SetupIframeServerResponseData } from './jsonrpc';
|
|
46
|
+
import { MetaframeInputMap } from './v0_4';
|
|
42
47
|
import { VersionsMetapage } from './versions';
|
|
43
48
|
|
|
44
49
|
// TODO combine/unify MetaframeEvents and MetaframeLoadingState
|
|
@@ -509,12 +514,12 @@ export class Metaframe extends EventEmitter<
|
|
|
509
514
|
var method = jsonrpc.method as JsonRpcMethodsFromParent;
|
|
510
515
|
if (
|
|
511
516
|
!(
|
|
512
|
-
method ==
|
|
517
|
+
method == "SetupIframeServerResponse" ||
|
|
513
518
|
(jsonrpc.parentId == this._parentId && jsonrpc.iframeId == this.id)
|
|
514
519
|
)
|
|
515
520
|
) {
|
|
516
521
|
this.log(
|
|
517
|
-
`window.message: received message but jsonrpc.parentId=${jsonrpc.parentId} _parentId=${this._parentId} jsonrpc.iframeId=${jsonrpc.iframeId} id=${this.id}`
|
|
522
|
+
`window.message: received message (method=${method}) but jsonrpc.parentId=${jsonrpc.parentId} _parentId=${this._parentId} jsonrpc.iframeId=${jsonrpc.iframeId} id=${this.id}`
|
|
518
523
|
);
|
|
519
524
|
return;
|
|
520
525
|
}
|
package/src/metapage/Metapage.ts
CHANGED
|
@@ -1,42 +1,55 @@
|
|
|
1
|
-
import { ListenerFn } from
|
|
2
|
-
import { create } from
|
|
3
|
-
import picomatch from
|
|
1
|
+
import { ListenerFn } from 'eventemitter3';
|
|
2
|
+
import { create } from 'mutative';
|
|
3
|
+
import picomatch from 'picomatch-browser';
|
|
4
4
|
|
|
5
|
-
import { VERSION_METAPAGE } from
|
|
5
|
+
import { VERSION_METAPAGE } from './Constants';
|
|
6
6
|
import {
|
|
7
7
|
convertMetapageDefinitionToCurrentVersion,
|
|
8
8
|
getMatchingMetapageVersion,
|
|
9
|
-
} from
|
|
10
|
-
import {
|
|
11
|
-
|
|
9
|
+
} from './conversions-metapage';
|
|
10
|
+
import {
|
|
11
|
+
MetaframeId,
|
|
12
|
+
MetaframePipeId,
|
|
13
|
+
MetapageId,
|
|
14
|
+
} from './core';
|
|
15
|
+
import {
|
|
16
|
+
deserializeInputs,
|
|
17
|
+
serializeInputs,
|
|
18
|
+
} from './data';
|
|
12
19
|
import {
|
|
13
20
|
MetapageEventDefinition,
|
|
14
21
|
MetapageEvents,
|
|
15
22
|
MetapageEventUrlHashUpdate,
|
|
16
|
-
} from
|
|
23
|
+
} from './events';
|
|
17
24
|
import {
|
|
18
25
|
JsonRpcMethodsFromChild,
|
|
19
26
|
MinimumClientMessage,
|
|
20
27
|
SetupIframeClientAckData,
|
|
21
|
-
} from
|
|
22
|
-
import { MetapageIFrameRpcClient } from
|
|
28
|
+
} from './jsonrpc';
|
|
29
|
+
import { MetapageIFrameRpcClient } from './MetapageIFrameRpcClient';
|
|
23
30
|
import {
|
|
24
31
|
generateMetapageId,
|
|
25
32
|
isDebugFromUrlsParams,
|
|
26
33
|
log as MetapageToolsLog,
|
|
27
34
|
pageLoaded,
|
|
28
|
-
} from
|
|
29
|
-
import {
|
|
35
|
+
} from './MetapageTools';
|
|
36
|
+
import {
|
|
37
|
+
INITIAL_NULL_METAPAGE_DEFINITION,
|
|
38
|
+
MetapageShared,
|
|
39
|
+
} from './Shared';
|
|
30
40
|
import {
|
|
31
41
|
MetaframeInputMap,
|
|
32
42
|
MetaframeInstance,
|
|
33
43
|
MetapageInstanceInputs,
|
|
34
44
|
PipeInput,
|
|
35
45
|
PipeUpdateBlob,
|
|
36
|
-
} from
|
|
37
|
-
import { MetapageOptionsV1 } from
|
|
38
|
-
import {
|
|
39
|
-
|
|
46
|
+
} from './v0_4';
|
|
47
|
+
import { MetapageOptionsV1 } from './v1';
|
|
48
|
+
import {
|
|
49
|
+
MetapageDefinitionV2,
|
|
50
|
+
MetapageMetadataV2,
|
|
51
|
+
} from './v2';
|
|
52
|
+
import { VersionsMetapage } from './versions';
|
|
40
53
|
|
|
41
54
|
interface MetapageStatePartial {
|
|
42
55
|
inputs: MetapageInstanceInputs;
|
|
@@ -971,9 +984,15 @@ export class Metapage extends MetapageShared {
|
|
|
971
984
|
return;
|
|
972
985
|
}
|
|
973
986
|
|
|
987
|
+
// ignore messages from other metapages
|
|
988
|
+
if (method !== "SetupIframeClientRequest" && jsonrpc.parentId !== this._id) {
|
|
989
|
+
return;
|
|
990
|
+
}
|
|
991
|
+
|
|
974
992
|
const metaframe = this.getMetaframe(metaframeId);
|
|
975
993
|
if (!metaframe) {
|
|
976
|
-
|
|
994
|
+
// SetupIframeClientRequest from other metapages is ignored
|
|
995
|
+
// this.error(`💥 onMessage method=${method}no metaframe id=${metaframeId}`);
|
|
977
996
|
return;
|
|
978
997
|
}
|
|
979
998
|
|