@akashic/headless-driver 1.9.2 → 1.9.6

package/lib/play/PlayManager.js

@@ -28,22 +28,9 @@ class PlayManager {
         return __awaiter(this, void 0, void 0, function* () {
             const playId = `${this.nextPlayId++}`;
             this.plays.push(Object.assign({ playId, status: "running", createdAt: Date.now(), lastSuspendedAt: null }, playLocation));
-            if (playlog && playlog.tickList) {
+            if (playlog) {
                 const amflow = this.createAMFlow(playId);
-                const activePermission = {
-                    readTick: true,
-                    writeTick: true,
-                    sendEvent: true,
-                    subscribeEvent: true,
-                    subscribeTick: true,
-                    maxEventPriority: 2
-                };
-                const token = this.createPlayToken(playId, activePermission);
-                // TODO: プレイ生成時に AMFlowStore 生成し playlog を渡して初期化できるようにし、 AMFlowClient 経由で playlog を渡さず済むようにする
-                yield new Promise((resolve, reject) => amflow.open(playId, (e) => (e ? reject(e) : resolve())));
-                yield new Promise((resolve, reject) => amflow.authenticate(token, (e) => (e ? reject(e) : resolve())));
-                yield new Promise((resolve, reject) => amflow.putStartPoint(playlog.startPoints[0], (e) => (e ? reject(e) : resolve())));
-                amflow.setTickList(playlog.tickList);
+                amflow.setDumpedPlaylog(playlog);
             }
             return playId;
         });

package/lib/play/amflow/AMFlowClient.d.ts

@@ -20,7 +20,8 @@ export declare class AMFlowClient implements AMFlow {
     open(playId: string, callback?: (error: Error | null) => void): void;
     close(callback?: (error: Error | null) => void): void;
     authenticate(token: string, callback: (error: Error | null, permission?: Permission) => void): void;
-    setTickList(tickList: TickList): void;
+    setTickList(tickList: TickList | null): void;
+    setDumpedPlaylog(dumped: DumpedPlaylog): void;
     sendTick(tick: Tick): void;
     onTick(handler: (tick: Tick) => void): void;
     offTick(handler: (tick: Tick) => void): void;

package/lib/play/amflow/AMFlowClient.js

@@ -19,7 +19,7 @@ class AMFlowClient {
         this.store = store;
     }
     open(playId, callback) {
-        Logger_1.getSystemLogger().info("AMFlowClient#open()", playId);
+        (0, Logger_1.getSystemLogger)().info("AMFlowClient#open()", playId);
         this.store.sendEventTrigger.add(this.handleSendEvent, this);
         this.store.sendTickTrigger.add(this.handleSendTick, this);
         this.store.putStartPointTrigger.add(this.handlePutStartPoint, this);
@@ -27,7 +27,7 @@ class AMFlowClient {
         if (callback) {
             setImmediate(() => {
                 if (this.playId !== playId) {
-                    callback(ErrorFactory_1.createError("runtime_error", "Invalid PlayID"));
+                    callback((0, ErrorFactory_1.createError)("runtime_error", "Invalid PlayID"));
                 }
                 else {
                     callback(null);
@@ -36,10 +36,10 @@ class AMFlowClient {
         }
     }
     close(callback) {
-        Logger_1.getSystemLogger().info("AMFlowClient#close()");
+        (0, Logger_1.getSystemLogger)().info("AMFlowClient#close()");
         if (this.state !== "open") {
             if (callback)
-                callback(ErrorFactory_1.createError("invalid_status", "Client is not open"));
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Client is not open"));
             return;
         }
         this.destroy();
@@ -51,7 +51,7 @@ class AMFlowClient {
     authenticate(token, callback) {
         setImmediate(() => {
             if (this.state !== "open") {
-                callback(ErrorFactory_1.createError("invalid_status", "Client is not open"), undefined);
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Client is not open"), undefined);
                 return;
             }
             let permission;
@@ -63,60 +63,63 @@ class AMFlowClient {
                 return;
             }
             this.permission = permission;
-            Logger_1.getSystemLogger().info("AMFlowClient#authenticate()", this.playId, token, permission);
+            (0, Logger_1.getSystemLogger)().info("AMFlowClient#authenticate()", this.playId, token, permission);
             if (permission) {
                 callback(null, permission);
             }
             else {
-                callback(ErrorFactory_1.createError("invalid_status", "Invalid playToken"), undefined);
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Invalid playToken"), undefined);
             }
         });
     }
     setTickList(tickList) {
         this.store.setTickList(tickList);
     }
+    setDumpedPlaylog(dumped) {
+        this.store.setDumpedPlaylog(dumped);
+    }
     sendTick(tick) {
         if (this.state !== "open") {
-            throw ErrorFactory_1.createError("invalid_status", "Client is not open");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Client is not open");
         }
         if (this.permission == null) {
-            throw ErrorFactory_1.createError("invalid_status", "Not authenticated");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Not authenticated");
         }
         if (!this.permission.writeTick) {
-            throw ErrorFactory_1.createError("permission_error", "Permission denied");
+            throw (0, ErrorFactory_1.createError)("permission_error", "Permission denied");
         }
         this.store.sendTick(tick);
     }
     onTick(handler) {
         if (this.state !== "open") {
-            throw ErrorFactory_1.createError("invalid_status", "Client is not open");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Client is not open");
         }
         if (this.permission == null) {
-            throw ErrorFactory_1.createError("invalid_status", "Not authenticated");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Not authenticated");
         }
         if (!this.permission.subscribeTick) {
-            throw ErrorFactory_1.createError("permission_error", "Permission denied");
+            throw (0, ErrorFactory_1.createError)("permission_error", "Permission denied");
         }
         this.tickHandlers.push(handler);
     }
     offTick(handler) {
         if (this.state !== "open") {
-            throw ErrorFactory_1.createError("invalid_status", "Client is not open");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Client is not open");
         }
         if (this.permission == null) {
-            throw ErrorFactory_1.createError("invalid_status", "Not authenticated");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Not authenticated");
         }
         this.tickHandlers = this.tickHandlers.filter((h) => h !== handler);
     }
     sendEvent(event) {
         if (this.state !== "open") {
-            throw ErrorFactory_1.createError("invalid_status", "Client is not open");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Client is not open");
         }
         if (this.permission == null) {
-            throw ErrorFactory_1.createError("invalid_status", "Not authenticated");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Not authenticated");
         }
         if (!this.permission.sendEvent) {
-            throw ErrorFactory_1.createError("permission_error", "Permission denied");
+            throw (0, ErrorFactory_1.createError)("permission_error", "Permission denied");
         }
         // Max Priority
         const prio = event[1 /* EventFlags */] & 3 /* Priority */;
@@ -126,13 +129,13 @@ class AMFlowClient {
     }
     onEvent(handler) {
         if (this.state !== "open") {
-            throw ErrorFactory_1.createError("invalid_status", "Client is not open");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Client is not open");
         }
         if (this.permission == null) {
-            throw ErrorFactory_1.createError("invalid_status", "Not authenticated");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Not authenticated");
         }
         if (!this.permission.subscribeEvent) {
-            throw ErrorFactory_1.createError("permission_error", "Permission denied");
+            throw (0, ErrorFactory_1.createError)("permission_error", "Permission denied");
         }
         this.eventHandlers.push(handler);
         if (0 < this.unconsumedEvents.length) {
@@ -144,10 +147,10 @@ class AMFlowClient {
     }
     offEvent(handler) {
         if (this.state !== "open") {
-            throw ErrorFactory_1.createError("invalid_status", "Client is not open");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Client is not open");
         }
         if (this.permission == null) {
-            throw ErrorFactory_1.createError("invalid_status", "Not authenticated");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Not authenticated");
         }
         this.eventHandlers = this.eventHandlers.filter((h) => h !== handler);
     }
@@ -169,18 +172,18 @@ class AMFlowClient {
                 callback = endOrCallback;
             }
             if (!callback) {
-                throw ErrorFactory_1.createError("runtime_error", "Callback is undefined");
+                throw (0, ErrorFactory_1.createError)("runtime_error", "Callback is undefined");
             }
             if (this.state !== "open") {
-                callback(ErrorFactory_1.createError("invalid_status", "Client is not open"), undefined);
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Client is not open"), undefined);
                 return;
             }
             if (this.permission == null) {
-                callback(ErrorFactory_1.createError("invalid_status", "Not authenticated"), undefined);
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Not authenticated"), undefined);
                 return;
             }
             if (!this.permission.readTick) {
-                callback(ErrorFactory_1.createError("permission_error", "Permission denied"), undefined);
+                callback((0, ErrorFactory_1.createError)("permission_error", "Permission denied"), undefined);
                 return;
             }
             const tickList = this.store.getTickList(opts);
@@ -188,22 +191,22 @@ class AMFlowClient {
                 callback(null, tickList);
             }
             else {
-                callback(ErrorFactory_1.createError("runtime_error", "No tick list"), undefined);
+                callback((0, ErrorFactory_1.createError)("runtime_error", "No tick list"), undefined);
             }
         });
     }
     putStartPoint(startPoint, callback) {
         setImmediate(() => {
             if (this.state !== "open") {
-                callback(ErrorFactory_1.createError("invalid_status", "Client is not open"));
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Client is not open"));
                 return;
             }
             if (this.permission == null) {
-                callback(ErrorFactory_1.createError("invalid_status", "Not authenticated"));
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Not authenticated"));
                 return;
             }
             if (!this.permission.writeTick) {
-                callback(ErrorFactory_1.createError("permission_error", "Permission denied"));
+                callback((0, ErrorFactory_1.createError)("permission_error", "Permission denied"));
                 return;
             }
             try {
@@ -219,15 +222,15 @@ class AMFlowClient {
     getStartPoint(opts, callback) {
         setImmediate(() => {
             if (this.state !== "open") {
-                callback(ErrorFactory_1.createError("invalid_status", "Client is not open"), undefined);
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Client is not open"), undefined);
                 return;
             }
             if (this.permission == null) {
-                callback(ErrorFactory_1.createError("invalid_status", "Not authenticated"), undefined);
+                callback((0, ErrorFactory_1.createError)("invalid_status", "Not authenticated"), undefined);
                 return;
             }
             if (!this.permission.readTick) {
-                callback(ErrorFactory_1.createError("permission_error", "Permission denied"), undefined);
+                callback((0, ErrorFactory_1.createError)("permission_error", "Permission denied"), undefined);
                 return;
             }
             const startPoint = this.store.getStartPoint(opts);
@@ -235,7 +238,7 @@ class AMFlowClient {
                 callback(null, startPoint);
             }
             else {
-                callback(ErrorFactory_1.createError("runtime_error", "No start point"), undefined);
+                callback((0, ErrorFactory_1.createError)("runtime_error", "No start point"), undefined);
             }
         });
     }
@@ -243,12 +246,12 @@ class AMFlowClient {
     // 未実装の状態のため未使用の lint エラーを無効とする
     putStorageData(key, value, options, callback) {
         setImmediate(() => {
-            callback(ErrorFactory_1.createError("not_implemented", "Not implemented"));
+            callback((0, ErrorFactory_1.createError)("not_implemented", "Not implemented"));
         });
     }
     getStorageData(keys, callback) {
         setImmediate(() => {
-            callback(ErrorFactory_1.createError("not_implemented", "Not implemented"), undefined);
+            callback((0, ErrorFactory_1.createError)("not_implemented", "Not implemented"), undefined);
         });
     }
     /* eslint-enable */

package/lib/play/amflow/AMFlowStore.d.ts

@@ -39,7 +39,8 @@ export declare class AMFlowStore {
      * この AMFlowStore を再開する。
      */
     resume(): void;
-    setTickList(tickList: TickList): void;
+    setTickList(tickList: TickList | null): void;
+    setDumpedPlaylog(dumped: DumpedPlaylog): void;
     destroy(): void;
     isDestroyed(): boolean;
     createPlayToken(permission: Permission): string;

package/lib/play/amflow/AMFlowStore.js

@@ -24,23 +24,23 @@ class AMFlowStore {
     authenticate(token, revoke) {
         const permission = this.authenticatePlayToken(token, revoke);
         if (!permission) {
-            throw ErrorFactory_1.createError("invalid_status", "Cannot call AMFlowStore#authenticate without authenticated token");
+            throw (0, ErrorFactory_1.createError)("invalid_status", "Cannot call AMFlowStore#authenticate without authenticated token");
         }
         if (this.isSuspended() && (permission.sendEvent || permission.writeTick)) {
-            throw ErrorFactory_1.createError("permission_error", "Play may be suspended");
+            throw (0, ErrorFactory_1.createError)("permission_error", "Play may be suspended");
         }
         return permission;
     }
     sendTick(tick) {
         if (this.isSuspended()) {
-            throw ErrorFactory_1.createError("bad_request", "Play may be suspended");
+            throw (0, ErrorFactory_1.createError)("bad_request", "Play may be suspended");
         }
         this.pushTick(tick);
         this.sendTickTrigger.fire(tick);
     }
     sendEvent(event) {
         if (this.isSuspended()) {
-            throw ErrorFactory_1.createError("bad_request", "Play may be suspended");
+            throw (0, ErrorFactory_1.createError)("bad_request", "Play may be suspended");
         }
         this.sendEventTrigger.fire(this.cloneDeep(event));
     }
@@ -63,7 +63,7 @@ class AMFlowStore {
     }
     putStartPoint(startPoint) {
         if (this.isSuspended()) {
-            throw ErrorFactory_1.createError("bad_request", "Play may be suspended");
+            throw (0, ErrorFactory_1.createError)("bad_request", "Play may be suspended");
         }
         this.putStartPointTrigger.fire(startPoint);
         // NOTE: frame: 0 のみ第0要素に保持する
@@ -123,8 +123,12 @@ class AMFlowStore {
         this.suspended = false;
     }
     setTickList(tickList) {
-        this.unfilteredTickList = this.cloneDeep(tickList);
-        this.filteredTickList = this.cloneDeep(tickList);
+        this.unfilteredTickList = tickList ? this.cloneDeep(tickList) : null;
+        this.filteredTickList = tickList ? this.cloneDeep(tickList) : null;
+    }
+    setDumpedPlaylog(dumped) {
+        this.setTickList(dumped.tickList);
+        dumped.startPoints.forEach((sp) => this.putStartPoint(sp));
     }
     destroy() {
         if (this.isDestroyed()) {
@@ -143,7 +147,7 @@ class AMFlowStore {
     }
     createPlayToken(permission) {
         const str = this.createRandomString(10);
-        const token = js_sha256_1.sha256(str);
+        const token = (0, js_sha256_1.sha256)(str);
         this.permissionMap.set(token, permission);
         return token;
     }

package/lib/runner/RunnerManager.js

@@ -120,28 +120,28 @@ class RunnerManager {
                     externalValue: params.externalValue
                 };
                 if (version === "3") {
-                    Logger_1.getSystemLogger().info("v3 content");
+                    (0, Logger_1.getSystemLogger)().info("v3 content");
                     const filePath = ExecVmScriptV3.getFilePath();
                     const str = fs.readFileSync(filePath, { encoding: "utf8" });
                     const script = new vm2_1.VMScript(str, filePath);
                     runner = nvm.run(script).createRunnerV3(runnerParameter);
                 }
                 else if (version === "2") {
-                    Logger_1.getSystemLogger().info("v2 content");
+                    (0, Logger_1.getSystemLogger)().info("v2 content");
                     const filePath = ExecVmScriptV2.getFilePath();
                     const str = fs.readFileSync(filePath, { encoding: "utf8" });
                     const script = new vm2_1.VMScript(str, filePath);
                     runner = nvm.run(script).createRunnerV2(runnerParameter);
                 }
                 else {
-                    Logger_1.getSystemLogger().info("v1 content");
+                    (0, Logger_1.getSystemLogger)().info("v1 content");
                     const filePath = ExecVmScriptV1.getFilePath();
                     const str = fs.readFileSync(filePath, { encoding: "utf8" });
                     const script = new vm2_1.VMScript(str, filePath);
                     runner = nvm.run(script).createRunnerV1(runnerParameter);
                 }
                 runner.errorTrigger.add((err) => {
-                    Logger_1.getSystemLogger().error(err.message);
+                    (0, Logger_1.getSystemLogger)().error(err.message);
                     this.stopRunner(runnerId);
                     return true;
                 });
@@ -257,7 +257,7 @@ class RunnerManager {
     }
     loadJSON(contentUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            return utils_1.loadFile(contentUrl).then((text) => JSON.parse(text));
+            return (0, utils_1.loadFile)(contentUrl).then((text) => JSON.parse(text));
         });
     }
     createLoadFileHandler(allowedUrls) {
@@ -276,7 +276,7 @@ class RunnerManager {
                     return void callback(new Error(`Not allowed to read this URL. ${url}`));
                 }
             }
-            utils_1.loadFile(url)
+            (0, utils_1.loadFile)(url)
                 .then((text) => {
                 callback(null, text);
             })
@@ -290,7 +290,7 @@ class RunnerManager {
             sandbox: {
                 trustedFunctions: {
                     engineFiles: () => {
-                        return requireEngineFiles_1.requireEngineFiles();
+                        return (0, requireEngineFiles_1.requireEngineFiles)();
                     }
                 }
             },

package/lib/utils.js

@@ -21,7 +21,7 @@ const node_fetch_1 = require("node-fetch");
 function loadFile(url) {
     return __awaiter(this, void 0, void 0, function* () {
         if (isHttpProtocol(url)) {
-            const res = yield node_fetch_1.default(url, { method: "GET" });
+            const res = yield (0, node_fetch_1.default)(url, { method: "GET" });
             return res.text();
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akashic/headless-driver",
-  "version": "1.9.2",
+  "version": "1.9.6",
   "description": "A library to execute contents using Akashic Engine headlessly",
   "main": "lib/index.js",
   "author": "DWANGO Co., Ltd.",
@@ -23,15 +23,15 @@
   ],
   "dependencies": {
     "@akashic/amflow": "~3.1.0",
-    "@akashic/headless-driver-runner": "1.9.2",
-    "@akashic/headless-driver-runner-v1": "1.9.2",
-    "@akashic/headless-driver-runner-v2": "1.9.2",
-    "@akashic/headless-driver-runner-v3": "1.9.2",
+    "@akashic/headless-driver-runner": "1.9.6",
+    "@akashic/headless-driver-runner-v1": "1.9.6",
+    "@akashic/headless-driver-runner-v2": "1.9.6",
+    "@akashic/headless-driver-runner-v3": "1.9.6",
     "@akashic/playlog": "~3.1.0",
     "@akashic/trigger": "~1.0.0",
     "js-sha256": "0.9.0",
     "lodash.clonedeep": "4.5.0",
-    "node-fetch": "2.6.1",
+    "node-fetch": "2.6.2",
     "vm2": "3.9.1"
   },
   "devDependencies": {
@@ -40,24 +40,24 @@
     "@types/get-port": "4.0.1",
     "@types/jest": "27.0.1",
     "@types/lodash.clonedeep": "4.5.6",
-    "@types/node": "14.17.12",
+    "@types/node": "14.17.15",
     "@types/node-fetch": "2.5.12",
     "@types/pixelmatch": "5.2.4",
     "@types/pngjs": "6.0.1",
-    "@typescript-eslint/eslint-plugin": "4.29.3",
+    "@typescript-eslint/eslint-plugin": "4.31.0",
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-import": "2.24.2",
     "eslint-plugin-jest": "24.4.0",
     "get-port": "5.1.1",
-    "jest": "26.6.3",
+    "jest": "27.1.1",
     "pixelmatch": "5.2.1",
     "pngjs": "6.0.0",
-    "prettier": "2.3.2",
+    "prettier": "2.4.0",
     "rimraf": "3.0.2",
     "serve-handler": "6.1.3",
-    "ts-jest": "26.5.6",
-    "typescript": "4.3.5"
+    "ts-jest": "27.0.5",
+    "typescript": "4.4.3"
   },
   "optionalDependencies": {
     "canvas": "2.8.0"
@@ -81,5 +81,5 @@
     "globalSetup": "<rootDir>/src/__tests__/setup.ts",
     "globalTeardown": "<rootDir>/src/__tests__/teardown.ts"
   },
-  "gitHead": "cce8652f35d9be2b045a9c597b34edfe771116ee"
+  "gitHead": "f9cf6266b0750e5560267e520092730717c526ed"
 }