kitchen-simulator 4.0.6 → 4.0.7

package/es/index.js

@@ -12,6 +12,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
+import * as Three from 'three';
 import LiteRenderer from "./LiteRenderer";
 import { createRoot } from 'react-dom/client';
 var ROOT_KEY = '__kitchenSimulatorRoot__';
@@ -22,6 +23,18 @@ function nextFrame() {
   });
 }
 
+// DIY-714 [Temp Fix] Rewrite API URLs
+var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com)/;
+var API_HOST_REPLACEMENT = 'https://api-old.diydesignspace.com';
+function rewriteApiUrl(url) {
+  return typeof url === 'string' ? url.replace(API_HOST_REGEX, API_HOST_REPLACEMENT) : url;
+}
+var originalTextureLoad = Three.TextureLoader.prototype.load;
+Three.TextureLoader.prototype.load = function (url, onLoad, onProgress, onError) {
+  var newUrl = rewriteApiUrl(url);
+  return originalTextureLoad.call(this, newUrl, onLoad, onProgress, onError);
+};
+
 /**
  * Track 3D asset network activity (gltf/glb/bin/textures/hdr/etc)
  * Ref-counted global install so multiple instances don't clobber each other.
@@ -144,7 +157,9 @@ function installGltfTracker() {
         var _len3,
           args,
           _key3,
-          url,
+          input,
+          init,
+          newUrl,
           track,
           _args2 = arguments;
         return _regeneratorRuntime.wrap(function (_context2) {
@@ -153,19 +168,25 @@ function installGltfTracker() {
               for (_len3 = _args2.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
                 args[_key3] = _args2[_key3];
               }
-              url = args === null || args === void 0 ? void 0 : args[0];
-              track = is3dAssetUrl(url);
+              input = args[0], init = args[1]; // DIY-714 [Temp Fix] Rewrite API URLs
+              if (typeof input === 'string') {
+                input = rewriteApiUrl(input);
+              } else if (input instanceof Request) {
+                newUrl = rewriteApiUrl(input.url);
+                input = new Request(newUrl, input);
+              }
+              track = is3dAssetUrl(input);
               if (track) {
                 _context2.next = 1;
                 break;
               }
-              return _context2.abrupt("return", g.originalFetch.apply(this, args));
+              return _context2.abrupt("return", g.originalFetch.call(this, input, init));
             case 1:
               g.inFlight += 1;
               notify();
               _context2.prev = 2;
               _context2.next = 3;
-              return g.originalFetch.apply(this, args);
+              return g.originalFetch.call(this, input, init);
             case 3:
               return _context2.abrupt("return", _context2.sent);
             case 4:

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,8 +16,10 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireDefault(require("react"));
+var Three = _interopRequireWildcard(require("three"));
 var _LiteRenderer = _interopRequireDefault(require("./LiteRenderer"));
 var _client = require("react-dom/client");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -30,6 +33,18 @@ function nextFrame() {
   });
 }
 
+// DIY-714 [Temp Fix] Rewrite API URLs
+var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com)/;
+var API_HOST_REPLACEMENT = 'https://api-old.diydesignspace.com';
+function rewriteApiUrl(url) {
+  return typeof url === 'string' ? url.replace(API_HOST_REGEX, API_HOST_REPLACEMENT) : url;
+}
+var originalTextureLoad = Three.TextureLoader.prototype.load;
+Three.TextureLoader.prototype.load = function (url, onLoad, onProgress, onError) {
+  var newUrl = rewriteApiUrl(url);
+  return originalTextureLoad.call(this, newUrl, onLoad, onProgress, onError);
+};
+
 /**
  * Track 3D asset network activity (gltf/glb/bin/textures/hdr/etc)
  * Ref-counted global install so multiple instances don't clobber each other.
@@ -152,7 +167,9 @@ function installGltfTracker() {
         var _len3,
           args,
           _key3,
-          url,
+          input,
+          init,
+          newUrl,
           track,
           _args2 = arguments;
         return _regenerator["default"].wrap(function (_context2) {
@@ -161,19 +178,25 @@ function installGltfTracker() {
               for (_len3 = _args2.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
                 args[_key3] = _args2[_key3];
               }
-              url = args === null || args === void 0 ? void 0 : args[0];
-              track = is3dAssetUrl(url);
+              input = args[0], init = args[1]; // DIY-714 [Temp Fix] Rewrite API URLs
+              if (typeof input === 'string') {
+                input = rewriteApiUrl(input);
+              } else if (input instanceof Request) {
+                newUrl = rewriteApiUrl(input.url);
+                input = new Request(newUrl, input);
+              }
+              track = is3dAssetUrl(input);
               if (track) {
                 _context2.next = 1;
                 break;
               }
-              return _context2.abrupt("return", g.originalFetch.apply(this, args));
+              return _context2.abrupt("return", g.originalFetch.call(this, input, init));
             case 1:
               g.inFlight += 1;
               notify();
               _context2.prev = 2;
               _context2.next = 3;
-              return g.originalFetch.apply(this, args);
+              return g.originalFetch.call(this, input, init);
             case 3:
               return _context2.abrupt("return", _context2.sent);
             case 4:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",