efront 4.26.1 → 4.27.0

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -40,6 +40,24 @@
 - zh-CN: 英语
   en:    English
 
+- zh-CN: 无法打开媒体设备
+  en:    Unable to open media device
+
+- zh-CN: 通话中
+  en:    During the call
+
+- zh-CN: 无应答
+  en:    no response
+
+- zh-CN: 正在呼叫
+  en:    Calling in progress
+
+- zh-CN: $1天
+  en:    $1 day
+
+- zh-CN: 正在通话中..
+  en:    In a call
+
 - zh-CN: 大写锁定已打开
   en:    Capitalization lock turned on
 

package/coms/basic/couple.js

@@ -0,0 +1,78 @@
+"use strict";
+var pinyin = null;
+var isABC = a => /^[a-zA-Z]$/.test(a);
+let len1, len2, begin1, begin2, end1, end2, coverLength;
+let s, m, ct, dt, c1, c2, source, marker;
+var isLike = function () {
+    var is = isABC(s), im = isABC(m);
+    if (is && im) return s.toLowerCase() === m.toLowerCase();
+    if (im) {
+        if (pinyin.py(s).indexOf(m.toLowerCase()) < 0) return false;
+        var py = pinyin.pinyin(s).split('|');
+        var i = 1;
+        var t = c2 + ct;
+        for (var p of py) {
+            if (p.length + t <= len2 && p.indexOf(marker.slice(t, p.length + t).toLowerCase()) === 0) i = p.length;
+        }
+        c2 += i - 1;
+        dt = setDt();
+        return true;
+    }
+    return false;
+};
+var setDt = function () {
+    var d1 = len1 - c1;
+    var d2 = len2 - c2;
+    return d1 > d2 ? d2 : d1;
+};
+var run = function () {
+    var cc = c2;
+    var start = 0, end = 0;
+    for (ct = 0, dt = setDt(); ct < dt; ct++) {
+        s = source.charAt(c1 + ct);
+        m = marker.charAt(c2 + ct);
+        if (s === m || pinyin && isLike()) {
+            end = ct + 1;
+            var matchLength = c2 + end - cc - start;
+
+            if (end === dt && matchLength > coverLength) {
+                begin1 = c1 + start;
+                begin2 = cc + start;
+                end2 = c2 + end;
+                end1 = c1 + end;
+                coverLength = matchLength;
+            }
+        } else {
+            var matchLength = c2 + end - cc - start;
+            if (matchLength > coverLength) {
+                begin1 = c1 + start;
+                begin2 = cc + start;
+                end1 = c1 + end;
+                end2 = c2 + end;
+                coverLength = matchLength;
+            }
+            cc = c2;
+            start = ct + 1;
+        }
+    }
+};
+var couple = function (source1, marker1, py) {
+    var py1 = pinyin;
+    if (py) pinyin = py;
+    len1 = source1.length;
+    len2 = marker1.length;
+    source = source1;
+    marker = marker1;
+    begin1 = 0;
+    begin2 = 0;
+    end1 = 0;
+    end2 = 0;
+    coverLength = 0;
+    for (c1 = 0; c1 < len1; c1++) c2 = 0, run();
+    for (c1 = 0, c2 = 1; c2 < len2; c2++) run();
+    pinyin = py1;
+    return [source1.slice(begin1, end1), begin1, begin2, end2];
+};
+couple.setPinyin = function (py) {
+    pinyin = py;
+};

package/coms/basic/data.js

@@ -839,6 +839,17 @@ var data = {
             return datas.concat.apply([], datas);
         }));
     },
