tokono.ma / diffuse
A music player that connects to your cloud/distributed storage.
5
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix Fission integration pt. 1

Steven Vandevelde 28aea950 f1428871

+35 -57
+1 -1
Justfile
··· 135 135 mkdir -p {{BUILD_DIR}}/vendor 136 136 cp {{NPM_DIR}}/subworkers/subworkers.js {{BUILD_DIR}}/subworkers.js 137 137 cp {{NPM_DIR}}/remotestoragejs/release/remotestorage.js {{BUILD_DIR}}/vendor/remotestorage.min.js 138 - cp {{NPM_DIR}}/ipfs-message-port-client/index.min.js {{BUILD_DIR}}/vendor/ipfs-message-port-client.min.js 139 138 cp {{NPM_DIR}}/webnative/dist/index.umd.min.js {{BUILD_DIR}}/vendor/webnative.min.js 140 139 cp ./vendor/pep.js {{BUILD_DIR}}/vendor/pep.js 141 140 142 141 {{NPM_DIR}}/.bin/esbuild {{NPM_DIR}}/webnative-elm/src/funnel.js --minify --outfile={{BUILD_DIR}}/vendor/webnative-elm.min.js 142 + {{NPM_DIR}}/.bin/esbuild {{NPM_DIR}}/ipfs-message-port-client/esm/src/index.js --minify --bundle --target=es2018 --outfile={{BUILD_DIR}}/vendor/ipfs-message-port-client.min.js --global-name=IpfsMessagePortClient 143 143 144 144 145 145 #
+2 -7
package.json
··· 26 26 "delay": "^5.0.0", 27 27 "fast-text-encoding": "^1.0.3", 28 28 "file-saver": "^2.0.2", 29 - "ipfs-message-port-client": "^0.11.1", 30 - "ipfs-message-port-protocol": "^0.11.1", 29 + "ipfs-message-port-client": "0.10.x", 30 + "ipfs-message-port-protocol": "0.10.x", 31 31 "jszip": "^3.7.1", 32 32 "load-script2": "^2.0.5", 33 33 "lunr": "^2.3.8", ··· 39 39 "tocca": "^2.0.9", 40 40 "webnative": "0.31.1", 41 41 "webnative-elm": "7.0.0" 42 - }, 43 - "pnpm": { 44 - "overrides": { 45 - "ipfs-message-port-protocol": "https://ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz" 46 - } 47 42 } 48 43 }
+12 -46
pnpm-lock.yaml
··· 1 1 lockfileVersion: 5.3 2 2 3 - overrides: 4 - ipfs-message-port-protocol: https://ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz 5 - 6 3 specifiers: 7 4 '@tokenizer/http': ^0.6.0 8 5 assert: ^2.0.0 ··· 15 12 events: ^3.3.0 16 13 fast-text-encoding: ^1.0.3 17 14 file-saver: ^2.0.2 18 - ipfs-message-port-client: ^0.11.1 19 - ipfs-message-port-protocol: https://ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz 15 + ipfs-message-port-client: 0.10.x 16 + ipfs-message-port-protocol: 0.10.x 20 17 jszip: ^3.7.1 21 18 load-script2: ^2.0.5 22 19 lunr: ^2.3.8 ··· 40 37 delay: 5.0.0 41 38 fast-text-encoding: 1.0.3 42 39 file-saver: 2.0.5 43 - ipfs-message-port-client: 0.11.1 44 - ipfs-message-port-protocol: '@ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz' 40 + ipfs-message-port-client: 0.10.3 41 + ipfs-message-port-protocol: 0.10.5 45 42 jszip: 3.7.1 46 43 load-script2: 2.0.6 47 44 lunr: 2.3.9 ··· 290 287 291 288 /@zxing/text-encoding/0.9.0: 292 289 resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==} 290 + requiresBuild: true 293 291 dev: false 294 292 optional: true 295 293 ··· 1345 1343 resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} 1346 1344 engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} 1347 1345 os: [darwin] 1346 + requiresBuild: true 1348 1347 dev: true 1349 1348 optional: true 1350 1349 ··· 1537 1536 engines: {node: '>=8'} 1538 1537 dev: false 1539 1538 1540 - /ipfs-core-types/0.10.1: 1541 - resolution: {integrity: sha512-s5+kXXcjkIdWPHblrE0TyiKxROQdL7zfkVI7FpEEwv5rtHCjpI0I4vKSzziZLLzLXf3a2F1qtscOnlaT0ruWBw==} 1542 - dependencies: 1543 - interface-datastore: 6.1.0 1544 - multiaddr: 10.0.1 1545 - multiformats: 9.6.3 1546 - transitivePeerDependencies: 1547 - - node-fetch 1548 - - supports-color 1549 - dev: false 1550 - 1551 1539 /ipfs-core-types/0.9.0: 1552 1540 resolution: {integrity: sha512-VJ8vJSHvI1Zm7/SxsZo03T+zzpsg8pkgiIi5hfwSJlsrJ1E2v68QPlnLshGHUSYw89Oxq0IbETYl2pGTFHTWfg==} 1553 1541 dependencies: ··· 1566 1554 browser-readablestream-to-it: 1.0.2 1567 1555 err-code: 3.0.1 1568 1556 ipfs-core-types: 0.9.0 1569 - ipfs-message-port-protocol: '@ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz' 1557 + ipfs-message-port-protocol: 0.10.5 1570 1558 ipfs-unixfs: 6.0.6 1571 1559 it-peekable: 1.0.3 1572 1560 multiformats: 9.6.3 ··· 1575 1563 - supports-color 1576 1564 dev: false 1577 1565 1578 - /ipfs-message-port-client/0.11.1: 1579 - resolution: {integrity: sha512-dT/XYWUGCvLmlHWtgTvL8TtobmWJphk5Cq499nG7Ng52hQUzZEUy0Mun1N3hqyd7SHMDVe7LGrQEY/l//seGyQ==} 1580 - engines: {node: '>=15.0.0', npm: '>=3.0.0'} 1566 + /ipfs-message-port-protocol/0.10.5: 1567 + resolution: {integrity: sha512-dHq+N0Epur5k7ZnQTSOepp5/Gmvtrg8SCD65t2okthkP8c4xIVxxaMpXZbHgi/2x0ix7HoQt4QiQa0StMkoj7A==} 1568 + engines: {node: '>=14.0.0', npm: '>=3.0.0'} 1581 1569 dependencies: 1582 - browser-readablestream-to-it: 1.0.2 1583 - err-code: 3.0.1 1584 - ipfs-core-types: 0.10.1 1585 - ipfs-message-port-protocol: '@ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz' 1586 - ipfs-unixfs: 6.0.6 1587 - it-peekable: 1.0.3 1570 + ipfs-core-types: 0.9.0 1588 1571 multiformats: 9.6.3 1589 1572 transitivePeerDependencies: 1590 1573 - node-fetch ··· 1597 1580 dependencies: 1598 1581 err-code: 3.0.1 1599 1582 protobufjs: 6.11.2 1600 - dev: false 1601 - 1602 - /ipld-block/0.11.1: 1603 - resolution: {integrity: sha512-sDqqLqD5qh4QzGq6ssxLHUCnH4emCf/8F8IwjQM2cjEEIEHMUj57XhNYgmGbemdYPznUhffxFGEHsruh5+HQRw==} 1604 - engines: {node: '>=6.0.0', npm: '>=3.0.0'} 1605 - dependencies: 1606 - cids: 1.1.9 1607 1583 dev: false 1608 1584 1609 1585 /ipld-dag-pb/0.22.3: ··· 3002 2978 '@ipld/dag-pb': 2.1.15 3003 2979 fission-bloom-filters: 1.7.1 3004 2980 ipfs-message-port-client: 0.10.3 3005 - ipfs-message-port-protocol: '@ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz' 2981 + ipfs-message-port-protocol: 0.10.5 3006 2982 ipld-dag-pb: 0.22.3 3007 2983 keystore-idb: 0.15.4 3008 2984 localforage: 1.10.0 ··· 3088 3064 resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} 3089 3065 engines: {node: '>= 6'} 3090 3066 dev: true 3091 - 3092 - '@ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz': 3093 - resolution: {tarball: https://ipfs.runfission.com/ipfs/bafybeigx6q4aezve7my76s5vvfuiinbxtepapqvmjf2jbgrozrut6cjape/p/ipfs-message-port-protocol.tar.gz} 3094 - name: ipfs-message-port-protocol 3095 - version: 0.6.0-fission 3096 - engines: {node: '>=10.3.0', npm: '>=3.0.0'} 3097 - dependencies: 3098 - cids: 1.1.9 3099 - ipld-block: 0.11.1 3100 - dev: false
+20 -3
src/Javascript/Brain/user.js
··· 98 98 // ------- 99 99 100 100 let wn 101 + let wnfs 101 102 102 103 103 104 ports.webnativeRequest = app => request => { 104 - constructFission().then(() => { 105 - self.webnativeElm.request({ app: app, request: request }) 105 + const getFs = () => wnfs 106 + 107 + constructFission.call(self).then(() => { 108 + console.log(request) 109 + if (request.method === "loadFileSystem") { 110 + self.webnative.loadFileSystem(...request.arguments).then(fs => { 111 + wnfs = fs 112 + app.ports.webnativeResponse.send({ 113 + tag: request.tag, 114 + error: null, 115 + method: request.method, 116 + data: {}, 117 + context: request.context 118 + }) 119 + }) 120 + } else { 121 + self.webnativeElm.request({ app: app, getFs, request: request }) 122 + } 106 123 }) 107 124 } 108 125 ··· 140 157 ) 141 158 }) 142 159 ) 143 - .then(port => self.IpfsMessagePortClient.from(port)) 160 + .then(port => self.IpfsMessagePortClient.IPFSClient.from(port)) 144 161 .then(ipfs => wn.ipfs.set(ipfs)) 145 162 } 146 163