@netless/slide 0.1.11 → 0.1.15

package/lib/SyncEventQueue.js

@@ -0,0 +1,83 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+import EventEmitter from "eventemitter3";
+var SyncEventQueue = /** @class */ (function (_super) {
+    __extends(SyncEventQueue, _super);
+    function SyncEventQueue() {
+        var _this = _super.call(this) || this;
+        _this.queue = [];
+        _this.slideIndex = -1;
+        _this.isLoading = false;
+        _this.schedule = function () {
+            var last = _this.queue[_this.queue.length - 1];
+            if (last && last.slideIndex !== _this.slideIndex && last.type !== "renderSlide" &&
+                _this.queue.length > 0 && !_this.isLoading && last.slideIndex >= 0) {
+                _this.emit("load", _this.queue[_this.queue.length - 1].slideIndex);
+                window.requestAnimationFrame(_this.schedule);
+                return;
+            }
+            if (_this.queue.some(function (evt) { return evt.type === "renderSlide"; })) {
+                var index = _this.findLastRenderSlideIndex();
+                if (index >= 0) {
+                    _this.queue = _this.queue.slice(index);
+                }
+            }
+            var evt = _this.queue[0];
+            if (evt) {
+                if (evt.type === "renderSlide" || evt.slideIndex === _this.slideIndex) {
+                    _this.queue.splice(0, 1);
+                    _this.emit("schedule", evt);
+                }
+            }
+            window.requestAnimationFrame(_this.schedule);
+        };
+        _this.schedule();
+        return _this;
+    }
+    SyncEventQueue.prototype.findLastRenderSlideIndex = function () {
+        for (var i = this.queue.length - 1; i >= 0; i--) {
+            var evt = this.queue[i];
+            if (evt.type === "renderSlide") {
+                return i;
+            }
+        }
+        return -1;
+    };
+    SyncEventQueue.prototype.setSlideIndex = function (index) {
+        this.slideIndex = index;
+    };
+    SyncEventQueue.prototype.setIsLoading = function (val) {
+        this.isLoading = val;
+    };
+    SyncEventQueue.prototype.addEvent = function (evt) {
+        var lastIndex = this.queue.length - 1;
+        var last = this.queue[lastIndex];
+        if (last && last.slideIndex === evt.slideIndex) {
+            if ((last.type === "prevStep" || last.type === "nextStep") && last.type === evt.type) {
+                this.queue[lastIndex] = evt;
+            }
+            else {
+                this.queue.push(evt);
+            }
+        }
+        else {
+            this.queue.push(evt);
+        }
+        console.log(this.queue);
+    };
+    return SyncEventQueue;
+}(EventEmitter));
+export { SyncEventQueue };

package/lib/SyncTaskManager.d.ts

@@ -0,0 +1,9 @@
+import { SyncEvent } from "./Slide";
+export declare class SyncTaskManager {
+    private fn;
+    private tasks;
+    private shadowTasks;
+    constructor(fn: (arg: SyncEvent) => Promise<void>);
+    private schedule;
+    addTask(evt: SyncEvent): void;
+}

package/lib/SyncTaskManager.js

@@ -0,0 +1,27 @@
+var SyncTaskManager = /** @class */ (function () {
+    function SyncTaskManager(fn) {
+        var _this = this;
+        this.tasks = [];
+        this.shadowTasks = [];
+        this.schedule = function () {
+            var task = _this.tasks[0];
+            if (task) {
+                _this.fn(task).then(function () {
+                    _this.tasks.splice(0, 1);
+                    window.requestAnimationFrame(_this.schedule);
+                });
+            }
+            else {
+                window.requestAnimationFrame(_this.schedule);
+            }
+        };
+        this.fn = fn;
+        this.schedule();
+    }
+    SyncTaskManager.prototype.addTask = function (evt) {
+        this.shadowTasks.push(evt);
+        this.tasks.push(evt);
+    };
+    return SyncTaskManager;
+}());
+export { SyncTaskManager };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/slide",
-  "version": "0.1.11",
+  "version": "0.1.15",
   "description": "> TODO: description",
   "author": "huaguzheng <huaguzheng2007@126.com>",
   "homepage": "https://github.com/huaguzheng/netless-ppt-plugin/tree/main/packages/slide#readme",
