@metapages/metapage 1.8.1 → 1.8.3
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.d.ts +0 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/metapage/MetapageIFrameRpcClient.d.ts.map +1 -1
- package/dist/metapage/MetapageIFrameRpcClient.js +1 -1
- package/dist/metapage/MetapageIFrameRpcClient.js.map +1 -1
- package/dist/metapage/util.d.ts.map +1 -1
- package/dist/metapage/util.js +9 -7
- package/dist/metapage/util.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -2
- package/src/metapage/MetapageIFrameRpcClient.ts +19 -12
- package/src/metapage/util.ts +56 -13
- package/dist/metapage/layoutUtils.d.ts +0 -2
- package/dist/metapage/layoutUtils.d.ts.map +0 -1
- package/src/metapage/layoutUtils.ts +0 -2
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC"}
|
|
@@ -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;AAIzD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAO5C,OAAO,EAAsB,cAAc,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAA0B,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAEL,wBAAwB,EAGzB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,iBAAiB,EAAoB,MAAM,YAAY,CAAC;AAajE,qBAAa,uBAAwB,SAAQ,YAAY,CACvD,wBAAwB,GAAG,cAAc,CAC1C;IACC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACnC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,EAAE,EAAE,WAAW,CAAC;IAChB,OAAO,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAEvC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,uBAAuB,EAAE,MAAM,CAAC;IAChC,MAAM,EAAE,iBAAiB,CAAM;IAC/B,OAAO,EAAE,iBAAiB,CAAM;IAChC,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAM;IAClC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,EAAE,CAAM;IACzD,OAAO,EAAE,OAAO,CAAS;IACzB,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAM;IAC/B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,4BAA4B,EAAE,OAAO,CAAS;IAC9C,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAE/C,SAAS,EAAE,cAAc,CAAC;gBAGxB,QAAQ,EAAE,cAAc,EACxB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,UAAU,EACpB,sBAAsB,EAAE,MAAM,EAC9B,KAAK,GAAE,OAAe;
|
|
1
|
+
{"version":3,"file":"MetapageIFrameRpcClient.d.ts","sourceRoot":"","sources":["../../src/metapage/MetapageIFrameRpcClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ class F extends b.EventEmitter {
|
|
|
16
16
|
}, this._cachedEventOutputsUpdate = {
|
|
17
17
|
iframeId: null,
|
|
18
18
|
inputs: null
|
|
19
|
-
}, !i.startsWith("http")) {
|
|
19
|
+
}, !i.startsWith("data:") && !i.startsWith("http")) {
|
|
20
20
|
for (; i.startsWith("/"); )
|
|
21
21
|
i = i.substring(1);
|
|
22
22
|
i = window.location.protocol + "//" + window.location.hostname + (window.location.port && window.location.port != "" ? ":" + window.location.port : "") + "/" + i;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetapageIFrameRpcClient.js","sources":["../../src/metapage/MetapageIFrameRpcClient.ts"],"sourcesContent":[null],"names":["MetapageIFrameRpcClient","EventEmitter","metapage","url","iframeId","parentId","consoleBackgroundColor","debug","urlBlob","MetapageHashParams","stringToRgb","selfThis","resolve","_d","_c","_b","_a","urlEncodedDefinition","getHashParamValueJsonFromUrl","convertMetaframeJsonToCurrentVersion","metaframeDef","event","listener","getMetaframeDefinitionFromUrl","err","MetapageEvents","name","inputBlob","inputs","maybeNewInputs","originalInputs","merge","inputUpdate","pipeId","updateBlob","outputs","maybeNewOutputs","originalOutputs","outputsUpdate","f","pipeName","fWrap","val","response","VERSION_METAPAGE","JsonRpcMethodsFromParent","version","serializeInputs","method","params","thing","message","payload","o","s","MetapageToolsLog","messageJSON","m"],"mappings":";;;;;;;;;;AAoCM,MAAOA,UAAgCC,EAAAA,aAE5C;AAAA,EAsBC,YACEC,GACAC,GACAC,GACAC,GACAC,GACAC,IAAiB,IAAK;
|
|
1
|
+
{"version":3,"file":"MetapageIFrameRpcClient.js","sources":["../../src/metapage/MetapageIFrameRpcClient.ts"],"sourcesContent":[null],"names":["MetapageIFrameRpcClient","EventEmitter","metapage","url","iframeId","parentId","consoleBackgroundColor","debug","urlBlob","MetapageHashParams","stringToRgb","selfThis","resolve","_d","_c","_b","_a","urlEncodedDefinition","getHashParamValueJsonFromUrl","convertMetaframeJsonToCurrentVersion","metaframeDef","event","listener","getMetaframeDefinitionFromUrl","err","MetapageEvents","name","inputBlob","inputs","maybeNewInputs","originalInputs","merge","inputUpdate","pipeId","updateBlob","outputs","maybeNewOutputs","originalOutputs","outputsUpdate","f","pipeName","fWrap","val","response","VERSION_METAPAGE","JsonRpcMethodsFromParent","version","serializeInputs","method","params","thing","message","payload","o","s","MetapageToolsLog","messageJSON","m"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/metapage/util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,MAAM,CAAC;AACnE,OAAO,
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/metapage/util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,MAAM,CAAC;AACnE,OAAO,EAGL,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC;AAKrE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,MAAM,CAAC;AAKnE,eAAO,MAAM,4BAA4B,QAClC,MAAM,YACD,gBAAgB,KACzB,QACD,oBAAoB,GAAG,oBAAoB,GAAG,oBAAoB,CAiBnE,CAAC;AAEF,eAAO,MAAM,6BAA6B,QACnC,MAAM,YACD,iBAAiB,KAC1B,QACC,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,GACrB,SAAS,CAyCZ,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBAEjC,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,KACxB,OAiBF,CAAC"}
|
package/dist/metapage/util.js
CHANGED
|
@@ -3,7 +3,7 @@ import { convertMetapageDefinitionToVersion as c } from "./conversions-metapage.
|
|
|
3
3
|
import { MetapageVersionCurrent as p, MetaframeVersionCurrent as f } from "./versions.js";
|
|
4
4
|
import { convertMetaframeJsonToCurrentVersion as h, convertMetaframeDefinitionToVersion as l } from "./conversions-metaframe.js";
|
|
5
5
|
import { getHashParamValueJsonFromUrl as u } from "../node_modules/@metapages/hash-query/dist/core/index.js";
|
|
6
|
-
const n = m(fetch), M = async (e,
|
|
6
|
+
const n = m(fetch), M = async (e, s) => {
|
|
7
7
|
const r = new URL(e);
|
|
8
8
|
r.pathname = r.pathname + (r.pathname.endsWith("/") ? "metapage.json" : "/metapage.json");
|
|
9
9
|
const a = await (await n(r.href, {
|
|
@@ -11,28 +11,30 @@ const n = m(fetch), M = async (e, o) => {
|
|
|
11
11
|
retries: 3,
|
|
12
12
|
retryDelay: 1e3
|
|
13
13
|
})).json();
|
|
14
|
-
return await c(a,
|
|
15
|
-
}, U = async (e,
|
|
14
|
+
return await c(a, s || p);
|
|
15
|
+
}, U = async (e, s) => {
|
|
16
|
+
if (e.startsWith("data:"))
|
|
17
|
+
return;
|
|
16
18
|
const r = new URL(e);
|
|
17
19
|
let t = u(e, "definition");
|
|
18
20
|
if (t != null && t.version)
|
|
19
21
|
return h(t);
|
|
20
22
|
r.pathname.endsWith("metaframe.json") || (r.pathname = r.pathname + (r.pathname.endsWith("/") ? "metaframe.json" : "/metaframe.json"));
|
|
21
23
|
try {
|
|
22
|
-
const
|
|
24
|
+
const o = await (await n(r.href, {
|
|
23
25
|
redirect: "follow",
|
|
24
26
|
retries: 3,
|
|
25
27
|
retryDelay: 1e3
|
|
26
28
|
})).json();
|
|
27
|
-
return await l(
|
|
29
|
+
return await l(o, s || f);
|
|
28
30
|
} catch (a) {
|
|
29
31
|
console.error(`Error fetching metaframe definition from ${r.href}: ${a}`);
|
|
30
32
|
return;
|
|
31
33
|
}
|
|
32
|
-
},
|
|
34
|
+
}, i = (e) => e ? !(e != null && e.inputs && Object.keys(e.inputs).length > 0 || e != null && e.outputs && Object.keys(e.outputs).length > 0 || e != null && e.allow || e != null && e.metadata && Object.keys(e.metadata).length > 0) : !0;
|
|
33
35
|
export {
|
|
34
36
|
U as getMetaframeDefinitionFromUrl,
|
|
35
37
|
M as getMetapageDefinitionFromUrl,
|
|
36
|
-
|
|
38
|
+
i as isEmptyMetaframeDefinition
|
|
37
39
|
};
|
|
38
40
|
//# sourceMappingURL=util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sources":["../../src/metapage/util.ts"],"sourcesContent":[null],"names":["fetchRetry","fetchRetryWrapper","getMetapageDefinitionFromUrl","url","version","metapageUrl","definition","convertMetapageDefinitionToVersion","MetapageVersionCurrent","getMetaframeDefinitionFromUrl","metaframeUrl","urlEncodedDefinition","getHashParamValueJsonFromUrl","convertMetaframeJsonToCurrentVersion","convertMetaframeDefinitionToVersion","MetaframeVersionCurrent","error","isEmptyMetaframeDefinition"],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"util.js","sources":["../../src/metapage/util.ts"],"sourcesContent":[null],"names":["fetchRetry","fetchRetryWrapper","getMetapageDefinitionFromUrl","url","version","metapageUrl","definition","convertMetapageDefinitionToVersion","MetapageVersionCurrent","getMetaframeDefinitionFromUrl","metaframeUrl","urlEncodedDefinition","getHashParamValueJsonFromUrl","convertMetaframeJsonToCurrentVersion","convertMetaframeDefinitionToVersion","MetaframeVersionCurrent","error","isEmptyMetaframeDefinition"],"mappings":";;;;;AAiBA,MAAMA,IAAaC,EAAkB,KAAK,GAE7BC,IAA+B,OAC1CC,GACAC,MAGE;AACI,QAAAC,IAAc,IAAI,IAAIF,CAAG;AACnB,EAAAE,EAAA,WACVA,EAAY,YACXA,EAAY,SAAS,SAAS,GAAG,IAAI,kBAAkB;AAMpD,QAAAC,IAAa,OALF,MAAMN,EAAWK,EAAY,MAAM;AAAA,IAClD,UAAU;AAAA,IACV,SAAS;AAAA,IACT,YAAY;AAAA,EAAA,CACb,GACiC;AAK3B,SAJqB,MAAME,EAChCD,GACAF,KAAWI,CAAsB;AAGrC,GAEaC,IAAgC,OAC3CN,GACAC,MAME;AACE,MAAAD,EAAI,WAAW,OAAO;AACjB;AAEH,QAAAO,IAAe,IAAI,IAAIP,CAAG;AAG5B,MAAAQ,IACFC,EAA6BT,GAAK,YAAY;AAEhD,MAAIQ,KAAA,QAAAA,EAAsB;AACxB,WAAOE,EAAqCF,CAAoB;AAIlE,EAAKD,EAAa,SAAS,SAAS,gBAAgB,MACrCA,EAAA,WACXA,EAAa,YACZA,EAAa,SAAS,SAAS,GAAG,IAC/B,mBACA;AAEJ,MAAA;AAMI,UAAAJ,IAAa,OALF,MAAMN,EAAWU,EAAa,MAAM;AAAA,MACnD,UAAU;AAAA,MACV,SAAS;AAAA,MACT,YAAY;AAAA,IAAA,CACb,GACiC;AAK3B,WAJqB,MAAMI,EAChCR,GACAF,KAAWW,CAAuB;AAAA,WAG7BC,GAAO;AACd,YAAQ,MACN,4CAA4CN,EAAa,IAAI,KAAKM,CAAK,EAAE;AAEpE;AAAA,EACT;AACF,GAEaC,IAA6B,CACxCX,MAKKA,IAGD,EAAAA,KAAA,QAAAA,EAAY,UAAU,OAAO,KAAKA,EAAW,MAAM,EAAE,SAAS,KAG9DA,KAAA,QAAAA,EAAY,WAAW,OAAO,KAAKA,EAAW,OAAO,EAAE,SAAS,KAGhEA,KAAA,QAAAA,EAAY,SAGZA,KAAA,QAAAA,EAAY,YAAY,OAAO,KAAKA,EAAW,QAAQ,EAAE,SAAS,KAX7D;"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -71,7 +71,7 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
71
71
|
// Urls can be relative paths, if so, turn them into absolute URLs
|
|
72
72
|
// Also local development often skips the "http:" part, so add that
|
|
73
73
|
// on so the origin is valid
|
|
74
|
-
if (!url.startsWith("http")) {
|
|
74
|
+
if (!url.startsWith("data:") && !url.startsWith("http")) {
|
|
75
75
|
while (url.startsWith("/")) {
|
|
76
76
|
url = url.substring(1);
|
|
77
77
|
}
|
|
@@ -119,17 +119,22 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
119
119
|
if (this._metapage?._definition?.metaframes?.[this.id]?.allow) {
|
|
120
120
|
selfThis._iframe.allow =
|
|
121
121
|
this._metapage._definition.metaframes[this.id].allow!;
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
122
|
+
if (this._debug) {
|
|
123
|
+
this.log(
|
|
124
|
+
`mf allow=${selfThis._iframe.allow} from this._metapage?._definition`
|
|
125
|
+
);
|
|
126
|
+
}
|
|
125
127
|
} else {
|
|
126
128
|
// else use the url encoded definition
|
|
127
129
|
let urlEncodedDefinition: MetaframeDefinitionV2 | undefined =
|
|
128
130
|
getHashParamValueJsonFromUrl(this.url, "definition");
|
|
129
131
|
|
|
130
|
-
urlEncodedDefinition =
|
|
131
|
-
|
|
132
|
-
|
|
132
|
+
urlEncodedDefinition =
|
|
133
|
+
urlEncodedDefinition && urlEncodedDefinition?.version
|
|
134
|
+
? await convertMetaframeJsonToCurrentVersion(
|
|
135
|
+
urlEncodedDefinition
|
|
136
|
+
)
|
|
137
|
+
: undefined;
|
|
133
138
|
if (!selfThis._iframe) {
|
|
134
139
|
// possibly already disposed
|
|
135
140
|
return;
|
|
@@ -138,13 +143,15 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
138
143
|
selfThis._iframe.allow = urlEncodedDefinition.allow;
|
|
139
144
|
} else {
|
|
140
145
|
// Otherwise use whatever is in the metaframe.json
|
|
141
|
-
let metaframeDef
|
|
146
|
+
let metaframeDef: MetaframeDefinitionV2 | undefined =
|
|
147
|
+
await selfThis.getDefinition();
|
|
142
148
|
if (this._debug) {
|
|
143
149
|
this.log(`mf metaframeDef=${JSON.stringify(metaframeDef)}`);
|
|
144
150
|
}
|
|
145
|
-
metaframeDef =
|
|
146
|
-
|
|
147
|
-
|
|
151
|
+
metaframeDef =
|
|
152
|
+
metaframeDef && metaframeDef?.version
|
|
153
|
+
? await convertMetaframeJsonToCurrentVersion(metaframeDef)
|
|
154
|
+
: undefined;
|
|
148
155
|
|
|
149
156
|
if (this._debug) {
|
|
150
157
|
this.log(`mf metaframeDef=${JSON.stringify(metaframeDef)}`);
|
|
@@ -229,7 +236,7 @@ export class MetapageIFrameRpcClient extends EventEmitter<
|
|
|
229
236
|
if (this._definition) {
|
|
230
237
|
return this._definition;
|
|
231
238
|
}
|
|
232
|
-
|
|
239
|
+
|
|
233
240
|
try {
|
|
234
241
|
const metaframeDef = await getMetaframeDefinitionFromUrl(this.url);
|
|
235
242
|
if (metaframeDef) {
|
package/src/metapage/util.ts
CHANGED
|
@@ -1,58 +1,101 @@
|
|
|
1
1
|
import fetchRetryWrapper from "fetch-retry";
|
|
2
2
|
import { convertMetapageDefinitionToVersion } from "./conversions-metapage";
|
|
3
3
|
import { MetaframeDefinitionV1, MetapageDefinitionV1 } from "./v1";
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
MetaframeVersionCurrent,
|
|
6
|
+
MetapageVersionCurrent,
|
|
7
|
+
VersionsMetaframe,
|
|
8
|
+
VersionsMetapage,
|
|
9
|
+
} from "./versions";
|
|
5
10
|
import { MetaframeDefinitionV4, MetapageDefinitionV3 } from "./v0_4";
|
|
6
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
convertMetaframeDefinitionToVersion,
|
|
13
|
+
convertMetaframeJsonToCurrentVersion,
|
|
14
|
+
} from "./conversions-metaframe";
|
|
7
15
|
import { MetaframeDefinitionV2, MetapageDefinitionV2 } from "./v2";
|
|
8
16
|
import { getHashParamValueJsonFromUrl } from "@metapages/hash-query";
|
|
9
17
|
|
|
10
18
|
const fetchRetry = fetchRetryWrapper(fetch);
|
|
11
19
|
|
|
12
|
-
export const getMetapageDefinitionFromUrl = async (
|
|
20
|
+
export const getMetapageDefinitionFromUrl = async (
|
|
21
|
+
url: string,
|
|
22
|
+
version?: VersionsMetapage
|
|
23
|
+
): Promise<
|
|
24
|
+
MetapageDefinitionV2 | MetapageDefinitionV1 | MetapageDefinitionV3
|
|
25
|
+
> => {
|
|
13
26
|
const metapageUrl = new URL(url);
|
|
14
|
-
metapageUrl.pathname =
|
|
27
|
+
metapageUrl.pathname =
|
|
28
|
+
metapageUrl.pathname +
|
|
29
|
+
(metapageUrl.pathname.endsWith("/") ? "metapage.json" : "/metapage.json");
|
|
15
30
|
const response = await fetchRetry(metapageUrl.href, {
|
|
16
31
|
redirect: "follow",
|
|
17
32
|
retries: 3,
|
|
18
33
|
retryDelay: 1000,
|
|
19
34
|
});
|
|
20
35
|
const definition = await response.json();
|
|
21
|
-
const convertedDefinition = await convertMetapageDefinitionToVersion(
|
|
36
|
+
const convertedDefinition = await convertMetapageDefinitionToVersion(
|
|
37
|
+
definition,
|
|
38
|
+
version || MetapageVersionCurrent
|
|
39
|
+
);
|
|
22
40
|
return convertedDefinition;
|
|
23
41
|
};
|
|
24
42
|
|
|
25
|
-
export const getMetaframeDefinitionFromUrl = async (
|
|
43
|
+
export const getMetaframeDefinitionFromUrl = async (
|
|
44
|
+
url: string,
|
|
45
|
+
version?: VersionsMetaframe
|
|
46
|
+
): Promise<
|
|
47
|
+
| MetaframeDefinitionV2
|
|
48
|
+
| MetaframeDefinitionV1
|
|
49
|
+
| MetaframeDefinitionV4
|
|
50
|
+
| undefined
|
|
51
|
+
> => {
|
|
52
|
+
if (url.startsWith("data:")) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
26
55
|
const metaframeUrl = new URL(url);
|
|
27
56
|
|
|
28
57
|
// first try hash param encoded definition
|
|
29
|
-
let urlEncodedDefinition: MetaframeDefinitionV2 | undefined =
|
|
58
|
+
let urlEncodedDefinition: MetaframeDefinitionV2 | undefined =
|
|
59
|
+
getHashParamValueJsonFromUrl(url, "definition");
|
|
30
60
|
|
|
31
61
|
if (urlEncodedDefinition?.version) {
|
|
32
|
-
return convertMetaframeJsonToCurrentVersion(urlEncodedDefinition)
|
|
62
|
+
return convertMetaframeJsonToCurrentVersion(urlEncodedDefinition);
|
|
33
63
|
}
|
|
34
64
|
|
|
35
65
|
// then try metaframe.json in the url
|
|
36
66
|
if (!metaframeUrl.pathname.endsWith("metaframe.json")) {
|
|
37
|
-
metaframeUrl.pathname =
|
|
67
|
+
metaframeUrl.pathname =
|
|
68
|
+
metaframeUrl.pathname +
|
|
69
|
+
(metaframeUrl.pathname.endsWith("/")
|
|
70
|
+
? "metaframe.json"
|
|
71
|
+
: "/metaframe.json");
|
|
38
72
|
}
|
|
39
73
|
try {
|
|
40
|
-
|
|
41
74
|
const response = await fetchRetry(metaframeUrl.href, {
|
|
42
75
|
redirect: "follow",
|
|
43
76
|
retries: 3,
|
|
44
77
|
retryDelay: 1000,
|
|
45
78
|
});
|
|
46
79
|
const definition = await response.json();
|
|
47
|
-
const convertedDefinition = await convertMetaframeDefinitionToVersion(
|
|
80
|
+
const convertedDefinition = await convertMetaframeDefinitionToVersion(
|
|
81
|
+
definition,
|
|
82
|
+
version || MetaframeVersionCurrent
|
|
83
|
+
);
|
|
48
84
|
return convertedDefinition;
|
|
49
85
|
} catch (error) {
|
|
50
|
-
console.error(
|
|
86
|
+
console.error(
|
|
87
|
+
`Error fetching metaframe definition from ${metaframeUrl.href}: ${error}`
|
|
88
|
+
);
|
|
51
89
|
return undefined;
|
|
52
90
|
}
|
|
53
91
|
};
|
|
54
92
|
|
|
55
|
-
export const isEmptyMetaframeDefinition = (
|
|
93
|
+
export const isEmptyMetaframeDefinition = (
|
|
94
|
+
definition?:
|
|
95
|
+
| MetaframeDefinitionV1
|
|
96
|
+
| MetaframeDefinitionV2
|
|
97
|
+
| MetaframeDefinitionV4
|
|
98
|
+
): boolean => {
|
|
56
99
|
if (!definition) {
|
|
57
100
|
return true;
|
|
58
101
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"layoutUtils.d.ts","sourceRoot":"","sources":["../../src/metapage/layoutUtils.ts"],"names":[],"mappings":""}
|