efront 4.26.2 → 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/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/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/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 });
+}

package/coms/frame/chat-rtc.xht

@@ -0,0 +1,275 @@
+<style>
+    & {
+        width: 100%;
+        height: 100%;
+        position: fixed;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        background: #111;
+    }
+
+    dv {
+        border: 1px solid;
+        width: 240px;
+        height: 180px;
+        right: 10px;
+        bottom: 10px;
+        display: block;
+        position: absolute;
+        color: #fff9;
+        background: #222;
+        z-index: 1;
+
+        >span {
+            position: relative;
+        }
+
+        &[full] {
+            z-index: 0 !important;
+            width: auto !important;
+            height: auto !important;
+            left: 0 !important;
+            right: 0 !important;
+            bottom: 0 !important;
+            top: 0 !important;
+            margin: 0 !important;
+            padding: 0 !important;
+            border: none;
+        }
+
+        &:after {
+            display: block;
+            content: "";
+            left: 0;
+            bottom: 0;
+            right: 0;
+            top: 0;
+            position: absolute;
+        }
+
+        >video {
+            display: block;
+            position: absolute;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            top: 0;
+            width: 100%;
+            height: 100%;
+        }
+    }
+
+    btn.button {
+        display: block;
+        position: absolute;
+        width: 60px;
+        line-height: 60px;
+        height: 60px;
+        border-radius: 30px;
+        margin: -23px;
+        z-index: 2;
+    }
+
+    [accept] {
+        left: 50%;
+        top: 50%;
+        background: #fff2;
+    }
+
+    [hangup] {
+        left: 50%;
+        bottom: 30px;
+        background: #913;
+    }
+
+    [info],
+    [error] {
+        display: block;
+        position: absolute;
+        top: 50%;
+        z-index: 1;
+        left: 0;
+        right: 0;
+        text-align: center;
+        line-height: 40px;
+        margin-top: -20px;
+        color: #fff;
+    }
+
+    [error] {
+        display: none;
+    }
+
+    &[error] {
+
+        [info],
+        [accept] {
+            display: none;
+        }
+
+        [error] {
+            display: block;
+        }
+    }
+</style>
+<div>
+    <dv full>
+        <video playsinline autoplay webkit-playsinline ondblclick="preventDefault"></video>
+        <span -bind="remoteUser.name"></span>
+    </dv>
+    <dv style="opacity: 0">
+        <video muted playsinline webkit-playsinline ondblclick="preventDefault"></video>
+        <span></span>
+    </dv>
+    <btn danger hangup @click="hangup">挂断</btn>
+    <btn accept -show="isRemote&&!started" @click="accept()">接听</btn>
+    <span error>${i18n`无法打开媒体设备`}</span>
+    <span info -show="started">
+        <span -bind="status()"></span>
+        &nbsp;<time></time>
+    </span>
+</div>
+<script>
+    var chatrtc = new ChatRTC;
+    // fullscreen.open();
+    var status = function () {
+        return acceptTime ? i18n`通话中` : rejectTime ? i18n`无应答` : i18n`正在呼叫`
+    };
+    var btn = button;
+    var dvs;
+    var callingStart = new Date, acceptTime = 0;
+    var started = false;
+    var interval = 0;
+    var timeNode = document.createTextNode("");
+    var rejectTime = 0;
+    care(this, function ([type, sender, data]) {
+        if (sender !== remoteUser.id) return;
+        switch (type) {
+            case "rtc-close":
+                if (acceptTime) return remove(this);
+                rejectTime = new Date;
+                if (remoteOffer) return remove(this);
+                break;
+            case "rtc-accept":
+                acceptTime = new Date;
+                chatrtc.setAnswer(data);
+                break;
+            case "rtc-didate":
+                chatrtc.addDidate(data);
+                break;
+        }
+    });
+    interval = setInterval(function () {
+        var toNum2 = a => a < 10 ? "0" + a : a;
+        var now = new Date;
+        var time = callingStart;
+        if (acceptTime) time = acceptTime;
+        var time = (new Date - time) / 1000 | 0;
+        if (time > 60 && !acceptTime && !rejectTime) {
+            rejectTime = time;
+        }
+        if (rejectTime && now - rejectTime > 16 * 1000) {
+            remove(page);
+        }
+        var value = [0, 0, 0, 0];
+        if (time >= 86400) {
+            value[0] = time / 86400 | 0;
+            time -= value[0] * 86400;
+        }
+        if (time >= 3600) {
+            value[1] = time / 3600 | 0;
+            time -= value[1] * 3600;
+        }
+        if (time >= 60) {
+            value[2] = time / 60 | 0;
+            time -= value[2] * 60;
+        }
+        value[3] = time;
+        var [date, ...time] = value;
+        if (date) timeNode.nodeValue = i18n`${date}天 ` + time.map(toNum2).join(":");
+        else if (time[0]) timeNode.nodeValue = time.map(toNum2).join(":");
+        else timeNode.nodeValue = time.slice(1).map(toNum2).join(":");
+
+    }, 20);
+    var time = function (elem) {
+        elem.appendChild(timeNode);
+    };
+    on('remove')(this, async function () {
+        await chatrtc.hangup();
+        chatrtc.send = null;
+        fullscreen.close();
+        chatrtc.remote = null;
+        chatrtc.local = null;
+        clearInterval(interval);
+    })
+    var canplay = function () {
+        var dv = this.parentNode;
+        var ratio = Math.min(dv.clientWidth / this.videoWidth, dv.clientHeight / this.videoHeight);
+        if (ratio) {
+            move.setSize(dv, [this.videoWidth * ratio, this.videoHeight * ratio]);
+            dv.style.opacity = 1;
+        }
+    }
+    once('mounted')(this, function () {
+        var [dv1, dv2, hangup, accept] = this.children;
+        dvs = [dv1, dv2];
+        drag.on(dv1, false);
+        drag.on(dv2, false);
+        drag.on(hangup, false);
+        drag.on(accept, false);
+        on("dblclick")(dv1, dblclick);
+        on("dblclick")(dv2, dblclick);
+        var v1 = chatrtc.remote = dv1.firstElementChild;
+        var v2 = chatrtc.local = dv2.firstElementChild;
+        v1.oncanplay = canplay;
+        v2.oncanplay = canplay;
+        if (!isRemote) start();
+    });
+    var accept = async function () {
+        await start();
+        acceptTime = new Date;
+    };
+    var onCandidate = function (candidate) {
+        cast(page, ["didate", candidate]);
+    };
+    var start = async function () {
+        try {
+            if (!remoteOffer) {
+                var offer = await chatrtc.call(onCandidate, remoteOffer);
+                cast(page, ['offer', offer]);
+            }
+            else {
+                var answer = await chatrtc.call(onCandidate, remoteOffer);
+                cast(page, ['accept', answer]);
+            }
+        }
+        catch {
+            page.setAttribute('error', '');
+        }
+        finally {
+            started = true;
+        }
+        render.refresh();
+    }
+    var page = this;
+    var hangup = async function () {
+        cast(page, ['hangup']);
+        remove(page);
+    };
+    var dblclick = function (a) {
+        if (this.hasAttribute('full')) return;
+        var style = this.getAttribute('style');
+        if (dvs.length !== 2) style = '';
+        dvs.forEach(v => {
+            if (v === this) v.setAttribute('full', ''), v.nodrag = true;
+            else v.removeAttribute('full'), v.nodrag = false, v.setAttribute('style', style), canplay.call(v);
+        });
+    };
+    this.onback = e => false;
+    var preventDefault = e => e.preventDefault();
+    var [remoteUser, localUser, remoteOffer] = arguments;
+    var isRemote = !!remoteOffer;
+
+</script>

package/coms/frame/chat.html

@@ -1,3 +1,8 @@
+<style>
+    [left] {
+        float: left;
+    }
+</style>
 <div head mount>
     <btn -if="users.length>0" class="menubtn" @click="showList=!showList" type_="showList?'default':'white'">
         <i></i>
@@ -7,6 +12,7 @@
     <template -if="user">
         <span -bind="user.name"></span>
         &nbsp;<span class="id">(<span -bind="user.id"></span>)</span>
+        <a left -if="user.id!==localid" @click="call()">呼叫</a>
     </template>
     <template -elseif="title" -src="title"> </template>
     <close @click="remove()"></close>