@@ -20,7 +20,8 @@
   },
   "scripts": {
     "dev": "tsc",
-    "build": "webpack --config webpack.config.js"
+    "build": "webpack --config webpack.config.js",
+    "watch": "webpack --config webpack.config.js --watch"
   },
   "bugs": {
     "url": "https://github.com/huaguzheng/netless-ppt-plugin/issues"
@@ -38,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "37c984a6261c5e446aee23c8ed656d757a0f1cd9"
+  "gitHead": "ac4648aee2458ff1f5be4407d0baada207ef1e2e"
 }

package/lib/PlayerController.js

@@ -1,101 +0,0 @@
-// @ts-ignore
-import { GUI } from "dat.gui";
-import md5 from "blueimp-md5";
-var PlayerController = /** @class */ (function () {
-    function PlayerController(props) {
-        this.runTime = {
-            fps: 0,
-            resolution: "",
-        };
-        this.target = props.target;
-        this.data = props.params;
-        this.player = props.player;
-        this.gui = this.createControllerGUI();
-        this.createStats();
-        this.addEventListener();
-    }
-    PlayerController.prototype.createStats = function () {
-        var _this = this;
-        setInterval(function () {
-            _this.controller.runTimeFps.setValue(_this.player.runtime.fps);
-            _this.controller.runTimeResolution.setValue(_this.player.view.width + "*" + _this.player.view.height);
-        }, 500);
-    };
-    PlayerController.prototype.createControllerGUI = function () {
-        var _a, _b, _c, _d, _e, _f;
-        var gui = new GUI({
-            autoPlace: true,
-            closed: true,
-        });
-        gui.domElement.style.opacity = ".6";
-        gui.domElement.style.transformOrigin = "100% 0";
-        gui.domElement.style.transform = "scale(1.4)";
-        this.target.appendChild(gui.domElement);
-        gui.domElement.style.position = "absolute";
-        gui.domElement.style.right = "0";
-        gui.domElement.style.top = "0";
-        gui.domElement.style.zIndex = "2";
-        this.controller = {
-            runTimeFps: gui.add({ "FPS": 0 }, "FPS", 0),
-            runTimeResolution: gui.add({ "分辨率": "" }, "分辨率", ""),
-            autoFps: gui.add({ "自动fps": (_a = this.data.autoFPS) !== null && _a !== void 0 ? _a : true }, "自动fps", true),
-            autoResolution: gui.add({ "自动分辨率": (_b = this.data.autoResolution) !== null && _b !== void 0 ? _b : false }, "自动分辨率", true),
-            moreCalculation: gui.add({ "额外计算": 0 }, "额外计算", 0, 100),
-            minFPS: gui.add({ "最低fps": (_c = this.data.minFPS) !== null && _c !== void 0 ? _c : 40 }, "最低fps", 0, 60),
-            maxFPS: gui.add({ "最高fps": (_d = this.data.maxFPS) !== null && _d !== void 0 ? _d : 50 }, "最高fps", 0, 60),
-            resolution: gui.add({ "目标分辨倍率": (_e = this.data.resolution) !== null && _e !== void 0 ? _e : window.devicePixelRatio }, "目标分辨倍率", 0.5, 4),
-            minResolution: gui.add({ "最小分辨倍率": (_f = this.data.minResolution) !== null && _f !== void 0 ? _f : 1 }, "最小分辨倍率", 0.5, 4),
-        };
-        this.controller.runTimeFps.disabled = true;
-        this.controller.runTimeResolution.disabled = true;
-        return gui;
-    };
-    PlayerController.prototype.addEventListener = function () {
-        var _this = this;
-        this.controller.autoFps.onChange(function (value) {
-            _this.data.autoFPS = value;
-            _this.player.updateConfig(_this.data);
-        });
-        this.controller.maxFPS.onChange(function (value) {
-            _this.data.maxFPS = value;
-            _this.player.updateConfig(_this.data);
-        });
-        this.controller.minFPS.onChange(function (value) {
-            _this.data.minFPS = value;
-            _this.player.updateConfig(_this.data);
-        });
-        this.controller.autoResolution.onChange(function (value) {
-            _this.data.autoResolution = value;
-            _this.player.updateConfig(_this.data);
-        });
-        this.controller.minResolution.onChange(function (value) {
-            _this.data.minResolution = value;
-            _this.player.updateConfig(_this.data);
-        });
-        this.controller.resolution.onChange(function (value) {
-            _this.data.resolution = value;
-            _this.player.updateConfig(_this.data);
-        });
-        var md5Value;
-        this.controller.moreCalculation.onChange(function (value) {
-            var calc = function () {
-                var str = "";
-                while (str.length < value) {
-                    str += Math.random().toString(32).substr(2);
-                }
-                md5(str);
-            };
-            if (md5Value) {
-                // @ts-ignore
-                _this.player.app.ticker.remove(md5Value);
-            }
-            if (value > 0) {
-                md5Value = calc;
-                // @ts-ignore
-                _this.player.app.ticker.add(md5Value);
-            }
-        });
-    };
-    return PlayerController;
-}());
-export { PlayerController };