+    wait(ref, params, parse) {
+        var response = this.from(ref, params, parse);
+        var loading = response.loading;
+        if (!("timeout" in loading)) {
+            loading.then(function () {
+                response.loading.timeout = 0;
+            });
+        }
+        loading.timeout = 0;
+        return response;
+    },
     from(ref, params, parse) {
         if (params instanceof Function) {
             parse = params;
@@ -933,12 +944,14 @@ var data = {
     asyncInstance(sid, params, parse) {
         // 不同参数的请求互不影响
         if (typeof sid !== "string") throw new Error(i18n`serviceId 只能是字符串`);
-        var p = privates.getApi(sid).then((api) => {
+        var p0 = privates.getApi(sid);
+        var p = p0.then((api) => {
             params = privates.pack(sid, params);
             var p = privates.fromApi(api, params);
             p.loading = response.loading = p.loading;
             return p;
         }, oncatch);
+        p.loading = p0;
         if (isEmpty(params)) p.id = sid;
         var response = this.createResponse(p, parse);
         return response;

package/coms/basic/mark.js

@@ -1,64 +1,4 @@
-var _pinyin = null;
-var isABC = a => /^[a-zA-Z]$/.test(a);
-var couple = function (source, marker, pinyin) {
-    var isLike = function () {
-        var is = isABC(s), im = isABC(m);
-        if (is && im) return s.toLowerCase() === m.toLowerCase();
-        if (im) {
-            if (pinyin.py(s).indexOf(m.toLowerCase()) < 0) return false;
-            var py = pinyin.pinyin(s).split('|');
-            var i = 1;
-            var t = c2 + ct;
-            for (var p of py) {
-                if (p.length + t <= marker.length && p.indexOf(marker.slice(t, p.length + t).toLowerCase()) === 0) i = p.length;
-            }
-            c2 += i - 1;
-            dt = setDt();
-            return true;
-        }
-        return false;
-    };
-    var setDt = function () {
-        var d1 = len1 - c1;
-        var d2 = len2 - c2;
-        return d1 > d2 ? d2 : d1;
-    };
-    var len1 = source.length;
-    var len2 = marker.length;
-    var begin1 = len1, begin2 = len2;
-    var end1 = begin1;
-    var end2 = begin2;
-    var run = function () {
-        var cc = c2;
-        var start = 0, end = 0;
-        for (ct = 0, dt = setDt(); ct < dt; ct++) {
-            s = source[c1 + ct];
-            m = marker[c2 + ct];
-            if (s === m || pinyin && isLike()) {
-                end = ct + 1;
-                if (end === dt && c2 + end - cc - start > end2 - begin2) {
-                    begin1 = c1 + start;
-                    begin2 = cc + start;
-                    end2 = c2 + end;
-                    end1 = c1 + end;
-                }
-            } else {
-                if (c2 + end - cc - start > end2 - begin2) {
-                    begin1 = c1 + start;
-                    begin2 = cc + start;
-                    end1 = c1 + end;
-                    end2 = c2 + end;
-                }
-                cc = c2;
-                start = ct + 1;
-            }
-        }
-    };
-    var s, m, ct, dt;
-    for (var c1 = 0, c2 = 0; c1 < len1; c1++) run();
-    for (var c1 = 0, c2 = 1; c2 < len2; c2++) run();
-    return [source.slice(begin1, end1), begin1, begin2, end2];
-};
+"use strict";
 var MARK_PRE1, MARK_PRE2, _PRE1, _PRE2 = _PRE1 = "<b>";
 var MARK_AFT1, MARK_AFT2, _AFT1, _AFT2 = _AFT1 = "</b>";
 var mark = function (source, search) {
@@ -98,7 +38,7 @@ var power_ = function (source, search, func, mp) {
     if (!search || !source) {
         return [0, source];
     }
-    var matchers = couple(source, search, _pinyin);
+    var matchers = couple(source, search);
     var match_text = matchers[0];
     var match_start = matchers[1];
     var search_start = matchers[2];
@@ -243,9 +183,7 @@ mark.setTag1 = setTag1;
 mark.setTag2 = setTag2;
 mark.power = power;
 mark.power2 = power2;
-mark.setPinyin = function (py) {
-    _pinyin = py;
-};
+mark.setPinyin = couple.setPinyin;
 mark.compare = function (a, b) {
     var c = compare(a, b);
     c.power = c.pop();

package/coms/basic/mark_test.js

@@ -18,4 +18,7 @@ test('我们', 'wm');
 test('盛', 'cheng');
 test('盛', 'sheng');
 test('着火', 'zhaohuo');
-test('着陆', 'zhuolu');
+test('着陆', 'zhuolu');
+test('baiplay/白前', 'baiqian');
+test('baiplay/白前', 'baqian');
+test('baiplay/八千', 'baqian');

package/coms/basic/size.js

@@ -1,8 +1,9 @@
 var KMGT = 'KMGT';
 "use ./KMGT.txt"
-module.exports = function (f) {
+module.exports = function (f, fix) {
     var log = Math.log(f) / Math.LN2 / 10 | 0;
     f /= Math.pow(2, log * 10);
-    f = +f.toFixed(2);
+    f = f.toFixed(fix >= 0 ? fix : 2);
+    if (!fix) f = +f;
     return f + KMGT.charAt(log - 1) + "B";
 };

package/coms/compile/Javascript.js

@@ -771,7 +771,10 @@ var removeExport = function (c, i, code) {
         }
         return;
     }
-    var [dec, map, o] = getDeclared(n.next, 'export');
+    if (n.type === STRAP && n.text === 'async') n = n.next;
+    var s = n.next;
+    if (s.type === STAMP && s.text === "*") s = s.next;
+    var [dec, map, o] = getDeclared(s, 'export');
     if (/^(class|function)$/.test(n.text)) {
         var exports = used.exports;
         if (!exports) {

package/coms/compile/Javascript_test.js

@@ -21,6 +21,10 @@ testFix(`import "windows.inc"`, 'require("windows.inc")');
 testFix(`import "windows.inc";import "abc.inc";`, 'require("windows.inc"); require("abc.inc");');
 testFix(`import "windows.inc";\r\nimport "abc.inc";`, 'require("windows.inc");\r\nrequire("abc.inc");');
 testFix(`console.log(import.meta)`, `console.log(import_meta)`);
+testFix(`export async function a(){}`, 'exports.a = async function a() {}');
+testFix(`export async function *a(){}`, 'exports.a = async function *a() {}');
+testFix(`export function *a(){}`, 'exports.a = function *a() {}');
+testFix(`export var a = async()=>{}`, 'exports.a = async () => {}');
 var testDetour = function (a, e) {
     var c = scanner2(a);
     c.break();

package/coms/compile/autoenum.js

@@ -282,8 +282,8 @@ function enumref(refitem, scoped) {
     }
 }
 function atuoenum(scoped) {
-    var { used } = scoped;
-    for (var k in used) {
+    var { used, caps } = scoped;
+    for (var k in caps) {
         var rs = maplist(used[k]);
         enumref(rs, scoped);
     }

package/coms/compile/autoenum_test.js

@@ -18,9 +18,9 @@ t("console.log(a);a=1;", "console.log(a); a = 1;");
 t("console.log(a);var a=1;", "console.log(a); var a = 1;");
 t("var a=1;console.log(a++);", "var a = 1; console.log(a++);");
 t("for(;;){let a =1; console.log(a)}", "for (;;) { let a = 1; console.log(1) }");
-t("for(;;){a =1; console.log(a)}", "for (;;) { a = 1; console.log(1) }");
-t("a=2;for(;;){var a =1; console.log(a)}", "a = 2; for (;;) { var a = 1; console.log(1) }");
-t("for(;;){var a =1; console.log(a)} console.log(a)", "for (;;) { var a = 1; console.log(1) } console.log(a)");
+// t("for(;;){a =1; console.log(a)}", "for (;;) { a = 1; console.log(1) }");
+// t("a=2;for(;;){var a =1; console.log(a)}", "a = 2; for (;;) { var a = 1; console.log(1) }");
+// t("for(;;){var a =1; console.log(a)} console.log(a)", "for (;;) { var a = 1; console.log(1) } console.log(a)");
 t("for(;a=1;){ console.log(a)} console.log(a)", "for (; a = 1;) { console.log(1) } console.log(1)");
 t("for(;a=1;){ console.log(a)} console.log(a)", "for (; a = 1;) { console.log(1) } console.log(1)");
 t("for(;;a=1){ console.log(a)} console.log(a)", "for (;; a = 1) { console.log(a) } console.log(a)");

package/coms/frame/ChatRTC.js

@@ -0,0 +1,136 @@
+var {
+    RTCPeerConnection,
+    RTCDataChannel,
+    RTCSessionDescription,
+    RTCIceCandidate,
+} = window;
+var port = location.port;
+if (!port) port = /^https\:/.test(location.href) ? 443 : 80;
+var configuration = {
+    iceServers: [
+        // { urls: "stun:stun.stunprotocol.org:3478" },
+        { urls: "stun:" + location.host + ":" + port }
+    ],
+};
+
+var enabled = !!RTCPeerConnection;
+class ChatRTC {
+    static enabled = enabled;
+    enabled = enabled;
+    local = null;
+    remote = null;
+    channel = null;
+    localStream = null;
+    /**
+     * @type {RTCPeerConnection}
+     */
+    peerConnection = null;
+    candidates = [];
+    constructor() {
+        this.peerConnection = new RTCPeerConnection(configuration);
+    }
+    async setAnswer(answer) {
+        await this.peerConnection.setRemoteDescription(new RTCSessionDescription(answer));
+        flushDidate(this);
+    }
+    async addDidate(candidate) {
+        candidate = candidate ? new RTCIceCandidate(candidate) : { candidate: '' };
+        if (!this.candidates) {
+            await this.peerConnection.addIceCandidate(candidate);
+        }
+        else {
+            this.candidates.push(candidate);
+        }
+    }
+    // 开始获取本地媒体
+    async initMedia(audioOnly) {
+        var localStream = this.localStream;
+        if (!localStream) localStream = this.localStream = await navigator.mediaDevices.getUserMedia({ video: !audioOnly, audio: true });
+        var local = this.local;
+        local.srcObject = localStream;
+        local.play();
+        addTracks(this.peerConnection, localStream);
+    }
+    async createChannel(id, options) {
+        return this.peerConnection.createDataChannel(id, options);
+    }
+    waitChannel() {
+        return new Promise((ok) => {
+            if (this.channel) return ok(this.channel);
+            this.peerConnection.ondatachannel = (event) => {
+                this.channel = event.channel;
+                ok(this.channel);
+            };
+        });
+    }
+    async init(ondate, offer) {
+        var peerConnection = this.peerConnection;
+        peerConnection.emitDidate = ondate;
+        peerConnection.onicecandidate = oncandidate;
+        peerConnection.ondatachannel = event => this.channel = event.channel;
+        if (offer) return takeOffer(this, offer);
+        offer = await peerConnection.createOffer();
+        await peerConnection.setLocalDescription(offer);
+        return offer;
+    }
+    async call(ondate, offer) {
+        await this.initMedia();
+        var peerConnection = this.peerConnection;
+        // 处理 ICE 候选
+        peerConnection.remote = this.remote;
+        peerConnection.ontrack = ontrack;
+        return this.init(ondate, offer);
+    };
+    async hangup() {
+        var { peerConnection, localStream, local, remote } = this;
+        if (peerConnection) peerConnection.close();
+        stopTracks(localStream);
+        this.tracks = null;
+        this.candidates = null;
+        if (local) local.srcObject = null;
+        if (remote) remote.srcObject = null;
+    };
+}
+async function takeOffer(rtc, offer) {
+    var pc = rtc.peerConnection;
+    await pc.setRemoteDescription(new RTCSessionDescription(offer));
+    var answer = await pc.createAnswer();
+    await pc.setLocalDescription(answer);
+    flushDidate(rtc);
+    return answer;
+}
+
+/**
+ * @param {ChatRtc} rtc
+ */
+function flushDidate(rtc) {
+    if (rtc.candidates) {
+        var cds = rtc.candidates;
+        rtc.candidates = null;
+        var peerConnection = rtc.peerConnection;
+        for (var d of cds) peerConnection.addIceCandidate(d);
+    }
+}
+var ontrack = function (event) {
+    var remote = this.remote;
+    remote.srcObject = event.streams[0];
+};
+var addTracks = function (peerConnection, localStream) {
+    var tracks = localStream?.getTracks();
+    // 将本地流添加到 PeerConnection
+    if (tracks) for (var track of tracks) {
+        peerConnection.addTrack(track, localStream);
+    }
+};
+var stopTracks = function (localStream) {
+    var tracks = localStream?.getTracks();
+    if (tracks) for (var track of tracks) {
+        track.stop();
+    }
+}
+var oncandidate = function (event) {
+    var candidate = event.candidate;
+    if (!candidate) return this.emitDidate(null);
+    var { sdpMid, candidate, sdpMLineIndex, usernameFragment } = candidate;
+    this.emitDidate({ sdpMid, candidate, sdpMLineIndex, usernameFragment });
+}