yootd 0.2.33 → 0.2.35

package/dist/utils/script.d.ts

@@ -0,0 +1 @@
+export declare const loadScript: (url: string) => Promise<void>;

package/dist/utils/script.js

@@ -0,0 +1,40 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+export var loadScript = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", new Promise(function (resolve, reject) {
+            // 检查是否已经存在
+            var scripts = document.head.querySelectorAll('script');
+            if (scripts != null && scripts.length > 0) {
+              var arr = Array.from(scripts);
+              if (arr.findIndex(function (item) {
+                return item.src === url;
+              }) != -1) {
+                resolve();
+                return;
+              }
+            }
+            var script = document.createElement('script');
+            script.src = url;
+            script.onload = function () {
+              resolve();
+            };
+            script.onerror = function (e) {
+              reject(e);
+            };
+            console.log("document.head", document.head);
+            document.head.appendChild(script);
+          }));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function loadScript(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/dist/video-player/index.js

@@ -4,8 +4,6 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-console.log('process.env', process.env.NODE_ENV);
-var isDev = process.env.NODE_ENV === 'development';
 // import * as faceapi from '@vladmandic/face-api';
 //
 // import * as posedetection from '@tensorflow-models/pose-detection';
@@ -20,6 +18,7 @@ import { Spin } from "./..";
 import { useBaseURL } from "../hooks/useBaseURL";
 import { useOSS } from "../hooks/useOSS";
 import { useRequest } from "../hooks/useRequest";
+import { loadScript } from "../utils/script";
 import controlBottomBg from "./assets/control-background.png";
 var PROGRESS_BAR_HEIGHT = 63;
 var MIN_SCORE = 0.5; // minimum score
@@ -824,105 +823,76 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 2:
             _context3.prev = 2;
             if (!((aiFeature.anchor || aiFeature.emotion || aiFeature.character || aiFeature.pose) && !tfInitialized)) {
-              _context3.next = 17;
+              _context3.next = 13;
               break;
             }
-            if (!isDev) {
-              _context3.next = 10;
-              break;
-            }
-            _context3.next = 7;
-            return import('@tensorflow/tfjs');
-          case 7:
-            _context3.t0 = _context3.sent;
-            _context3.next = 11;
-            break;
-          case 10:
-            _context3.t0 = window.tf;
-          case 11:
-            tf = _context3.t0;
-            _context3.next = 14;
+            _context3.next = 6;
+            return loadScript("".concat(window.location.origin, "/oss/cdn/@tensorflow/tfjs/dist/tf.min.js"));
+          case 6:
+            console.log('window.tf', window.tf);
+            tf = window.tf; // 初始化
+            _context3.next = 10;
             return tf.setBackend('webgl');
-          case 14:
-            _context3.next = 16;
+          case 10:
+            _context3.next = 12;
             return tf.ready();
-          case 16:
+          case 12:
             setTfInitialized(true);
-          case 17:
-            _context3.next = 22;
+          case 13:
+            _context3.next = 18;
             break;
-          case 19:
-            _context3.prev = 19;
-            _context3.t1 = _context3["catch"](2);
-            console.error('tensorflow 加载失败: ', _context3.t1);
-          case 22:
-            _context3.prev = 22;
+          case 15:
+            _context3.prev = 15;
+            _context3.t0 = _context3["catch"](2);
+            console.error('tensorflow 加载失败: ', _context3.t0);
+          case 18:
+            _context3.prev = 18;
             if (!((aiFeature.anchor || aiFeature.emotion || aiFeature.character) && !faceApiInitialized)) {
-              _context3.next = 45;
-              break;
-            }
-            if (!isDev) {
-              _context3.next = 30;
+              _context3.next = 36;
               break;
             }
-            _context3.next = 27;
-            return import('@vladmandic/face-api');
-          case 27:
-            _context3.t2 = _context3.sent;
-            _context3.next = 31;
-            break;
-          case 30:
-            _context3.t2 = window.faceapi;
-          case 31:
-            faceapi = _context3.t2;
-            _context3.next = 34;
+            _context3.next = 22;
+            return loadScript("".concat(window.location.origin, "/oss/cdn/@vladmandic/face-api@1.7.15/dist/face-api.js"));
+          case 22:
+            faceapi = window.faceapi;
+            _context3.next = 25;
             return faceapi.nets.ssdMobilenetv1.load("".concat(OSS, "/model-zoo/face-api-models/model"));
-          case 34:
-            _context3.next = 36;
+          case 25:
+            _context3.next = 27;
             return faceapi.nets.ageGenderNet.load("".concat(OSS, "/face-api-models/model"));
-          case 36:
-            _context3.next = 38;
+          case 27:
+            _context3.next = 29;
             return faceapi.nets.faceLandmark68Net.load("".concat(OSS, "/model-zoo/face-api-models/model"));
-          case 38:
-            _context3.next = 40;
+          case 29:
+            _context3.next = 31;
             return faceapi.nets.faceRecognitionNet.load("".concat(OSS, "/model-zoo/face-api-models/model"));
-          case 40:
-            _context3.next = 42;
+          case 31:
+            _context3.next = 33;
             return faceapi.nets.faceExpressionNet.load("".concat(OSS, "/model-zoo/face-api-models/model"));
-          case 42:
+          case 33:
             setOptions(new faceapi.SsdMobilenetv1Options({
               minConfidence: MIN_SCORE,
               maxResults: MAX_RESULTS
             }));
             detectAllFacesRef.current = faceapi.detectAllFaces;
             setFaceApiInitialized(true);
-          case 45:
-            _context3.next = 50;
+          case 36:
+            _context3.next = 41;
             break;
-          case 47:
-            _context3.prev = 47;
-            _context3.t3 = _context3["catch"](22);
-            console.error('faceapi 加载失败: ', _context3.t3);
-          case 50:
-            _context3.prev = 50;
+          case 38:
+            _context3.prev = 38;
+            _context3.t1 = _context3["catch"](18);
+            console.error('faceapi 加载失败: ', _context3.t1);
+          case 41:
+            _context3.prev = 41;
             if (!(aiFeature.pose && poseDetector == null)) {
-              _context3.next = 66;
+              _context3.next = 52;
               break;
             }
-            if (!isDev) {
-              _context3.next = 58;
-              break;
-            }
-            _context3.next = 55;
-            return import('@tensorflow-models/pose-detection');
-          case 55:
-            _context3.t4 = _context3.sent;
-            _context3.next = 59;
-            break;
-          case 58:
-            _context3.t4 = window.poseDetection;
-          case 59:
-            poseDetection = _context3.t4;
+            _context3.next = 45;
+            return loadScript("".concat(window.location.origin, "/oss/cdn/@tensorflow-models/pose-detection@2.1.3/dist/pose-detection.min.js"));
+          case 45:
+            poseDetection = window.poseDetection;
             detectorConfig = {
               modelType: poseDetection.movenet.modelType.MULTIPOSE_LIGHTNING,
               enableTracking: true,
@@ -930,24 +900,24 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
               scoreThreshold: 0.3,
               modelUrl: "".concat(OSS, "/model-zoo/pose-detection-models/model.json")
             };
-            _context3.next = 63;
+            _context3.next = 49;
             return poseDetection.createDetector(poseDetection.SupportedModels.MoveNet, detectorConfig);
-          case 63:
+          case 49:
             _poseDetector = _context3.sent;
             getAdjacentPairsRef.current = poseDetection.util.getAdjacentPairs;
             setPoseDetector(_poseDetector);
-          case 66:
-            _context3.next = 71;
+          case 52:
+            _context3.next = 57;
             break;
-          case 68:
-            _context3.prev = 68;
-            _context3.t5 = _context3["catch"](50);
-            console.error('pose detection 加载失败: ', _context3.t5);
-          case 71:
+          case 54:
+            _context3.prev = 54;
+            _context3.t2 = _context3["catch"](41);
+            console.error('pose detection 加载失败: ', _context3.t2);
+          case 57:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[2, 19], [22, 47], [50, 68]]);
+      }, _callee3, null, [[2, 15], [18, 38], [41, 54]]);
     }))();
     return function () {
       loaded = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yootd",
-  "version": "0.2.33",
+  "version": "0.2.35",
   "description": "基于 Antd 二次开发的组件库",
   "license": "MIT",
   "sideEffects": [
@@ -54,10 +54,13 @@
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
+    "@tensorflow-models/pose-detection": ">=2.1.3",
+    "@tensorflow/tfjs": ">=4.22.0",
     "@types/lodash": "^4.17.12",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "@umijs/lint": "^4.0.0",
+    "@vladmandic/face-api": ">=1.7.14",
     "cross-env": "^10.0.0",
     "dumi": "^2.3.0",
     "dumi-theme-antd": "^0.4.2",
@@ -77,9 +80,6 @@
     "@dnd-kit/sortable": ">=8.0.0",
     "@dnd-kit/utilities": ">=3.2.2",
     "@tanstack/react-query": ">=5.59.15",
-    "@tensorflow-models/pose-detection": ">=2.1.3",
-    "@tensorflow/tfjs": ">=4.22.0",
-    "@vladmandic/face-api": ">=1.7.14",
     "@xyflow/react": ">=12.3.3",
     "antd": ">=5.21.4",
     "axios": ">=1.7.7",