@needle-tools/engine 5.1.6 → 5.1.7
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/CHANGELOG.md +7 -0
- package/components.needle.json +1 -1
- package/dist/{needle-engine.bundle-FRzWLdVf.umd.cjs → needle-engine.bundle-1QN--joB.umd.cjs} +140 -140
- package/dist/{needle-engine.bundle-BcyvM7a6.js → needle-engine.bundle-DT6F1AXh.js} +4839 -4791
- package/dist/{needle-engine.bundle-CadxfFMM.min.js → needle-engine.bundle-DlX4Rcl_.min.js} +140 -140
- package/dist/needle-engine.d.ts +33 -15
- package/dist/needle-engine.js +28 -28
- package/dist/needle-engine.min.js +1 -1
- package/dist/needle-engine.umd.cjs +1 -1
- package/lib/engine/api.d.ts +1 -1
- package/lib/engine/api.js +1 -1
- package/lib/engine/api.js.map +1 -1
- package/lib/engine/engine_init.js +2 -2
- package/lib/engine/engine_license.d.ts +7 -7
- package/lib/engine/engine_license.js +71 -71
- package/lib/engine/engine_license.js.map +1 -1
- package/lib/engine/engine_networking_blob.js +3 -3
- package/lib/engine/engine_networking_blob.js.map +1 -1
- package/lib/engine/engine_utils.js +6 -0
- package/lib/engine/engine_utils.js.map +1 -1
- package/lib/engine/engine_utils_qrcode.js +2 -2
- package/lib/engine/engine_utils_qrcode.js.map +1 -1
- package/lib/engine/webcomponents/needle menu/needle-menu-spatial.js +2 -2
- package/lib/engine/webcomponents/needle menu/needle-menu-spatial.js.map +1 -1
- package/lib/engine/webcomponents/needle menu/needle-menu.js +5 -5
- package/lib/engine/webcomponents/needle menu/needle-menu.js.map +1 -1
- package/lib/engine/webcomponents/needle-engine.js +2 -2
- package/lib/engine/webcomponents/needle-engine.js.map +1 -1
- package/lib/engine/webcomponents/needle-engine.loading.js +2 -2
- package/lib/engine/webcomponents/needle-engine.loading.js.map +1 -1
- package/lib/engine/xr/NeedleXRSession.js +20 -2
- package/lib/engine/xr/NeedleXRSession.js.map +1 -1
- package/lib/engine/xr/TempXRContext.js +2 -2
- package/lib/engine/xr/TempXRContext.js.map +1 -1
- package/lib/engine-components/export/usdz/USDZExporter.js +4 -4
- package/lib/engine-components/export/usdz/USDZExporter.js.map +1 -1
- package/lib/engine-components/webxr/WebARSessionRoot.d.ts +24 -6
- package/lib/engine-components/webxr/WebARSessionRoot.js +130 -39
- package/lib/engine-components/webxr/WebARSessionRoot.js.map +1 -1
- package/lib/engine-components/webxr/WebXR.d.ts +3 -3
- package/lib/engine-components/webxr/WebXR.js +4 -4
- package/lib/engine-components/webxr/WebXR.js.map +1 -1
- package/package.json +1 -1
- package/plugins/common/license.js +23 -5
- package/plugins/vite/dependencies.js +34 -0
- package/plugins/vite/license.js +4 -4
- package/plugins/vite/needle-app.js +13 -0
- package/src/engine/api.ts +1 -1
- package/src/engine/engine_init.ts +2 -2
- package/src/engine/engine_license.ts +68 -68
- package/src/engine/engine_networking_blob.ts +3 -3
- package/src/engine/engine_utils.ts +4 -0
- package/src/engine/engine_utils_qrcode.ts +2 -2
- package/src/engine/webcomponents/needle menu/needle-menu-spatial.ts +2 -2
- package/src/engine/webcomponents/needle menu/needle-menu.ts +5 -5
- package/src/engine/webcomponents/needle-engine.loading.ts +6 -6
- package/src/engine/webcomponents/needle-engine.ts +2 -2
- package/src/engine/xr/NeedleXRSession.ts +19 -2
- package/src/engine/xr/TempXRContext.ts +2 -2
- package/src/engine-components/export/usdz/USDZExporter.ts +4 -4
- package/src/engine-components/webxr/WebARSessionRoot.ts +124 -38
- package/src/engine-components/webxr/WebXR.ts +4 -4
|
@@ -9,19 +9,19 @@ import { DeviceUtilities, getParam } from "./engine_utils.js";
|
|
|
9
9
|
|
|
10
10
|
const debug = getParam("__debuglic__");
|
|
11
11
|
|
|
12
|
-
const
|
|
12
|
+
const __JlN: ((result: boolean) => void)[] = [];
|
|
13
13
|
|
|
14
14
|
// DO NOT EDIT MANUALLY
|
|
15
|
-
let
|
|
15
|
+
let _$feH: string = "";
|
|
16
16
|
// eslint-disable-next-line prefer-const
|
|
17
|
-
let
|
|
17
|
+
let Cll: string = "";
|
|
18
18
|
|
|
19
19
|
if (debug) {
|
|
20
|
-
console.log("License Type: " +
|
|
21
|
-
if (
|
|
22
|
-
console.log("License JWT: " +
|
|
20
|
+
console.log("License Type: " + _$feH);
|
|
21
|
+
if (Cll) {
|
|
22
|
+
console.log("License JWT: " + Cll);
|
|
23
23
|
try {
|
|
24
|
-
const payload = JSON.parse(atob(
|
|
24
|
+
const payload = JSON.parse(atob(Cll.split(".")[1].replace(/-/g, '+').replace(/_/g, '/')));
|
|
25
25
|
console.log("License JWT payload:", payload);
|
|
26
26
|
}
|
|
27
27
|
catch { console.log("License JWT payload: (failed to decode)"); }
|
|
@@ -32,8 +32,8 @@ if (debug) {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
/** @internal */
|
|
35
|
-
export function
|
|
36
|
-
switch (
|
|
35
|
+
export function _owM() {
|
|
36
|
+
switch (_$feH) {
|
|
37
37
|
case "pro":
|
|
38
38
|
case "enterprise":
|
|
39
39
|
return true;
|
|
@@ -42,8 +42,8 @@ export function _RTmnPEj() {
|
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
/** @internal */
|
|
45
|
-
export function
|
|
46
|
-
switch (
|
|
45
|
+
export function _$lAjTeY() {
|
|
46
|
+
switch (_$feH) {
|
|
47
47
|
case "indie":
|
|
48
48
|
return true;
|
|
49
49
|
}
|
|
@@ -51,8 +51,8 @@ export function _wHm() {
|
|
|
51
51
|
}
|
|
52
52
|
|
|
53
53
|
/** @internal */
|
|
54
|
-
export function
|
|
55
|
-
switch (
|
|
54
|
+
export function WfpL() {
|
|
55
|
+
switch (_$feH) {
|
|
56
56
|
case "edu":
|
|
57
57
|
return true;
|
|
58
58
|
}
|
|
@@ -60,20 +60,20 @@ export function BwwAkey() {
|
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
/** @internal */
|
|
63
|
-
export function
|
|
64
|
-
return
|
|
63
|
+
export function _ERXbX() {
|
|
64
|
+
return _owM() || _$lAjTeY() || WfpL();
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
|
|
68
68
|
/** @internal */
|
|
69
|
-
export function
|
|
70
|
-
if (
|
|
69
|
+
export function _$fUPpV(cb: (result: boolean) => void) {
|
|
70
|
+
if (_owM() || _$lAjTeY() || WfpL())
|
|
71
71
|
return cb(true);
|
|
72
|
-
|
|
72
|
+
__JlN.push(cb);
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
-
function
|
|
76
|
-
for (const cb of
|
|
75
|
+
function $tNDg(result: boolean) {
|
|
76
|
+
for (const cb of __JlN) {
|
|
77
77
|
try {
|
|
78
78
|
cb(result);
|
|
79
79
|
}
|
|
@@ -88,7 +88,7 @@ function _qknHtcMb(result: boolean) {
|
|
|
88
88
|
|
|
89
89
|
// ECDSA P-256 public key for verifying license JWTs (verification-only, safe to ship)
|
|
90
90
|
/* eslint-disable no-secrets/no-secrets -- public key, not a secret */
|
|
91
|
-
const
|
|
91
|
+
const UaNi = {
|
|
92
92
|
kty: "EC",
|
|
93
93
|
crv: "P-256",
|
|
94
94
|
x: "A34nyKMjhQYVgzeE4tyLUYdx34TAKogDa7v7PRaO9Lg",
|
|
@@ -112,7 +112,7 @@ function base64urlDecode(str: string): Uint8Array {
|
|
|
112
112
|
* Verify a JWT license token and return the `type` claim if valid.
|
|
113
113
|
* Returns null if the JWT is missing, malformed, or has an invalid signature.
|
|
114
114
|
*/
|
|
115
|
-
async function
|
|
115
|
+
async function _jkTgbWSW(jwt: string): Promise<string | null> {
|
|
116
116
|
if (!jwt) return null;
|
|
117
117
|
try {
|
|
118
118
|
const parts = jwt.split(".");
|
|
@@ -122,7 +122,7 @@ async function _nbExawP(jwt: string): Promise<string | null> {
|
|
|
122
122
|
|
|
123
123
|
const key = await crypto.subtle.importKey(
|
|
124
124
|
"jwk",
|
|
125
|
-
|
|
125
|
+
UaNi,
|
|
126
126
|
{ name: "ECDSA", namedCurve: "P-256" },
|
|
127
127
|
false,
|
|
128
128
|
["verify"]
|
|
@@ -182,24 +182,24 @@ async function _nbExawP(jwt: string): Promise<string | null> {
|
|
|
182
182
|
}
|
|
183
183
|
|
|
184
184
|
/** Verify the injected JWT and update the license type if valid.
|
|
185
|
-
* The engine ONLY trusts the JWT — the plain
|
|
185
|
+
* The engine ONLY trusts the JWT — the plain _$feH string is ignored. */
|
|
186
186
|
let _jwtVerificationPromise: Promise<void> | undefined = undefined;
|
|
187
|
-
async function
|
|
188
|
-
// NOTE: do NOT add an `if (!
|
|
187
|
+
async function _$xpTijs(): Promise<void> {
|
|
188
|
+
// NOTE: do NOT add an `if (!Cll) return` guard here.
|
|
189
189
|
// esbuild (Vite dependency pre-bundling) would see the variable as constant ""
|
|
190
190
|
// and tree-shake the entire JWT verification code path.
|
|
191
|
-
const jwt =
|
|
191
|
+
const jwt = Cll;
|
|
192
192
|
// Clear after reading — this reassignment also prevents esbuild from
|
|
193
193
|
// constant-folding the variable (it now has multiple assignment sites).
|
|
194
|
-
|
|
195
|
-
const verifiedType = await
|
|
194
|
+
Cll = "";
|
|
195
|
+
const verifiedType = await _jkTgbWSW(jwt);
|
|
196
196
|
if (verifiedType) {
|
|
197
|
-
|
|
197
|
+
_$feH = verifiedType;
|
|
198
198
|
if (debug) console.log("License type set from verified JWT: " + verifiedType);
|
|
199
|
-
|
|
199
|
+
$tNDg(_ERXbX());
|
|
200
200
|
}
|
|
201
201
|
else {
|
|
202
|
-
|
|
202
|
+
_$feH = "basic";
|
|
203
203
|
if (debug && jwt) console.warn("JWT verification failed — license reset to basic");
|
|
204
204
|
}
|
|
205
205
|
}
|
|
@@ -650,18 +650,18 @@ export namespace Telemetry {
|
|
|
650
650
|
}
|
|
651
651
|
|
|
652
652
|
|
|
653
|
-
export function
|
|
653
|
+
export function _QQIM() {
|
|
654
654
|
|
|
655
|
-
if(
|
|
655
|
+
if(_$feH === "") _$feH = "basic";
|
|
656
656
|
|
|
657
657
|
// Start JWT verification — must be here (not top-level) to avoid tree-shaking
|
|
658
|
-
_jwtVerificationPromise =
|
|
658
|
+
_jwtVerificationPromise = _$xpTijs();
|
|
659
659
|
|
|
660
660
|
Telemetry.init();
|
|
661
661
|
ContextRegistry.registerCallback(ContextEvent.ContextRegistered, evt => {
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
setTimeout(() =>
|
|
662
|
+
_vIz(evt.context);
|
|
663
|
+
__YpDHW(evt.context);
|
|
664
|
+
setTimeout(() => _fTHGCOy(evt.context), 2000);
|
|
665
665
|
});
|
|
666
666
|
// ContextCreated fires after the renderer exists, so the canvas is available for context-loss monitoring
|
|
667
667
|
ContextRegistry.registerCallback(ContextEvent.ContextCreated, evt => {
|
|
@@ -670,17 +670,17 @@ export function __gVa() {
|
|
|
670
670
|
});
|
|
671
671
|
}
|
|
672
672
|
|
|
673
|
-
export let
|
|
673
|
+
export let _jcZJFQ: Promise<void> | undefined = undefined;
|
|
674
674
|
let applicationIsForbidden = false;
|
|
675
675
|
let applicationForbiddenText = "";
|
|
676
|
-
async function
|
|
676
|
+
async function QBdsZzv() {
|
|
677
677
|
// Only perform the runtime license check once
|
|
678
|
-
if (
|
|
678
|
+
if (_jcZJFQ) return _jcZJFQ;
|
|
679
679
|
// Wait for JWT verification to complete first (if running)
|
|
680
680
|
if (_jwtVerificationPromise) {
|
|
681
681
|
await _jwtVerificationPromise;
|
|
682
682
|
}
|
|
683
|
-
if (
|
|
683
|
+
if (_$feH === "basic") {
|
|
684
684
|
try {
|
|
685
685
|
const licenseUrl = "https://needle.tools/api/v1/needle-engine/check?location=" + encodeURIComponent(window.location.href) + "&version=" + VERSION + "&generator=" + encodeURIComponent(GENERATOR);
|
|
686
686
|
const res = await fetch(licenseUrl, {
|
|
@@ -692,29 +692,29 @@ async function __KTmAYg() {
|
|
|
692
692
|
if (res?.status === 200) {
|
|
693
693
|
applicationIsForbidden = false;
|
|
694
694
|
if (debug) console.log("License check succeeded");
|
|
695
|
-
|
|
696
|
-
|
|
695
|
+
_$feH = "pro";
|
|
696
|
+
$tNDg(true);
|
|
697
697
|
}
|
|
698
698
|
else if (res?.status === 403) {
|
|
699
|
-
|
|
699
|
+
$tNDg(false);
|
|
700
700
|
applicationIsForbidden = true;
|
|
701
701
|
applicationForbiddenText = await res.text();
|
|
702
702
|
}
|
|
703
703
|
else {
|
|
704
|
-
|
|
704
|
+
$tNDg(false);
|
|
705
705
|
if (debug) console.log("License check failed with status " + res?.status);
|
|
706
706
|
}
|
|
707
707
|
}
|
|
708
708
|
catch (err) {
|
|
709
|
-
|
|
709
|
+
$tNDg(false);
|
|
710
710
|
if (debug) console.error("License check failed", err);
|
|
711
711
|
}
|
|
712
712
|
}
|
|
713
|
-
else if (debug) console.log("Runtime license check is skipped because license is already applied as \"" +
|
|
713
|
+
else if (debug) console.log("Runtime license check is skipped because license is already applied as \"" + _$feH + "\"");
|
|
714
714
|
}
|
|
715
|
-
|
|
715
|
+
_jcZJFQ = QBdsZzv();
|
|
716
716
|
|
|
717
|
-
async function
|
|
717
|
+
async function __YpDHW(ctx: IContext) {
|
|
718
718
|
function createForbiddenElement() {
|
|
719
719
|
const div = document.createElement("div");
|
|
720
720
|
div.className = "needle-forbidden";
|
|
@@ -779,40 +779,40 @@ async function _$LyU(ctx: IContext) {
|
|
|
779
779
|
}, 500)
|
|
780
780
|
}
|
|
781
781
|
|
|
782
|
-
async function
|
|
782
|
+
async function _vIz(ctx: IContext) {
|
|
783
783
|
try {
|
|
784
|
-
if (!
|
|
785
|
-
return
|
|
784
|
+
if (!_owM() && !_$lAjTeY()) {
|
|
785
|
+
return _qdVRlod(ctx);
|
|
786
786
|
}
|
|
787
787
|
}
|
|
788
788
|
catch (err) {
|
|
789
789
|
if (debug) console.log("License check failed", err)
|
|
790
|
-
return
|
|
790
|
+
return _qdVRlod(ctx)
|
|
791
791
|
}
|
|
792
|
-
if (debug)
|
|
792
|
+
if (debug) _qdVRlod(ctx)
|
|
793
793
|
}
|
|
794
794
|
|
|
795
795
|
|
|
796
796
|
|
|
797
|
-
async function
|
|
797
|
+
async function _qdVRlod(ctx: IContext) {
|
|
798
798
|
|
|
799
799
|
// if the engine loads faster than the license check, we need to capture the ready event here
|
|
800
800
|
let isReady = false;
|
|
801
801
|
ctx.domElement.addEventListener("ready", () => isReady = true);
|
|
802
802
|
|
|
803
|
-
await
|
|
803
|
+
await _jcZJFQ?.catch(() => { });
|
|
804
804
|
|
|
805
805
|
|
|
806
|
-
if (
|
|
807
|
-
if (
|
|
806
|
+
if (_owM() || _$lAjTeY()) return;
|
|
807
|
+
if (_ERXbX() === false) $nAg();
|
|
808
808
|
|
|
809
809
|
// check if the engine is already ready (meaning has finished loading)
|
|
810
810
|
if (isReady) {
|
|
811
|
-
|
|
811
|
+
__lRxm(ctx);
|
|
812
812
|
}
|
|
813
813
|
else {
|
|
814
814
|
ctx.domElement.addEventListener("ready", () => {
|
|
815
|
-
|
|
815
|
+
__lRxm(ctx);
|
|
816
816
|
});
|
|
817
817
|
}
|
|
818
818
|
}
|
|
@@ -820,7 +820,7 @@ async function $GvoIiWw(ctx: IContext) {
|
|
|
820
820
|
// const licenseElementIdentifier = "needle-license-element";
|
|
821
821
|
// const licenseDuration = 10000;
|
|
822
822
|
// const licenseDelay = 1200;
|
|
823
|
-
function
|
|
823
|
+
function __lRxm(ctx: IContext) {
|
|
824
824
|
|
|
825
825
|
const style = `
|
|
826
826
|
position: relative;
|
|
@@ -833,7 +833,7 @@ function _sEwWUCOP(ctx: IContext) {
|
|
|
833
833
|
padding: 10px;
|
|
834
834
|
padding-left: 30px;
|
|
835
835
|
`;
|
|
836
|
-
if (
|
|
836
|
+
if (_$feH === "edu") {
|
|
837
837
|
if (navigator.webdriver) {
|
|
838
838
|
console.log("This project is supported by Needle for Education – https://needle.tools");
|
|
839
839
|
}
|
|
@@ -890,7 +890,7 @@ function _sEwWUCOP(ctx: IContext) {
|
|
|
890
890
|
}
|
|
891
891
|
}, 1000);
|
|
892
892
|
|
|
893
|
-
if (
|
|
893
|
+
if (WfpL()) {
|
|
894
894
|
const removeDelay = 20_000;
|
|
895
895
|
setTimeout(() => {
|
|
896
896
|
clearInterval(interval);
|
|
@@ -899,7 +899,7 @@ function _sEwWUCOP(ctx: IContext) {
|
|
|
899
899
|
const intervalInMinutes = 5;
|
|
900
900
|
setTimeout(() => {
|
|
901
901
|
if (ctx.domElement.parentNode)
|
|
902
|
-
|
|
902
|
+
__lRxm(ctx);
|
|
903
903
|
}, 1000 * 60 * intervalInMinutes)
|
|
904
904
|
}, removeDelay);
|
|
905
905
|
}
|
|
@@ -910,7 +910,7 @@ function _sEwWUCOP(ctx: IContext) {
|
|
|
910
910
|
const base64Logo = "data:image/webp;base64,UklGRrABAABXRUJQVlA4WAoAAAAQAAAAHwAAHwAAQUxQSKEAAAARN6CmbSM4WR7vdARON11EBDq3fLiNbVtVzpMCPlKAEzsx0Y/x+Ovuv4dn0EFE/ydAvz6YggXzgh5sVgXM/zOC/4sii7qgGvB5N7hmuQYwkvazWAu1JPW41FXSHq6pnaQWvqYH18Fc0j1hO/BFTtIeSBlJi5w6qIIO7IOrwhFsB2Yxukif0FTRLpXswHR8MxbslKe9VZsn/Ub5C7YFOpqSTABWUDgg6AAAAFAGAJ0BKiAAIAA+7VyoTqmkpCI3+qgBMB2JbACdMt69DwMIQBLhkTO6XwY00UEDK6cNIDnuNibPf0EgAP7Y1myuiQHLDsF/0h5unrGh6WAbv7aegg2ZMd3uRKfT/3SJztcaujYfTvMXspfCTmYcoO6a+vhC3ss4M8uM58t4siiu59I4aOl59e9Sr6xoxYlHf2v+NnBNpJYeJf8jABQAId/PXuBkLEFkiCucgSGEcfhvajql/j3reCGl0M5/9gQWy7ayNPs+wlvIxFnNfSlfuND4CZOCyxOHhRqOmHN4ULHo3tCSrUNvgAA=";
|
|
911
911
|
|
|
912
912
|
let lastLogTime = 0;
|
|
913
|
-
async function
|
|
913
|
+
async function $nAg(_logo?: string) {
|
|
914
914
|
const now = Date.now();
|
|
915
915
|
if (now - lastLogTime < 2000) return;
|
|
916
916
|
lastLogTime = now;
|
|
@@ -943,7 +943,7 @@ async function _XLWxG(_logo?: string) {
|
|
|
943
943
|
}
|
|
944
944
|
|
|
945
945
|
|
|
946
|
-
async function
|
|
946
|
+
async function _fTHGCOy(context: IContext) {
|
|
947
947
|
// isAllowed() now also covers cross-origin-isolated pages (where beacons can't be sent)
|
|
948
948
|
// and Do Not Track / GPC.
|
|
949
949
|
if (!Telemetry.isAllowed(context)) {
|
|
@@ -957,7 +957,7 @@ async function _ZJOGEA(context: IContext) {
|
|
|
957
957
|
|
|
958
958
|
// current url without query parameters
|
|
959
959
|
const currentUrl = window.location.href.split("?")[0];
|
|
960
|
-
const license =
|
|
960
|
+
const license = _$feH;
|
|
961
961
|
|
|
962
962
|
const beaconData = {
|
|
963
963
|
license,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FileLoader } from "three";
|
|
2
2
|
|
|
3
3
|
import { showBalloonWarning } from "./debug/index.js";
|
|
4
|
-
import {
|
|
4
|
+
import { _ERXbX } from "./engine_license.js";
|
|
5
5
|
import { delay } from "./engine_utils.js";
|
|
6
6
|
import { md5AsBytes, md5Hex, sha256Base64 } from "./engine_utils_hash.js";
|
|
7
7
|
|
|
@@ -45,7 +45,7 @@ export namespace BlobStorage {
|
|
|
45
45
|
*/
|
|
46
46
|
export function canUpload(info: { filesize: number }) {
|
|
47
47
|
const sizeInMB = info.filesize / 1024 / 1024;
|
|
48
|
-
if (
|
|
48
|
+
if (_ERXbX()) {
|
|
49
49
|
return sizeInMB < maxSizeInMB;
|
|
50
50
|
}
|
|
51
51
|
return sizeInMB < maxFreeSizeInMB;
|
|
@@ -100,7 +100,7 @@ export namespace BlobStorage {
|
|
|
100
100
|
console.warn(`Your file is too large for uploading (${filesizeInMB.toFixed(1)}MB). Max allowed size is ${maxSizeInMB}MB`);
|
|
101
101
|
return null;
|
|
102
102
|
}
|
|
103
|
-
else if (!
|
|
103
|
+
else if (!_ERXbX() && filesizeInMB > maxFreeSizeInMB) {
|
|
104
104
|
if (opts?.silent !== true) showBalloonWarning(`File is too large for uploading. Please get a <a href=\"https://needle.tools/pricing\" target=\"_blank\">commercial license</a> to upload files larger than 5MB`);
|
|
105
105
|
console.warn(`Your file is too large for uploading (${filesizeInMB.toFixed(1)}MB). Max size is 5MB for non-commercial users. Please get a commercial license at https://needle.tools/pricing for larger files (up to 50MB)`);
|
|
106
106
|
return null;
|
|
@@ -687,6 +687,8 @@ export namespace DeviceUtilities {
|
|
|
687
687
|
/** @returns `true` for MacOS devices */
|
|
688
688
|
export function isMacOS() {
|
|
689
689
|
if (__isMacOS !== undefined) return __isMacOS;
|
|
690
|
+
// Guard against non-browser (SSR / prerender) environments where `navigator` is undefined.
|
|
691
|
+
if (typeof navigator === "undefined") return __isMacOS = false;
|
|
690
692
|
if (isiOS() || isiPad()) return __isMacOS = false;
|
|
691
693
|
const userAgent = navigator.userAgent.toLowerCase();
|
|
692
694
|
if (navigator.userAgentData) {
|
|
@@ -711,6 +713,8 @@ export namespace DeviceUtilities {
|
|
|
711
713
|
/** @returns `true` for mobile Apple devices like iPad, iPhone, iPod, Vision Pro, ... */
|
|
712
714
|
export function isiOS() {
|
|
713
715
|
if (__isiOS !== undefined) return __isiOS;
|
|
716
|
+
// Guard against non-browser (SSR / prerender) environments where `navigator` is undefined.
|
|
717
|
+
if (typeof navigator === "undefined") return __isiOS = false;
|
|
714
718
|
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
|
715
719
|
return __isiOS = iosDevices.includes(navigator.platform)
|
|
716
720
|
// iPad on iOS 13 detection
|
|
@@ -4,7 +4,7 @@ import { Quaternion, Vector2, Vector3, Vector4 } from "three";
|
|
|
4
4
|
|
|
5
5
|
import { needleLogoOnlySVG } from "./assets/index.js";
|
|
6
6
|
import { isDevEnvironment } from "./debug/debug.js";
|
|
7
|
-
import {
|
|
7
|
+
import { _ERXbX } from "./engine_license.js";
|
|
8
8
|
import { InternalAttributeUtils } from "./engine_utils_attributes.js";
|
|
9
9
|
import type { NeedleEngineWebComponent } from "./webcomponents/needle-engine.js";
|
|
10
10
|
|
|
@@ -135,7 +135,7 @@ async function internalRenderQRCodeOverlays(canvas: HTMLCanvasElement, args: { s
|
|
|
135
135
|
console.debug("[QR Code] No web component found")
|
|
136
136
|
}
|
|
137
137
|
|
|
138
|
-
const canUseCustomLogo =
|
|
138
|
+
const canUseCustomLogo = _ERXbX();
|
|
139
139
|
|
|
140
140
|
// Query logo src from needle-engine attribute.
|
|
141
141
|
// For any supported attribute it's possible to use "falsey" values (e.g. "0" or "false" to disable the logo in the QR code)
|
|
@@ -2,7 +2,7 @@ import { Mesh, Object3D, TextureLoader, Vector4 } from "three";
|
|
|
2
2
|
import ThreeMeshUI from "three-mesh-ui";
|
|
3
3
|
|
|
4
4
|
import { addNewComponent } from "../../engine_components.js";
|
|
5
|
-
import {
|
|
5
|
+
import { _ERXbX } from "../../engine_license.js";
|
|
6
6
|
import { OneEuroFilterXYZ } from "../../engine_math.js";
|
|
7
7
|
import type { Context } from "../../engine_setup.js";
|
|
8
8
|
import { lookAtObject } from "../../engine_three_utils.js";
|
|
@@ -321,7 +321,7 @@ export class NeedleSpatialMenu {
|
|
|
321
321
|
}
|
|
322
322
|
if (this.menu) {
|
|
323
323
|
const index = this.menu.children.indexOf(this._poweredByNeedleElement as any);
|
|
324
|
-
if (!this._showNeedleLogo &&
|
|
324
|
+
if (!this._showNeedleLogo && _ERXbX()) {
|
|
325
325
|
if (index >= 0) {
|
|
326
326
|
this._poweredByNeedleElement.removeFromParent();
|
|
327
327
|
this.markDirty();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { showBalloonMessage } from "../../debug/debug.js";
|
|
2
2
|
import type { Context } from "../../engine_context.js";
|
|
3
|
-
import { _$
|
|
3
|
+
import { _ERXbX, _$fUPpV, Telemetry } from "../../engine_license.js";
|
|
4
4
|
import { isLocalNetwork } from "../../engine_networking_utils.js";
|
|
5
5
|
import { HTMLElementBase } from "../../engine_ssr.js";
|
|
6
6
|
import { DeviceUtilities, getParam } from "../../engine_utils.js";
|
|
@@ -784,8 +784,8 @@ export class NeedleMenuElement extends HTMLElementBase {
|
|
|
784
784
|
try {
|
|
785
785
|
// if the user has a license then we CAN hide the needle logo
|
|
786
786
|
// calling this method immediately will cause an issue with vite bundling tho
|
|
787
|
-
window.requestAnimationFrame(() =>
|
|
788
|
-
if (res == true &&
|
|
787
|
+
window.requestAnimationFrame(() => _$fUPpV(res => {
|
|
788
|
+
if (res == true && _ERXbX() && !debugNonCommercial) {
|
|
789
789
|
let visible = this._userRequestedLogoVisible;
|
|
790
790
|
if (visible === undefined) visible = false;
|
|
791
791
|
this.___onSetLogoVisible(visible);
|
|
@@ -836,7 +836,7 @@ export class NeedleMenuElement extends HTMLElementBase {
|
|
|
836
836
|
// ensure the menu is not hidden or removed
|
|
837
837
|
const requiredParent = this?.parentNode;
|
|
838
838
|
if (this.style.display != "flex" || this.style.visibility != "visible" || this.style.opacity != "1" || requiredParent != this._domElement?.shadowRoot) {
|
|
839
|
-
if (!
|
|
839
|
+
if (!_ERXbX()) {
|
|
840
840
|
const change = changeEventCounter++;
|
|
841
841
|
// if a user doesn't have a local pro license *but* for development the menu is hidden then we show a warning
|
|
842
842
|
if (isLocalNetwork() && this._userRequestedMenuVisible === false) {
|
|
@@ -932,7 +932,7 @@ export class NeedleMenuElement extends HTMLElementBase {
|
|
|
932
932
|
showNeedleLogo(visible: boolean) {
|
|
933
933
|
this._userRequestedLogoVisible = visible;
|
|
934
934
|
if (!visible) {
|
|
935
|
-
if (!
|
|
935
|
+
if (!_ERXbX() || debugNonCommercial) {
|
|
936
936
|
console.warn("[Needle Engine] You need a commercial license to hide the Needle Engine logo in production.");
|
|
937
937
|
const localNetwork = isLocalNetwork()
|
|
938
938
|
if (!localNetwork) return;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { needleLogoOnlySVG } from "../assets/index.js"
|
|
2
2
|
import { isDevEnvironment, showBalloonWarning } from "../debug/index.js";
|
|
3
|
-
import {
|
|
3
|
+
import { _ERXbX, _owM, _jcZJFQ } from "../engine_license.js";
|
|
4
4
|
import { Mathf } from "../engine_math.js";
|
|
5
5
|
import { LoadingProgressArgs } from "../engine_setup.js";
|
|
6
6
|
import { getParam } from "../engine_utils.js";
|
|
@@ -205,7 +205,7 @@ export class EngineLoadingView implements ILoadingViewHandler {
|
|
|
205
205
|
}
|
|
206
206
|
|
|
207
207
|
|
|
208
|
-
const hasLicense =
|
|
208
|
+
const hasLicense = _owM();
|
|
209
209
|
if (!existing) {
|
|
210
210
|
this._loadingElement.style.position = "absolute";
|
|
211
211
|
this._loadingElement.style.width = "100%";
|
|
@@ -373,7 +373,7 @@ export class EngineLoadingView implements ILoadingViewHandler {
|
|
|
373
373
|
|
|
374
374
|
// private async handleRuntimeLicense(loadingElement: HTMLElement) {
|
|
375
375
|
// // First check if we have a commercial license
|
|
376
|
-
// let commercialLicense =
|
|
376
|
+
// let commercialLicense = _ERXbX();
|
|
377
377
|
// // if it's the case then we don't need to perform a runtime check
|
|
378
378
|
// if (commercialLicense) return;
|
|
379
379
|
|
|
@@ -393,10 +393,10 @@ export class EngineLoadingView implements ILoadingViewHandler {
|
|
|
393
393
|
// loadingElement.appendChild(nonCommercialContainer);
|
|
394
394
|
|
|
395
395
|
// // Use the runtime license check
|
|
396
|
-
// if (!isDevEnvironment() &&
|
|
396
|
+
// if (!isDevEnvironment() && _jcZJFQ) {
|
|
397
397
|
// if (debugLicense) console.log("Waiting for runtime license check");
|
|
398
|
-
// await
|
|
399
|
-
// commercialLicense =
|
|
398
|
+
// await _jcZJFQ;
|
|
399
|
+
// commercialLicense = _ERXbX();
|
|
400
400
|
// }
|
|
401
401
|
// if (commercialLicense) return;
|
|
402
402
|
// nonCommercialContainer.style.transition = "opacity .5s ease-in-out";
|
|
@@ -3,7 +3,7 @@ import type { Texture } from "three";
|
|
|
3
3
|
import { isDevEnvironment, showBalloonWarning } from "../debug/index.js";
|
|
4
4
|
import { PUBLIC_KEY, VERSION } from "../engine_constants.js";
|
|
5
5
|
import { ContextEvent, ContextRegistry } from "../engine_context_registry.js";
|
|
6
|
-
import {
|
|
6
|
+
import { _ERXbX, Telemetry } from "../engine_license.js";
|
|
7
7
|
import { onStart } from "../engine_lifecycle_api.js";
|
|
8
8
|
import { setDracoDecoderPath, setDracoDecoderType, setKtx2TranscoderPath } from "../engine_loaders.gltf.js";
|
|
9
9
|
import { Context, ContextCreateArgs } from "../engine_setup.js";
|
|
@@ -579,7 +579,7 @@ export class NeedleEngineWebComponent extends HTMLElementBase implements INeedle
|
|
|
579
579
|
|
|
580
580
|
|
|
581
581
|
// Loading start events
|
|
582
|
-
const allowOverridingDefaultLoading =
|
|
582
|
+
const allowOverridingDefaultLoading = _ERXbX();
|
|
583
583
|
// default loading can be overriden by calling preventDefault in the onload start event
|
|
584
584
|
this.ensureLoadStartIsRegistered();
|
|
585
585
|
let useDefaultLoading = this.dispatchEvent(new CustomEvent("loadstart", {
|
|
@@ -710,8 +710,8 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
710
710
|
const defaultInit: XRSessionInit = this.getDefaultSessionInit(mode);
|
|
711
711
|
const domOverlayElement = getDOMOverlayElement(context.domElement);
|
|
712
712
|
if (domOverlayElement && !DeviceUtilities.isQuest()) { // excluding quest since dom-overlay breaks sessiongranted
|
|
713
|
+
// 'dom-overlay' is already part of the default optional features — only the root needs to be assigned
|
|
713
714
|
defaultInit.domOverlay = { root: domOverlayElement };
|
|
714
|
-
defaultInit.optionalFeatures!.push('dom-overlay');
|
|
715
715
|
}
|
|
716
716
|
init = {
|
|
717
717
|
...defaultInit,
|
|
@@ -761,6 +761,13 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
761
761
|
}
|
|
762
762
|
}
|
|
763
763
|
this.invokeSessionRequestStart(mode, init, context ?? Context.Current);
|
|
764
|
+
// Features are collected from multiple places (default init, user init, component onBeforeXR
|
|
765
|
+
// callbacks, session request hooks) — make sure the final request contains no duplicates and
|
|
766
|
+
// no optional feature that is already required
|
|
767
|
+
const requiredFeatures = Array.from(new Set(init.requiredFeatures));
|
|
768
|
+
const optionalFeatures = Array.from(new Set(init.optionalFeatures)).filter(f => !requiredFeatures.includes(f));
|
|
769
|
+
init.requiredFeatures = requiredFeatures;
|
|
770
|
+
init.optionalFeatures = optionalFeatures;
|
|
764
771
|
if (debug) showBalloonMessage("Requesting " + mode + " session (" + Date.now() + ")");
|
|
765
772
|
Telemetry.sendEvent(Context.Current, "xr", {
|
|
766
773
|
action: "session_request",
|
|
@@ -776,9 +783,19 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
776
783
|
if (e?.code === 9) {
|
|
777
784
|
// NotSupportedError: surface the platform's reason if it provides one
|
|
778
785
|
// (e.g. which required feature is unsupported) instead of only a generic hint
|
|
779
|
-
|
|
786
|
+
let reason = typeof e?.message === "string" && e.message.length > 0
|
|
780
787
|
? e.message
|
|
781
788
|
: "Make sure you allow the required permissions.";
|
|
789
|
+
if (!init.requiredFeatures?.length) {
|
|
790
|
+
// All requested features are optional, so the session *configuration* can not be
|
|
791
|
+
// the reason for the rejection (the platform message claiming so is misleading):
|
|
792
|
+
// the browser or device is blocking the session mode itself
|
|
793
|
+
reason = mode === "immersive-ar"
|
|
794
|
+
? "AR seems to be blocked or unavailable on this device. Check the browser's site settings (Augmented Reality and Camera permissions) and that 'Google Play Services for AR' is installed and up to date."
|
|
795
|
+
: "VR seems to be blocked or unavailable on this device. Check the browser's site settings (Virtual Reality permission).";
|
|
796
|
+
if (window.self !== window.top) reason += " Embedded pages need allow=\"xr-spatial-tracking; camera\" on the iframe.";
|
|
797
|
+
console.warn(`[Needle] The ${mode} session request was rejected although all requested features are optional — the device or browser is blocking the session mode itself, not the session configuration.`);
|
|
798
|
+
}
|
|
782
799
|
showBalloonWarning(`Couldn't start XR session: ${reason}`, { duration: 30_000 });
|
|
783
800
|
}
|
|
784
801
|
console.log("If the specified XR configuration is not supported (e.g. entering AR doesnt work) - make sure you access the website on a secure connection (HTTPS) and your device has the required permissions (e.g. camera access)");
|
|
@@ -3,7 +3,7 @@ import { ArrayCamera, AxesHelper, Camera, Color, DirectionalLight, Fog, GridHelp
|
|
|
3
3
|
import { needleLogoOnlySVG } from "../assets/index.js";
|
|
4
4
|
import { isDevEnvironment } from "../debug/index.js";
|
|
5
5
|
import { ObjectUtils, PrimitiveType } from "../engine_create_objects.js";
|
|
6
|
-
import {
|
|
6
|
+
import { _ERXbX } from "../engine_license.js";
|
|
7
7
|
import { Mathf } from "../engine_math.js";
|
|
8
8
|
import { delay, DeviceUtilities } from "../engine_utils.js";
|
|
9
9
|
|
|
@@ -215,7 +215,7 @@ export class TemporaryXRContext {
|
|
|
215
215
|
this._scene.background = new Color(0x000000);
|
|
216
216
|
|
|
217
217
|
let logoSrc = needleLogoOnlySVG;
|
|
218
|
-
if (
|
|
218
|
+
if (_ERXbX()) {
|
|
219
219
|
const htmlComponent = document.querySelector("needle-engine");
|
|
220
220
|
if (htmlComponent) {
|
|
221
221
|
const licenseLogo = htmlComponent.getAttribute("logo-src");
|
|
@@ -3,7 +3,7 @@ import { Euler, Material, Matrix4, Mesh, Object3D, Quaternion, Vector3 } from "t
|
|
|
3
3
|
|
|
4
4
|
import { isDevEnvironment, showBalloonMessage, showBalloonWarning } from "../../../engine/debug/index.js";
|
|
5
5
|
import { findObjectOfType } from "../../../engine/engine_components.js";
|
|
6
|
-
import {
|
|
6
|
+
import { _owM } from "../../../engine/engine_license.js";
|
|
7
7
|
import { serializable } from "../../../engine/engine_serialization.js";
|
|
8
8
|
import { getFormattedDate, Progress } from "../../../engine/engine_time_utils.js";
|
|
9
9
|
import { DeviceUtilities, getParam } from "../../../engine/engine_utils.js";
|
|
@@ -277,7 +277,7 @@ export class USDZExporter extends Behaviour {
|
|
|
277
277
|
let name = this.exportFileName ?? this.objectToExport?.name ?? this.name;
|
|
278
278
|
name += "-" + getFormattedDate(); // seems iOS caches the file in some cases, this ensures we always have a fresh file
|
|
279
279
|
|
|
280
|
-
if (!
|
|
280
|
+
if (!_owM()) {
|
|
281
281
|
if (name !== "") name += "-";
|
|
282
282
|
name += "MadeWithNeedle";
|
|
283
283
|
}
|
|
@@ -682,7 +682,7 @@ export class USDZExporter extends Behaviour {
|
|
|
682
682
|
if (debug)
|
|
683
683
|
showBalloonMessage("Quicklook url: " + callToActionURL);
|
|
684
684
|
if (callToActionURL) {
|
|
685
|
-
if (!
|
|
685
|
+
if (!_owM()) {
|
|
686
686
|
console.warn("Quicklook closed: custom redirects require a Needle Engine Pro license: https://needle.tools/pricing", callToActionURL)
|
|
687
687
|
}
|
|
688
688
|
else {
|
|
@@ -697,7 +697,7 @@ export class USDZExporter extends Behaviour {
|
|
|
697
697
|
private buildQuicklookOverlay(): CustomBranding {
|
|
698
698
|
const obj: CustomBranding = {};
|
|
699
699
|
if (this.customBranding) Object.assign(obj, this.customBranding);
|
|
700
|
-
if (!
|
|
700
|
+
if (!_owM()) {
|
|
701
701
|
console.log("Custom Quicklook banner text requires pro license: https://needle.tools/pricing");
|
|
702
702
|
obj.callToAction = "Close";
|
|
703
703
|
obj.checkoutTitle = "🌵 Made with Needle";
|