Skip to content

Commit 627409e

Browse files
AlexNi245hai-ko
AlexNi245
authored and
hai-ko
committed
Fix modules (#596)
* accepts more than one default con * normalize ensName before adding it to contract list (#582) * normalize ensName before adding it to contract list * release 0.2.9 * fix bug in profile that prevented ENS name owners from creating a profile * release profile and react * Use latest react package in web (#591) * fix bug in profile that prevented ENS name owners from creating a profile * release profile and react * use dm3-react v0.2.11 in web * update yarn.lock * use profile v0.2.2 (#592) * use profile v0.2.2 * update yarn.lock * use commonfJs instead of esnext * replace dist.backend * use node instead of ts-node * remove billboard-widget and billdboard-client form packages * push yarn lock * remove old backend config * lint ignore for billboard widget * remove backend build from pipeline * remove backen build from action.yml * repair broken action.yml * remove all eft over references to dist.backend * fix global config * use proper globalConfic Input * add globa config to resolverEndpint deps
1 parent d13b6f1 commit 627409e

File tree

74 files changed

+895
-2474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+895
-2474
lines changed

‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
},
77
extends: ['prettier'],
88
plugins: ['no-only-tests'],
9-
ignorePatterns: ['package.json', '**/*.js'],
9+
ignorePatterns: ['package.json', '**/*.js', '**/billboard-widget/**'],
1010
rules: {
1111
'max-len': ['error', { code: 120 }],
1212
'no-console': ['error'],

‎.github/workflows/on-push.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ jobs:
4141
with:
4242
name: lib-builds
4343
path: packages/lib/**/dist/
44-
- uses: actions/upload-artifact@master
45-
with:
46-
name: lib-backend-builds
47-
path: packages/lib/**/dist.backend/
4844
- uses: actions/upload-artifact@master
4945
with:
5046
name: lib-schema
@@ -174,4 +170,4 @@ jobs:
174170
uses: ./test-action
175171
with:
176172
workspace-name: 'dm3-offchain-resolver'
177-
package-pat: ${{ secrets.PACKAGE_PAT }}
173+
package-pat: ${{ secrets.PACKAGE_PAT }}

‎package.json

-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
"packages/lib/offchainResolver-api",
1414
"packages/lib/billboard-api",
1515
"packages/backend",
16-
"packages/billboard-client",
1716
"packages/react",
1817
"packages/web",
19-
"packages/billboard-widget",
2018
"packages/integration-tests",
2119
"packages/offchain-resolver",
2220
"packages/messenger-widget",

‎packages/backend/cli.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const lib = require('dm3-lib/dist.backend');
1+
const lib = require('dm3-lib');
22

33
const main = async () => {
44
const encryptionKeyPair = await lib.crypto.createKeyPair();

‎packages/backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"scripts": {
3030
"docker:up": "docker-compose up -d",
31-
"start": "ts-node --transpile-only ./src/index.ts",
31+
"start": "node ./dist/index.js",
3232
"test": "npm run docker:up && jest --coverage --runInBand --transformIgnorePatterns 'node_modules/(?!(dm3-lib-\\w*)/)'",
3333
"build": "yarn tsc && cp ./config.yml ./dist/config.yml | true",
3434
"createDeliveryServiceProfile": "node --no-warnings ./cli.js"

‎packages/backend/src/auth.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import { validateSchema } from 'dm3-lib-shared/dist.backend';
2-
import {
3-
createChallenge,
4-
createNewSessionToken,
5-
} from 'dm3-lib-delivery/dist.backend';
1+
import { validateSchema } from 'dm3-lib-shared';
2+
import { createChallenge, createNewSessionToken } from 'dm3-lib-delivery';
63

74
import express from 'express';
85
import cors from 'cors';

‎packages/backend/src/cleanup/cleanUpPendingMessages.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { IDatabase } from '../persistance/getDatabase';
2-
import { logInfo } from 'dm3-lib-shared/dist.backend';
2+
import { logInfo } from 'dm3-lib-shared';
33

44
//1 day
55
const DEFAULT_CLEANUP_INTERVAL = 86400000;

‎packages/backend/src/config/getDeliveryServiceProperties.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import { parse } from 'yaml';
22
import { existsSync, readFileSync } from 'fs';
33
import { resolve } from 'path';
4-
import { logInfo, validateSchema } from 'dm3-lib-shared/dist.backend';
5-
import {
6-
schema,
7-
DeliveryServiceProperties,
8-
} from 'dm3-lib-delivery/dist.backend';
4+
import { logInfo, validateSchema } from 'dm3-lib-shared';
5+
import { schema, DeliveryServiceProperties } from 'dm3-lib-delivery';
96

107
const DEFAULT_CONFIG_FILE_PATH = resolve(__dirname, './../config.yml');
118
const DEFAULT_DELIVERY_SERVICE_PROPERTIES: DeliveryServiceProperties = {

‎packages/backend/src/delivery.ts

+3-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@ import express from 'express';
33
import { IDatabase } from './persistance/getDatabase';
44
import { WithLocals } from './types';
55
import { auth } from './utils';
6-
import {
7-
schema,
8-
getMessages,
9-
Acknoledgment,
10-
} from 'dm3-lib-delivery/dist.backend';
11-
import { validateSchema } from 'dm3-lib-shared/dist.backend';
12-
import { getConversationId } from 'dm3-lib-storage/dist.backend';
6+
import { schema, getMessages, Acknoledgment } from 'dm3-lib-delivery';
7+
import { validateSchema } from 'dm3-lib-shared';
8+
import { getConversationId } from 'dm3-lib-storage';
139

1410
const syncAcknoledgmentParamsSchema = {
1511
type: 'object',

‎packages/backend/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { getDatabase } from './persistance/getDatabase';
1515
import Profile from './profile';
1616
import RpcProxy from './rpc/rpc-proxy';
1717
import Storage from './storage';
18-
import { logInfo } from 'dm3-lib-shared/dist.backend';
18+
import { logInfo } from 'dm3-lib-shared';
1919

2020
import {
2121
errorHandler,

‎packages/backend/src/messaging.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { Socket } from 'socket.io';
33
import { onConnection } from './messaging';
44
import { testData } from '../../../test-data/encrypted-envelops.test';
55
import { WithLocals } from './types';
6-
import { Session } from 'dm3-lib-delivery/dist.backend';
7-
import { UserProfile } from 'dm3-lib-profile/dist.backend';
8-
import { createKeyPair } from 'dm3-lib-crypto/dist.backend';
9-
import { ethersHelper } from 'dm3-lib-shared/dist.backend';
6+
import { Session } from 'dm3-lib-delivery';
7+
import { UserProfile } from 'dm3-lib-profile';
8+
import { createKeyPair } from 'dm3-lib-crypto';
9+
import { ethersHelper } from 'dm3-lib-shared';
1010
const SENDER_ADDRESS = '0x25A643B6e52864d0eD816F1E43c0CF49C83B8292';
1111
const RECEIVER_ADDRESS = '0xDd36ae7F9a8E34FACf1e110c6e9d37D0dc917855';
1212

‎packages/backend/src/messaging.ts

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import { Socket } from 'socket.io';
22
import express from 'express';
33
import { WithLocals } from './types';
4-
import { validateSchema } from 'dm3-lib-shared/dist.backend';
5-
import { EncryptionEnvelop } from 'dm3-lib-messaging/dist.backend';
6-
import { normalizeEnsName } from 'dm3-lib-profile/dist.backend';
7-
import {
8-
schema,
9-
checkToken,
10-
incomingMessage,
11-
} from 'dm3-lib-delivery/dist.backend';
4+
import { validateSchema } from 'dm3-lib-shared';
5+
import { EncryptionEnvelop } from 'dm3-lib-messaging';
6+
import { normalizeEnsName } from 'dm3-lib-profile';
7+
import { schema, checkToken, incomingMessage } from 'dm3-lib-delivery';
128

139
const pendingMessageSchema = {
1410
type: 'object',

‎packages/backend/src/persistance/getDatabase.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import {
2-
Session as DSSession,
3-
spamFilter,
4-
} from 'dm3-lib-delivery/dist.backend';
5-
import { EncryptionEnvelop } from 'dm3-lib-messaging/dist.backend';
6-
import { UserStorage } from 'dm3-lib-storage/dist.backend';
1+
import { Session as DSSession, spamFilter } from 'dm3-lib-delivery';
2+
import { EncryptionEnvelop } from 'dm3-lib-messaging';
3+
import { UserStorage } from 'dm3-lib-storage';
74
import { createClient } from 'redis';
85
import winston from 'winston';
96
import Messages from './messages';

‎packages/backend/src/persistance/messages/createMessage.test.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { Redis, IDatabase, getRedisClient, getDatabase } from '../getDatabase';
22
import winston from 'winston';
3-
import {
4-
DeliveryInformation,
5-
EncryptionEnvelop,
6-
} from 'dm3-lib-messaging/dist.backend';
3+
import { DeliveryInformation, EncryptionEnvelop } from 'dm3-lib-messaging';
74

85
const SENDER_ADDRESS = '0x25A643B6e52864d0eD816F1E43c0CF49C83B8292';
96
const RECEIVER_ADDRESS = '0xDd36ae7F9a8E34FACf1e110c6e9d37D0dc917855';

‎packages/backend/src/persistance/messages/createMessage.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {
33
schema,
44
DeliveryInformation,
55
EncryptionEnvelop,
6-
} from 'dm3-lib-messaging/dist.backend';
7-
import { validateSchema, stringify } from 'dm3-lib-shared/dist.backend';
6+
} from 'dm3-lib-messaging';
7+
import { validateSchema, stringify } from 'dm3-lib-shared';
88
export function createMessage(redis: Redis) {
99
return async (
1010
conversationId: string,

‎packages/backend/src/persistance/messages/getIncomingMessages.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EncryptionEnvelop } from 'dm3-lib-messaging/dist.backend';
1+
import { EncryptionEnvelop } from 'dm3-lib-messaging';
22
import { Redis, RedisPrefix } from '../getDatabase';
33
import { getMessages } from './getMessages';
44

‎packages/backend/src/persistance/messages/getMessages.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EncryptionEnvelop } from 'dm3-lib-messaging/dist.backend';
1+
import { EncryptionEnvelop } from 'dm3-lib-messaging';
22
import { Redis, RedisPrefix } from '../getDatabase';
33

44
export function getMessages(

‎packages/backend/src/persistance/messages/syncAcknoledgment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Redis, RedisPrefix } from '../getDatabase';
2-
import { normalizeEnsName } from 'dm3-lib-profile/dist.backend';
2+
import { normalizeEnsName } from 'dm3-lib-profile';
33
export function syncAcknoledgment(redis: Redis) {
44
return async (
55
conversationId: string,

‎packages/backend/src/persistance/pending/addPending.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Redis, RedisPrefix } from '../getDatabase';
2-
import { normalizeEnsName } from 'dm3-lib-profile/dist.backend';
2+
import { normalizeEnsName } from 'dm3-lib-profile';
33

44
export function addPending(redis: Redis) {
55
return async (ensName: string, contactEnsName: string): Promise<void> => {

‎packages/backend/src/persistance/session/getIdEnsName.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Redis, RedisPrefix } from '../getDatabase';
2-
import { normalizeEnsName } from 'dm3-lib-profile/dist.backend';
2+
import { normalizeEnsName } from 'dm3-lib-profile';
33

44
export function getIdEnsName(redis: Redis) {
55
return async (ensName: string) =>

‎packages/backend/src/persistance/session/getSession.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Redis, RedisPrefix } from '../getDatabase';
2-
import { Session, spamFilter } from 'dm3-lib-delivery/dist.backend';
2+
import { Session, spamFilter } from 'dm3-lib-delivery';
33
import { getIdEnsName } from './getIdEnsName';
44

55
export function getSession(redis: Redis) {

‎packages/backend/src/persistance/session/setSession.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Redis, IDatabase, getRedisClient, getDatabase } from '../getDatabase';
2-
import { UserProfile } from 'dm3-lib-profile/dist.backend';
3-
import { Session } from 'dm3-lib-delivery/dist.backend';
2+
import { UserProfile } from 'dm3-lib-profile';
3+
import { Session } from 'dm3-lib-delivery';
44
import winston from 'winston';
55

66
const USER_ADDRESS = '0x25A643B6e52864d0eD816F1E43c0CF49C83B8292';

‎packages/backend/src/persistance/session/setSession.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Redis, RedisPrefix } from '../getDatabase';
2-
import { Session, schema } from 'dm3-lib-delivery/dist.backend';
3-
import { validateSchema, stringify } from 'dm3-lib-shared/dist.backend';
4-
import { normalizeEnsName } from 'dm3-lib-profile/dist.backend';
2+
import { Session, schema } from 'dm3-lib-delivery';
3+
import { validateSchema, stringify } from 'dm3-lib-shared';
4+
import { normalizeEnsName } from 'dm3-lib-profile';
55
import { getIdEnsName } from './getIdEnsName';
66

77
export function setSession(redis: Redis) {

‎packages/backend/src/persistance/storage/getUserStorage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Redis, RedisPrefix } from '../getDatabase';
2-
import { UserStorage } from 'dm3-lib-storage/dist.backend';
2+
import { UserStorage } from 'dm3-lib-storage';
33
import { getIdEnsName } from '../session/getIdEnsName';
44

55
export function getUserStorage(redis: Redis) {

‎packages/backend/src/persistance/storage/setUserStorage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { stringify } from 'dm3-lib-shared/dist.backend';
1+
import { stringify } from 'dm3-lib-shared';
22
import { Redis, RedisPrefix } from '../getDatabase';
33
import { getIdEnsName } from '../session/getIdEnsName';
44

‎packages/backend/src/profile.test.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import bodyParser from 'body-parser';
22

3-
import {
4-
UserProfile,
5-
getProfileCreationMessage,
6-
} from 'dm3-lib-profile/dist.backend';
7-
import { stringify } from 'dm3-lib-shared/dist.backend';
3+
import { UserProfile, getProfileCreationMessage } from 'dm3-lib-profile';
4+
import { stringify } from 'dm3-lib-shared';
85
import { ethers } from 'ethers';
96
import express from 'express';
107
import request from 'supertest';

‎packages/backend/src/profile.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import {
2-
getUserProfile,
3-
submitUserProfile,
4-
} from 'dm3-lib-delivery/dist.backend';
5-
import { normalizeEnsName, schema } from 'dm3-lib-profile/dist.backend';
6-
import { validateSchema } from 'dm3-lib-shared/dist.backend';
1+
import { getUserProfile, submitUserProfile } from 'dm3-lib-delivery';
2+
import { normalizeEnsName, schema } from 'dm3-lib-profile';
3+
import { validateSchema } from 'dm3-lib-shared';
74
import express, { NextFunction } from 'express';
85
import { WithLocals } from './types';
96
import { auth } from './utils';

‎packages/backend/src/rpc/methods/handleGetDeliveryServiceProperties.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { stringify } from 'dm3-lib-shared/dist.backend';
1+
import { stringify } from 'dm3-lib-shared';
22
import express from 'express';
33

44
export function handleGetDeliveryServiceProperties(

‎packages/backend/src/rpc/methods/handleResolveProfileExtension.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Axios } from 'axios';
2-
import { stringify } from 'dm3-lib-shared/dist.backend';
2+
import { stringify } from 'dm3-lib-shared';
33
import express from 'express';
44
import { WithLocals } from '../../types';
55

‎packages/backend/src/rpc/methods/handleSubmitMessage.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { schema, incomingMessage } from 'dm3-lib-delivery/dist.backend';
2-
import { EncryptionEnvelop } from 'dm3-lib-messaging/dist.backend';
3-
import { validateSchema } from 'dm3-lib-shared/dist.backend';
1+
import { schema, incomingMessage } from 'dm3-lib-delivery';
2+
import { EncryptionEnvelop } from 'dm3-lib-messaging';
3+
import { validateSchema } from 'dm3-lib-shared';
44
import 'dotenv/config';
55
import express from 'express';
66
import { WithLocals } from '../../types';

‎packages/backend/src/rpc/rpc-proxy.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import request from 'supertest';
55
import RpcProxy from './rpc-proxy';
66
import { testData } from '../../../../test-data/encrypted-envelops.test';
77

8-
import { createKeyPair } from 'dm3-lib-crypto/dist.backend';
9-
import { normalizeEnsName, UserProfile } from 'dm3-lib-profile/dist.backend';
10-
import { stringify } from 'dm3-lib-shared/dist.backend';
8+
import { createKeyPair } from 'dm3-lib-crypto';
9+
import { normalizeEnsName, UserProfile } from 'dm3-lib-profile';
10+
import { stringify } from 'dm3-lib-shared';
1111

1212
// eslint-disable-next-line no-console
1313
const log = (toLog: any) => console.log(toLog);

‎packages/backend/src/storage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import express from 'express';
33
import stringify from 'safe-stable-stringify';
44
import { WithLocals } from './types';
55
import { auth } from './utils';
6-
import { normalizeEnsName } from 'dm3-lib-profile/dist.backend';
6+
import { normalizeEnsName } from 'dm3-lib-profile';
77

88
export default () => {
99
const router = express.Router();

‎packages/backend/src/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ethers } from 'ethers';
22
import express from 'express';
33
import { IDatabase } from './persistance/getDatabase';
4-
import { DeliveryServiceProperties } from 'dm3-lib-delivery/dist.backend';
4+
import { DeliveryServiceProperties } from 'dm3-lib-delivery';
55

66
export interface WithLocals {
77
locals: Record<string, any> &

‎packages/backend/src/utils.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { Express, NextFunction, Request, Response } from 'express';
33
import { Socket } from 'socket.io';
44
import { ExtendedError } from 'socket.io/dist/namespace';
55
import { WithLocals } from './types';
6-
import { normalizeEnsName } from 'dm3-lib-profile/dist.backend';
7-
import { checkToken } from 'dm3-lib-delivery/dist.backend';
8-
import { KeyPair } from 'dm3-lib-crypto/dist.backend';
6+
import { normalizeEnsName } from 'dm3-lib-profile';
7+
import { checkToken } from 'dm3-lib-delivery';
8+
import { KeyPair } from 'dm3-lib-crypto';
99

1010
export async function auth(
1111
req: Request,

‎packages/billboard-widget/.eslintrc.cjs

-14
This file was deleted.

‎packages/billboard-widget/src/components/CreateMessage.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ declare module 'react' {
1919
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
2020
//@ts-ignore
2121
extends AriaAttributes,
22+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
23+
//@ts-ignore
2224
DOMAttributes<T> {
2325
enterkeyhint?: string;
2426
}

‎packages/lib/billboard-api/tsconfig.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
"strict": true,
1010
"forceConsistentCasingInFileNames": true,
1111
"noFallthroughCasesInSwitch": true,
12-
"module": "esnext",
12+
"module": "CommonJS",
1313
"moduleResolution": "node",
1414
"resolveJsonModule": true,
1515
"isolatedModules": true,
16-
"jsx": "react-jsx",
1716
"outDir": "dist",
1817
"sourceMap": true
1918
},

0 commit comments

Comments
 (0)