package/lib/RenderingTaskManager.js

@@ -1,134 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-import EventEmitter from "eventemitter3";
-var Task = /** @class */ (function () {
-    function Task(index, slideIndex, fn, eventHub) {
-        this.state = "idle";
-        this.index = -1;
-        this.slideIndex = -1;
-        this.fn = fn;
-        this.index = index;
-        this.slideIndex = slideIndex;
-        this.eventHub = eventHub;
-    }
-    Task.prototype.apply = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var e_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.eventHub.emit("task-start", this);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        this.state = "start";
-                        return [4 /*yield*/, this.fn()];
-                    case 2:
-                        _a.sent();
-                        this.state = "end";
-                        this.eventHub.emit("task-end", this);
-                        return [3 /*break*/, 4];
-                    case 3:
-                        e_1 = _a.sent();
-                        this.eventHub.emit("task-error", {
-                            task: this,
-                            error: e_1,
-                        });
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    return Task;
-}());
-export { Task };
-var RenderingTaskManager = /** @class */ (function () {
-    function RenderingTaskManager() {
-        var _this = this;
-        this.eventHub = new EventEmitter();
-        this.tasks = [];
-        this.index = 0;
-        this.eventHub.on("task-end", function (task) {
-            var _a;
-            var selfIndex = _this.tasks.findIndex(function (t) { return t.index === task.index; });
-            var nextIndex = selfIndex + 1;
-            if (nextIndex >= 0) {
-                (_a = _this.tasks[nextIndex]) === null || _a === void 0 ? void 0 : _a.apply();
-            }
-            if (selfIndex >= 0) {
-                _this.tasks.splice(selfIndex, 1);
-                _this.replaceIdleTask();
-            }
-        });
-        this.eventHub.on("task-error", function (_a) {
-            var task = _a.task;
-            var selfIndex = _this.tasks.findIndex(function (t) { return t.index === task.index; });
-            if (selfIndex >= 0) {
-                _this.tasks.splice(selfIndex, 1);
-                _this.replaceIdleTask();
-            }
-        });
-    }
-    RenderingTaskManager.prototype.replaceIdleTask = function () {
-        var _this = this;
-        var _a;
-        var ids = new Set();
-        for (var i = 0, len = this.tasks.length; i < len; i++) {
-            if (this.tasks[i].state === "idle" && ((_a = this.tasks[i + 1]) === null || _a === void 0 ? void 0 : _a.state) === "idle") {
-                ids.add(i);
-            }
-        }
-        Array.from(ids).forEach(function (id) {
-            _this.tasks.splice(id, 1);
-        });
-    };
-    RenderingTaskManager.prototype.addTask = function (fn, slideIndex) {
-        var task = new Task(this.index++, slideIndex, fn, this.eventHub);
-        this.tasks.push(task);
-        this.tasks.sort(function (a, b) { return a.index - b.index; });
-        this.replaceIdleTask();
-        if (this.tasks.length === 1) {
-            task.apply();
-        }
-    };
-    RenderingTaskManager.prototype.hasStartTask = function () {
-        return this.tasks.some(function (t) { return t.state === "start"; });
-    };
-    return RenderingTaskManager;
-}());
-export { RenderingTaskManager };

package/lib/waitUntil.js

@@ -1,56 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-export var delay = function (value) { return new Promise(function (resolve) { return setTimeout(resolve, value); }); };
-export function waitUntil(fn, timeout) {
-    return __awaiter(this, void 0, void 0, function () {
-        var start;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    start = Date.now();
-                    _a.label = 1;
-                case 1:
-                    if (!(!fn() && Date.now() - start < timeout)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, delay(50)];
-                case 2:
-                    _a.sent();
-                    return [3 /*break*/, 1];
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
-}