@famibee/skynovel 1.26.0 → 1.27.0
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 +15 -0
- package/app.js +129 -74
- package/appMain.js +3 -0
- package/core/lib/appMain.d.ts.map +1 -1
- package/core/lib/preload.d.ts +4 -1
- package/core/lib/preload.d.ts.map +1 -1
- package/core/lib/preload.js +1 -0
- package/core/lib/sn/SysApp.d.ts +1 -1
- package/core/lib/sn/SysApp.d.ts.map +1 -1
- package/core/lib/sn/SysBase.d.ts +1 -1
- package/core/lib/sn/SysBase.d.ts.map +1 -1
- package/core/lib/sn/SysNode.d.ts +1 -1
- package/core/lib/sn/SysNode.d.ts.map +1 -1
- package/package.json +1 -1
- package/web.js +34 -34
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
# [1.27.0](https://github.com/famibee/SKYNovel/compare/v1.26.0...v1.27.0) (2022-01-11)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* [update_check]DLでアーキテクチャ(x32、x64など)別の対応が可能に ([b8e569f](https://github.com/famibee/SKYNovel/commit/b8e569febb418f69c58879cab036d370fa66a3f1))
|
|
7
|
+
|
|
8
|
+
- feat: [update_check]のアプリダウンロードでアーキテクチャ(x32、x64など)別の対応が可能に
|
|
9
|
+
- 拡張機能により生成された _index.json ファイルを使用
|
|
10
|
+
- 旧版の .yml ファイルもしばらく対応する
|
|
11
|
+
- feat: アプリ実行時に OSや CPU アーキテクチャに対応するファイルが見つからない場合、同じOSのファイルをすべてダウンロードさせる
|
|
12
|
+
- fix: [update_check]でDLするか確認するダイアログを無効にしていたのを修正
|
|
13
|
+
- fix: [update_check]のダウンロードテクノロジーを[snapshot]と同じにし、保存ダイアログなしでダウンロードフォルダに保存するように
|
|
14
|
+
|
|
15
|
+
|
|
1
16
|
# [1.26.0](https://github.com/famibee/SKYNovel/compare/v1.25.10...v1.26.0) (2022-01-10)
|
|
2
17
|
|
|
3
18
|
|
package/app.js
CHANGED
|
@@ -71525,14 +71525,14 @@ const DebugMng_1 = __webpack_require__(/*! ./DebugMng */ "./core/src/sn/DebugMng
|
|
|
71525
71525
|
;
|
|
71526
71526
|
var BreakState;
|
|
71527
71527
|
(function (BreakState) {
|
|
71528
|
-
BreakState[BreakState["
|
|
71529
|
-
BreakState[BreakState["
|
|
71530
|
-
BreakState[BreakState["
|
|
71531
|
-
BreakState[BreakState["
|
|
71532
|
-
BreakState[BreakState["
|
|
71533
|
-
BreakState[BreakState["
|
|
71534
|
-
BreakState[BreakState["
|
|
71535
|
-
BreakState[BreakState["
|
|
71528
|
+
BreakState[BreakState["Running"] = 0] = "Running";
|
|
71529
|
+
BreakState[BreakState["Wait"] = 1] = "Wait";
|
|
71530
|
+
BreakState[BreakState["Break"] = 2] = "Break";
|
|
71531
|
+
BreakState[BreakState["Breaking"] = 3] = "Breaking";
|
|
71532
|
+
BreakState[BreakState["Step"] = 4] = "Step";
|
|
71533
|
+
BreakState[BreakState["Stepping"] = 5] = "Stepping";
|
|
71534
|
+
BreakState[BreakState["StepOuting"] = 6] = "StepOuting";
|
|
71535
|
+
BreakState[BreakState["StepOut"] = 7] = "StepOut";
|
|
71536
71536
|
})(BreakState || (BreakState = {}));
|
|
71537
71537
|
;
|
|
71538
71538
|
class ScriptIterator {
|
|
@@ -71561,14 +71561,14 @@ class ScriptIterator {
|
|
|
71561
71561
|
__classPrivateFieldSet(ScriptIterator, _a, {}, "f", _ScriptIterator_hFuncBP);
|
|
71562
71562
|
this.isBreak = () => false;
|
|
71563
71563
|
__classPrivateFieldGet(this, _ScriptIterator_hHook, "f").continue({});
|
|
71564
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71564
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Running, "f");
|
|
71565
71565
|
},
|
|
71566
71566
|
restart: () => this.isBreak = () => false,
|
|
71567
71567
|
add_break: o => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_regBreakPoint).call(this, o.fn, o.o),
|
|
71568
71568
|
data_break: o => {
|
|
71569
|
-
if (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f") !== BreakState.
|
|
71569
|
+
if (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f") !== BreakState.Running)
|
|
71570
71570
|
return;
|
|
71571
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71571
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Wait, "f");
|
|
71572
71572
|
this.main.setLoop(false, `変数 ${o.dataId}【${o.old_v}】→【${o.new_v}】データブレーク`);
|
|
71573
71573
|
this.sys.callHook('stopOnDataBreakpoint', {});
|
|
71574
71574
|
this.sys.send2Dbg('stopOnDataBreakpoint', {});
|
|
@@ -71584,7 +71584,7 @@ class ScriptIterator {
|
|
|
71584
71584
|
if (__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_isIdxOverLast).call(this))
|
|
71585
71585
|
return;
|
|
71586
71586
|
__classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
|
|
71587
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71587
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Breaking, "f");
|
|
71588
71588
|
this.main.setLoop(true);
|
|
71589
71589
|
this.main.resume();
|
|
71590
71590
|
},
|
|
@@ -71595,9 +71595,9 @@ class ScriptIterator {
|
|
|
71595
71595
|
const tkn = __classPrivateFieldGet(this, _ScriptIterator_script, "f").aToken[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get)];
|
|
71596
71596
|
this.sys.callHook(`stopOnStep${__classPrivateFieldGet(this, _ScriptIterator_REGSTEPIN, "f").test(tkn) ? 'In' : ''}`, {});
|
|
71597
71597
|
__classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
|
|
71598
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
71599
|
-
? BreakState.
|
|
71600
|
-
: BreakState.
|
|
71598
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Wait
|
|
71599
|
+
? BreakState.Step
|
|
71600
|
+
: BreakState.Stepping, "f");
|
|
71601
71601
|
this.main.setLoop(true);
|
|
71602
71602
|
this.main.resume();
|
|
71603
71603
|
},
|
|
@@ -71610,12 +71610,12 @@ class ScriptIterator {
|
|
|
71610
71610
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepover).call(this, o);
|
|
71611
71611
|
},
|
|
71612
71612
|
pause: () => {
|
|
71613
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71613
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
71614
71614
|
this.main.setLoop(false, '一時停止');
|
|
71615
71615
|
this.sys.send2Dbg('stopOnStep', {});
|
|
71616
71616
|
},
|
|
71617
71617
|
stopOnEntry: () => {
|
|
71618
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71618
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
71619
71619
|
this.main.setLoop(false, '一時停止');
|
|
71620
71620
|
this.sys.send2Dbg('stopOnEntry', {});
|
|
71621
71621
|
},
|
|
@@ -71625,7 +71625,7 @@ class ScriptIterator {
|
|
|
71625
71625
|
.replace(__classPrivateFieldGet(ScriptIterator, _a, "f", _ScriptIterator_REG4CODE_FN), `$1/prj/$2/${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")}$3`));
|
|
71626
71626
|
this.cnvPath4Dbg = (fn) => this.sys.pathBaseCnvSnPath4Dbg + fn.replace('/crypto_prj/', '/prj/');
|
|
71627
71627
|
_ScriptIterator_csDepth_macro_esc.set(this, 0);
|
|
71628
|
-
_ScriptIterator_breakState.set(this, BreakState.
|
|
71628
|
+
_ScriptIterator_breakState.set(this, BreakState.Running);
|
|
71629
71629
|
this.isBreak = (_token) => false;
|
|
71630
71630
|
_ScriptIterator_procDebugtag.set(this, (_tag_name) => { });
|
|
71631
71631
|
_ScriptIterator_evtMng.set(this, void 0);
|
|
@@ -71956,12 +71956,12 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
71956
71956
|
this.sys.callHook(`stopOnStep${out ? 'Out' : ''}`, {});
|
|
71957
71957
|
__classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - (out ? 1 : 0), "f");
|
|
71958
71958
|
__classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
|
|
71959
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.
|
|
71959
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.StepOut : BreakState.StepOuting, "f");
|
|
71960
71960
|
this.main.setLoop(true);
|
|
71961
71961
|
this.main.resume();
|
|
71962
71962
|
}, _ScriptIterator_idxDx4Dbg_get = function _ScriptIterator_idxDx4Dbg_get() {
|
|
71963
|
-
return __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
71964
|
-
|| __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
71963
|
+
return __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Break
|
|
71964
|
+
|| __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Step ? 1 : 0;
|
|
71965
71965
|
}, _ScriptIterator_isIdxOverLast = function _ScriptIterator_isIdxOverLast() {
|
|
71966
71966
|
if (__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") < __classPrivateFieldGet(this, _ScriptIterator_script, "f").len)
|
|
71967
71967
|
return false;
|
|
@@ -71970,34 +71970,34 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
71970
71970
|
return true;
|
|
71971
71971
|
}, _ScriptIterator_isBreak_base = function _ScriptIterator_isBreak_base(token) {
|
|
71972
71972
|
switch (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f")) {
|
|
71973
|
-
case BreakState.
|
|
71973
|
+
case BreakState.StepOuting:
|
|
71974
71974
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
71975
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71975
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.StepOut, "f");
|
|
71976
71976
|
break;
|
|
71977
|
-
case BreakState.
|
|
71977
|
+
case BreakState.StepOut:
|
|
71978
71978
|
if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
|
|
71979
71979
|
break;
|
|
71980
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71980
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
71981
71981
|
this.main.setLoop(false, 'ステップ実行');
|
|
71982
71982
|
this.sys.send2Dbg('stopOnStep', {});
|
|
71983
71983
|
return true;
|
|
71984
|
-
case BreakState.
|
|
71984
|
+
case BreakState.Stepping:
|
|
71985
71985
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
71986
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71986
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
71987
71987
|
break;
|
|
71988
|
-
case BreakState.
|
|
71988
|
+
case BreakState.Step:
|
|
71989
71989
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
71990
71990
|
this.main.setLoop(false, 'ステップ実行');
|
|
71991
71991
|
this.sys.send2Dbg('stopOnStep', {});
|
|
71992
71992
|
return true;
|
|
71993
|
-
case BreakState.
|
|
71993
|
+
case BreakState.Breaking:
|
|
71994
71994
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
71995
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
71995
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Running, "f");
|
|
71996
71996
|
break;
|
|
71997
71997
|
default:
|
|
71998
71998
|
{
|
|
71999
71999
|
if ((0, Grammar_1.tagToken2Name)(token) in __classPrivateFieldGet(ScriptIterator, _a, "f", _ScriptIterator_hFuncBP)) {
|
|
72000
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
72000
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Break, "f");
|
|
72001
72001
|
this.main.setLoop(false, `関数 ${token} ブレーク`);
|
|
72002
72002
|
this.sys.callHook('stopOnBreakpoint', {});
|
|
72003
72003
|
this.sys.send2Dbg('stopOnBreakpoint', {});
|
|
@@ -72017,8 +72017,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
72017
72017
|
}
|
|
72018
72018
|
else if (('hitCondition' in o) && --o.hitCondition > 0)
|
|
72019
72019
|
break;
|
|
72020
|
-
const isBreak = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
72021
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
72020
|
+
const isBreak = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Running;
|
|
72021
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Break, "f");
|
|
72022
72022
|
this.main.setLoop(false, isBreak ? ((o.condition ? '条件' : 'ヒットカウント') + 'ブレーク') : 'ステップ実行');
|
|
72023
72023
|
const type = isBreak ? 'stopOnBreakpoint' : 'stopOnStep';
|
|
72024
72024
|
this.sys.callHook(type, {});
|
|
@@ -72032,7 +72032,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
72032
72032
|
if (o?.hitCondition)
|
|
72033
72033
|
--o.hitCondition;
|
|
72034
72034
|
}, _ScriptIterator_aStack = function _ScriptIterator_aStack() {
|
|
72035
|
-
const idx_n = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
72035
|
+
const idx_n = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Breaking ? 1 : 0;
|
|
72036
72036
|
const tkn0 = __classPrivateFieldGet(this, _ScriptIterator_script, "f").aToken[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - 1 + idx_n];
|
|
72037
72037
|
const fn0 = __classPrivateFieldGet(this, _ScriptIterator_cnvSnPath4Dbg, "f").call(this, __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"));
|
|
72038
72038
|
const tag_name0 = (0, Grammar_1.tagToken2Name)(tkn0);
|
|
@@ -73150,7 +73150,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
73150
73150
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
73151
73151
|
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
73152
73152
|
};
|
|
73153
|
-
var _SysApp_hInfo, _SysApp_main;
|
|
73153
|
+
var _SysApp_instances, _SysApp_hInfo, _SysApp_main, _SysApp_dl_app;
|
|
73154
73154
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
73155
73155
|
exports.SysApp = void 0;
|
|
73156
73156
|
const SysNode_1 = __webpack_require__(/*! ./SysNode */ "./core/src/sn/SysNode.ts");
|
|
@@ -73162,6 +73162,7 @@ const { to_app } = window;
|
|
|
73162
73162
|
class SysApp extends SysNode_1.SysNode {
|
|
73163
73163
|
constructor(hPlg = {}, arg = { cur: 'prj/', crypto: false, dip: '' }) {
|
|
73164
73164
|
super(hPlg, arg);
|
|
73165
|
+
_SysApp_instances.add(this);
|
|
73165
73166
|
_SysApp_hInfo.set(this, {
|
|
73166
73167
|
getAppPath: '',
|
|
73167
73168
|
isPackaged: false,
|
|
@@ -73169,6 +73170,8 @@ class SysApp extends SysNode_1.SysNode {
|
|
|
73169
73170
|
userData: '',
|
|
73170
73171
|
getVersion: '',
|
|
73171
73172
|
env: {},
|
|
73173
|
+
platform: '',
|
|
73174
|
+
arch: '',
|
|
73172
73175
|
screenResolutionX: 0,
|
|
73173
73176
|
screenResolutionY: 0,
|
|
73174
73177
|
});
|
|
@@ -73309,19 +73312,31 @@ class SysApp extends SysNode_1.SysNode {
|
|
|
73309
73312
|
if (CmnLib_1.CmnLib.debugLog)
|
|
73310
73313
|
DebugMng_1.DebugMng.myTrace(`[update_check] url=${url}`, 'D');
|
|
73311
73314
|
(async () => {
|
|
73312
|
-
|
|
73313
|
-
|
|
73315
|
+
let oIdx = {};
|
|
73316
|
+
let sYml = '';
|
|
73317
|
+
let netver = '';
|
|
73318
|
+
const resIdxJS = await this.fetch(url + '_index.json');
|
|
73319
|
+
if (resIdxJS.ok) {
|
|
73314
73320
|
if (CmnLib_1.CmnLib.debugLog)
|
|
73315
|
-
DebugMng_1.DebugMng.myTrace(`[update_check]
|
|
73316
|
-
|
|
73321
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] _index.jsonを取得しました`, 'D');
|
|
73322
|
+
oIdx = await resIdxJS.json();
|
|
73323
|
+
netver = oIdx.version;
|
|
73324
|
+
}
|
|
73325
|
+
else {
|
|
73326
|
+
const resYml = await this.fetch(url + `latest${CmnLib_1.CmnLib.isMac ? '-mac' : ''}.yml`);
|
|
73327
|
+
if (!resYml.ok) {
|
|
73328
|
+
if (CmnLib_1.CmnLib.debugLog)
|
|
73329
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] [update_check] .ymlが見つかりません`);
|
|
73330
|
+
return;
|
|
73331
|
+
}
|
|
73332
|
+
if (CmnLib_1.CmnLib.debugLog)
|
|
73333
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] .ymlを取得しました`, 'D');
|
|
73334
|
+
sYml = await resYml.text();
|
|
73335
|
+
const mv = /version: (.+)/.exec(sYml);
|
|
73336
|
+
if (!mv)
|
|
73337
|
+
throw `[update_check] .yml に version が見つかりません`;
|
|
73338
|
+
netver = mv[1];
|
|
73317
73339
|
}
|
|
73318
|
-
if (CmnLib_1.CmnLib.debugLog)
|
|
73319
|
-
DebugMng_1.DebugMng.myTrace(`[update_check] .ymlを取得しました`, 'D');
|
|
73320
|
-
const txtYml = await res.text();
|
|
73321
|
-
const mv = /version: (.+)/.exec(txtYml);
|
|
73322
|
-
if (!mv)
|
|
73323
|
-
throw `[update_check] .yml に version が見つかりません`;
|
|
73324
|
-
const netver = mv[1];
|
|
73325
73340
|
const appver = __classPrivateFieldGet(this, _SysApp_hInfo, "f").getVersion;
|
|
73326
73341
|
if (CmnLib_1.CmnLib.debugLog)
|
|
73327
73342
|
DebugMng_1.DebugMng.myTrace(`[update_check] 現在ver=${appver} 新規ver=${netver}`, 'D');
|
|
@@ -73330,39 +73345,65 @@ class SysApp extends SysNode_1.SysNode {
|
|
|
73330
73345
|
DebugMng_1.DebugMng.myTrace(`[update_check] バージョン更新なし`, 'I');
|
|
73331
73346
|
return;
|
|
73332
73347
|
}
|
|
73348
|
+
const mbo = {
|
|
73349
|
+
title: 'アプリ更新',
|
|
73350
|
+
icon: (__classPrivateFieldGet(this, _SysApp_hInfo, "f").getAppPath + '/app/icon.png'),
|
|
73351
|
+
buttons: ['OK', 'Cancel'],
|
|
73352
|
+
defaultId: 0,
|
|
73353
|
+
cancelId: 1,
|
|
73354
|
+
message: `アプリ【${this.cfg.oCfg.book.title}】に更新があります。\nダウンロードしますか?`,
|
|
73355
|
+
detail: `現在 NOW ver ${appver}\n新規 NEW ver ${netver}`,
|
|
73356
|
+
};
|
|
73357
|
+
const di = await to_app.showMessageBox(mbo);
|
|
73358
|
+
if (di.response > 0)
|
|
73359
|
+
return;
|
|
73333
73360
|
if (CmnLib_1.CmnLib.debugLog)
|
|
73334
73361
|
DebugMng_1.DebugMng.myTrace(`[update_check] アプリダウンロード開始`, 'D');
|
|
73335
|
-
|
|
73336
|
-
|
|
73337
|
-
|
|
73338
|
-
|
|
73339
|
-
|
|
73340
|
-
|
|
73341
|
-
|
|
73342
|
-
|
|
73343
|
-
|
|
73344
|
-
|
|
73345
|
-
|
|
73346
|
-
|
|
73347
|
-
|
|
73348
|
-
|
|
73362
|
+
if (resIdxJS.ok) {
|
|
73363
|
+
const key = __classPrivateFieldGet(this, _SysApp_hInfo, "f").platform + '_' + __classPrivateFieldGet(this, _SysApp_hInfo, "f").arch;
|
|
73364
|
+
let pa = oIdx[key];
|
|
73365
|
+
if (pa)
|
|
73366
|
+
await __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, url, key + '-' + pa.cn, pa.path);
|
|
73367
|
+
else {
|
|
73368
|
+
let d = '';
|
|
73369
|
+
const aApp = [];
|
|
73370
|
+
const regOldSameKey = new RegExp('^' + __classPrivateFieldGet(this, _SysApp_hInfo, "f").platform + '_');
|
|
73371
|
+
for (const k in oIdx) {
|
|
73372
|
+
if (!regOldSameKey.test(k))
|
|
73373
|
+
continue;
|
|
73374
|
+
const ap = oIdx[k];
|
|
73375
|
+
d += '\n- ' + ap.path;
|
|
73376
|
+
aApp.push({ url, urlApp: k + '-' + ap.cn, fn: String(ap.path) });
|
|
73377
|
+
}
|
|
73378
|
+
mbo.message = `CPU = ${__classPrivateFieldGet(this, _SysApp_hInfo, "f").arch}\nに対応するファイルが見つかりません。同じOSのファイルをすべてダウンロードしますか?`;
|
|
73379
|
+
mbo.detail = aApp.length + ' 個ファイルがあります' + d;
|
|
73380
|
+
const di = await to_app.showMessageBox(mbo);
|
|
73381
|
+
if (di.response > 0)
|
|
73382
|
+
return;
|
|
73383
|
+
await Promise.all(aApp.map(ap => __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, ap.url, ap.urlApp, ap.fn)));
|
|
73384
|
+
}
|
|
73385
|
+
}
|
|
73386
|
+
else {
|
|
73387
|
+
const mp = /path: (.+)/.exec(sYml);
|
|
73388
|
+
if (!mp)
|
|
73389
|
+
throw `[update_check] path が見つかりません`;
|
|
73390
|
+
const path = mp[1];
|
|
73349
73391
|
if (CmnLib_1.CmnLib.debugLog)
|
|
73350
|
-
DebugMng_1.DebugMng.myTrace(`[update_check]
|
|
73351
|
-
|
|
73392
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] path=${path}`, 'D');
|
|
73393
|
+
const mc = /sha512: (.+)/.exec(sYml);
|
|
73394
|
+
if (!mc)
|
|
73395
|
+
throw `[update_check] sha512 が見つかりません`;
|
|
73396
|
+
const sha = mc[1];
|
|
73397
|
+
if (CmnLib_1.CmnLib.debugLog)
|
|
73398
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] sha=${sha}=`, 'D');
|
|
73399
|
+
const mm = /(.+)(\.\w+)/.exec(path) ?? ['', '', ''];
|
|
73400
|
+
await __classPrivateFieldGet(this, _SysApp_instances, "m", _SysApp_dl_app).call(this, url, mm[1] + '-' + __classPrivateFieldGet(this, _SysApp_hInfo, "f").arch + mm[2], path);
|
|
73352
73401
|
}
|
|
73353
|
-
const pathDL = __classPrivateFieldGet(this, _SysApp_hInfo, "f").downloads + '/' + path;
|
|
73354
|
-
if (CmnLib_1.CmnLib.debugLog)
|
|
73355
|
-
DebugMng_1.DebugMng.myTrace(`[update_check] pathDL=${pathDL}`, 'D');
|
|
73356
|
-
const b = await res_dl.blob();
|
|
73357
|
-
const url2 = URL.createObjectURL(b);
|
|
73358
|
-
const a = document.createElement('a');
|
|
73359
|
-
document.body.appendChild(a);
|
|
73360
|
-
a.download = path;
|
|
73361
|
-
a.href = url2;
|
|
73362
|
-
a.click();
|
|
73363
|
-
a.remove();
|
|
73364
73402
|
if (CmnLib_1.CmnLib.debugLog)
|
|
73365
73403
|
DebugMng_1.DebugMng.myTrace(`アプリファイルを保存しました`, 'D');
|
|
73404
|
+
mbo.buttons.pop();
|
|
73405
|
+
mbo.message = `アプリ【${this.cfg.oCfg.book.title}】の更新パッケージを\nダウンロードしました`;
|
|
73406
|
+
to_app.showMessageBox(mbo);
|
|
73366
73407
|
})();
|
|
73367
73408
|
return false;
|
|
73368
73409
|
};
|
|
@@ -73445,7 +73486,21 @@ class SysApp extends SysNode_1.SysNode {
|
|
|
73445
73486
|
titleSub(title) { to_app.win_setTitle(title); }
|
|
73446
73487
|
}
|
|
73447
73488
|
exports.SysApp = SysApp;
|
|
73448
|
-
_SysApp_hInfo = new WeakMap(), _SysApp_main = new WeakMap()
|
|
73489
|
+
_SysApp_hInfo = new WeakMap(), _SysApp_main = new WeakMap(), _SysApp_instances = new WeakSet(), _SysApp_dl_app = async function _SysApp_dl_app(url, urlApp, fn) {
|
|
73490
|
+
if (CmnLib_1.CmnLib.debugLog)
|
|
73491
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] アプリファイルDL試行... url=${url + urlApp}`, 'D');
|
|
73492
|
+
const res = await this.fetch(url + urlApp);
|
|
73493
|
+
if (!res.ok) {
|
|
73494
|
+
if (CmnLib_1.CmnLib.debugLog)
|
|
73495
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] アプリファイルが見つかりません url=${url + fn}`);
|
|
73496
|
+
return;
|
|
73497
|
+
}
|
|
73498
|
+
const pathDL = __classPrivateFieldGet(this, _SysApp_hInfo, "f").downloads + '/' + fn;
|
|
73499
|
+
if (CmnLib_1.CmnLib.debugLog)
|
|
73500
|
+
DebugMng_1.DebugMng.myTrace(`[update_check] pathDL=${pathDL}`, 'D');
|
|
73501
|
+
const ab = await res.arrayBuffer();
|
|
73502
|
+
await this.writeFileSync(pathDL, new DataView(ab));
|
|
73503
|
+
};
|
|
73449
73504
|
|
|
73450
73505
|
|
|
73451
73506
|
/***/ }),
|
package/appMain.js
CHANGED
|
@@ -23499,6 +23499,8 @@ class appMain {
|
|
|
23499
23499
|
userData: electron_1.app.getPath('userData'),
|
|
23500
23500
|
getVersion: '',
|
|
23501
23501
|
env: { ...process.env },
|
|
23502
|
+
platform: process.platform,
|
|
23503
|
+
arch: process.arch,
|
|
23502
23504
|
screenResolutionX: __classPrivateFieldGet(this, _appMain_screenRX, "f"),
|
|
23503
23505
|
screenResolutionY: __classPrivateFieldGet(this, _appMain_screenRY, "f"),
|
|
23504
23506
|
});
|
|
@@ -23542,6 +23544,7 @@ class appMain {
|
|
|
23542
23544
|
bw.setSize(w, h);
|
|
23543
23545
|
__classPrivateFieldSet(this, _appMain_isMovingWin, false, "f");
|
|
23544
23546
|
});
|
|
23547
|
+
electron_1.ipcMain.handle('showMessageBox', (_, o) => electron_1.dialog.showMessageBox(o));
|
|
23545
23548
|
electron_1.ipcMain.handle('capturePage', (_, fn) => bw.webContents.capturePage()
|
|
23546
23549
|
.then(ni => (0, fs_extra_1.writeFileSync)(fn, (fn.slice(-4) === '.png') ? ni.toPNG() : ni.toJPEG(80))));
|
|
23547
23550
|
electron_1.ipcMain.handle('navigate_to', (_, url) => electron_1.shell.openExternal(url));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appMain.d.ts","sourceRoot":"","sources":["../src/appMain.ts"],"names":[],"mappings":"AAOA,OAAO,EAAc,aAAa,
|
|
1
|
+
{"version":3,"file":"appMain.d.ts","sourceRoot":"","sources":["../src/appMain.ts"],"names":[],"mappings":"AAOA,OAAO,EAAc,aAAa,EAAoC,MAAM,UAAU,CAAC;AAOvF,qBAAa,OAAO;;IAkBC,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAvC,OAAO;IA4HP,YAAY;IAIZ,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,aAAa;CAgDhF"}
|
package/core/lib/preload.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export declare type HPROC = {
|
|
|
12
12
|
createReadStream: (path: string) => Promise<ReadStream>;
|
|
13
13
|
readFileSync: (path: string) => Promise<string>;
|
|
14
14
|
readFile: (path: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void) => void;
|
|
15
|
-
writeFileSync: (path: string, data:
|
|
15
|
+
writeFileSync: (path: string, data: string | NodeJS.ArrayBufferView, o?: object) => Promise<void>;
|
|
16
16
|
appendFile: (path: string, data: string, callback: (err: Error) => void) => Promise<void>;
|
|
17
17
|
window: (centering: boolean, x: number, y: number, w: number, h: number) => void;
|
|
18
18
|
isSimpleFullScreen: () => Promise<boolean>;
|
|
@@ -21,6 +21,7 @@ export declare type HPROC = {
|
|
|
21
21
|
win_setTitle: (title: string) => void;
|
|
22
22
|
win_setContentSize: (w: number, h: number) => Promise<void>;
|
|
23
23
|
win_setSize: (w: number, h: number) => Promise<void>;
|
|
24
|
+
showMessageBox: (o: Electron.MessageBoxOptions) => Promise<Electron.MessageBoxReturnValue>;
|
|
24
25
|
capturePage: (fn: string) => Promise<void>;
|
|
25
26
|
navigate_to: (url: string) => void;
|
|
26
27
|
openDevTools: () => void;
|
|
@@ -41,6 +42,8 @@ export declare type HINFO = {
|
|
|
41
42
|
env: {
|
|
42
43
|
[name: string]: any;
|
|
43
44
|
};
|
|
45
|
+
platform: string;
|
|
46
|
+
arch: string;
|
|
44
47
|
screenResolutionX: number;
|
|
45
48
|
screenResolutionY: number;
|
|
46
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../src/preload.ts"],"names":[],"mappings":";AAQA,OAAO,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AACjD,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,QAAQ,CAAC;AAErC,oBAAY,KAAK,GAAG;IACnB,OAAO,EAAI,MAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IAE/B,UAAU,EAAG,CAAC,IAAI,EAAE,MAAM,KAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,QAAQ,EAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAI,IAAI,CAAC;IACvD,UAAU,EAAG,CAAC,IAAI,EAAE,MAAM,KAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,aAAa,EAAG,CAAC,IAAI,EAAE,MAAM,KAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,cAAc,EAAG,CAAC,IAAI,EAAE,MAAM,KAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,iBAAiB,EAAG,CAAC,IAAI,EAAE,MAAM,KAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1D,gBAAgB,EAAG,CAAC,IAAI,EAAE,MAAM,KAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IACxD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/C,QAAQ,EAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,EAAE,MAAM,KAAI,IAAI,KAAI,IAAI,CAAC;IAC9F,aAAa,EAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAI,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../src/preload.ts"],"names":[],"mappings":"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"}
|
package/core/lib/preload.js
CHANGED
|
@@ -33,6 +33,7 @@ exports.hProc = {
|
|
|
33
33
|
win_setTitle: title => ipcRenderer.invoke('win_setTitle', title).catch(fncE),
|
|
34
34
|
win_setContentSize: (w, h) => ipcRenderer.invoke('win_setContentSize', w, h).catch(fncE),
|
|
35
35
|
win_setSize: (w, h) => ipcRenderer.invoke('win_setSize', w, h).catch(fncE),
|
|
36
|
+
showMessageBox: o => ipcRenderer.invoke('showMessageBox', o).catch(fncE),
|
|
36
37
|
capturePage: fn => ipcRenderer.invoke('capturePage', fn).catch(fncE),
|
|
37
38
|
navigate_to: url => ipcRenderer.invoke('navigate_to', url).catch(fncE),
|
|
38
39
|
openDevTools: () => ipcRenderer.invoke('openDevTools').catch(fncE),
|
package/core/lib/sn/SysApp.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare class SysApp extends SysNode {
|
|
|
11
11
|
});
|
|
12
12
|
protected loaded(hPlg: HPlugin, arg: HSysBaseArg): Promise<void>;
|
|
13
13
|
protected readFileSync: (path: string) => Promise<string>;
|
|
14
|
-
protected writeFileSync: (path: string, data:
|
|
14
|
+
protected writeFileSync: (path: string, data: string | NodeJS.ArrayBufferView, o?: object | undefined) => Promise<void>;
|
|
15
15
|
appendFile: (path: string, data: string, callback: (err: Error) => void) => Promise<void>;
|
|
16
16
|
ensureFileSync: (path: string) => Promise<void>;
|
|
17
17
|
protected $path_userdata: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SysApp.d.ts","sourceRoot":"","sources":["../../src/sn/SysApp.ts"],"names":[],"mappings":";AAOA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAI/F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAOpC,qBAAa,MAAO,SAAQ,OAAO;;gBACtB,IAAI,KAAK,EAAE,GAAG;;;;KAAwC;cAKzC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"SysApp.d.ts","sourceRoot":"","sources":["../../src/sn/SysApp.ts"],"names":[],"mappings":";AAOA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAI/F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAOpC,qBAAa,MAAO,SAAQ,OAAO;;gBACtB,IAAI,KAAK,EAAE,GAAG;;;;KAAwC;cAKzC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW;IA6B/D,UAAmB,YAAY,oCAAuB;IACtD,UAAmB,aAAa,iGAAwB;IAC/C,UAAU,gFAAsB;IAChC,cAAc,kCAAyB;IAEhD,UAAoB,cAAc,SAAO;IACzC,UAAmB,eAAe,SAAM;IAE/B,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,UAAU,KAAI,IAAI;cAqDpD,GAAG;IAWnB,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE;IAcrF,YAAY,SAAgB,MAAM,MAAM,MAAM,mBAMrD;IACO,aAAa,UAAiB,MAAM,mBAE3C;IAGF,mBAA4B,KAAK,gBAA2C;IAG5E,mBAA4B,OAAO,EAAE,IAAI,CAcxC;IAGD,mBAA4B,OAAO,EAAE,IAAI,CAwCxC;IAGD,mBAA4B,WAAW,EAAE,IAAI,CAO5C;cAEkB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAEzC,mBAA4B,YAAY,EAAE,IAAI,CAe7C;IACD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,sBAkClC;IAED,mBAA4B,YAAY,EAAE,IAAI,CAqG7C;IAoBD,mBAA4B,MAAM,EAAE,IAAI,CASvC;IAED,SAAkB,cAAc,OAAQ,MAAM,aAG7C;CAED"}
|
package/core/lib/sn/SysBase.d.ts
CHANGED
|
@@ -52,7 +52,7 @@ export declare class SysBase implements ISysBase {
|
|
|
52
52
|
protected readonly window: ITag;
|
|
53
53
|
setTitleInfo(txt: string): void;
|
|
54
54
|
decStr(ext: string, d: string): string;
|
|
55
|
-
dec(ext: string, d: ArrayBuffer): Promise<string |
|
|
55
|
+
dec(ext: string, d: ArrayBuffer): Promise<string | ArrayBuffer | HTMLImageElement | HTMLVideoElement>;
|
|
56
56
|
protected enc: (d: string) => string;
|
|
57
57
|
protected stk: () => string;
|
|
58
58
|
hash: (_data: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SysBase.d.ts","sourceRoot":"","sources":["../../src/sn/SysBase.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SysBase.d.ts","sourceRoot":"","sources":["../../src/sn/SysBase.ts"],"names":[],"mappings":"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"}
|
package/core/lib/sn/SysNode.d.ts
CHANGED
|
@@ -6,6 +6,6 @@ export declare class SysNode extends SysBase {
|
|
|
6
6
|
protected readonly isApp = true;
|
|
7
7
|
savePic(fn: string, data_url: string): Promise<void>;
|
|
8
8
|
protected readFileSync(_path: string): Promise<string>;
|
|
9
|
-
protected writeFileSync(_path: string, _data:
|
|
9
|
+
protected writeFileSync(_path: string, _data: string | NodeJS.ArrayBufferView, _o?: object): Promise<void>;
|
|
10
10
|
}
|
|
11
11
|
//# sourceMappingURL=SysNode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SysNode.d.ts","sourceRoot":"","sources":["../../src/sn/SysNode.ts"],"names":[],"mappings":";AAOA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAEjD,qBAAa,OAAQ,SAAQ,OAAO;IACpB,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO;IAY5D,mBAA4B,KAAK,QAAQ;IAE1B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;cAQnC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAC5C,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"SysNode.d.ts","sourceRoot":"","sources":["../../src/sn/SysNode.ts"],"names":[],"mappings":";AAOA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAEjD,qBAAa,OAAQ,SAAQ,OAAO;IACpB,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO;IAY5D,mBAA4B,KAAK,QAAQ;IAE1B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;cAQnC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAC5C,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,EAAE,MAAM;CAEhG"}
|
package/package.json
CHANGED
package/web.js
CHANGED
|
@@ -72873,14 +72873,14 @@ const DebugMng_1 = __webpack_require__(/*! ./DebugMng */ "./core/src/sn/DebugMng
|
|
|
72873
72873
|
;
|
|
72874
72874
|
var BreakState;
|
|
72875
72875
|
(function (BreakState) {
|
|
72876
|
-
BreakState[BreakState["
|
|
72877
|
-
BreakState[BreakState["
|
|
72878
|
-
BreakState[BreakState["
|
|
72879
|
-
BreakState[BreakState["
|
|
72880
|
-
BreakState[BreakState["
|
|
72881
|
-
BreakState[BreakState["
|
|
72882
|
-
BreakState[BreakState["
|
|
72883
|
-
BreakState[BreakState["
|
|
72876
|
+
BreakState[BreakState["Running"] = 0] = "Running";
|
|
72877
|
+
BreakState[BreakState["Wait"] = 1] = "Wait";
|
|
72878
|
+
BreakState[BreakState["Break"] = 2] = "Break";
|
|
72879
|
+
BreakState[BreakState["Breaking"] = 3] = "Breaking";
|
|
72880
|
+
BreakState[BreakState["Step"] = 4] = "Step";
|
|
72881
|
+
BreakState[BreakState["Stepping"] = 5] = "Stepping";
|
|
72882
|
+
BreakState[BreakState["StepOuting"] = 6] = "StepOuting";
|
|
72883
|
+
BreakState[BreakState["StepOut"] = 7] = "StepOut";
|
|
72884
72884
|
})(BreakState || (BreakState = {}));
|
|
72885
72885
|
;
|
|
72886
72886
|
class ScriptIterator {
|
|
@@ -72909,14 +72909,14 @@ class ScriptIterator {
|
|
|
72909
72909
|
__classPrivateFieldSet(ScriptIterator, _a, {}, "f", _ScriptIterator_hFuncBP);
|
|
72910
72910
|
this.isBreak = () => false;
|
|
72911
72911
|
__classPrivateFieldGet(this, _ScriptIterator_hHook, "f").continue({});
|
|
72912
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
72912
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Running, "f");
|
|
72913
72913
|
},
|
|
72914
72914
|
restart: () => this.isBreak = () => false,
|
|
72915
72915
|
add_break: o => __classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_regBreakPoint).call(this, o.fn, o.o),
|
|
72916
72916
|
data_break: o => {
|
|
72917
|
-
if (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f") !== BreakState.
|
|
72917
|
+
if (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f") !== BreakState.Running)
|
|
72918
72918
|
return;
|
|
72919
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
72919
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Wait, "f");
|
|
72920
72920
|
this.main.setLoop(false, `変数 ${o.dataId}【${o.old_v}】→【${o.new_v}】データブレーク`);
|
|
72921
72921
|
this.sys.callHook('stopOnDataBreakpoint', {});
|
|
72922
72922
|
this.sys.send2Dbg('stopOnDataBreakpoint', {});
|
|
@@ -72932,7 +72932,7 @@ class ScriptIterator {
|
|
|
72932
72932
|
if (__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_isIdxOverLast).call(this))
|
|
72933
72933
|
return;
|
|
72934
72934
|
__classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
|
|
72935
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
72935
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Breaking, "f");
|
|
72936
72936
|
this.main.setLoop(true);
|
|
72937
72937
|
this.main.resume();
|
|
72938
72938
|
},
|
|
@@ -72943,9 +72943,9 @@ class ScriptIterator {
|
|
|
72943
72943
|
const tkn = __classPrivateFieldGet(this, _ScriptIterator_script, "f").aToken[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get)];
|
|
72944
72944
|
this.sys.callHook(`stopOnStep${__classPrivateFieldGet(this, _ScriptIterator_REGSTEPIN, "f").test(tkn) ? 'In' : ''}`, {});
|
|
72945
72945
|
__classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
|
|
72946
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
72947
|
-
? BreakState.
|
|
72948
|
-
: BreakState.
|
|
72946
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Wait
|
|
72947
|
+
? BreakState.Step
|
|
72948
|
+
: BreakState.Stepping, "f");
|
|
72949
72949
|
this.main.setLoop(true);
|
|
72950
72950
|
this.main.resume();
|
|
72951
72951
|
},
|
|
@@ -72958,12 +72958,12 @@ class ScriptIterator {
|
|
|
72958
72958
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_go_stepover).call(this, o);
|
|
72959
72959
|
},
|
|
72960
72960
|
pause: () => {
|
|
72961
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
72961
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
72962
72962
|
this.main.setLoop(false, '一時停止');
|
|
72963
72963
|
this.sys.send2Dbg('stopOnStep', {});
|
|
72964
72964
|
},
|
|
72965
72965
|
stopOnEntry: () => {
|
|
72966
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
72966
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
72967
72967
|
this.main.setLoop(false, '一時停止');
|
|
72968
72968
|
this.sys.send2Dbg('stopOnEntry', {});
|
|
72969
72969
|
},
|
|
@@ -72973,7 +72973,7 @@ class ScriptIterator {
|
|
|
72973
72973
|
.replace(__classPrivateFieldGet(ScriptIterator, _a, "f", _ScriptIterator_REG4CODE_FN), `$1/prj/$2/${__classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f")}$3`));
|
|
72974
72974
|
this.cnvPath4Dbg = (fn) => this.sys.pathBaseCnvSnPath4Dbg + fn.replace('/crypto_prj/', '/prj/');
|
|
72975
72975
|
_ScriptIterator_csDepth_macro_esc.set(this, 0);
|
|
72976
|
-
_ScriptIterator_breakState.set(this, BreakState.
|
|
72976
|
+
_ScriptIterator_breakState.set(this, BreakState.Running);
|
|
72977
72977
|
this.isBreak = (_token) => false;
|
|
72978
72978
|
_ScriptIterator_procDebugtag.set(this, (_tag_name) => { });
|
|
72979
72979
|
_ScriptIterator_evtMng.set(this, void 0);
|
|
@@ -73304,12 +73304,12 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
73304
73304
|
this.sys.callHook(`stopOnStep${out ? 'Out' : ''}`, {});
|
|
73305
73305
|
__classPrivateFieldSet(this, _ScriptIterator_csDepth_macro_esc, __classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length - (out ? 1 : 0), "f");
|
|
73306
73306
|
__classPrivateFieldSet(this, _ScriptIterator_idxToken, __classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - __classPrivateFieldGet(this, _ScriptIterator_instances, "a", _ScriptIterator_idxDx4Dbg_get), "f");
|
|
73307
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.
|
|
73307
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, out ? BreakState.StepOut : BreakState.StepOuting, "f");
|
|
73308
73308
|
this.main.setLoop(true);
|
|
73309
73309
|
this.main.resume();
|
|
73310
73310
|
}, _ScriptIterator_idxDx4Dbg_get = function _ScriptIterator_idxDx4Dbg_get() {
|
|
73311
|
-
return __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
73312
|
-
|| __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
73311
|
+
return __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Break
|
|
73312
|
+
|| __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Step ? 1 : 0;
|
|
73313
73313
|
}, _ScriptIterator_isIdxOverLast = function _ScriptIterator_isIdxOverLast() {
|
|
73314
73314
|
if (__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") < __classPrivateFieldGet(this, _ScriptIterator_script, "f").len)
|
|
73315
73315
|
return false;
|
|
@@ -73318,34 +73318,34 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
73318
73318
|
return true;
|
|
73319
73319
|
}, _ScriptIterator_isBreak_base = function _ScriptIterator_isBreak_base(token) {
|
|
73320
73320
|
switch (__classPrivateFieldGet(this, _ScriptIterator_breakState, "f")) {
|
|
73321
|
-
case BreakState.
|
|
73321
|
+
case BreakState.StepOuting:
|
|
73322
73322
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
73323
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
73323
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.StepOut, "f");
|
|
73324
73324
|
break;
|
|
73325
|
-
case BreakState.
|
|
73325
|
+
case BreakState.StepOut:
|
|
73326
73326
|
if (__classPrivateFieldGet(this, _ScriptIterator_aCallStk, "f").length !== __classPrivateFieldGet(this, _ScriptIterator_csDepth_macro_esc, "f"))
|
|
73327
73327
|
break;
|
|
73328
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
73328
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
73329
73329
|
this.main.setLoop(false, 'ステップ実行');
|
|
73330
73330
|
this.sys.send2Dbg('stopOnStep', {});
|
|
73331
73331
|
return true;
|
|
73332
|
-
case BreakState.
|
|
73332
|
+
case BreakState.Stepping:
|
|
73333
73333
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
73334
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
73334
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Step, "f");
|
|
73335
73335
|
break;
|
|
73336
|
-
case BreakState.
|
|
73336
|
+
case BreakState.Step:
|
|
73337
73337
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
73338
73338
|
this.main.setLoop(false, 'ステップ実行');
|
|
73339
73339
|
this.sys.send2Dbg('stopOnStep', {});
|
|
73340
73340
|
return true;
|
|
73341
|
-
case BreakState.
|
|
73341
|
+
case BreakState.Breaking:
|
|
73342
73342
|
__classPrivateFieldGet(this, _ScriptIterator_instances, "m", _ScriptIterator_subHitCondition).call(this);
|
|
73343
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
73343
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Running, "f");
|
|
73344
73344
|
break;
|
|
73345
73345
|
default:
|
|
73346
73346
|
{
|
|
73347
73347
|
if ((0, Grammar_1.tagToken2Name)(token) in __classPrivateFieldGet(ScriptIterator, _a, "f", _ScriptIterator_hFuncBP)) {
|
|
73348
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
73348
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Break, "f");
|
|
73349
73349
|
this.main.setLoop(false, `関数 ${token} ブレーク`);
|
|
73350
73350
|
this.sys.callHook('stopOnBreakpoint', {});
|
|
73351
73351
|
this.sys.send2Dbg('stopOnBreakpoint', {});
|
|
@@ -73365,8 +73365,8 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
73365
73365
|
}
|
|
73366
73366
|
else if (('hitCondition' in o) && --o.hitCondition > 0)
|
|
73367
73367
|
break;
|
|
73368
|
-
const isBreak = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
73369
|
-
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.
|
|
73368
|
+
const isBreak = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Running;
|
|
73369
|
+
__classPrivateFieldSet(this, _ScriptIterator_breakState, BreakState.Break, "f");
|
|
73370
73370
|
this.main.setLoop(false, isBreak ? ((o.condition ? '条件' : 'ヒットカウント') + 'ブレーク') : 'ステップ実行');
|
|
73371
73371
|
const type = isBreak ? 'stopOnBreakpoint' : 'stopOnStep';
|
|
73372
73372
|
this.sys.callHook(type, {});
|
|
@@ -73380,7 +73380,7 @@ _a = ScriptIterator, _ScriptIterator_script = new WeakMap(), _ScriptIterator_scr
|
|
|
73380
73380
|
if (o?.hitCondition)
|
|
73381
73381
|
--o.hitCondition;
|
|
73382
73382
|
}, _ScriptIterator_aStack = function _ScriptIterator_aStack() {
|
|
73383
|
-
const idx_n = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.
|
|
73383
|
+
const idx_n = __classPrivateFieldGet(this, _ScriptIterator_breakState, "f") === BreakState.Breaking ? 1 : 0;
|
|
73384
73384
|
const tkn0 = __classPrivateFieldGet(this, _ScriptIterator_script, "f").aToken[__classPrivateFieldGet(this, _ScriptIterator_idxToken, "f") - 1 + idx_n];
|
|
73385
73385
|
const fn0 = __classPrivateFieldGet(this, _ScriptIterator_cnvSnPath4Dbg, "f").call(this, __classPrivateFieldGet(this, _ScriptIterator_scriptFn, "f"));
|
|
73386
73386
|
const tag_name0 = (0, Grammar_1.tagToken2Name)(tkn0);
|